summaryrefslogtreecommitdiffstats
path: root/packages/gitbook-markdown
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2015-01-23 15:23:26 +0100
committerSamy Pessé <samypesse@gmail.com>2016-12-22 15:00:32 +0100
commitbb465bf5f1750eb5b4fe35e7b374a67b8409fea6 (patch)
treeaf295aa556383471ae8d2e8e1fae5b52fbda0de2 /packages/gitbook-markdown
parent48acab9214ddfdb7afa5accbeb912346cdffb4e8 (diff)
downloadgitbook-bb465bf5f1750eb5b4fe35e7b374a67b8409fea6.zip
gitbook-bb465bf5f1750eb5b4fe35e7b374a67b8409fea6.tar.gz
gitbook-bb465bf5f1750eb5b4fe35e7b374a67b8409fea6.tar.bz2
Remove correctly highlight.js from client bundle
Diffstat (limited to 'packages/gitbook-markdown')
-rw-r--r--packages/gitbook-markdown/lib/page.js4
-rw-r--r--packages/gitbook-markdown/lib/utils/hljs-browser.js5
-rw-r--r--packages/gitbook-markdown/lib/utils/hljs.js1
-rw-r--r--packages/gitbook-markdown/package.json2
4 files changed, 3 insertions, 9 deletions
diff --git a/packages/gitbook-markdown/lib/page.js b/packages/gitbook-markdown/lib/page.js
index 55054dc..f98d342 100644
--- a/packages/gitbook-markdown/lib/page.js
+++ b/packages/gitbook-markdown/lib/page.js
@@ -2,7 +2,7 @@ var Q = require('q');
var _ = require('lodash');
var kramed = require('kramed');
-var hljs = require('./utils/hljs.js');
+var hljs = require('highlight.js');
var lnormalize = require('./utils/lang').normalize;
@@ -10,7 +10,7 @@ function parsePage(src) {
var options = _.extend({}, kramed.defaults, {
// Synchronous highlighting with highlight.js
highlight: function (code, lang) {
- if(!lang) return code;
+ if(!lang || !hljs) return code;
// Normalize lang
lang = lnormalize(lang);
diff --git a/packages/gitbook-markdown/lib/utils/hljs-browser.js b/packages/gitbook-markdown/lib/utils/hljs-browser.js
deleted file mode 100644
index 7379cd6..0000000
--- a/packages/gitbook-markdown/lib/utils/hljs-browser.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
- highlight: function(lang, code) {
- return {value: code};
- }
-};
diff --git a/packages/gitbook-markdown/lib/utils/hljs.js b/packages/gitbook-markdown/lib/utils/hljs.js
deleted file mode 100644
index 0eaa5df..0000000
--- a/packages/gitbook-markdown/lib/utils/hljs.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require("highlight.js");
diff --git a/packages/gitbook-markdown/package.json b/packages/gitbook-markdown/package.json
index 47756c0..6e301dd 100644
--- a/packages/gitbook-markdown/package.json
+++ b/packages/gitbook-markdown/package.json
@@ -37,6 +37,6 @@
}
],
"browser": {
- "lib/utils/hljs.js": "lib/utils/hljs-browser.js"
+ "highlight.js": false
}
}