hexo-theme-shokax 0.5.0-beta1 → 0.5.0-beta2-dev-ec59668

package/README.md

@@ -5,7 +5,6 @@
 - [x] 移除 pjax
 - [x] 移除 quicklink
 - [x] 移除 assetUrl 为基的动态 Vendor 机制
-- [x] 移除 ShokaX Inject
 - [ ] 引入新的 Inject 类技术 (长期)
 - [ ] 引入新的工作流程
 - [x] 重构 player (nyx-player)

package/_config.yml

@@ -354,10 +354,6 @@ vendors:
   cdns:
     cdnjs: https://s4.zstatic.net/ajax/libs
   js:
-    pace:
-      source: cdnjs
-      url: pace/1.2.4/pace.min.js
-      sri: "sha384-k6YtvFUEIuEFBdrLKJ3YAUbBki333tj1CSUisai5Cswsg9wcLNaPzsTHDswp4Az8"
     jquery:
       source: cdnjs
       url: jquery/3.5.1/jquery.min.js
@@ -388,10 +384,6 @@ vendors:
       source: cdnjs
       url: KaTeX/0.16.9/katex.min.css
       sri: "sha384-n8MVd4RsNIU0tAv4ct0nTaAbDJwPJzDEaqSD1odI+WdtXRGWt2kTvGFasHpSy3SV"
-    comment:
-      source: local
-      url: css/comment.css
-      sri: ""
     fancybox:
       source: cdnjs
       url: fancybox/3.5.7/jquery.fancybox.min.css

package/layout/_mixin/comment.pug

@@ -1,4 +1,5 @@
 mixin CommentRender()
+    != shokax_inject('comment')
     if page.comment !== false
         div(class="wrap" id="comments")
 

package/layout/_partials/footer.pug

@@ -37,4 +37,7 @@ div(class="status")
                 a(target="_blank" href=`https://beian.mps.gov.cn/#/query/webSearch?code=${RC}`)
                     img(loading="lazy" decoding="async" src=theme.statics + theme.assets + '/' + theme.footer.icp.icon style="max-width: 2em;display:inline;" width="20" height="20" alt="备案")
                     != beianN
+    != shokax_inject('status')
+
+!= shokax_inject('footer')
 

package/layout/_partials/header.pug

@@ -14,4 +14,5 @@ nav(id="nav")
                 i(class="ic i-sun")
             li(class="item search")
                 i(class="ic i-search")
+            != shokax_inject('rightNav')
 

package/layout/_partials/layout.pug

@@ -21,6 +21,7 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
                 link(rel="preload" href!=covers as="image" fetchpriority="high")
 
         != partial('_partials/head/head_com.pug')
+        != shokax_inject('head')
         block head
         title
             block title
@@ -130,7 +131,6 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
         != partial('_partials/third-party/clarity.pug', {}, {cache: true})
         != partial('_partials/third-party/google-analytics.pug', {}, {cache: true})
 
-        != vendor_js('pace')
         != vendor_js('jquery')
         != vendor_js('justifiedGallery')
         != vendor_js('fancybox')
@@ -140,4 +140,6 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
 
         != _js('siteInit.js')
 
+        != shokax_inject('bodyEnd')
+
 

package/layout/_partials/post/footer.pug

@@ -16,3 +16,5 @@ div(class="meta")
                 != __('post.edited') + __('symbol.space')
             time(title=__('post.modified') + __('symbol.colon') + full_date(post.updated) itemprop="dateModified" datetime=moment(post.updated).format())
                 != date(post.updated)
+    
+    != shokax_inject('postMeta')

package/layout/_partials/post/post.pug

@@ -38,3 +38,5 @@ article(itemscope itemtype="http://schema.org/Article" class="post block" lang=t
             != partial('_partials/post/reward.pug', {}, {cache: true})
         if theme.creative_commons.license
             != partial('_partials/post/copyright.pug')
+    
+    != shokax_inject('postBodyEnd')

package/layout/_partials/sidebar/overview.pug

@@ -36,5 +36,7 @@ div(class="social")
             - var sidebarIcon = '<i class="ic i-' + link.split('||')[1].trim() + '"></i>'
             != _url(sidebarURL, sidebarIcon, {title: sidebarURL, class: 'item ' + name})
 
+!= shokax_inject('sidebar')
+
 div(class="menu")
     != partial('_partials/sidebar/menu.pug')

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.5.0-beta1",
+    "version": "0.5.0-beta2-dev-ec59668",
     "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",
-    "packageManager": "pnpm@10.6.5",
+    "packageManager": "pnpm@10.8.0",
     "scripts": {
         "test": "tsc --build --verbose",
         "build": "node ./toolbox/compiler.mjs"
@@ -16,24 +16,24 @@
         "@types/jquery": "^3.5.32",
         "@types/js-yaml": "^4.0.9",
         "@types/katex": "^0.16.7",
-        "@types/node": "^22.13.10",
+        "@types/node": "^22.14.0",
         "@types/quicklink": "^2.3.4",
-        "@typescript-eslint/eslint-plugin": "^8.27.0",
-        "@typescript-eslint/parser": "^8.27.0",
-        "eslint": "^9.22.0",
+        "@typescript-eslint/eslint-plugin": "^8.29.1",
+        "@typescript-eslint/parser": "^8.29.1",
+        "eslint": "^9.24.0",
         "eslint-config-standard": "~17",
         "eslint-plugin-vue": "^10.0.0",
         "glob": "^11.0.1",
-        "typescript": "^5.8.2"
+        "typescript": "^5.8.3"
     },
     "dependencies": {
-        "@algolia/client-search": "^5.21.0",
+        "@algolia/client-search": "^5.23.3",
         "@common.js/p-limit": "^6.1.0",
         "@waline/client": "^3.5.6",
-        "algoliasearch": "5.21.0",
-        "dompurify": "^3.2.4",
-        "es-toolkit": "^1.33.0",
-        "esbuild": "^0.25.1",
+        "algoliasearch": "5.23.3",
+        "dompurify": "^3.2.5",
+        "es-toolkit": "^1.34.1",
+        "esbuild": "^0.25.2",
         "hexo": "^7.3.0",
         "hexo-algoliasearch": "^2.0.1",
         "hexo-feed": "^1.1.2",
@@ -41,14 +41,14 @@
         "hexo-pagination": "^4.0.0",
         "hexo-renderer-pug": "^3.0.0",
         "hexo-util": "^3.3.0",
-        "instantsearch.js": "^4.78.0",
+        "instantsearch.js": "^4.78.1",
         "js-yaml": "^4.1.0",
-        "katex": "^0.16.21",
+        "katex": "^0.16.22",
         "mouse-firework": "^0.1.1",
-        "nyx-player": "^0.0.1",
+        "nyx-player": "^0.0.2",
         "quicklink": "^2.3.0",
         "theme-shokax-anime": "^0.0.8",
-        "twikoo": "^1.6.41"
+        "twikoo": "^1.6.42"
     },
     "engines": {
         "node": ">=20.0.0"

package/scripts/generaters/script.js

@@ -24,6 +24,7 @@ var import_package = __toESM(require("../../package.json"));
 var import_promises = __toESM(require("node:fs/promises"));
 var import_esbuild = require("esbuild");
 var import_utils = require("../utils");
+var import_hexo_util = require("hexo-util");
 hexo.extend.generator.register("script", async function(locals) {
   const config = hexo.config;
   const theme = hexo.theme.config;
@@ -97,7 +98,8 @@ hexo.extend.generator.register("script", async function(locals) {
     enterPoint = "node_modules/hexo-theme-shokax/source/js/_app/pjax/siteInit.ts";
     patchDir = "node_modules/hexo-theme-shokax/source/js/_app/components/cloudflare.ts";
   }
-  await (0, import_esbuild.build)({
+  const resultApp = await (0, import_esbuild.build)({
+    write: false,
     entryPoints: [enterPoint],
     bundle: true,
     outdir: "shokaxTemp",
@@ -134,27 +136,47 @@ hexo.extend.generator.register("script", async function(locals) {
     }
   });
   const res = [];
-  (await import_promises.default.readdir("shokaxTemp")).forEach(async (file) => {
-    const fileContent = await import_promises.default.readFile("shokaxTemp/" + file);
-    if (file.endsWith(".js")) {
+  resultApp.outputFiles.forEach((file) => {
+    if (file.path.endsWith(".js")) {
       res.push({
-        path: theme.js + "/" + file,
-        data: fileContent
+        path: theme.js + "/" + file.path.split("/").pop(),
+        data: file.contents
       });
-    } else if (file.endsWith(".css")) {
+    } else if (file.path.endsWith(".css")) {
       res.push({
-        path: theme.css + "/" + file,
-        data: fileContent
+        path: theme.css + "/" + file.path.split("/").pop(),
+        data: file.contents
       });
     } else {
       res.push({
-        path: theme.statics + "/" + file,
-        data: fileContent
+        path: theme.statics + "/" + file.path.split("/").pop(),
+        data: file.contents
       });
     }
   });
+  hexo.extend.helper.register("preloadjs", function() {
+    const { statics, js } = hexo.theme.config;
+    let resultHtml = "";
+    res.forEach((file) => {
+      if (file.path.endsWith(".js")) {
+        resultHtml += (0, import_hexo_util.htmlTag)("link", { rel: "modulepreload", href: import_hexo_util.url_for.call(this, `${statics}${js}/${file}`) }, "");
+      }
+    });
+    return resultHtml;
+  });
+  hexo.extend.helper.register("load_async_css", function() {
+    const { statics, css } = hexo.theme.config;
+    let resultHtml = "";
+    res.forEach((file) => {
+      if (file.path.endsWith(".css")) {
+        resultHtml += (0, import_hexo_util.htmlTag)("link", { rel: "stylesheet", href: import_hexo_util.url_for.call(this, `${statics}${css}/${file}`), media: "none", onload: "this.media='all'" }, "");
+      }
+    });
+    return resultHtml;
+  });
   if (theme.experiments.cloudflarePatch) {
-    await (0, import_esbuild.build)({
+    const resultCF = await (0, import_esbuild.build)({
+      write: false,
       entryPoints: [patchDir],
       bundle: true,
       platform: "browser",
@@ -174,7 +196,7 @@ hexo.extend.generator.register("script", async function(locals) {
     });
     res.push({
       path: theme.js + "/cf-patch.js",
-      data: await import_promises.default.readFile("cf-patch.js")
+      data: resultCF.outputFiles[0].contents
     });
   }
   return res;

package/scripts/generaters/summary_ai.js

@@ -90,6 +90,7 @@ class SummaryDatabase {
     if (this.data.summaries[pathHash]?.sha256 === contentHash) {
       return this.data.summaries[pathHash].summary;
     } else {
+      hexo.log.info(`[ShokaX Summary AI] \u6B63\u5728\u5411 API \u8BF7\u6C42 ${path} \u7684\u6458\u8981`);
       const summaryContent = await getSummaryByAPI(content);
       this.data.summaries[pathHash] = {
         summary: summaryContent,

package/scripts/helpers/engine.js

@@ -1,28 +1,5 @@
 "use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var import_hexo_util = require("hexo-util");
-var import_node_fs = __toESM(require("node:fs"));
 const randomBG = function(count = 1, image_server = null, image_list = []) {
   let i;
   if (image_server) {
@@ -65,25 +42,8 @@ const randomBG = function(count = 1, image_server = null, image_list = []) {
   }
   return parseImage(image_list[Math.floor(Math.random() * image_list.length)], "mw690");
 };
-hexo.extend.helper.register("preloadjs", function() {
-  const { statics, js } = hexo.theme.config;
-  let res = "";
-  import_node_fs.default.readdirSync("./shokaxTemp").forEach((file) => {
-    if (file.endsWith(".js")) {
-      res += (0, import_hexo_util.htmlTag)("link", { rel: "modulepreload", href: import_hexo_util.url_for.call(this, `${statics}${js}/${file}`) }, "");
-    }
-  });
-  return res;
-});
-hexo.extend.helper.register("load_async_css", function() {
-  const { statics, css } = hexo.theme.config;
-  let res = "";
-  import_node_fs.default.readdirSync("./shokaxTemp").forEach((file) => {
-    if (file.endsWith(".css")) {
-      res += (0, import_hexo_util.htmlTag)("link", { rel: "stylesheet", href: import_hexo_util.url_for.call(this, `${statics}${css}/${file}`), media: "none", onload: "this.media='all'" }, "");
-    }
-  });
-  return res;
+hexo.extend.helper.register("shokax_inject", function(point) {
+  return hexo.theme.config.injects[point].map((item) => this.partial(item.layout, item.locals, item.options)).join("");
 });
 hexo.extend.helper.register("_url", function(path, text, options = {}) {
   if (!path) {

package/scripts/plugin/index.js

@@ -1,7 +1,30 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var import_package = require("../../package.json");
 var import_promises = require("node:fs/promises");
+var import_injects = __toESM(require("./lib/injects"));
 hexo.on("generateBefore", async () => {
-  await (0, import_promises.rm)("./shokaxTemp", { force: true, recursive: true });
+  (0, import_injects.default)(hexo);
   try {
     await (0, import_promises.unlink)("cf-patch.js");
   } catch (e) {

package/scripts/plugin/lib/injects-point.js

@@ -0,0 +1,40 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var injects_point_exports = {};
+__export(injects_point_exports, {
+  default: () => injects_point_default
+});
+module.exports = __toCommonJS(injects_point_exports);
+var injects_point_default = {
+  views: [
+    "head",
+    "sidebar",
+    "rightNav",
+    "postMeta",
+    "postBodyEnd",
+    "footer",
+    "bodyEnd",
+    "comment",
+    "status"
+  ],
+  styles: [
+    "variable",
+    "mixin",
+    "style"
+  ]
+};

package/scripts/plugin/lib/injects.js

@@ -0,0 +1,105 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var injects_exports = {};
+__export(injects_exports, {
+  default: () => injects_default
+});
+module.exports = __toCommonJS(injects_exports);
+var import_node_fs = __toESM(require("node:fs"));
+var import_node_path = __toESM(require("node:path"));
+var import_injects_point = __toESM(require("./injects-point"));
+/*!
+  inject.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
+ */
+const defaultExtname = ".pug";
+class StylusInject {
+  files;
+  base_dir;
+  constructor(base_dir) {
+    this.base_dir = base_dir;
+    this.files = [];
+  }
+  push(file) {
+    this.files.push(import_node_path.default.resolve(this.base_dir, file));
+  }
+}
+class ViewInject {
+  base_dir;
+  raws;
+  constructor(base_dir) {
+    this.base_dir = base_dir;
+    this.raws = [];
+  }
+  raw(name, raw, ...args) {
+    if (import_node_path.default.extname(name) === "") {
+      name += defaultExtname;
+    }
+    this.raws.push({ name, raw, args });
+  }
+  file(name, file, ...args) {
+    if (import_node_path.default.extname(name) === "") {
+      name += import_node_path.default.extname(file);
+    }
+    this.raw(name, import_node_fs.default.readFileSync(import_node_path.default.resolve(this.base_dir, file), "utf8"), ...args);
+  }
+}
+function initInject(base_dir) {
+  const injects = {};
+  import_injects_point.default.styles.forEach((item) => {
+    injects[item] = new StylusInject(base_dir);
+  });
+  import_injects_point.default.views.forEach((item) => {
+    injects[item] = new ViewInject(base_dir);
+  });
+  return injects;
+}
+var injects_default = (hexo) => {
+  const injects = initInject(hexo.base_dir);
+  hexo.execFilterSync("theme_inject", injects);
+  hexo.theme.config.injects = {};
+  import_injects_point.default.styles.forEach((type) => {
+    hexo.theme.config.injects[type] = injects[type].files;
+  });
+  import_injects_point.default.views.forEach((type) => {
+    const configs = /* @__PURE__ */ Object.create(null);
+    hexo.theme.config.injects[type] = [];
+    injects[type].raws.forEach((injectObj, index) => {
+      const name = `inject/${type}/${injectObj.name}`;
+      hexo.theme.setView(name, injectObj.raw);
+      configs[name] = {
+        layout: name,
+        locals: injectObj.args[0],
+        options: injectObj.args[1],
+        order: injectObj.args[2] || index
+      };
+    });
+    hexo.theme.config.injects[type] = Object.values(configs).sort((x, y) => x.order - y.order);
+  });
+};

package/source/js/_app/player.ts

@@ -10,5 +10,5 @@ export const initAudioPlayer = async function () {
     })
   })
   const { initPlayer } = await import('nyx-player')
-  initPlayer("#player","#showBtn", urls, "#playBtn")
+  initPlayer("#player","#showBtn", urls, "#playBtn", "html[data-theme="dark"]", "shokax")
 }