github/marktext
5
0
Fork 0
mirror of https://github.com/marktext/marktext.git synced 2025-05-02 01:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

update prismjs (#1012)

Browse Source 
* update prismjs

* update language.json
This commit is contained in:
Ran Luo 2019-05-08 06:13:08 +08:00 committed by Felix Häusler
parent de841c8fdb
commit 7dee1a4135
7 changed files with 2598 additions and 985 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -189,7 +189,7 @@
"keyboard-layout": "^2.0.15",
"mermaid": "^8.0.0",
"popper.js": "^1.15.0",
"prismjs2": "^1.15.1",
"prismjs": "^1.16.0",
"snabbdom": "^0.7.3",
"snabbdom-to-html": "^5.1.1",
"snapsvg": "^0.5.1",

3186
resources/THIRD-PARTY-LICENSES.txt
View File

File diff suppressed because it is too large Load Diff

8
src/muya/lib/prism/index.js
View File

@ -1,12 +1,14 @@
import Prism from 'prismjs2'
import Prism from 'prismjs'
import { filter } from 'fuzzaldrin'
import initLoadLanguage, { loadedCache } from './loadLanguage'
import languages from './languages'
const prism = Prism
window.Prism = Prism
import('prismjs2/plugins/keep-markup/prism-keep-markup')
const langs = Object.keys(languages).map(name => (languages[name]))
import('prismjs/plugins/keep-markup/prism-keep-markup')
const langs = Object.keys(languages).map(name => {
return Object.assign({}, languages[name], { name })
})
const loadLanguage = initLoadLanguage(Prism)
const search = text => {

373
src/muya/lib/prism/languages.json
View File

File diff suppressed because it is too large Load Diff

2
src/muya/lib/prism/loadLanguage.js
View File

@ -74,7 +74,7 @@ function initLoadLanguage (Prism) {
}
delete Prism.languages[language]
await import('prismjs2/components/prism-' + language)
await import('prismjs/components/prism-' + language)
loadedCache.add(language)
promises.push(Promise.resolve({
status: 'loaded',

4
src/muya/lib/utils/exportHtml.js
View File

@ -1,12 +1,12 @@
import marked from '../parser/marked'
import Prism from 'prismjs2'
import Prism from 'prismjs'
import katex from 'katex'
import mermaid from 'mermaid'
import flowchart from 'flowchart.js'
import Diagram from '../parser/render/sequence'
import vegaEmbed from 'vega-embed'
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, unescapeHtml } from '../utils'

8
yarn.lock
View File

@ -8754,10 +8754,10 @@ pretty-error@^2.0.2:
renderkid "^2.0.1"
utila "~0.4"
prismjs2@^1.15.1:
version "1.15.1"
resolved "https://registry.yarnpkg.com/prismjs2/-/prismjs2-1.15.1.tgz#6dda1b9aa7e8ecddf55b145f2189b605f89e2738"
integrity sha512-tDYrcjuYxi5VceNCniF7YjxFTHJv7unA5KbN9EVZh0hnKmEaxdSSe43Gagobvue5UnbnUSB0y+l5b8Y3C1cXkA==
prismjs@^1.16.0:
version "1.16.0"
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.16.0.tgz#406eb2c8aacb0f5f0f1167930cb83835d10a4308"
integrity sha512-OA4MKxjFZHSvZcisLGe14THYsug/nF6O1f0pAJc0KN0wTyAcLqmsbE+lTGKSpyh+9pEW57+k6pg2AfYR+coyHA==
optionalDependencies:
clipboard "^2.0.0"