hexo-theme-shokax 0.3.0 → 0.3.2

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/README.md

@@ -1,3 +1,6 @@
+# 📣 公告
+* [ShokaX 正在寻找社区维护者](https://github.com/theme-shoka-x/hexo-theme-shokaX/discussions/137)
+
 # hexo-theme-shokaX
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fzkz098%2Fhexo-theme-shokaX.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fzkz098%2Fhexo-theme-shokaX?ref=badge_shield)
 ![LICENSE](	https://img.shields.io/github/license/theme-shoka-x/hexo-theme-shokaX)
@@ -47,6 +50,13 @@ github仓库建议通过右边的 releases 下载,步骤为:
 - 下载 Assets 中的 `Source code(zip)`
 - 解压即可作为主题使用
 
+## 📚子项目
+- [ShokaX docs](https://github.com/theme-shoka-x/shokaX-docs) ShokaX 主题文档 (正在编写中，欢迎加入！)
+- [HRMNMI](https://github.com/theme-shoka-x/hexo-renderer-multi-next-markdown-it) ShokaX 正在使用的 markdown 渲染器 (等待重构)
+- [ShokaX CLI](https://github.com/theme-shoka-x/shokaX-CLI) ShokaX 命令行安装程序
+- [ShokaX Pjax](https://github.com/theme-shoka-x/theme-shokax-pjax) ShokaX 提供的高效 Pjax 实现
+- [ShokaX Anime](https://github.com/theme-shoka-x/theme-shokax-anime) ShokaX 提供的精简版 Anime.js 实现
+
 ## 🛠️二次开发
 [ShokaX官方开发文档](https://docs.kaitaku.xyz/develop/basic/)
 
@@ -58,8 +68,7 @@ github仓库建议通过右边的 releases 下载,步骤为:
 - [Easy hexo](https://easyhexo.com/)
 
 # 许可证
-许可证: AGPL 3 or later \
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fzkz098%2Fhexo-theme-shokaX.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fzkz098%2Fhexo-theme-shokaX?ref=badge_large)
+许可证: AGPL 3 or later
 
 ## 特别说明
 AGPL许可证主要目的是限制修改后的分发行为，避免未经许可的二次修改封装商业行为 \

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/comment.pug

@@ -21,7 +21,6 @@ mixin CommentRender()
             script(type="module" data-pjax).
                 import { init } from 'https://unpkg.com/@waline/client@v2/dist/waline.mjs';
 
-                const path = document.getElementById("twikoo_visitors").getAttribute("data-path");
                 setTimeout(function () {
                     init({
                         el: '#wcomments',
@@ -34,7 +33,7 @@ mixin CommentRender()
                         wordLimit: #{theme.waline.wordLimit},
                         pageSize: #{theme.waline.pageSize},
                         pageview: #{theme.waline.pageview},
-                        path: path,
+                        path: window.location.pathname,
                         dark: 'html[data-theme="dark"]'
                     });
                 }, 1000)

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/layout/_partials/layout.pug

@@ -73,17 +73,17 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
         - var ccText = theme.creative_commons.license.toUpperCase()
         script(data-config type="text/javascript").
             var LOCAL = {
-                path: `#{_permapath(page.path)}`,
-                favicon: {
-                show: `#{__('favicon.show')}`,
-                hide: `#{__('favicon.hide')}`
-            },
-            search: {
-            placeholder: "!{__('search.placeholder')}",
-                empty: "!{__('search.empty')}",
-                stats: "!{__('search.stats')}"
-            },
-            valine: #{page.valine ? _safedump(page.valine) : true},
+                    path: `#{_permapath(page.path)}`,
+                    favicon: {
+                    show: `#{__('favicon.show')}`,
+                    hide: `#{__('favicon.hide')}`
+                },
+                search: {
+                    placeholder: "!{__('search.placeholder')}",
+                    empty: "!{__('search.empty')}",
+                    stats: "!{__('search.stats')}"
+                },
+                valine: #{page.valine ? _safedump(page.valine) : true},
                 chart: #{!!page.chart},
                 copy_tex: #{!!page.math},
                 katex: #{!!page.math},
@@ -94,18 +94,18 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
                 outime: #{page.outime !== false},
                 template: `#{__('outime.template')}`,
                 quiz: {
-                choice: `#{__('quiz.choice')}`,
-                multiple: `#{__('quiz.multiple')}`,
-                true_false: `#{__('quiz.true_false')}`,
-                essay: `#{__('quiz.essay')}`,
-                gap_fill: `#{__('quiz.gap_fill')}`,
-                mistake: `#{__('quiz.mistake')}`
-            },
-            ignores: [
-            (uri) => uri.includes('#'),
-            (uri) => new RegExp(LOCAL.path + '$').test(uri),
-                !{JSON.stringify(ignores)}
-            ]
+                    choice: `#{__('quiz.choice')}`,
+                    multiple: `#{__('quiz.multiple')}`,
+                    true_false: `#{__('quiz.true_false')}`,
+                    essay: `#{__('quiz.essay')}`,
+                    gap_fill: `#{__('quiz.gap_fill')}`,
+                    mistake: `#{__('quiz.mistake')}`
+                },
+                ignores: [
+                    (uri) => uri.includes('#'),
+                    (uri) => new RegExp(LOCAL.path + '$').test(uri),
+                        !{JSON.stringify(ignores)}
+                ]
             };
 
         if theme.polyfill.enable

package/package.json

@@ -1,43 +1,51 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.3.0",
+    "version": "0.3.2",
     "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/node": "^20.2.3",
-        "@typescript-eslint/eslint-plugin": "^6.0.0",
-        "@typescript-eslint/parser": "^5.59.7",
-        "eslint": "^8.41.0",
+        "@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.0",
+        "eslint-plugin-n": "^16.0.1",
         "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-vue": "^9.14.0",
+        "eslint-plugin-vue": "^9.15.1",
         "hexo-fs": "^4.1.1",
-        "hexo-util": "^3.0.1",
-        "instantsearch.js": "^4.56.0",
-        "theme-shokax-anime": "^0.0.4",
-        "theme-shokax-pjax": "^0.0.2",
-        "typescript": "^5.0.4",
-        "vue": "^3.3.4"
+        "hexo-util": "^3.1.0",
+        "instantsearch.js": "^4.56.7",
+        "mocha": "^10.2.0",
+        "typescript": "^5.1.6",
+        "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,26 +5,8 @@ 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) {
-    console.log(path);
-    let result = [];
-    fs.readdirSync(path).forEach((item) => {
-        console.log(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) {
-                console.log('push');
-                result.push(node_path_1.default.join(path, item));
-            }
-        }
-    });
-    return result;
-}
+const esbuild = require("esbuild");
 hexo.extend.generator.register('script', function (locals) {
-    const log = hexo.log || console.log;
     const config = hexo.config;
     const theme = hexo.theme.config;
     const siteConfig = {
@@ -62,6 +44,7 @@ hexo.extend.generator.register('script', function (locals) {
         },
         playerAPI: theme.playerAPI,
         disableVL: theme.disableVL,
+        noPlayer: theme.experiments?.noPlayer,
         audio: undefined,
         fireworks: undefined
     };
@@ -76,42 +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')));
-    console.log(files);
-    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/scripts/helpers/summary_ai.js

@@ -47,7 +47,6 @@ function postMessage(path, content, dbPath, startMessage) {
                             db ??= {};
                             db[path] ??= {};
                             db[path][dbPath] ??= '';
-                            console.log(db[path]);
                             db[path][dbPath] = summary;
                         }
                         node_fs_1.default.writeFileSync('summary.json', JSON.stringify(db));

package/scripts/plugin/index.js

@@ -1,7 +1,7 @@
 "use strict";
 /*!
-  index.js in next-theme/hexo-theme-next by theme-next
-  under GNU AFFERO GENERAL PUBLIC LICENSE v3.0
+  index.js in next-theme/hexo-theme-next by next-theme
+  under GNU AFFERO GENERAL PUBLIC LICENSE v3.0 OR LATER
   https://github.com/next-theme/hexo-theme-next/blob/master/LICENSE.md
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {