Change: mermaid javascript reads from URL instead of from local file #…

…175 add markdown-pdf.mermaidServer option
yzane · Mar 17, 2020 · 86ac3c0 · 86ac3c0
1 parent fe1eea6
commit 86ac3c0
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/README.ja.md b/README.ja.md
@@ -218,6 +218,7 @@ Markdown PDF をインストールして、Visual Studio Code で Markdownファ
 |[PlantUML options](#plantuml-options)|[markdown-pdf.plantumlOpenMarker](#markdown-pdfplantumlopenmarker)| |
 ||[markdown-pdf.plantumlCloseMarker](#markdown-pdfplantumlclosemarker)| |
 |[markdown-it-include options](#markdown-it-include-options)|[markdown-pdf.markdown-it-include.enable](#markdown-pdfmarkdown-it-includeenable)| |
+|[mermaid options](#mermaid-options)|[markdown-pdf.mermaidServer](#markdown-pdfmermaidserver)||
 
 ### Save options
 
@@ -509,6 +510,12 @@ Markdown PDF をインストールして、Visual Studio Code で Markdownファ
   - markdown-it-include を有効にします
   - boolean. Default: true
 
+### mermaid options
+
+#### `markdown-pdf.mermaidServer`
+  - mermaid server
+  - Default: https://unpkg.com/mermaid/dist/mermaid.min.js
+
 <div class="page"/>
 
 ## FAQ

diff --git a/README.md b/README.md
@@ -221,6 +221,7 @@ If the download is not successful or you want to avoid downloading every time yo
 |[PlantUML options](#plantuml-options)|[markdown-pdf.plantumlOpenMarker](#markdown-pdfplantumlopenmarker)| |
 ||[markdown-pdf.plantumlCloseMarker](#markdown-pdfplantumlclosemarker)| |
 |[markdown-it-include options](#markdown-it-include-options)|[markdown-pdf.markdown-it-include.enable](#markdown-pdfmarkdown-it-includeenable)| |
+|[mermaid options](#mermaid-options)|[markdown-pdf.mermaidServer](#markdown-pdfmermaidserver)||
 
 ### Save options
 
@@ -515,6 +516,12 @@ If the download is not successful or you want to avoid downloading every time yo
   - Enable markdown-it-include.
   - boolean. Default: true
 
+### mermaid options
+
+#### `markdown-pdf.mermaidServer`
+  - mermaid server
+  - Default: https://unpkg.com/mermaid/dist/mermaid.min.js
+
 <div class="page"/>
 
 ## FAQ

diff --git a/extension.js b/extension.js
@@ -329,8 +329,9 @@ function makeHtml(data, uri) {
     var filename = path.join(__dirname, 'template', 'template.html');
     var template = readFile(filename);
 
-     // read mermaid javascripts
-     var mermaid = readFile(path.join(__dirname, 'node_modules', 'mermaid', 'dist', 'mermaid.min.js'));
+    // read mermaid javascripts
+    var mermaidServer = vscode.workspace.getConfiguration('markdown-pdf')['mermaidServer'] || '';
+    var mermaid = '<script src=\"' + mermaidServer + '\"></script>';
 
     // compile template
     var mustache = require('mustache');

diff --git a/package.json b/package.json
@@ -450,6 +450,11 @@
           "type": "boolean",
           "default": true,
           "description": "Enable markdown-it-include. "
+        },
+        "markdown-pdf.mermaidServer": {
+          "type": "string",
+          "default": "https://unpkg.com/mermaid/dist/mermaid.min.js",
+          "description": "mermaid server."
         }
       }
     }
@@ -477,7 +482,6 @@
     "markdown-it-include": "^1.1.0",
     "markdown-it-named-headers": "0.0.4",
     "markdown-it-plantuml": "^1.4.1",
-    "mermaid": "^8.4.0",
     "mkdirp": "^0.5.1",
     "mustache": "^3.1.0",
     "puppeteer-core": "^2.1.1",

diff --git a/template/template.html b/template/template.html
@@ -4,9 +4,7 @@
 <title>{{{title}}}</title>
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 {{{style}}}
-<script>
-  {{{mermaid}}}
-</script>
+{{{mermaid}}}
 </head>
 <body>
   <script>