From 6174a975c8a28e169d0e961347f77f69fc13c710 Mon Sep 17 00:00:00 2001
From: laggage <38829279+laggage@users.noreply.github.com>
Date: Thu, 17 Mar 2022 18:52:54 +0800
Subject: [PATCH] fix: fix bad app download link for mac (#61)

* fix: fix bad app download link for mac

* chore: replace prismjs2 with prismjs

* Rename `Mark Text` to `MarkText`
---
 README.md                            |  2 +-
 package.json                         |  2 +-
 public/index.html                    |  2 +-
 src/components/sponsor.vue           |  4 +--
 src/components/titleBar.vue          |  4 +--
 src/markdowns/inlineFormats.md       |  4 +--
 src/markdowns/themes.md              | 10 +++----
 src/muya/README.md                   |  4 +--
 src/muya/lib/config/index.js         |  2 +-
 src/muya/lib/utils/exportHtml.js     |  6 ++--
 src/muya/lib/utils/importMarkdown.js |  2 +-
 src/muya/package.json                |  2 +-
 yarn.lock                            | 41 +++-------------------------
 13 files changed, 26 insertions(+), 59 deletions(-)
diff --git a/README.md b/README.md
index f5dc053..3b9f01a 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-### Mark Text website
\ No newline at end of file
+### MarkText website
diff --git a/package.json b/package.json
index 449ec47..48b2b39 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "katex": "^0.10.1",
     "mermaid": "^8.0.0",
     "popper.js": "^1.15.0",
-    "prismjs2": "^1.15.1",
+    "prismjs": "^1.27.0",
     "snabbdom": "^0.7.3",
     "snabbdom-to-html": "^5.1.1",
     "snapsvg": "^0.5.1",
diff --git a/public/index.html b/public/index.html
index c347556..36a774f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>Mark Text</title>
+    <title>MarkText</title>
   </head>
   <body>
     <noscript>
diff --git a/src/components/sponsor.vue b/src/components/sponsor.vue
index 9ccb069..59421db 100644
--- a/src/components/sponsor.vue
+++ b/src/components/sponsor.vue
@@ -39,7 +39,7 @@
 
       </div>
       <div class="ask-sponsor">
-        <h4>Sponsor Mark Text Development</h4>
+        <h4>Sponsor MarkText Development</h4>
         <p>Mark Text is an MIT licensed open source project, you will always be able to download the latest version from <a href="https://github.com/marktext/marktext/releases" target="_blank">GitHub release page</a>. Mark Text is still in development, and its development is inseparable from all sponsors. I hope you join them:</p>
         <div class="button-group">
           <a href="https://opencollective.com/marktext#platinum-sponsors" class="opencollective">
@@ -59,7 +59,7 @@
           <strong>What's the difference between Patreon and OpenCollective?</strong>
           <div class="description">
             <div>
-              <p>Sponsored by Patreon, goes directly to support Ran Luo's work on Mark Text. Sponsored by Open Collective, all expenses are transparent, and used for the development of Mark Text.</p>
+              <p>Sponsored by Patreon, goes directly to support Ran Luo's work on MarkText. Sponsored by Open Collective, all expenses are transparent, and used for the development of Mark Text.</p>
               <strong>We also accept <a href="https://github.com/Jocs/sponsor.me" target="_blank"> One Time Donations</a></strong>
             </div>
             <img src="../assets/do_code.image.svg" alt="" class="bg-image">
diff --git a/src/components/titleBar.vue b/src/components/titleBar.vue
index 0e10948..a8b3fee 100644
--- a/src/components/titleBar.vue
+++ b/src/components/titleBar.vue
@@ -3,7 +3,7 @@
     <div class="nav" :class="{ 'is-open':isOpenNav }">
       <h1>
         <img src="../assets/logo.png" alt="marktext">
-        Mark Text
+        MarkText
       </h1>
       <div class="nav-group">
         <a href="javascript:;" @click="scrollTo('#features')">Features</a>
@@ -25,7 +25,7 @@
         <div class="download-group">
           <div class="download-info">Available for macOS, Windows and Linux.</div>
           <div class="button-group">
-            <a class="button" href="https://github.com/marktext/marktext/releases/latest/download/marktext.dmg" target="_blank">
+            <a class="button" href="https://github.com/marktext/marktext/releases/latest/download/marktext-x64.dmg" target="_blank">
               <svg :viewBox="MacIcon.viewBox" aria-hidden="true" class="icon">
                 <use :xlink:href="MacIcon.url" />
               </svg>
diff --git a/src/markdowns/inlineFormats.md b/src/markdowns/inlineFormats.md
index c9e7ac7..a793363 100644
--- a/src/markdowns/inlineFormats.md
+++ b/src/markdowns/inlineFormats.md
@@ -1,5 +1,5 @@
 #### Inline Formats
 
-**Mark Text** support all  [CommonMark Spec](https://spec.commonmark.org/0.28/)  and  [GitHub Flavored Markdown Spec](https://github.github.com/gfm/) syntax.
+**MarkText** support all  [CommonMark Spec](https://spec.commonmark.org/0.28/)  and  [GitHub Flavored Markdown Spec](https://github.github.com/gfm/) syntax.
 
-**strong**, *emphasis*, `inline code`, $a \ne b$, ~~strike~~, :smile: [link](), ![picture](./girl.jpg)
\ No newline at end of file
+**strong**, *emphasis*, `inline code`, $a \ne b$, ~~strike~~, :smile: [link](), ![picture](./girl.jpg)
diff --git a/src/markdowns/themes.md b/src/markdowns/themes.md
index 20fc926..1aa0d02 100644
--- a/src/markdowns/themes.md
+++ b/src/markdowns/themes.md
@@ -15,14 +15,14 @@ f(n)
 $$
 
 ```javascript
-// Yeh, Mark Text is simple and elegant markdown editor.
+// Yeh, MarkText is simple and elegant markdown editor.
 const marktext = 'markdown editor'
 ```
 
-| name                                              | use for        |
-| :-----------------------------------------------: | :------------: |
-| [Mark Text](https://github.com/marktext/marktext) | Write markdown |
+|                       name                       | use for        |
+|:------------------------------------------------:| :------------: |
+| [MarkText](https://github.com/marktext/marktext) | Write markdown |
 
 > It has roots in a piece of classical Latin literature from 45 BC
 > 
-> making it over 2000 years old.
\ No newline at end of file
+> making it over 2000 years old.
diff --git a/src/muya/README.md b/src/muya/README.md
index 3b84154..a72626a 100644
--- a/src/muya/README.md
+++ b/src/muya/README.md
@@ -2,7 +2,7 @@
 
 A browser based Markdown editor.
 
-**CHANGE** from muya in Mark Text
+**CHANGE** from muya in MarkText
 
 disabled `flowchart.js` `sequence` `and vega-embed`
 
@@ -10,4 +10,4 @@ disabled `flowchart.js` `sequence` `and vega-embed`
 // import flowchart from 'flowchart.js'
 // import Diagram from './sequence'
 // import vegaEmbed from 'vega-embed'
-```
\ No newline at end of file
+```
diff --git a/src/muya/lib/config/index.js b/src/muya/lib/config/index.js
index 26ba324..ee88a0e 100644
--- a/src/muya/lib/config/index.js
+++ b/src/muya/lib/config/index.js
@@ -242,7 +242,7 @@ export const MUYA_DEFAULT_OPTION = {
 }
 
 // export const DIAGRAM_TEMPLATE = {
-//   'mermaid': `graph LR;\nYou-->|Mark Text|Me;`
+//   'mermaid': `graph LR;\nYou-->|MarkText|Me;`
 // }
 
 export const isInElectron = window && window.process && window.process.type === 'renderer'
diff --git a/src/muya/lib/utils/exportHtml.js b/src/muya/lib/utils/exportHtml.js
index e1ad94e..283c948 100644
--- a/src/muya/lib/utils/exportHtml.js
+++ b/src/muya/lib/utils/exportHtml.js
@@ -1,11 +1,11 @@
 import marked from '../parser/marked'
-import Prism from 'prismjs2'
+import Prism from 'prismjs'
 import katex from 'katex'
 import githubMarkdownCss from 'github-markdown-css/github-markdown.css'
-import highlightCss from 'prismjs2/themes/prism.css'
+import highlightCss from 'prismjs/themes/prism.css'
 import katexCss from 'katex/dist/katex.css'
 import { EXPORT_DOMPURIFY_CONFIG } from '../config'
-import { sanitize } from '../utils'
+import { sanitize } from './index'
 import { validEmoji } from '../ui/emojis'
 
 export const getSanitizeHtml = markdown => {
diff --git a/src/muya/lib/utils/importMarkdown.js b/src/muya/lib/utils/importMarkdown.js
index 04774d2..5f7170c 100644
--- a/src/muya/lib/utils/importMarkdown.js
+++ b/src/muya/lib/utils/importMarkdown.js
@@ -1,5 +1,5 @@
 /**
- * translate markdown format to content state used by Mark Text
+ * translate markdown format to content state used by MarkText
  * there is some difference when parse loose list item and tight lsit item.
  * Both of them add a p block in li block, use the CSS style to distinguish loose and tight.
  */
diff --git a/src/muya/package.json b/src/muya/package.json
index ca7aba7..9846730 100644
--- a/src/muya/package.json
+++ b/src/muya/package.json
@@ -1,7 +1,7 @@
 {
   "name": "muya",
   "version": "0.1.2",
-  "description": "A browser based markdown editor that powers Mark Text",
+  "description": "A browser based markdown editor that powers MarkText",
   "main": "dist/muya.min.js",
   "scripts": {
     "test": "npm run test"
diff --git a/yarn.lock b/yarn.lock
index 1130f5c..c0e8fed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1912,15 +1912,6 @@ cli-width@^2.0.0:
   resolved "http://registry.npm.taobao.org/cli-width/download/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
-clipboard@^2.0.0:
-  version "2.0.4"
-  resolved "http://registry.npm.taobao.org/clipboard/download/clipboard-2.0.4.tgz#836dafd66cf0fea5d71ce5d5b0bf6e958009112d"
-  integrity sha1-g22v1mzw/qXXHOXVsL9ulYAJES0=
-  dependencies:
-    good-listener "^1.2.2"
-    select "^1.1.2"
-    tiny-emitter "^2.0.0"
-
 cliui@^2.1.0:
   version "2.1.0"
   resolved "http://registry.npm.taobao.org/cliui/download/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
@@ -2864,11 +2855,6 @@ delayed-stream@~1.0.0:
   resolved "http://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegate@^3.1.2:
-  version "3.2.0"
-  resolved "http://registry.npm.taobao.org/delegate/download/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
-  integrity sha1-tmtxwxWFIuirV0T3INjKDCr1kWY=
-
 delegates@^1.0.0:
   version "1.0.0"
   resolved "http://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -4089,13 +4075,6 @@ globule@^1.0.0:
     lodash "~4.17.10"
     minimatch "~3.0.2"
 
-good-listener@^1.2.2:
-  version "1.2.2"
-  resolved "http://registry.npm.taobao.org/good-listener/download/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
-  integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=
-  dependencies:
-    delegate "^3.1.2"
-
 graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.15"
   resolved "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
@@ -7022,12 +7001,10 @@ pretty-error@^2.0.2:
     renderkid "^2.0.1"
     utila "~0.4"
 
-prismjs2@^1.15.1:
-  version "1.15.1"
-  resolved "http://registry.npm.taobao.org/prismjs2/download/prismjs2-1.15.1.tgz#6dda1b9aa7e8ecddf55b145f2189b605f89e2738"
-  integrity sha1-bdobmqfo7N31WxRfIYm2BfieJzg=
-  optionalDependencies:
-    clipboard "^2.0.0"
+prismjs@^1.27.0:
+  version "1.27.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057"
+  integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==
 
 private@^0.1.6, private@^0.1.8, private@~0.1.5:
   version "0.1.8"
@@ -7661,11 +7638,6 @@ select-hose@^2.0.0:
   resolved "http://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-select@^1.1.2:
-  version "1.1.2"
-  resolved "http://registry.npm.taobao.org/select/download/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
-  integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
-
 selfsigned@^1.9.1:
   version "1.10.4"
   resolved "http://registry.npm.taobao.org/selfsigned/download/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
@@ -8476,11 +8448,6 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
-tiny-emitter@^2.0.0:
-  version "2.1.0"
-  resolved "http://registry.npm.taobao.org/tiny-emitter/download/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
-  integrity sha1-HRpW7fxRxD6GPLtTgqcjMONVVCM=
-
 title-case@^2.1.0:
   version "2.1.1"
   resolved "http://registry.npm.taobao.org/title-case/download/title-case-2.1.1.tgz#3e127216da58d2bc5becf137ab91dae3a7cd8faa"
