hexo-theme-shokax 0.4.25 → 0.5.0-beta1

package/scripts/generaters/index.js

@@ -21,13 +21,31 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var import_promises = require("node:fs/promises");
 var import_hexo_pagination = __toESM(require("hexo-pagination"));
-const fs = require("hexo-fs");
+function getFileExtension(path) {
+  const filename = path.split(/[\\/]/).pop() || "";
+  const lastDotIndex = filename.lastIndexOf(".");
+  return lastDotIndex > 0 ? filename.slice(lastDotIndex + 1) : "";
+}
 hexo.config.index_generator = Object.assign({
   per_page: typeof hexo.config.per_page === "undefined" ? 10 : hexo.config.per_page,
   order_by: "-date"
 }, hexo.config.index_generator);
-hexo.extend.generator.register("index", function(locals) {
+hexo.extend.helper.register("getCoverExt", function(path) {
+  const theme = hexo.theme.config;
+  if (theme.homeConfig.cateCards.length > 0) {
+    const cardMap = /* @__PURE__ */ new Map();
+    theme.homeConfig.cateCards.forEach((card) => {
+      cardMap.set(card.slug, card.cover);
+    });
+    if (cardMap.has(path)) {
+      const cover = cardMap.get(path);
+      return getFileExtension(cover);
+    }
+  }
+});
+hexo.extend.generator.register("index", async function(locals) {
   const covers = [];
   const catlist = [];
   let pages;
@@ -37,6 +55,7 @@ hexo.extend.generator.register("index", function(locals) {
   const paginationDir = config.pagination_dir || "page";
   const path = config.index_generator.path || "";
   const categories = locals.categories;
+  const theme = hexo.theme.config;
   const getTopcat = function(cat) {
     if (cat.parent) {
       const pCat = categories.findOne({ _id: cat.parent });
@@ -46,50 +65,44 @@ hexo.extend.generator.register("index", function(locals) {
     }
   };
   if (categories && categories.length) {
-    categories.forEach((cat) => {
-      const cover = `source/_posts/${cat.slug}`;
-      if (fs.existsSync(cover + "/cover.avif")) {
-        covers.push({
-          path: cat.slug + "/cover.avif",
-          data: function() {
-            return fs.createReadStream(cover + "/cover.avif");
-          }
-        });
-      } else if (fs.existsSync(cover + "/cover.webp")) {
-        covers.push({
-          path: cat.slug + "/cover.webp",
-          data: function() {
-            return fs.createReadStream(cover + "/cover.webp");
+    await Promise.all(
+      categories.map(async (cat) => {
+        const cover = `source/_posts/${cat.slug}`;
+        if (theme.homeConfig.cateCards.length > 0) {
+          const cardMap = /* @__PURE__ */ new Map();
+          theme.homeConfig.cateCards.forEach((card) => {
+            cardMap.set(card.slug, card.cover);
+          });
+          if (cardMap.has(cat.slug)) {
+            const cover2 = cardMap.get(cat.slug);
+            const coverData = await (0, import_promises.readFile)(`source/_posts/${cover2}`);
+            covers.push({
+              path: `${cat.slug}/cover.${getFileExtension(cover2)}`,
+              data: coverData
+            });
+            const topcat = getTopcat(cat);
+            if (topcat._id !== cat._id) {
+              cat.top = topcat;
+            }
+            const child = categories.find({ parent: cat._id });
+            let pl = 6;
+            if (child.length !== 0) {
+              cat.child = child.length;
+              cat.subs = child.sort({ name: 1 }).limit(6).toArray();
+              pl = Math.max(0, pl - child.length);
+              if (pl > 0) {
+                cat.subs.push(...cat.posts.sort({ title: 1 }).filter(function(item, i) {
+                  return item.categories.last()._id === cat._id;
+                }).limit(pl).toArray());
+              }
+            } else {
+              cat.subs = cat.posts.sort({ title: 1 }).limit(6).toArray();
+            }
+            catlist.push(cat);
           }
-        });
-      } else if (fs.existsSync(cover + "/cover.jpg")) {
-        covers.push({
-          path: cat.slug + "/cover.jpg",
-          data: function() {
-            return fs.createReadStream(cover + "/cover.jpg");
-          }
-        });
-        const topcat = getTopcat(cat);
-        if (topcat._id !== cat._id) {
-          cat.top = topcat;
-        }
-        const child = categories.find({ parent: cat._id });
-        let pl = 6;
-        if (child.length !== 0) {
-          cat.child = child.length;
-          cat.subs = child.sort({ name: 1 }).limit(6).toArray();
-          pl = Math.max(0, pl - child.length);
-          if (pl > 0) {
-            cat.subs.push(...cat.posts.sort({ title: 1 }).filter(function(item, i) {
-              return item.categories.last()._id === cat._id;
-            }).limit(pl).toArray());
-          }
-        } else {
-          cat.subs = cat.posts.sort({ title: 1 }).limit(6).toArray();
         }
-        catlist.push(cat);
-      }
-    });
+      })
+    );
   }
   if (posts.length > 0) {
     pages = (0, import_hexo_pagination.default)(path, posts, {

package/scripts/generaters/script.js

@@ -21,10 +21,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var import_package = __toESM(require("../../package.json"));
-var import_node_fs = __toESM(require("node:fs"));
+var import_promises = __toESM(require("node:fs/promises"));
 var import_esbuild = require("esbuild");
 var import_utils = require("../utils");
-hexo.extend.generator.register("script", function(locals) {
+hexo.extend.generator.register("script", async function(locals) {
   const config = hexo.config;
   const theme = hexo.theme.config;
   const siteConfig = {
@@ -55,10 +55,6 @@ hexo.extend.generator.register("script", function(locals) {
       enable: theme.outime.enable,
       days: theme.outime.days
     },
-    quicklink: {
-      timeout: theme.quicklink.timeout,
-      priority: theme.quicklink.priority
-    },
     playerAPI: theme.playerAPI,
     experiments: {
       copyrightLength: theme.experiments.copyrightLength
@@ -93,14 +89,15 @@ hexo.extend.generator.register("script", function(locals) {
     siteConfig.audio = theme.audio;
   }
   let enterPoint, patchDir;
-  if (import_node_fs.default.existsSync("themes/shokaX/source/js/_app/pjax/siteInit.ts")) {
-    patchDir = "themes/shokaX/source/js/_app/components/cloudflare.ts";
+  try {
+    await import_promises.default.readFile("themes/shokaX/source/js/_app/pjax/siteInit.ts", "utf-8");
     enterPoint = "themes/shokaX/source/js/_app/pjax/siteInit.ts";
-  } else {
-    patchDir = "node_modules/hexo-theme-shokax/source/js/_app/components/cloudflare.ts";
+    patchDir = "themes/shokaX/source/js/_app/components/cloudflare.ts";
+  } catch (e) {
     enterPoint = "node_modules/hexo-theme-shokax/source/js/_app/pjax/siteInit.ts";
+    patchDir = "node_modules/hexo-theme-shokax/source/js/_app/components/cloudflare.ts";
   }
-  (0, import_esbuild.buildSync)({
+  await (0, import_esbuild.build)({
     entryPoints: [enterPoint],
     bundle: true,
     outdir: "shokaxTemp",
@@ -121,8 +118,6 @@ hexo.extend.generator.register("script", function(locals) {
     mainFields: ["module", "browser", "main"],
     splitting: true,
     define: {
-      __UNLAZY_LOGGING__: "false",
-      __UNLAZY_HASH_DECODING__: theme.modules.unlazyHash ? "true" : "false",
       __shokax_player__: theme.modules.player ? "true" : "false",
       __shokax_VL__: theme.modules.visibilityListener ? "true" : "false",
       __shokax_fireworks__: theme.fireworks && theme.fireworks.enable && theme.fireworks.options && theme.modules.fireworks ? "true" : "false",
@@ -139,35 +134,27 @@ hexo.extend.generator.register("script", function(locals) {
     }
   });
   const res = [];
-  import_node_fs.default.readdirSync("./shokaxTemp").forEach((file) => {
-    const fileText = import_node_fs.default.readFileSync(`./shokaxTemp/${file}`, { encoding: "utf-8" });
-    if (file.endsWith("js")) {
-      const result = hexo.render.renderSync({ text: fileText, engine: "js" });
+  (await import_promises.default.readdir("shokaxTemp")).forEach(async (file) => {
+    const fileContent = await import_promises.default.readFile("shokaxTemp/" + file);
+    if (file.endsWith(".js")) {
       res.push({
         path: theme.js + "/" + file,
-        data: function() {
-          return result;
-        }
+        data: fileContent
       });
-    } else if (file.endsWith("css")) {
-      const result = hexo.render.renderSync({ text: fileText, engine: "css" });
+    } else if (file.endsWith(".css")) {
       res.push({
         path: theme.css + "/" + file,
-        data: function() {
-          return result;
-        }
+        data: fileContent
       });
     } else {
       res.push({
-        path: theme.js + "/" + file,
-        data: function() {
-          return fileText;
-        }
+        path: theme.statics + "/" + file,
+        data: fileContent
       });
     }
   });
   if (theme.experiments.cloudflarePatch) {
-    const result = (0, import_esbuild.buildSync)({
+    await (0, import_esbuild.build)({
       entryPoints: [patchDir],
       bundle: true,
       platform: "browser",
@@ -187,9 +174,7 @@ hexo.extend.generator.register("script", function(locals) {
     });
     res.push({
       path: theme.js + "/cf-patch.js",
-      data: function() {
-        return import_node_fs.default.readFileSync("./cf-patch.js", { encoding: "utf-8" });
-      }
+      data: await import_promises.default.readFile("cf-patch.js")
     });
   }
   return res;

package/scripts/helpers/engine.js

@@ -23,7 +23,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var import_hexo_util = require("hexo-util");
 var import_node_fs = __toESM(require("node:fs"));
-const randomServer = parseInt(String(Math.random() * 4), 10) + 1;
 const randomBG = function(count = 1, image_server = null, image_list = []) {
   let i;
   if (image_server) {
@@ -37,13 +36,12 @@ const randomBG = function(count = 1, image_server = null, image_list = []) {
     return image_server + "?" + Math.floor(Math.random() * 999999);
   }
   const parseImage = function(img, size) {
-    if (img.startsWith("//") || img.startsWith("http")) {
+    if (img.startsWith("//") || img.startsWith("https")) {
       return img;
     } else if (hexo.theme.config.experiments?.usingRelative) {
       return img;
     } else {
-      console.warn("sinaimg blocked all request from outside website,so don't use this format");
-      return `https://tva${randomServer}.sinaimg.cn/` + size + "/" + img;
+      throw new Error("Image URL is not valid: " + img);
     }
   };
   if (count && count > 1) {
@@ -158,6 +156,3 @@ hexo.extend.helper.register("random_color", function() {
   const [r, g, b] = arr;
   return `#${r.toString(16).length > 1 ? r.toString(16) : "0" + r.toString(16)}${g.toString(16).length > 1 ? g.toString(16) : "0" + g.toString(16)}${b.toString(16).length > 1 ? b.toString(16) : "0" + b.toString(16)}`;
 });
-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("");
-});

package/scripts/plugin/index.js

@@ -1,75 +1,38 @@
-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_injects = __toESM(require("./lib/injects"));
 var import_package = require("../../package.json");
-var fs = __toESM(require("node:fs"));
-/*!
-  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
- */
-hexo.on("generateBefore", () => {
-  (0, import_injects.default)(hexo);
-  fs.rmSync("./shokaxTemp", { force: true, recursive: true });
-  if (fs.existsSync("cf-patch.js")) {
-    fs.unlinkSync("cf-patch.js");
-  }
-  if (fs.existsSync("request.lock")) {
-    fs.unlinkSync("request.lock");
-  }
-  if (fs.existsSync("requested.lock")) {
-    fs.unlinkSync("requested.lock");
+var import_promises = require("node:fs/promises");
+hexo.on("generateBefore", async () => {
+  await (0, import_promises.rm)("./shokaxTemp", { force: true, recursive: true });
+  try {
+    await (0, import_promises.unlink)("cf-patch.js");
+  } catch (e) {
   }
 });
-hexo.on("generateAfter", () => {
-  fetch("https://registry.npmmirror.com/hexo-theme-shokax/latest", { headers: {
-    "User-Agent": "ShokaX Client (hexo-theme-shokax)"
-  } }).then((res) => {
-    res.json().then((resp) => {
-      try {
-        const latest = resp["version"];
-        const current = import_package.version.split(".");
-        let isOutdated = false;
-        for (let i = 0; i < Math.max(latest.length, current.length); i++) {
-          if (!current[i] || latest[i] > current[i]) {
-            isOutdated = true;
-            break;
-          }
-          if (latest[i] < current[i]) {
-            break;
-          }
-        }
-        if (isOutdated) {
-          hexo.log.warn(`Your theme ShokaX is outdated. Current version: v${current.join(".")}, latest version: v${latest.join(".")}`);
-          hexo.log.warn("Visit https://github.com/theme-shoka-x/hexo-theme-shokaX/releases for more information.");
-        }
-      } catch (e) {
-        hexo.log.warn("Failed to detect version info. Error message:");
-        hexo.log.warn(e);
+hexo.on("generateAfter", async () => {
+  try {
+    const res = await fetch("https://registry.npmmirror.com/hexo-theme-shokax/latest", {
+      headers: {
+        "User-Agent": "ShokaX Client (hexo-theme-shokax)"
       }
-    }).catch((e) => {
-      hexo.log.warn("Failed to detect version info. Error message:");
-      hexo.log.warn(e);
     });
-  });
+    const resp = await res.json();
+    const latest = resp.version;
+    const current = import_package.version.split(".");
+    let isOutdated = false;
+    for (let i = 0; i < Math.max(latest.length, current.length); i++) {
+      if (!current[i] || latest[i] > current[i]) {
+        isOutdated = true;
+        break;
+      }
+      if (latest[i] < current[i]) {
+        break;
+      }
+    }
+    if (isOutdated) {
+      hexo.log.warn(`Your theme ShokaX is outdated. Current version: v${current.join(".")}, latest version: v${latest.join(".")}`);
+      hexo.log.warn("Visit https://github.com/theme-shoka-x/hexo-theme-shokaX/releases for more information.");
+    }
+  } catch (e) {
+    hexo.log.warn("Failed to detect version info. Error message:");
+    hexo.log.warn(e);
+  }
 });

package/scripts/tags/media.js

@@ -30,7 +30,7 @@ function postMedia(args, content) {
   switch (args[0]) {
     case "video":
     case "audio":
-      return `<div class="media-container"><div class="player" data-type="${args[0]}" data-src='${JSON.stringify(list)}'></div></div>`;
+      return `<div class="media-container"><div class="player" data-type="${args[0]}" src='${JSON.stringify(list)}'></div></div>`;
   }
 }
 hexo.extend.tag.register("media", postMedia, { ends: true });

package/source/css/app.styl

@@ -20,22 +20,9 @@ if $_iconfont = hexo-config('style.iconfont')
 else
   @import "_iconfont";
 
-// Scaffolding
-@import "_common/scaffolding";
-
-// Layout
-@import "_common/outline";
-
-// Components
-@import "_common/components";
-
 if $custom = hexo-config('style.custom')
   @import $custom;
 
-if hexo-config('injects.style')
-  for $inject_style in hexo-config('injects.style')
-    @import $inject_style;
-
 if $optimize = hexo-config('experiments.optimizeLongPosts')
   @import "optimize.styl"
 

package/source/css/page.styl

@@ -0,0 +1,3 @@
+@import "scaffolding"
+
+@import "_common/components/pages"

package/source/css/post.styl

@@ -0,0 +1,5 @@
+@import "scaffolding"
+
+@import "_common/components/post"
+@import "_common/components/highlight"
+@import "_common/components/tags"

package/source/css/scaffolding.styl

@@ -0,0 +1,5 @@
+@import "app"
+
+@import "_common/scaffolding"
+@import "_common/outline"
+@import "_common/components/third-party"

package/source/js/_app/components/comments.ts

@@ -1,6 +1,8 @@
 import { CONFIG } from '../globals/globalVars'
 import { init, RecentComments } from '@waline/client'
+// @ts-ignore
 import { pageviewCount } from '@waline/client/pageview'
+// @ts-ignore
 await import('@waline/client/style')
 
 export const walineComment = function () {
@@ -21,7 +23,6 @@ export const walineComment = function () {
 }
 
 export const walinePageview = function () {
-  // TODO waline 上游此模块存在问题
   pageviewCount({
     serverURL: CONFIG.waline.serverURL,
     path: window.location.pathname
@@ -35,7 +36,6 @@ export const walineRecentComments = async function () {
     serverURL: CONFIG.waline.serverURL.replace(/\/+$/, ''),
     count: 10
   })
-  // TODO 疑似 waline API 返回格式与文档不一致，需要确认是否为上游问题
   // @ts-ignore
   comments.data.forEach(function (item) {
     let cText = (item.orig.length > 50) ? item.orig.substring(0, 50) + '...' : item.orig
@@ -74,7 +74,6 @@ export const walineRecentComments = async function () {
     commentTime.className = 'breadcrumb'
     commentTime.innerText = `${item.nick} @ ${item.time}`
     commentLink.href = root + item.href
-    commentLink['data-pjax-state'] = 'data-pjax-state'
     commentEl.className = 'item'
 
     commentText.appendChild(document.createElement('br'))

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

@@ -3,14 +3,12 @@
 import { CONFIG, Container, diffY, menuToggle, showContents, sideBar } from '../globals/globalVars'
 import { clipBoard } from '../globals/tools'
 import { pageScroll, transition } from '../library/anime'
-import { $dom } from '../library/dom'
-import initProto, { getHeight, setDisplay } from '../library/proto'
+import { getHeight, setDisplay } from '../library/proto'
 
-initProto()
 export const sideBarToggleHandle = (event:Event, force?:number) => {
-  if (sideBar.hasClass('on')) {
-    sideBar.removeClass('on')
-    menuToggle.removeClass('close')
+  if (sideBar.classList.contains('on')) {
+    sideBar.classList.remove('on')
+    menuToggle.classList.remove('close')
     if (force) {
       // @ts-ignore
       // noinspection JSConstantReassignment
@@ -25,8 +23,8 @@ export const sideBarToggleHandle = (event:Event, force?:number) => {
       sideBar.style = ''
     } else {
       transition(sideBar, 'slideRightIn', () => {
-        sideBar.addClass('on')
-        menuToggle.addClass('close')
+        sideBar.classList.add('on')
+        menuToggle.classList.add('close')
       })
     }
   }
@@ -61,29 +59,30 @@ export const sideBarTab = () => {
     const text = document.createTextNode(element.getAttribute('data-title'))
     span.appendChild(text)
     tab.appendChild(span)
-    tab.addClass(item + ' item')
+    tab.classList.add(item)
+    tab.classList.add('item')
 
     if (active) {
-      element.addClass(active)
-      tab.addClass(active)
+      element.classList.add(active)
+      tab.classList.add(active)
     } else {
-      element.removeClass('active')
+      element.classList.remove('active')
     }
     tab.addEventListener('click', (event) => {
       const target = event.currentTarget as HTMLElement
-      if (target.hasClass('active')) return
+      if (target.classList.contains('active')) return
 
-      sideBar.find('.tab .item').forEach((element) => {
-        element.removeClass('active')
+      sideBar.querySelectorAll('.tab .item').forEach((element) => {
+        element.classList.remove('active')
       })
 
-      sideBar.find('.panel').forEach((element) => {
-        element.removeClass('active')
+      sideBar.querySelectorAll('.panel').forEach((element) => {
+        element.classList.remove('active')
       })
 
-      sideBar.querySelector('.panel.' + target.className.replace(' item', '')).addClass('active')
+      sideBar.querySelector('.panel.' + target.className.replace(' item', '')).classList.add('active')
 
-      target.addClass('active')
+      target.classList.add('active')
     })
 
     list.appendChild(tab)
@@ -104,39 +103,39 @@ export const sidebarTOC = () => {
 
     if (!target) return
 
-    if (target.hasClass('current')) {
+    if (target.classList.contains('current')) {
       return
     }
 
-    $dom.each('.toc .active', (element) => {
-      element && element.removeClass('active current')
+    document.querySelectorAll('.toc .active').forEach((element) => {
+      element && element.classList.remove('active current')
     })
 
     sections.forEach((element) => {
-      element && element.removeClass('active')
+      element && element.classList.remove('active')
     })
 
-    target.addClass('active current')
-    sections[index] && sections[index].addClass('active')
+    target.classList.add('active current')
+    sections[index] && sections[index].classList.add('active')
 
     let parent = <Element> target.parentNode
 
     while (!parent.matches('.contents')) {
       if (parent.matches('li')) {
-        parent.addClass('active')
+        parent.classList.add('active')
         const t = document.getElementById(decodeURIComponent(parent.querySelector('a.toc-link').getAttribute('href').replace('#', '')))
         if (t) {
-          t.addClass('active')
+          t.classList.add('active')
         }
       }
       parent = <Element> parent.parentNode
     }
     // Scrolling to center active TOC element if TOC content is taller than viewport.
-    if (getComputedStyle(sideBar).display !== 'none' && tocElement.hasClass('active')) {
+    if (getComputedStyle(sideBar).display !== 'none' && tocElement.classList.contains('active')) {
       pageScroll((tocElement as HTMLElement), target.offsetTop - ((tocElement as HTMLElement).offsetHeight / 4))
     }
   }
-  const navItems = $dom.all('.contents li')
+  const navItems = document.querySelectorAll<HTMLElement>('.contents li')
 
   if (navItems.length < 1) {
     return
@@ -224,18 +223,19 @@ export const goToCommentHandle = () => {
 }
 
 export const menuActive = () => {
-  $dom.each('.menu .item:not(.title)', (element) => {
+  document.querySelectorAll('.menu .item:not(.title)').forEach((element) => {
     const target = <HTMLAnchorElement> element.querySelector('a[href]')
-    const parentItem = element.parentNode.parentNode
+    const parentItem = element.parentNode.parentNode as HTMLElement
     if (!target) return
     const isSamePath = target.pathname === location.pathname || target.pathname === location.pathname.replace('index.html', '')
     const isSubPath = !CONFIG.root.startsWith(target.pathname) && location.pathname.startsWith(target.pathname)
     const active = !target.onclick && target.hostname === location.hostname && (isSamePath || isSubPath)
-    element.toggleClass('active', active)
-    if (element.parentNode.querySelector('.active') && parentItem.hasClass('dropdown')) {
-      parentItem.removeClass('active').addClass('expand')
+    element.classList.toggle('active', active)
+    if (element.parentNode.querySelector('.active') && parentItem.classList.contains('dropdown')) {
+      parentItem.classList.remove('active')
+      parentItem.classList.add('expand')
     } else {
-      parentItem.removeClass('expand')
+      parentItem.classList.remove('expand')
     }
   })
 }

package/source/js/_app/components/tcomments.ts

@@ -40,7 +40,6 @@ export const twikooRecentComments = async function () {
     commentTime.className = 'breadcrumb'
     commentTime.innerText = `${item.nick} @ ${item.time}`
     commentLink.href = root + item.href
-    commentLink['data-pjax-state'] = 'data-pjax-state'
     commentEl.className = 'item'
 
     commentText.appendChild(document.createElement('br'))

package/source/js/_app/globals/globalVars.ts

@@ -1,9 +1,4 @@
-import { $dom } from '../library/dom'
-import Pjax from 'theme-shokax-pjax'
-import initProto from '../library/proto'
-
 export const CONFIG = shokax_CONFIG
-initProto()
 export const statics = CONFIG.statics.indexOf('//') > 0 ? CONFIG.statics : CONFIG.root
 export const scrollAction: { x: number, y: number } = { x: 0, y: 0 }
 export let diffY = 0
@@ -19,7 +14,6 @@ export const quickBtn = document.getElementById('quick')
 export const sideBar = document.getElementById('sidebar')
 export const siteBrand = document.getElementById('brand')
 export let toolBtn = document.getElementById('tool')
-export let toolPlayer
 export let backToTop: HTMLElement
 export let goToComment
 export let showContents
@@ -29,7 +23,6 @@ export let oWinHeight = window.innerHeight
 export let oWinWidth = window.innerWidth
 export let LOCAL_HASH = 0
 export let LOCAL_URL = window.location.href
-export let pjax:Pjax
 
 export function setSiteNavHeight (value:number):void {
   siteNavHeight = value
@@ -66,18 +59,10 @@ export function setLocalUrl (value:string):void {
   LOCAL_URL = value
 }
 
-export function setPjax (value:Pjax):void {
-  pjax = value
-}
-
 export function setOriginTitle (value:string):void {
   originTitle = value
 }
 
-export function setToolPlayer (value:any):void {
-  toolPlayer = value
-}
-
 export function setBackToTop (value:HTMLElement):void {
   backToTop = value
 }