hexo-theme-shokax 0.3.1 → 0.3.3

package/.eslintrc.cjs

@@ -9,11 +9,13 @@ module.exports = {
   extends: [
     'standard',
     'plugin:@typescript-eslint/recommended',
-    'plugin:vue/vue3-recommended'
+    'plugin:vue/vue3-recommended',
+    'plugin:chai-friendly/recommended'
   ],
   plugins: [
     '@typescript-eslint',
-    'vue'
+    'vue',
+    'chai-friendly'
   ],
   parserOptions: {
     ecmaVersion: 12
@@ -25,6 +27,6 @@ module.exports = {
     '@typescript-eslint/ban-ts-comment': 'off',
     '@typescript-eslint/no-var-requires': 'off',
     '@typescript-eslint/no-unused-vars': 'off',
-    'prefer-const': 'warn'
+    'prefer-const': 'off'
   }
 }

package/_config.yml

@@ -358,18 +358,18 @@ advVendors:
   js:
     pace:
       src: bytedance:pace/1.0.2/pace.min.js
-    pjax:
-      src: npm:theme-shokax-pjax@latest/pjax.shokax.min.js
+#    pjax:
+#      src: npm:theme-shokax-pjax@latest/pjax.shokax.min.js
     fetch:
       src: npm:whatwg-fetch@3.4.0/dist/fetch.umd.js
-    anime:
-      src: npm:theme-shokax-anime@latest/anime.shokax.min.js
+#    anime:
+#      src: npm:theme-shokax-anime@latest/anime.shokax.min.js
     algolia:
       src: bytedance:algoliasearch/4.12.1/algoliasearch-lite.umd.min.js
     instantsearch:
       src: bytedance:instantsearch.js/4.39.0/instantsearch.production.min.js
-    lazyload:
-      src: bytedance:lozad.js/1.16.0/lozad.min.js
+#    lazyload:
+#      src: bytedance:lozad.js/1.16.0/lozad.min.js
     quicklink:
       src: bytedance:quicklink/2.2.0/quicklink.umd.min.js
     fancybox:
@@ -388,11 +388,11 @@ advVendors:
 vendorsList:
   js:
     - pace
-    - pjax
-    - anime
+#    - pjax
+#    - anime
     - algolia
     - instantsearch
-    - lazyload
+#    - lazyload
     - quicklink
     - fancybox
     - copy_tex
@@ -405,12 +405,12 @@ vendors:
 
   js:
     pace: npm/pace-js@1.0.2/pace.min.js # ok
-    pjax: npm/theme-shokax-pjax@latest/pjax.shokax.min.js # ok
+#    pjax: npm/theme-shokax-pjax@latest/pjax.shokax.min.js # ok
     fetch: npm/whatwg-fetch@3.4.0/dist/fetch.umd.min.js # ok
-    anime: npm/theme-shokax-anime@latest/anime.shokax.min.js
+#    anime: npm/theme-shokax-anime@latest/anime.shokax.min.js
     algolia: npm/algoliasearch@4/dist/algoliasearch-lite.umd.js # ok
     instantsearch: npm/instantsearch.js@4/dist/instantsearch.production.min.js # ok
-    lazyload: npm/lozad@1/dist/lozad.min.js # ok
+#    lazyload: npm/lozad@1/dist/lozad.min.js # ok
     quicklink: npm/quicklink@2/dist/quicklink.umd.js # ok
     fancybox: combine/npm/jquery@3.5.1/dist/jquery.min.js,npm/@fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.js,npm/justifiedGallery@3.8.1/dist/js/jquery.justifiedGallery.min.js # notok
     valine: gh/amehime/MiniValine@4.2.2-beta10/dist/MiniValine.min.js # TODO 弃用

package/layout/_mixin/widgets.pug

@@ -26,7 +26,7 @@ mixin WRender(item)
             ul(class="leancloud-recent-comment" id="new-comment")
                 if tk || waline
                     li(v-for="com in coms" class="item")
-                        a(v-bind:href="com.href" data-pjax-state="data-pjax-state")
+                        a(v-bind:href="root + com.href" data-pjax-state="data-pjax-state")
                             span(class="breadcrumb") {{com.nick}} @ {{com.time}}
                             span {{com.text}}
                                 br

package/package.json

@@ -1,26 +1,30 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.3.1",
+    "version": "0.3.3",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
     "author": "zkz098",
     "license": "AGPL-3.0-or-later",
     "scripts": {
-        "test": "tsc",
+        "test": "mocha test --coverage",
         "build": "pnpm install && tsc"
     },
     "devDependencies": {
+        "@types/chai": "^4.3.5",
         "@types/fancybox": "^3.5.3",
         "@types/hexo": "^3.8.8",
         "@types/jquery": "^3.5.16",
         "@types/js-yaml": "^4.0.5",
         "@types/lozad": "^1.16.1",
+        "@types/mocha": "^10.0.1",
         "@types/node": "^20.4.4",
         "@typescript-eslint/eslint-plugin": "^6.2.0",
         "@typescript-eslint/parser": "^6.2.0",
+        "chai": "^4.3.7",
         "eslint": "^8.45.0",
         "eslint-config-standard": "*",
+        "eslint-plugin-chai-friendly": "^0.7.2",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-n": "^16.0.1",
         "eslint-plugin-promise": "^6.1.1",
@@ -28,16 +32,20 @@
         "hexo-fs": "^4.1.1",
         "hexo-util": "^3.1.0",
         "instantsearch.js": "^4.56.7",
-        "theme-shokax-anime": "^0.0.4",
-        "theme-shokax-pjax": "^0.0.2",
+        "mocha": "^10.2.0",
         "typescript": "^5.1.6",
-        "vue": "^3.3.4"
+        "vue": "^3.3.4",
+        "jsdom": "^22.1.0"
     },
     "dependencies": {
-        "js-yaml": "^4.1.0"
+        "esbuild": "^0.18.17",
+        "js-yaml": "^4.1.0",
+        "lozad": "^1.16.0",
+        "theme-shokax-anime": "^0.0.4",
+        "theme-shokax-pjax": "^0.0.2"
+    },
+    "engines": {
+        "node": ">=18.0.0"
     },
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "engineStrict": true
+    "engineStrict": true
 }

package/scripts/generaters/script.js

@@ -5,21 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const package_json_1 = __importDefault(require("../../package.json"));
 const fs = require("hexo-fs");
-const node_path_1 = __importDefault(require("node:path"));
-function findJsFile(path) {
-    let result = [];
-    fs.readdirSync(path).forEach((item) => {
-        if (!item.endsWith('js')) {
-            result = result.concat(findJsFile(node_path_1.default.join(path, item)));
-        }
-        else {
-            if (item.indexOf('player') === -1 && item.indexOf('fireworks') === -1) {
-                result.push(node_path_1.default.join(path, item));
-            }
-        }
-    });
-    return result;
-}
+const esbuild = require("esbuild");
 hexo.extend.generator.register('script', function (locals) {
     const config = hexo.config;
     const theme = hexo.theme.config;
@@ -58,6 +44,7 @@ hexo.extend.generator.register('script', function (locals) {
         },
         playerAPI: theme.playerAPI,
         disableVL: theme.disableVL,
+        noPlayer: theme.experiments?.noPlayer,
         audio: undefined,
         fireworks: undefined
     };
@@ -72,41 +59,26 @@ hexo.extend.generator.register('script', function (locals) {
     if (theme?.audio) {
         siteConfig.audio = theme.audio;
     }
-    let text = '';
-    let path;
-    if (fs.existsSync('themes/shokaX/source/js/_app/library/dom.js')) {
-        path = 'themes/shokaX/source/js/_app';
+    let text;
+    let enterPoint;
+    if (fs.existsSync('themes/shokaX/source/js/_app/pjax/siteInit.js')) {
+        enterPoint = 'themes/shokaX/source/js/_app/pjax/siteInit.js';
     }
     else {
-        path = 'node_modules/hexo-theme-shokax/source/js/_app';
+        enterPoint = 'node_modules/hexo-theme-shokax/source/js/_app/pjax/siteInit.js';
     }
-    let files = findJsFile(node_path_1.default.join(path, 'library'));
-    files = files.concat(findJsFile(node_path_1.default.join(path, 'globals')));
-    files = files.concat(findJsFile(node_path_1.default.join(path, 'page')));
-    files = files.concat(findJsFile(node_path_1.default.join(path, 'pjax')));
-    files = files.concat(findJsFile(node_path_1.default.join(path, 'components')));
-    files.forEach(function (item) {
-        text += fs.readFileSync(item).toString();
+    text = 'const CONFIG = ' + JSON.stringify(siteConfig) + ';';
+    esbuild.buildSync({
+        entryPoints: [enterPoint],
+        bundle: true,
+        outfile: 'shokax_temp.js',
+        platform: 'browser',
+        target: ['es2021'],
+        minify: true
     });
-    if (!theme.experiments?.noPlayer) {
-        if (fs.existsSync('themes/shokaX/source/js/_app/player.js')) {
-            text += fs.readFileSync('themes/shokaX/source/js/_app/player.js').toString();
-        }
-        else {
-            text += fs.readFileSync('node_modules/hexo-theme-shokax/source/js/_app/player.js').toString();
-        }
-    }
-    if (theme.fireworks && theme.fireworks.enable) {
-        if (fs.existsSync('themes/shokaX/source/js/_app/fireworks.js')) {
-            text += fs.readFileSync('themes/shokaX/source/js/_app/fireworks.js').toString();
-        }
-        else {
-            text += fs.readFileSync('node_modules/hexo-theme-shokax/source/js/_app/fireworks.js').toString();
-        }
-        siteConfig.fireworks = theme.fireworks.color || ['rgba(255,182,185,.9)', 'rgba(250,227,217,.9)', 'rgba(187,222,214,.9)', 'rgba(138,198,209,.9)'];
-    }
-    text = 'const CONFIG = ' + JSON.stringify(siteConfig) + ';' + text;
+    text += fs.readFileSync('shokax_temp.js');
     const result = hexo.render.renderSync({ text, engine: 'js' });
+    fs.unlinkSync('shokax_temp.js');
     return {
         path: theme.js + '/app.js',
         data: function () {

package/scripts/helpers/asset.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const package_json_1 = __importDefault(require("../../package.json"));
 const hexo_util_1 = require("hexo-util");
 hexo.extend.helper.register('_new_comments', function (mode) {
+    const root = this.config.url.replace(/^(https?:\/\/)?[^\/]*/, '');
     if (mode === 'twikoo') {
         return `<script data-pjax type="module">
             let comments = []
@@ -29,7 +30,8 @@ hexo.extend.helper.register('_new_comments', function (mode) {
                 Vue.createApp({
                   data() {
                       return {
-                          coms: comments
+                          coms: comments,
+                          root: '${root}'
                       }
                   }
                   }).mount('#new-comment')
@@ -61,7 +63,8 @@ hexo.extend.helper.register('_new_comments', function (mode) {
           Vue.createApp({
             data() {
                 return {
-                    coms: items
+                    coms: items,
+                    root: '${root}'
                 }
             }
           }).mount('#new-comment')

package/source/js/_app/components/sidebar.js

@@ -1,44 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.menuActive = exports.goToCommentHandle = exports.goToBottomHandle = exports.backToTopHandle = exports.sidebarTOC = exports.sideBarTab = exports.sideBarToggleHandle = void 0;
+const globalVars_1 = require("../globals/globalVars");
+const tools_1 = require("../globals/tools");
+const anime_1 = require("../library/anime");
+const dom_1 = require("../library/dom");
 const sideBarToggleHandle = (event, force) => {
-    if (sideBar.hasClass('on')) {
-        sideBar.removeClass('on');
-        menuToggle.removeClass('close');
+    if (globalVars_1.sideBar.hasClass('on')) {
+        globalVars_1.sideBar.removeClass('on');
+        globalVars_1.menuToggle.removeClass('close');
         if (force) {
-            sideBar.style = '';
+            globalVars_1.sideBar.style = '';
         }
         else {
-            transition(sideBar, 'slideRightOut');
+            (0, anime_1.transition)(globalVars_1.sideBar, 'slideRightOut');
         }
     }
     else {
         if (force) {
-            sideBar.style = '';
+            globalVars_1.sideBar.style = '';
         }
         else {
-            transition(sideBar, 'slideRightIn', () => {
-                sideBar.addClass('on');
-                menuToggle.addClass('close');
+            (0, anime_1.transition)(globalVars_1.sideBar, 'slideRightIn', () => {
+                globalVars_1.sideBar.addClass('on');
+                globalVars_1.menuToggle.addClass('close');
             });
         }
     }
 };
+exports.sideBarToggleHandle = sideBarToggleHandle;
 const sideBarTab = () => {
-    const sideBarInner = sideBar.child('.inner');
-    if (sideBar.child('.tab')) {
-        sideBarInner.removeChild(sideBar.child('.tab'));
+    const sideBarInner = globalVars_1.sideBar.child('.inner');
+    if (globalVars_1.sideBar.child('.tab')) {
+        sideBarInner.removeChild(globalVars_1.sideBar.child('.tab'));
     }
     const list = document.createElement('ul');
     let active = 'active';
     list.className = 'tab';
     ['contents', 'related', 'overview'].forEach((item) => {
-        const element = sideBar.child('.panel.' + item);
+        const element = globalVars_1.sideBar.child('.panel.' + item);
         if (element.innerHTML.trim().length < 1) {
             if (item === 'contents') {
-                showContents.display('none');
+                globalVars_1.showContents.display('none');
             }
             return;
         }
         if (item === 'contents') {
-            showContents.display('');
+            globalVars_1.showContents.display('');
         }
         const tab = document.createElement('li');
         const span = document.createElement('span');
@@ -57,13 +65,13 @@ const sideBarTab = () => {
             const target = event.currentTarget;
             if (target.hasClass('active'))
                 return;
-            sideBar.find('.tab .item').forEach((element) => {
+            globalVars_1.sideBar.find('.tab .item').forEach((element) => {
                 element.removeClass('active');
             });
-            sideBar.find('.panel').forEach((element) => {
+            globalVars_1.sideBar.find('.panel').forEach((element) => {
                 element.removeClass('active');
             });
-            sideBar.child('.panel.' + target.className.replace(' item', '')).addClass('active');
+            globalVars_1.sideBar.child('.panel.' + target.className.replace(' item', '')).addClass('active');
             target.addClass('active');
         });
         list.appendChild(tab);
@@ -71,12 +79,13 @@ const sideBarTab = () => {
     });
     if (list.childNodes.length > 1) {
         sideBarInner.insertBefore(list, sideBarInner.childNodes[0]);
-        sideBar.child('.panels').style.paddingTop = '';
+        globalVars_1.sideBar.child('.panels').style.paddingTop = '';
     }
     else {
-        sideBar.child('.panels').style.paddingTop = '.625rem';
+        globalVars_1.sideBar.child('.panels').style.paddingTop = '.625rem';
     }
 };
+exports.sideBarTab = sideBarTab;
 const sidebarTOC = () => {
     const activateNavByIndex = (index) => {
         const target = navItems[index];
@@ -85,7 +94,7 @@ const sidebarTOC = () => {
         if (target.hasClass('current')) {
             return;
         }
-        $dom.each('.toc .active', (element) => {
+        dom_1.$dom.each('.toc .active', (element) => {
             element && element.removeClass('active current');
         });
         sections.forEach((element) => {
@@ -97,18 +106,18 @@ const sidebarTOC = () => {
         while (!parent.matches('.contents')) {
             if (parent.matches('li')) {
                 parent.addClass('active');
-                const t = $dom(parent.child('a.toc-link').attr('href'));
+                const t = (0, dom_1.$dom)(parent.child('a.toc-link').attr('href'));
                 if (t) {
                     t.addClass('active');
                 }
             }
             parent = parent.parentNode;
         }
-        if (getComputedStyle(sideBar).display !== 'none' && tocElement.hasClass('active')) {
-            pageScroll(tocElement, target.offsetTop - (tocElement.offsetHeight / 4));
+        if (getComputedStyle(globalVars_1.sideBar).display !== 'none' && tocElement.hasClass('active')) {
+            (0, anime_1.pageScroll)(tocElement, target.offsetTop - (tocElement.offsetHeight / 4));
         }
     };
-    const navItems = $dom.all('.contents li');
+    const navItems = dom_1.$dom.all('.contents li');
     if (navItems.length < 1) {
         return;
     }
@@ -116,15 +125,15 @@ const sidebarTOC = () => {
     let activeLock = null;
     sections = sections.map((element, index) => {
         const link = element.child('a.toc-link');
-        const anchor = $dom(decodeURI(link.attr('href')));
+        const anchor = (0, dom_1.$dom)(decodeURI(link.attr('href')));
         if (!anchor)
             return null;
         const alink = anchor.child('a.anchor');
         const anchorScroll = (event) => {
             event.preventDefault();
-            const target = $dom(decodeURI(event.currentTarget.attr('href')));
+            const target = (0, dom_1.$dom)(decodeURI(event.currentTarget.attr('href')));
             activeLock = index;
-            pageScroll(target, null, () => {
+            (0, anime_1.pageScroll)(target, null, () => {
                 activateNavByIndex(index);
                 activeLock = null;
             });
@@ -132,11 +141,11 @@ const sidebarTOC = () => {
         link.addEventListener('click', anchorScroll);
         alink && alink.addEventListener('click', (event) => {
             anchorScroll(event);
-            clipBoard(CONFIG.hostname + '/' + LOCAL.path + event.currentTarget.attr('href'));
+            (0, tools_1.clipBoard)(CONFIG.hostname + '/' + LOCAL.path + event.currentTarget.attr('href'));
         });
         return anchor;
     });
-    const tocElement = sideBar.child('.contents.panel');
+    const tocElement = globalVars_1.sideBar.child('.contents.panel');
     const findIndex = (entries) => {
         let index = 0;
         let entry = entries[index];
@@ -156,7 +165,7 @@ const sidebarTOC = () => {
     };
     const createIntersectionObserver = () => {
         const observer = new IntersectionObserver((entries) => {
-            const index = findIndex(entries) + (diffY < 0 ? 1 : 0);
+            const index = findIndex(entries) + (globalVars_1.diffY < 0 ? 1 : 0);
             if (activeLock === null) {
                 activateNavByIndex(index);
             }
@@ -169,17 +178,21 @@ const sidebarTOC = () => {
     };
     createIntersectionObserver();
 };
+exports.sidebarTOC = sidebarTOC;
 const backToTopHandle = () => {
-    pageScroll(0);
+    (0, anime_1.pageScroll)(0);
 };
+exports.backToTopHandle = backToTopHandle;
 const goToBottomHandle = () => {
-    pageScroll(parseInt(String(Container.changeOrGetHeight())));
+    (0, anime_1.pageScroll)(parseInt(String(globalVars_1.Container.changeOrGetHeight())));
 };
+exports.goToBottomHandle = goToBottomHandle;
 const goToCommentHandle = () => {
-    pageScroll($dom('#comments'));
+    (0, anime_1.pageScroll)((0, dom_1.$dom)('#comments'));
 };
+exports.goToCommentHandle = goToCommentHandle;
 const menuActive = () => {
-    $dom.each('.menu .item:not(.title)', (element) => {
+    dom_1.$dom.each('.menu .item:not(.title)', (element) => {
         const target = element.child('a[href]');
         const parentItem = element.parentNode.parentNode;
         if (!target)
@@ -196,3 +209,4 @@ const menuActive = () => {
         }
     });
 };
+exports.menuActive = menuActive;

package/source/js/_app/fireworks.js

@@ -1,3 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initFireworks = void 0;
+const theme_shokax_anime_1 = __importDefault(require("theme-shokax-anime"));
 const canvasEl = document.createElement('canvas');
 canvasEl.style.cssText = 'position:fixed;top:0;left:0;pointer-events:none;z-index:9999999';
 document.body.appendChild(canvasEl);
@@ -19,9 +26,9 @@ function updateCoords(e) {
     pointerY = e.clientY || (e.touches && e.touches[0].clientY);
 }
 function setParticuleDirection(p) {
-    const angle = anime.random(0, 360) * Math.PI / 180;
-    const value = anime.random(50, 180);
-    const radius = [-1, 1][anime.random(0, 1)] * value;
+    const angle = theme_shokax_anime_1.default.random(0, 360) * Math.PI / 180;
+    const value = theme_shokax_anime_1.default.random(50, 180);
+    const radius = [-1, 1][theme_shokax_anime_1.default.random(0, 1)] * value;
     return {
         x: p.x + radius * Math.cos(angle),
         y: p.y + radius * Math.sin(angle)
@@ -41,8 +48,8 @@ function createParticule(x, y) {
             ctx.fill();
         }
     };
-    p.color = colors[anime.random(0, colors.length - 1)];
-    p.radius = anime.random(16, 32);
+    p.color = colors[theme_shokax_anime_1.default.random(0, colors.length - 1)];
+    p.radius = theme_shokax_anime_1.default.random(16, 32);
     p.endPos = setParticuleDirection(p);
     return p;
 }
@@ -78,9 +85,9 @@ function animateParticules(x, y) {
     for (let i = 0; i < numberOfParticules; i++) {
         particules.push(createParticule(x, y));
     }
-    anime().timeline().add({
+    (0, theme_shokax_anime_1.default)().timeline().add({
         targets: particules,
-        duration: anime.random(1200, 1800),
+        duration: theme_shokax_anime_1.default.random(1200, 1800),
         easing: 'easeOutExpo',
         update: renderParticule,
         x: p => p.endPos.x,
@@ -88,19 +95,19 @@ function animateParticules(x, y) {
         radius: 0.1
     }).add({
         targets: circle,
-        duration: anime.random(1200, 1800),
+        duration: theme_shokax_anime_1.default.random(1200, 1800),
         easing: 'easeOutExpo',
         update: renderParticule,
-        radius: anime.random(80, 160),
+        radius: theme_shokax_anime_1.default.random(80, 160),
         lineWidth: 0,
         alpha: {
             value: 0,
             easing: 'linear',
-            duration: anime.random(600, 800)
+            duration: theme_shokax_anime_1.default.random(600, 800)
         }
     }).play();
 }
-const render = anime({
+const render = (0, theme_shokax_anime_1.default)({
     duration: Infinity,
     update() {
         ctx.clearRect(0, 0, canvasEl.width, canvasEl.height);
@@ -116,13 +123,19 @@ const hasAncestor = (node, name) => {
     } while ((node = node.parentNode) !== null);
     return false;
 };
-document.addEventListener(tap, (e) => {
-    if (hasAncestor(e.target, 'a')) {
+function initFireworks() {
+    if (typeof CONFIG.fireworks === 'undefined') {
         return;
     }
-    render.play();
-    updateCoords(e);
-    animateParticules(pointerX, pointerY);
-}, false);
-setCanvasSize();
-window.addEventListener('resize', setCanvasSize, false);
+    document.addEventListener(tap, (e) => {
+        if (hasAncestor(e.target, 'a')) {
+            return;
+        }
+        render.play();
+        updateCoords(e);
+        animateParticules(pointerX, pointerY);
+    }, false);
+    setCanvasSize();
+    window.addEventListener('resize', setCanvasSize, false);
+}
+exports.initFireworks = initFireworks;