markmap-lib 0.14.5-alpha.19 → 0.14.5-alpha.21

package/dist/index.js

@@ -1,16 +1,15 @@
-/*! markmap-lib v0.14.5-alpha.19+5323905 | MIT License */
+/*! markmap-lib v0.14.5-alpha.21+fb81f2c | MIT License */
 'use strict';
 
 var _extends = require('@babel/runtime/helpers/extends');
 var markmapCommon = require('markmap-common');
 var remarkable = require('remarkable');
 var remarkableKatex = require('remarkable-katex');
-var Prism = require('prismjs');
-var loadLanguages = require('prismjs/components/index.js');
 var yaml = require('js-yaml');
+var hljs$1 = require('highlight.js');
 
 const template = "<!DOCTYPE html>\n<html>\n<head>\n<meta charset=\"UTF-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n<meta http-equiv=\"X-UA-Compatible\" content=\"ie=edge\">\n<title>Markmap</title>\n<style>\n* {\n  margin: 0;\n  padding: 0;\n}\n#mindmap {\n  display: block;\n  width: 100vw;\n  height: 100vh;\n}\n</style>\n<!--CSS-->\n</head>\n<body>\n<svg id=\"mindmap\"></svg>\n<!--JS-->\n</body>\n</html>\n" ;
-const baseJsPaths = [`d3@${"7.8.5"}/dist/d3.min.js`, `markmap-view@${"0.14.5-alpha.19"}/dist/browser/index.js`];
+const baseJsPaths = [`d3@${"7.8.5"}/dist/d3.min.js`, `markmap-view@${"0.14.5-alpha.21"}/dist/browser/index.js`];
 function fillTemplate(root, assets, extra) {
   var _extra, _extra$baseJs;
   extra = _extends({}, extra);
@@ -47,6 +46,7 @@ function fillTemplate(root, assets, extra) {
   return html;
 }
 
+const name$3 = 'katex';
 function getConfig$1() {
   const preloadScripts = [`katex@${"0.16.8"}/dist/katex.min.js`].map(path => markmapCommon.buildJSItem(path));
   const webfontloader = markmapCommon.buildJSItem(`webfontloader@${"1.6.28"}/webfontloader.js`);
@@ -99,7 +99,6 @@ function definePlugin(plugin) {
   return plugin;
 }
 
-const name$3 = 'katex';
 var katex = definePlugin(() => {
   const plugin = {
     name: name$3,
@@ -127,57 +126,9 @@ var katex = definePlugin(() => {
   return plugin;
 });
 
-function getConfig() {
-  const preloadScripts = [`prismjs@${"1.29.0"}/components/prism-core.min.js`, `prismjs@${"1.29.0"}/plugins/autoloader/prism-autoloader.min.js`].map(path => markmapCommon.buildJSItem(path));
-  const styles = [`prismjs@${"1.29.0"}/themes/prism.css`].map(path => markmapCommon.buildCSSItem(path));
-  return {
-    versions: {
-      prismjs: "1.29.0" 
-    },
-    preloadScripts,
-    styles
-  };
-}
-
-const name$2 = 'prism';
-var prism = definePlugin(() => {
-  const plugin = {
-    name: name$2,
-    config: getConfig(),
-    transform(transformHooks) {
-      let enableFeature = markmapCommon.noop;
-      transformHooks.parser.tap(md => {
-        md.set({
-          highlight: (str, lang) => {
-            enableFeature();
-            let grammar = Prism.languages[lang];
-            if (!grammar && lang) {
-              loadLanguages([lang]);
-              grammar = Prism.languages[lang];
-            }
-            if (grammar) {
-              return Prism.highlight(str, grammar, lang);
-            }
-            return '';
-          }
-        });
-      });
-      transformHooks.beforeParse.tap((_, context) => {
-        enableFeature = () => {
-          context.features[name$2] = true;
-        };
-      });
-      return {
-        styles: plugin.config.styles
-      };
-    }
-  };
-  return plugin;
-});
-
-const name$1 = 'frontmatter';
+const name$2 = 'frontmatter';
 var frontmatter = definePlugin({
-  name: name$1,
+  name: name$2,
   transform(transformHooks) {
     transformHooks.beforeParse.tap((md, context) => {
       const {
@@ -225,9 +176,9 @@ function normalizeNumber(value) {
   return +value;
 }
 
-const name = 'npmUrl';
+const name$1 = 'npmUrl';
 var npmUrl = definePlugin({
-  name,
+  name: name$1,
   transform(transformHooks) {
     transformHooks.afterParse.tap((_, context) => {
       const {
@@ -252,7 +203,44 @@ var npmUrl = definePlugin({
   }
 });
 
-const plugins = [frontmatter, katex, prism, npmUrl];
+const name = 'hljs';
+function getConfig() {
+  const styles = [`highlight.js@${"11.8.0"}/styles/default.css`].map(path => markmapCommon.buildCSSItem(path));
+  return {
+    versions: {
+      hljs: "11.8.0" 
+    },
+    styles
+  };
+}
+var hljs = definePlugin(() => {
+  const plugin = {
+    name,
+    config: getConfig(),
+    transform(transformHooks) {
+      let enableFeature = markmapCommon.noop;
+      transformHooks.parser.tap(md => {
+        md.set({
+          highlight: (str, language) => {
+            enableFeature();
+            return hljs$1.highlightAuto(str, language ? [language] : undefined).value;
+          }
+        });
+      });
+      transformHooks.beforeParse.tap((_, context) => {
+        enableFeature = () => {
+          context.features[name] = true;
+        };
+      });
+      return {
+        styles: plugin.config.styles
+      };
+    }
+  };
+  return plugin;
+});
+
+const plugins = [frontmatter, katex, hljs, npmUrl];
 
 function cleanNode(node) {
   if (node.type === 'heading') {
@@ -397,10 +385,7 @@ class Transformer {
         revoke();
         current.content = `${current.content || ''}${text}`;
       } else if (token.type === 'fence') {
-        let result = md.renderer.render([token], md.options, {});
-        // Remarkable only adds className to `<code>` but not `<pre>`, copy it to make PrismJS style work.
-        const matches = result.match(/<code( class="[^"]*")>/);
-        if (matches) result = result.replace('<pre>', `<pre${matches[1]}>`);
+        const result = md.renderer.render([token], md.options, {});
         current.children.push({
           type: token.type,
           depth: depth + 1,
@@ -461,7 +446,7 @@ class Transformer {
 }
 
 const transformerVersions = {
-  'markmap-lib': '0.14.5-alpha.19+5323905',
+  'markmap-lib': '0.14.5-alpha.21+fb81f2c',
   d3: "7.8.5"
 };
 

package/dist/index.mjs

@@ -1,14 +1,13 @@
-/*! markmap-lib v0.14.5-alpha.19+5323905 | MIT License */
+/*! markmap-lib v0.14.5-alpha.21+fb81f2c | MIT License */
 import _extends from '@babel/runtime/helpers/esm/extends';
 import { buildJSItem, persistCSS, persistJS, buildCSSItem, Hook, wrapFunction, noop, getFullUrl } from 'markmap-common';
 import { Remarkable } from 'remarkable';
 import remarkableKatex from 'remarkable-katex';
-import Prism from 'prismjs';
-import loadLanguages from 'prismjs/components/index.js';
 import yaml from 'js-yaml';
+import hljs$1 from 'highlight.js';
 
 const template = "<!DOCTYPE html>\n<html>\n<head>\n<meta charset=\"UTF-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n<meta http-equiv=\"X-UA-Compatible\" content=\"ie=edge\">\n<title>Markmap</title>\n<style>\n* {\n  margin: 0;\n  padding: 0;\n}\n#mindmap {\n  display: block;\n  width: 100vw;\n  height: 100vh;\n}\n</style>\n<!--CSS-->\n</head>\n<body>\n<svg id=\"mindmap\"></svg>\n<!--JS-->\n</body>\n</html>\n" ;
-const baseJsPaths = [`d3@${"7.8.5"}/dist/d3.min.js`, `markmap-view@${"0.14.5-alpha.19"}/dist/browser/index.js`];
+const baseJsPaths = [`d3@${"7.8.5"}/dist/d3.min.js`, `markmap-view@${"0.14.5-alpha.21"}/dist/browser/index.js`];
 function fillTemplate(root, assets, extra) {
   var _extra, _extra$baseJs;
   extra = _extends({}, extra);
@@ -45,6 +44,7 @@ function fillTemplate(root, assets, extra) {
   return html;
 }
 
+const name$3 = 'katex';
 function getConfig$1() {
   const preloadScripts = [`katex@${"0.16.8"}/dist/katex.min.js`].map(path => buildJSItem(path));
   const webfontloader = buildJSItem(`webfontloader@${"1.6.28"}/webfontloader.js`);
@@ -97,7 +97,6 @@ function definePlugin(plugin) {
   return plugin;
 }
 
-const name$3 = 'katex';
 var katex = definePlugin(() => {
   const plugin = {
     name: name$3,
@@ -125,57 +124,9 @@ var katex = definePlugin(() => {
   return plugin;
 });
 
-function getConfig() {
-  const preloadScripts = [`prismjs@${"1.29.0"}/components/prism-core.min.js`, `prismjs@${"1.29.0"}/plugins/autoloader/prism-autoloader.min.js`].map(path => buildJSItem(path));
-  const styles = [`prismjs@${"1.29.0"}/themes/prism.css`].map(path => buildCSSItem(path));
-  return {
-    versions: {
-      prismjs: "1.29.0" 
-    },
-    preloadScripts,
-    styles
-  };
-}
-
-const name$2 = 'prism';
-var prism = definePlugin(() => {
-  const plugin = {
-    name: name$2,
-    config: getConfig(),
-    transform(transformHooks) {
-      let enableFeature = noop;
-      transformHooks.parser.tap(md => {
-        md.set({
-          highlight: (str, lang) => {
-            enableFeature();
-            let grammar = Prism.languages[lang];
-            if (!grammar && lang) {
-              loadLanguages([lang]);
-              grammar = Prism.languages[lang];
-            }
-            if (grammar) {
-              return Prism.highlight(str, grammar, lang);
-            }
-            return '';
-          }
-        });
-      });
-      transformHooks.beforeParse.tap((_, context) => {
-        enableFeature = () => {
-          context.features[name$2] = true;
-        };
-      });
-      return {
-        styles: plugin.config.styles
-      };
-    }
-  };
-  return plugin;
-});
-
-const name$1 = 'frontmatter';
+const name$2 = 'frontmatter';
 var frontmatter = definePlugin({
-  name: name$1,
+  name: name$2,
   transform(transformHooks) {
     transformHooks.beforeParse.tap((md, context) => {
       const {
@@ -223,9 +174,9 @@ function normalizeNumber(value) {
   return +value;
 }
 
-const name = 'npmUrl';
+const name$1 = 'npmUrl';
 var npmUrl = definePlugin({
-  name,
+  name: name$1,
   transform(transformHooks) {
     transformHooks.afterParse.tap((_, context) => {
       const {
@@ -250,7 +201,44 @@ var npmUrl = definePlugin({
   }
 });
 
-const plugins = [frontmatter, katex, prism, npmUrl];
+const name = 'hljs';
+function getConfig() {
+  const styles = [`highlight.js@${"11.8.0"}/styles/default.css`].map(path => buildCSSItem(path));
+  return {
+    versions: {
+      hljs: "11.8.0" 
+    },
+    styles
+  };
+}
+var hljs = definePlugin(() => {
+  const plugin = {
+    name,
+    config: getConfig(),
+    transform(transformHooks) {
+      let enableFeature = noop;
+      transformHooks.parser.tap(md => {
+        md.set({
+          highlight: (str, language) => {
+            enableFeature();
+            return hljs$1.highlightAuto(str, language ? [language] : undefined).value;
+          }
+        });
+      });
+      transformHooks.beforeParse.tap((_, context) => {
+        enableFeature = () => {
+          context.features[name] = true;
+        };
+      });
+      return {
+        styles: plugin.config.styles
+      };
+    }
+  };
+  return plugin;
+});
+
+const plugins = [frontmatter, katex, hljs, npmUrl];
 
 function cleanNode(node) {
   if (node.type === 'heading') {
@@ -395,10 +383,7 @@ class Transformer {
         revoke();
         current.content = `${current.content || ''}${text}`;
       } else if (token.type === 'fence') {
-        let result = md.renderer.render([token], md.options, {});
-        // Remarkable only adds className to `<code>` but not `<pre>`, copy it to make PrismJS style work.
-        const matches = result.match(/<code( class="[^"]*")>/);
-        if (matches) result = result.replace('<pre>', `<pre${matches[1]}>`);
+        const result = md.renderer.render([token], md.options, {});
         current.children.push({
           type: token.type,
           depth: depth + 1,
@@ -459,7 +444,7 @@ class Transformer {
 }
 
 const transformerVersions = {
-  'markmap-lib': '0.14.5-alpha.19+5323905',
+  'markmap-lib': '0.14.5-alpha.21+fb81f2c',
   d3: "7.8.5"
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-lib",
-  "version": "0.14.5-alpha.19+5323905",
+  "version": "0.14.5-alpha.21+fb81f2c",
   "description": "Visualize your Markdown as mindmaps with Markmap",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -47,12 +47,13 @@
   },
   "devDependencies": {
     "@types/remarkable": "^2.0.3",
-    "markmap-common": "0.14.5-alpha.19+5323905",
-    "markmap-view": "0.14.5-alpha.19+5323905",
+    "markmap-common": "0.14.5-alpha.21+fb81f2c",
+    "markmap-view": "0.14.5-alpha.21+fb81f2c",
     "webfontloader": "^1.6.28"
   },
   "dependencies": {
     "@babel/runtime": "^7.22.6",
+    "highlight.js": "^11.8.0",
     "js-yaml": "^4.1.0",
     "katex": "^0.16.8",
     "prismjs": "^1.29.0",
@@ -62,5 +63,5 @@
   "peerDependencies": {
     "markmap-common": "*"
   },
-  "gitHead": "532390588885518c11fa50b8a77c0694821cfecf"
+  "gitHead": "fb81f2cb688f400f17f911774539267219f639ce"
 }

package/types/plugins/hljs.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("../types").ITransformPlugin | (() => import("../types").ITransformPlugin);
+export default _default;

package/types/plugins/katex.config.d.ts

@@ -1,4 +1,5 @@
 import { JSItem } from 'markmap-common';
+export declare const name = "katex";
 export declare function getConfig(): {
     versions: {
         katex: string;

package/types/plugins/prism.config.d.ts

@@ -1,3 +1,4 @@
+export declare const name = "prism";
 export declare function getConfig(): {
     versions: {
         prismjs: string;