Merge pull request #348 from everfu/dev

Dev

README.md

@@ -81,4 +81,4 @@ Check out the [Documentation](https://solitude.js.org/) for more information.
 
 ## License
 
-[MIT](./LICENSE) License © 2023-PRESENT [Ever Fu](https://github.com/everfu)
+[MIT](./LICENSE) License © 2023-PRESENT [Ever Fu](https://github.com/everfu)

README_zh-Hant.md

@@ -79,4 +79,4 @@
 
 ## 版權
 
-[MIT](./LICENSE) License © 2023-至今 [Efu](https://github.com/everfu)
+[MIT](./LICENSE) License © 2023-至今 [Efu](https://github.com/everfu)

layout/includes/inject/body.pug

@@ -16,12 +16,12 @@ div
     script(src=url_for(theme.cdn.waterfall))
     script(src=url_for(theme.cdn.pjax))
 
-    if theme.mermaid
-        script(src=url_for(theme.cdn.mermaid_js))
-
     if theme.post.share.enable && theme.post.share.list && theme.post.share.list.includes('qrcode')
         script(src=url_for(theme.cdn.qrcode))
 
+    if theme.mermaid
+        script(src=url_for(theme.cdn.mermaid_js))
+
     if theme.display_mode.universe
         script(src=url_for(theme.cdn.universe_js))
         script.
@@ -115,4 +115,4 @@ if theme.footer.randomlink
 include ../body/mode
 
 // google adsense
-include ../body/gadsense
+include ../body/gadsense

layout/includes/loading.pug

@@ -4,22 +4,34 @@ div(id="loading-box" onclick="preloader.endLoading();" style="zoom:1")
 
 script.
     const preloader = {
+        isLoaded: false,
         endLoading: () => {
-            document.getElementById('loading-box').classList.toggle('loaded');
+            if (!preloader.isLoaded) {
+                document.getElementById('loading-box').classList.add('loaded');
+                preloader.isLoaded = true;
+            }
         },
         initLoading: () => {
             document.getElementById('loading-box').classList.remove('loaded');
+            preloader.isLoaded = false;
         },
         removePaceDone: () => {
             document.getElementById('body').classList = 'pace-done';
         }
     }
+
     window.addEventListener('load', () => {
         preloader.endLoading();
     });
+
     window.addEventListener('pjax:send', () => {
         preloader.initLoading();
     });
+
     document.addEventListener('pjax:complete', () => {
         preloader.endLoading();
-    });
+    });
+
+    setTimeout(() => {
+        preloader.endLoading();
+    }, 5000);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-solitude",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "A beautiful, powerful, and efficient Hexo theme developed by EverFu.",
   "main": "package.json",
   "scripts": {
@@ -19,14 +19,17 @@
     "url": "https://github.com/everfu/hexo-theme-solitude"
   },
   "dependencies": {
-    "hexo-renderer-stylus": "^3.0.0",
-    "hexo-renderer-pug": "^3.0.0"
+    "hexo-renderer-pug": "^3.0.0",
+    "hexo-renderer-stylus": "^3.0.0"
   },
   "bugs": {
     "url": "https://github.com/everfu/hexo-theme-solitude/issues",
     "email": "[email protected]"
   },
   "homepage": "https://everfu.github.io/Solitude/",
   "author": "Hexo-Theme-Solitude<[email protected]>",
-  "license": "MIT"
-}
+  "license": "MIT",
+  "devDependencies": {
+    "@types/node": "^22.0.0"
+  }
+}

scripts/helper/stylus.js

@@ -22,4 +22,4 @@ hexo.extend.filter.register('stylus:renderer', function (style) {
     style.define('$prismjs_enable', prismjsEnable)
     style.define('$prismjs_line_number', prismjsLineNumber)
     style.define('$language', config.language)
-});
+});