Merge pull request #63 from leimao/upgrade_mathjax

Upgrade MathJax to 3.2.2
ppoffice · Jan 6, 2024 · 0dc59c2 · 0dc59c2
2 parents 34fd4df + 6fde89c
commit 0dc59c2
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 28 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-component-inferno",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "A collection of Inferno.js layout components and utility scripts for Hexo",
   "main": "lib/index.js",
   "repository": "https://github.com/ppoffice/hexo-component-inferno",

diff --git a/src/hexo/helper/cdn.test.js b/src/hexo/helper/cdn.test.js
@@ -21,7 +21,7 @@ describe('Get JavaScript library URL', () => {
       () => cdn('moment', '2.24.0', 'min/moment.min.js'),
       () => cdn('outdatedbrowser', '1.1.5', 'outdatedbrowser/outdatedbrowser.min.js'),
       () => cdn('highlight.js', '9.18.1', 'styles/a11y-dark.css'),
-      () => cdn('mathjax', '2.7.6', 'unpacked/MathJax.min.js'),
+      () => cdn('mathjax', '3.2.2', 'es5/tex-mml-chtml.js'),
       () => cdn('pace-js', '1.0.2', 'pace.min.js'),
       () => cdn('katex', '0.11.1', 'dist/katex.min.js'),
       () => cdn('clipboard', '2.0.6', 'dist/clipboard.min.js'),
@@ -41,7 +41,7 @@ describe('Get JavaScript library URL', () => {
       'https://cdn.jsdelivr.net/npm/moment@2.24.0/min/moment.min.js',
       'https://cdn.jsdelivr.net/npm/outdatedbrowser@1.1.5/outdatedbrowser/outdatedbrowser.min.js',
       'https://cdn.jsdelivr.net/npm/highlight.js@9.18.1/styles/a11y-dark.css',
-      'https://cdn.jsdelivr.net/npm/mathjax@2.7.6/unpacked/MathJax.min.js',
+      'https://cdn.jsdelivr.net/npm/mathjax@3.2.2/es5/tex-mml-chtml.js',
       'https://cdn.jsdelivr.net/npm/pace-js@1.0.2/pace.min.js',
       'https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.js',
       'https://cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js',
@@ -63,7 +63,7 @@ describe('Get JavaScript library URL', () => {
       'https://unpkg.com/moment@2.24.0/min/moment.min.js',
       'https://unpkg.com/outdatedbrowser@1.1.5/outdatedbrowser/outdatedbrowser.min.js',
       'https://unpkg.com/highlight.js@9.18.1/styles/a11y-dark.css',
-      'https://unpkg.com/mathjax@2.7.6/unpacked/MathJax.js',
+      'https://unpkg.com/mathjax@3.2.2/es5/tex-mml-chtml.js',
       'https://unpkg.com/pace-js@1.0.2/pace.min.js',
       'https://unpkg.com/katex@0.11.1/dist/katex.min.js',
       'https://unpkg.com/clipboard@2.0.6/dist/clipboard.min.js',
@@ -85,7 +85,7 @@ describe('Get JavaScript library URL', () => {
       'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js',
       'https://cdnjs.cloudflare.com/ajax/libs/outdated-browser/1.1.5/outdatedbrowser.min.js',
       'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.18.1/styles/a11y-dark.min.css',
-      'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.6/MathJax.js',
+      'https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.2.2/es5/tex-mml-chtml.js',
       'https://cdnjs.cloudflare.com/ajax/libs/pace/1.0.2/pace.min.js',
       'https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.11.1/katex.min.js',
       'https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.6/clipboard.min.js',
@@ -107,7 +107,7 @@ describe('Get JavaScript library URL', () => {
       'https://cdnjs.loli.net/ajax/libs/moment.js/2.24.0/moment.min.js',
       'https://cdnjs.loli.net/ajax/libs/outdated-browser/1.1.5/outdatedbrowser.min.js',
       'https://cdnjs.loli.net/ajax/libs/highlight.js/9.18.1/styles/a11y-dark.min.css',
-      'https://cdnjs.loli.net/ajax/libs/mathjax/2.7.6/MathJax.js',
+      'https://cdnjs.loli.net/ajax/libs/mathjax/3.2.2/es5/tex-mml-chtml.js',
       'https://cdnjs.loli.net/ajax/libs/pace/1.0.2/pace.min.js',
       'https://cdnjs.loli.net/ajax/libs/KaTeX/0.11.1/katex.min.js',
       'https://cdnjs.loli.net/ajax/libs/clipboard.js/2.0.6/clipboard.min.js',
@@ -129,7 +129,7 @@ describe('Get JavaScript library URL', () => {
       'https://my.cdn/moment@2.24.0/min/moment.min.js',
       'https://my.cdn/outdatedbrowser@1.1.5/outdatedbrowser/outdatedbrowser.min.js',
       'https://my.cdn/highlight.js@9.18.1/styles/a11y-dark.css',
-      'https://my.cdn/mathjax@2.7.6/unpacked/MathJax.min.js',
+      'https://my.cdn/mathjax@3.2.2/es5/tex-mml-chtml.js',
       'https://my.cdn/pace-js@1.0.2/pace.min.js',
       'https://my.cdn/katex@0.11.1/dist/katex.min.js',
       'https://my.cdn/clipboard@2.0.6/dist/clipboard.min.js',
@@ -153,7 +153,7 @@ describe('Get JavaScript library URL', () => {
       'https://my.cdn/ajax/libs/moment.js/2.24.0/moment.min.js',
       'https://my.cdn/ajax/libs/outdated-browser/1.1.5/outdatedbrowser.min.js',
       'https://my.cdn/ajax/libs/highlight.js/9.18.1/styles/a11y-dark.min.css',
-      'https://my.cdn/ajax/libs/mathjax/2.7.6/MathJax.js',
+      'https://my.cdn/ajax/libs/mathjax/3.2.2/es5/tex-mml-chtml.js',
       'https://my.cdn/ajax/libs/pace/1.0.2/pace.min.js',
       'https://my.cdn/ajax/libs/KaTeX/0.11.1/katex.min.js',
       'https://my.cdn/ajax/libs/clipboard.js/2.0.6/clipboard.min.js',

diff --git a/src/view/plugin/mathjax.jsx b/src/view/plugin/mathjax.jsx
@@ -16,28 +16,26 @@ class Mathjax extends Component {
   render() {
     const { jsUrl } = this.props;
 
-    const js = `MathJax.Hub.Config({
-            'HTML-CSS': {
-                matchFontHeight: false
-            },
-            SVG: {
-                matchFontHeight: false
-            },
-            CommonHTML: {
-                matchFontHeight: false
-            },
-            tex2jax: {
-                inlineMath: [
-                    ['$','$'],
-                    ['\\\\(','\\\\)']
-                ]
-            }
-        });`;
+    const js = `MathJax = {
+      tex: {
+        inlineMath: [['$', '$'], ['\\\\(', '\\\\)']]
+      },
+      svg: {
+        fontCache: 'global'
+      },
+      chtml: {
+        matchFontHeight: false
+      }
+    };`;
 
     return (
       <>
-        <script type="text/x-mathjax-config" dangerouslySetInnerHTML={{ __html: js }}></script>
-        <script src={jsUrl} defer={true}></script>
+        <script
+          type="text/javascript"
+          id="MathJax-script"
+          async
+          dangerouslySetInnerHTML={{ __html: js }}></script>
+        <script src={jsUrl}></script>
       </>
     );
   }
@@ -61,7 +59,7 @@ Mathjax.Cacheable = cacheComponent(Mathjax, 'plugin.mathjax', (props) => {
     return null;
   }
   return {
-    jsUrl: helper.cdn('mathjax', '2.7.9', 'unpacked/MathJax.js?config=TeX-MML-AM_CHTML'),
+    jsUrl: helper.cdn('mathjax', '3.2.2', 'es5/tex-mml-chtml.js'),
   };
 });