fix: workaround for Windows

mathjax/MathJax#2486 (comment)
hexojs · Aug 8, 2020 · d9f7dd8 · d9f7dd8
1 parent c9a817a
commit d9f7dd8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -118,7 +118,7 @@ math:
     options:
       throwOnError: false
   mathjax:
-    css: 'https://cdn.jsdelivr.net/gh/hexojs/hexo-math/master/dist/style.css'
+    css: 'https://cdn.jsdelivr.net/gh/hexojs/hexo-math/dist/style.css'
     options:
       conversion:
         display: false

diff --git a/index.js b/index.js
@@ -10,7 +10,7 @@ hexo.config.math = Object.assign({
     }
   },
   mathjax: {
-    css: 'https://cdn.jsdelivr.net/gh/hexojs/hexo-math/master/dist/style.css',
+    css: 'https://cdn.jsdelivr.net/gh/hexojs/hexo-math/dist/style.css',
     options: {
       // https://docs.mathjax.org/en/latest/web/typeset.html#conversion-options
       conversion: {

diff --git a/lib/katex.js b/lib/katex.js
@@ -10,9 +10,9 @@ module.exports = hexo => {
     const { katex: fmCfg } = this;
     const [jsonCfg] = args;
     const argsCfg = jsonCfg ? JSON.parse(jsonCfg) : false;
-    let options = Object.assign({}, globalCfg);
-    if (fmCfg) options = Object.assign({}, options, fmCfg);
-    if (argsCfg) options = Object.assign({}, options, argsCfg);
+    let options = { ...globalCfg };
+    if (fmCfg) options = { ...options, ...fmCfg };
+    if (argsCfg) options = { ...options, ...argsCfg };
 
     return renderKatex(content, options);
   };

diff --git a/lib/mathjax.js b/lib/mathjax.js
@@ -10,13 +10,15 @@ module.exports = hexo => {
     const { mathjax: fmCfg } = this;
     const [jsonCfg] = args;
     const argsCfg = jsonCfg ? JSON.parse(jsonCfg) : false;
-    let options = Object.assign({}, globalCfg);
-    if (fmCfg) options = Object.assign({}, options, fmCfg);
-    if (argsCfg) options = Object.assign({}, options, argsCfg);
+    let options = { ...globalCfg };
+    if (fmCfg) options = { ...options, ...fmCfg };
+    if (argsCfg) options = { ...options, ...argsCfg };
     const { conversion, svg, tex } = options;
 
     const MathJax = await init({
       loader: {
+        // https://github.com/mathjax/MathJax/issues/2486
+        paths: { mathjax: 'mathjax/es5' },
         load: ['input/tex', 'output/svg']
       },
       tex,