Comparing version 2.0.4 to 2.0.5
@@ -8,2 +8,3 @@ 'use strict'; | ||
var hljs = _interopDefault(require('highlight.js')); | ||
var Prism = _interopDefault(require('prismjs')); | ||
var vueify = require('vueify'); | ||
@@ -133,2 +134,36 @@ | ||
/** | ||
* SEE https://github.com/PrismJS/prism | ||
* @param {String} code | ||
* @param {String} lang | ||
*/ | ||
var highlightJs = function (code, lang) { | ||
return hljs.highlight(lang, code).value | ||
}; | ||
/** | ||
* SEE https://github.com/PrismJS/prism | ||
* @param {String} code | ||
* @param {String} lang | ||
*/ | ||
var prismJs = function (code, lang) { | ||
if ( lang === void 0 ) lang = 'autoit'; | ||
if (!Prism.languages[lang]) { | ||
try { | ||
require(("prismjs/components/prism-" + lang)); | ||
} catch (e) { | ||
lang = 'autoit'; | ||
} | ||
} | ||
return Prism.highlight(code, Prism.languages[lang]) | ||
}; | ||
global.Prism = Prism; | ||
var highlightMap = { | ||
'highlight.js': highlightJs, | ||
prism: prismJs | ||
}; | ||
var renderer = getRenderer(); | ||
@@ -145,8 +180,19 @@ var FIX_VUE = /<span class="hljs-tag"><\/</g; | ||
var markup = marked(source, { renderer: renderer }); | ||
return { demos: demos, markup: markup } | ||
function code (raw, language) { | ||
var highlight = config.highlight; | ||
var fn = null; | ||
if (typeof highlight === 'function') { | ||
fn = highlight; | ||
} else if (highlightMap[highlight]) { | ||
fn = highlightMap[highlight]; | ||
} else { | ||
throw new Error('Invalid highlight option!') | ||
} | ||
var lang = language === 'vue' ? 'html' : language; | ||
var markup = hljs.highlight(lang, raw).value; | ||
var markup = fn(raw, lang); | ||
@@ -174,3 +220,2 @@ // TODO: 优化判断条件 | ||
var customMarkups = ''; | ||
if (typeof config.customMarkups === 'function') { | ||
@@ -261,3 +306,4 @@ customMarkups = config.customMarkups() || ''; | ||
var defaults = { | ||
target: 'vue' | ||
target: 'vue', | ||
highlight: 'highlight.js' | ||
}; | ||
@@ -264,0 +310,0 @@ |
import marked from 'marked'; | ||
import indent from 'indent'; | ||
import hljs from 'highlight.js'; | ||
import Prism from 'prismjs'; | ||
import { compiler } from 'vueify'; | ||
@@ -128,2 +129,36 @@ | ||
/** | ||
* SEE https://github.com/PrismJS/prism | ||
* @param {String} code | ||
* @param {String} lang | ||
*/ | ||
var highlightJs = function (code, lang) { | ||
return hljs.highlight(lang, code).value | ||
}; | ||
/** | ||
* SEE https://github.com/PrismJS/prism | ||
* @param {String} code | ||
* @param {String} lang | ||
*/ | ||
var prismJs = function (code, lang) { | ||
if ( lang === void 0 ) lang = 'autoit'; | ||
if (!Prism.languages[lang]) { | ||
try { | ||
require(("prismjs/components/prism-" + lang)); | ||
} catch (e) { | ||
lang = 'autoit'; | ||
} | ||
} | ||
return Prism.highlight(code, Prism.languages[lang]) | ||
}; | ||
global.Prism = Prism; | ||
var highlightMap = { | ||
'highlight.js': highlightJs, | ||
prism: prismJs | ||
}; | ||
var renderer = getRenderer(); | ||
@@ -140,8 +175,19 @@ var FIX_VUE = /<span class="hljs-tag"><\/</g; | ||
var markup = marked(source, { renderer: renderer }); | ||
return { demos: demos, markup: markup } | ||
function code (raw, language) { | ||
var highlight = config.highlight; | ||
var fn = null; | ||
if (typeof highlight === 'function') { | ||
fn = highlight; | ||
} else if (highlightMap[highlight]) { | ||
fn = highlightMap[highlight]; | ||
} else { | ||
throw new Error('Invalid highlight option!') | ||
} | ||
var lang = language === 'vue' ? 'html' : language; | ||
var markup = hljs.highlight(lang, raw).value; | ||
var markup = fn(raw, lang); | ||
@@ -169,3 +215,2 @@ // TODO: 优化判断条件 | ||
var customMarkups = ''; | ||
if (typeof config.customMarkups === 'function') { | ||
@@ -256,3 +301,4 @@ customMarkups = config.customMarkups() || ''; | ||
var defaults = { | ||
target: 'vue' | ||
target: 'vue', | ||
highlight: 'highlight.js' | ||
}; | ||
@@ -259,0 +305,0 @@ |
{ | ||
"name": "md2vue", | ||
"version": "2.0.4", | ||
"version": "2.0.5", | ||
"main": "./dist/md2vue.common.js", | ||
@@ -17,2 +17,3 @@ "module": "dist/md2vue.esm.js", | ||
"marked": "^0.3.6", | ||
"prismjs": "^1.8.4", | ||
"vueify": "github:AngusFu/vueify" | ||
@@ -19,0 +20,0 @@ }, |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Dynamic require
Supply chain riskDynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.
Found 1 instance in 1 package
308480
1692
6
1
2
+ Addedprismjs@^1.8.4
+ Addedprismjs@1.29.0(transitive)