fix: getScripts load

YunYouJun · May 4, 2022 · 6d39d3b · 6d39d3b · vercel · May 4, 2022
1 parent 8b1658c
commit 6d39d3b
Show file tree

Hide file tree

Showing 7 changed files with 5,017 additions and 155 deletions.
diff --git a/demo/package.json b/demo/package.json
@@ -15,6 +15,7 @@
   },
   "devDependencies": {
     "hexo": "6.1.0",
+    "hexo-browsersync": "^0.3.0",
     "hexo-generator-archive": "^1.0.0",
     "hexo-generator-category": "^1.0.0",
     "hexo-generator-feed": "^3.0.0",

diff --git a/packages/hexo-theme-yun/layout/_third-party/comments/minivaline.pug b/packages/hexo-theme-yun/layout/_third-party/comments/minivaline.pug
@@ -1,7 +1,8 @@
 #minivaline-container
 - var minivalineConfig = JSON.stringify(theme.minivaline)
-script.
-  Yun.utils.getScript("#{theme.vendors.minivaline_js}", () => {
+script(type="module").
+  import { getScript } from '/js/utils.js'
+  getScript("#{theme.vendors.minivaline_js}", () => {
     const minivalineConfig = !{minivalineConfig}
     minivalineConfig.el = "#minivaline-container"
     new MiniValine(minivalineConfig);

diff --git a/packages/hexo-theme-yun/layout/_third-party/comments/twikoo.pug b/packages/hexo-theme-yun/layout/_third-party/comments/twikoo.pug
@@ -1,8 +1,10 @@
 //- after init, #tcomment will be #twikoo
 #tcomment
 - var twikooConfig = JSON.stringify(theme.twikoo)
-script.
-  Yun.utils.getScript("#{theme.vendors.twikoo}", () => {
+script(type="module").
+  import { getScript } from '/js/utils.js'
+
+  getScript("#{theme.vendors.twikoo}", () => {
     const twikooConfig = !{twikooConfig}
     twikooConfig.el = '#tcomment'
     twikoo.init(twikooConfig)

diff --git a/packages/hexo-theme-yun/layout/_third-party/comments/valine.pug b/packages/hexo-theme-yun/layout/_third-party/comments/valine.pug
@@ -3,8 +3,9 @@
 //- not use valine_config() for window.location.pathname
 - theme.valine.el = "#valine-container"
 - theme.valine.lang = (theme.valine.lang || config.language || "zh-cn").toLowerCase()
-script.
-  Yun.utils.getScript("#{theme.vendors.valine_js}", () => {
+script(type="module").
+  import { getScript } from '/js/utils.js'
+  getScript("#{theme.vendors.valine_js}", () => {
     const valineConfig = !{JSON.stringify(theme.valine)}
     valineConfig.path = "#{url_for(page.path)}"
     new Valine(valineConfig)

diff --git a/packages/hexo-theme-yun/layout/_third-party/math/katex.pug b/packages/hexo-theme-yun/layout/_third-party/math/katex.pug
@@ -5,9 +5,10 @@ if theme.katex.copy_tex
   script(defer, src=theme.vendors.katex.copy_tex.js)
 
 script(defer src=theme.vendors.katex.auto_render)
-script.
+script(type="module").
+  import { renderKatex } from '/js/utils.js'
   document.addEventListener("DOMContentLoaded", () => {
-    Yun.utils.renderKatex({
+    renderKatex({
       ...!{JSON.stringify(theme.katex.options)},
       ...!{String(JSON.stringify(page.katex))}?.options,
     });

diff --git a/packages/hexo-theme-yun/layout/_third-party/mermaid/mermaid.pug b/packages/hexo-theme-yun/layout/_third-party/mermaid/mermaid.pug
@@ -1,5 +1,6 @@
-script.
-  Yun.utils.getScript("#{theme.vendors.mermaid}", () => {
+script(type="module").
+  import { getScript } from '/js/utils.js'
+  getScript("#{theme.vendors.mermaid}", () => {
     const mermaidOptions = !{JSON.stringify(theme.mermaid.options)}
     mermaid.initialize(mermaidOptions);
   }, window.mermaid);