hexo-theme-shokax 0.3.13 → 0.4.0-alpha.2

package/_config.yml

@@ -21,7 +21,6 @@ pwa:
 
 # 实验性特性
 experiments:
-  noPlayer: false # 禁用音乐播放器
   gradient: false # 使用CSS渐变作为文章封面
   fixedCover: "" # 主页面cover(为空则使用bing随机图片)
   debug: false # 使用debug模式启动
@@ -31,6 +30,17 @@ experiments:
   # 具体见https://docs.kaitaku.xyz/guide/theme.html#%E9%95%BF%E6%96%87%E7%AB%A0%E4%BC%98%E5%8C%96
   mobileWidth: 820px # 移动版和桌面版导航栏最短切换长度
 
+# ShokaX 模块化分包引入设置
+# 请关闭所有不使用的模块以优化主题 js 体积和性能
+modules:
+  player: true # 启用音乐播放器
+  fireworks: true # 启用鼠标点击烟花特效
+  unlazyHash: false # 启用unlazy hash预览图支持
+  visibilityListener: true # 启用可见度监听器
+  tabs: true # 启用选项卡扩展支持，如需开启 summary 功能请一并开启
+  quiz: true # 启用文章内问题扩展支持
+  fancybox: true # 启用 fancybox 支持（不建议禁用）
+
 # 优化性能区
 performance:
   # 使用preconnect预加载的网址(不建议超过三个)
@@ -38,15 +48,11 @@ performance:
     - "https://lf9-cdn-tos.bytecdntp.com"
   # 使用dns-prefetch预解析的网址
   dnsPrefetch:
-    - "https://cdn.jsdelivr.net"
-    - "https://unpkg.com"
 
 playerAPI: "https://api.injahow.cn" # 结尾不带/,只填写域名
 # 如果条件允许,请参考 https://github.com/injahow/meting-api 自建API
 # 使用vercel自行部署,请参考: https://github.com/xizeyoupan/Meting-API
 
-disableVL: false # 禁用可见度监听
-
 icon:
   favicon: "/favicon.ico"
   apple_touch_icon: "/apple-touch-icon.png"
@@ -263,7 +269,8 @@ footer:
     word2: 秋 #第二个字
   icp: # ICP备案
     enable: false
-    icon: "beian.webp" #网安备案图片
+    # 请在登录后从 https://beian.mps.gov.cn/web/business/businessHome/website 下载对应图标
+    icon: "" #网安备案图片
     icpnumber: "xxx" # ICP备案号
     beian: "xxx" # 网安备案号
     recordcode: "xxx" # 网安备案链接中的recordcode参数
@@ -357,9 +364,9 @@ vendors:
 #    pjax: npm_webcache|theme-shokax-pjax@0.0.3/pjax.shokax.min.js
 #    anime: npm_webcache|theme-shokax-anime@0.0.6/anime.shokax.min.js
 #    lozad: npm_webcache|lozad@1.16.0/dist/lozad.min.js
-    algolia: bytedance|algoliasearch/4.12.1/algoliasearch-lite.umd.min.js
-    instantsearch: bytedance|instantsearch.js/4.39.0/instantsearch.production.min.js
-    quicklink: npm_webcache|quicklink@2.3.0/dist/quicklink.umd.js
+#    algolia: bytedance|algoliasearch/4.12.1/algoliasearch-lite.umd.min.js
+#    instantsearch: bytedance|instantsearch.js/4.39.0/instantsearch.production.min.js
+#    quicklink: npm_webcache|quicklink@2.3.0/dist/quicklink.umd.js
 #    mouse_firework: npm_webcache|mouse-firework@0.0.4/dist/index.umd.js
   async_js:
     fancybox: bytedance|??jquery/3.5.1/jquery.min.js,fancybox/3.5.7/jquery.fancybox.min.js,justifiedGallery/3.8.1/js/jquery.justifiedGallery.min.js

package/layout/_mixin/comment.pug

@@ -3,17 +3,17 @@ mixin CommentRender()
     - var tk = theme?.twikoo?.enable,wl = theme?.waline?.enable
     if page.comment !== false && !theme.experiments.disableThemeComment
         if tk
-            div(class="wrap" id="tcomments")
+            div(class="wrap" id="comments")
             script(type="text/javascript" data-pjax).
                 setTimeout(function () {
                     twikoo.init({
                         envId: '#{ theme.twikoo.envId }',
-                        el: '#tcomments',
+                        el: '#comments',
                         region: '#{theme.twikoo.region}'
                     })
                 }, 1000)
         else if wl
-            div(class="wrap" id="wcomments")
+            div(class="wrap" id="comments")
             - var locale = JSON.stringify(theme.waline.locale)
             - var emoji = JSON.stringify(theme.waline.emoji)
             - var meta = JSON.stringify(theme.waline.meta)
@@ -23,7 +23,7 @@ mixin CommentRender()
 
                 setTimeout(function () {
                     init({
-                        el: '#wcomments',
+                        el: '#comments',
                         serverURL: '#{theme.waline.serverURL.replace(/\/+$/, '')}',
                         lang: '#{theme.waline.lang}',
                         locale: !{locale},

package/layout/_partials/footer.pug

@@ -33,7 +33,7 @@ div(class="status")
             - var beianN = theme.footer.icp?.beian, RC=theme.footer.icp?.recordcode
             if beianN && RC
                 br
-                a(target="_blank" href=`https://www.beian.gov.cn/portal/registerSystemInfo?recordcode=${RC}`)
+                a(target="_blank" href=`https://beian.mps.gov.cn/#/query/webSearch?code=${RC}`)
                     img(src=theme.statics + theme.assets + '/' + theme.footer.icp.icon style="max-width: 2em;display:inline;" width="20" height="20")
                     != beianN
     != shokax_inject('status')

package/layout/_partials/head/head.pug

@@ -38,11 +38,17 @@ each prelink in prelinks
 each dnsLink in dnslinks
     link(rel="dns-prefetch" href=dnsLink)
 
-- var fontConfig = theme?.font?.loadFromGoogle
+- var fontConfig = theme.font?.loadFromGoogle
 if fontConfig
     != _vendor_font()
 != _css('app.css')
 
+if theme.polyfill.enable
+    script(src=`https://polyfill.io/v3/polyfill.min.js?features=${theme.polyfill.features}` defer)
+
+!= vendor_js()
+!= _js('siteInit.js')
+
 include pwa.pug
 if tk
     script(src=theme.twikoo.link )

package/layout/_partials/header.pug

@@ -11,7 +11,7 @@ nav(id="nav")
                     != alternate || title
         ul(class="right" id="rightNav")
             li(class="item theme" @click="changeThemeByBtn")
-                i(class="ic" :class="{'i-sun': !themeStatus,'i-moon': themeStatus}")
+                i(class="ic i-sun")
             li(class="item search")
                 i(class="ic i-search")
             != shokax_inject('rightNav')

package/layout/_partials/layout.pug

@@ -115,16 +115,6 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
                 ]
             };
 
-        if theme.polyfill.enable
-            script(src=`https://polyfill.io/v3/polyfill.min.js?features=${theme.polyfill.features}`)
-
-        - debugVue = theme?.experiments?.debug
-        if debugVue
-            script(src="https://cdn.bootcdn.net/ajax/libs/vue/3.3.4/vue.global.min.js")
-        else
-            script(src="https://cdn.bootcdn.net/ajax/libs/vue/3.3.4/vue.global.prod.min.js")
-        != vendor_js()
-        != _js('app.js')
         != partial('_partials/third-party/baidu-analytics.pug', {}, {cache: true})
         != partial('_partials/third-party/clarity.pug', {}, {cache: true})
         != partial('_partials/third-party/google-analytics.pug', {}, {cache: true})

package/layout/_partials/post/footer.pug

@@ -16,10 +16,9 @@ div(class="meta")
         script(type = "module" data-pjax).
             import { pageviewCount } from 'https://unpkg.com/@waline/client@2/dist/pageview.mjs';
 
-            const path = document.getElementById("twikoo_visitors").getAttribute("data-path");
             pageviewCount({
                 serverURL: '#{theme.waline.serverURL}',
-                path: path,
+                path: window.location.pathname,
             });
 
     != shokax_inject('postMeta')

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.3.13",
+    "version": "0.4.0-alpha.2",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
@@ -9,33 +9,38 @@
     "packageManager": "pnpm@8.14.1",
     "scripts": {
         "test": "tsc --build --verbose",
-        "build": "cd ./source && tsc --build --verbose && cd ../scripts && tsc --build --verbose"
+        "build": "cd ./scripts && tsc --build --verbose"
     },
     "devDependencies": {
         "@types/fancybox": "^3.5.6",
         "@types/jquery": "^3.5.29",
         "@types/js-yaml": "^4.0.9",
         "@types/node": "^20.11.10",
-        "@typescript-eslint/eslint-plugin": "^6.19.1",
-        "@typescript-eslint/parser": "^6.19.1",
+        "@types/quicklink": "^2.3.4",
+        "@typescript-eslint/eslint-plugin": "^6.20.0",
+        "@typescript-eslint/parser": "^6.20.0",
+        "@waline/client": "3.0.0-alpha.11",
         "eslint": "^8.56.0",
         "eslint-config-standard": "~17",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-n": "^16.6.2",
         "eslint-plugin-promise": "^6.1.1",
         "eslint-plugin-vue": "^9.20.1",
-        "instantsearch.js": "^4.64.1",
         "typescript": "^5.3.3",
         "vue": "^3.4.15"
     },
     "dependencies": {
+        "@algolia/client-search": "^4.22.1",
+        "algoliasearch": "4.22.1",
         "esbuild": "^0.20.0",
         "hexo": "7.0.0",
         "hexo-fs": "^4.1.1",
         "hexo-pagination": "^3.0.0",
         "hexo-util": "^3.2.0",
+        "instantsearch.js": "^4.64.2",
         "js-yaml": "^4.1.0",
         "mouse-firework": "^0.0.5",
+        "quicklink": "^2.3.0",
         "theme-shokax-anime": "^0.0.6",
         "theme-shokax-pjax": "^0.0.3",
         "unlazy": "^0.10.4"

package/scripts/generaters/archive.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-ignore
 const hexo_pagination_1 = __importDefault(require("hexo-pagination"));
 // @ts-ignore
-const fmtNum = num => {
+const fmtNum = (num) => {
     return num < 10 ? '0' + num : num;
 };
 if (!(hexo.config.archive && hexo.config.archive.enabled === false)) {

package/scripts/generaters/script.js

@@ -1,34 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /* global hexo */
 const package_json_1 = __importDefault(require("../../package.json"));
-const fs = __importStar(require("hexo-fs"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const esbuild_1 = require("esbuild");
 const utils_1 = require("../utils");
 hexo.extend.generator.register('script', function (locals) {
@@ -67,8 +44,6 @@ hexo.extend.generator.register('script', function (locals) {
             priority: theme.quicklink.priority
         },
         playerAPI: theme.playerAPI,
-        disableVL: theme.disableVL,
-        noPlayer: theme.experiments?.noPlayer,
         audio: undefined,
         fireworks: (theme.fireworks && theme.fireworks.enable && theme.fireworks.options)
             ? theme.fireworks.options
@@ -85,34 +60,81 @@ hexo.extend.generator.register('script', function (locals) {
     if (theme?.audio) {
         siteConfig.audio = theme.audio;
     }
-    let text;
     let enterPoint;
-    if (fs.existsSync('themes/shokaX/source/js/_app/pjax/siteInit.js')) {
-        enterPoint = 'themes/shokaX/source/js/_app/pjax/siteInit.js';
+    if (node_fs_1.default.existsSync('themes/shokaX/source/js/_app/pjax/siteInit.ts')) {
+        enterPoint = 'themes/shokaX/source/js/_app/pjax/siteInit.ts';
     }
     else {
-        enterPoint = 'node_modules/hexo-theme-shokax/source/js/_app/pjax/siteInit.js';
+        enterPoint = 'node_modules/hexo-theme-shokax/source/js/_app/pjax/siteInit.ts';
     }
-    text = 'const CONFIG = ' + JSON.stringify(siteConfig) + ';';
     (0, esbuild_1.buildSync)({
         entryPoints: [enterPoint],
         bundle: true,
-        outfile: 'shokax_temp.js',
+        outdir: 'shokaxTemp',
+        tsconfigRaw: {
+            compilerOptions: {
+                target: 'ES2022',
+                esModuleInterop: true,
+                module: 'ESNext',
+                moduleResolution: 'Node',
+                skipLibCheck: true
+            }
+        },
         platform: 'browser',
-        format: 'iife',
+        format: 'esm',
         target: ['es2022'],
         minify: true,
+        legalComments: 'linked',
+        mainFields: ['module', 'main'],
+        splitting: true,
         define: {
-            __UNLAZY_LOGGING__: 'false'
+            __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',
+            __shokax_search__: config?.algolia ? 'true' : 'false',
+            __shokax_outime__: theme.outime.enable ? 'true' : 'false',
+            __shokax_tabs__: theme.modules.tabs ? 'true' : 'false',
+            __shokax_quiz__: theme.modules.quiz ? 'true' : 'false',
+            __shokax_fancybox__: theme.modules.fancybox ? 'true' : 'false',
+            shokax_CONFIG: JSON.stringify(siteConfig)
+        },
+        alias: {
+            'algoliasearch/lite': 'algoliasearch/dist/algoliasearch-lite.esm.browser.js'
         }
     });
-    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 () {
-            return result;
+    const res = [];
+    node_fs_1.default.readdirSync('./shokaxTemp').forEach((file) => {
+        const fileText = node_fs_1.default.readFileSync(`./shokaxTemp/${file}`, { encoding: 'utf-8' });
+        if (file.endsWith('js')) {
+            const result = hexo.render.renderSync({ text: fileText, engine: 'js' });
+            res.push({
+                path: theme.js + '/' + file,
+                data: function () {
+                    return result;
+                }
+            });
         }
-    };
+        else if (file.endsWith('css')) {
+            const result = hexo.render.renderSync({ text: fileText, engine: 'css' });
+            res.push({
+                path: theme.css + '/' + file,
+                data: function () {
+                    return result;
+                }
+            });
+        }
+        else {
+            res.push({
+                path: theme.js + '/' + file,
+                data: function () {
+                    return fileText;
+                }
+            });
+        }
+        node_fs_1.default.unlinkSync(`./shokaxTemp/${file}`);
+    });
+    node_fs_1.default.rmSync('./shokaxTemp', { force: true, recursive: true });
+    return res;
 });

package/scripts/helpers/asset.js

@@ -126,7 +126,7 @@ hexo.extend.helper.register('_css', function (...urls) {
 });
 hexo.extend.helper.register('_js', function (...urls) {
     const { statics, js } = hexo.theme.config;
-    return urls.map(url => (0, hexo_util_1.htmlTag)('script', { src: hexo_util_1.url_for.call(this, `${statics}${js}/${url}?v=${package_json_1.default.version}`) }, '')).join('');
+    return urls.map(url => (0, hexo_util_1.htmlTag)('script', { src: hexo_util_1.url_for.call(this, `${statics}${js}/${url}?v=${package_json_1.default.version}`), type: 'module', fetchpriority: 'high' }, '')).join('');
 });
 hexo.extend.helper.register('vendor_js', function () {
     const vendors = hexo.theme.config.vendors;

package/scripts/helpers/list_categories.js

@@ -1,5 +1,3 @@
-'use strict';
-/* global hexo */
 const prepareQuery = (categories, parent) => {
     const query = {
         parent: undefined
@@ -13,7 +11,6 @@ const prepareQuery = (categories, parent) => {
     return categories.find(query).sort('name', 1).filter(cat => cat.length);
 };
 hexo.extend.helper.register('_list_categories', function (depth = 0) {
-    // let hexo = this
     const categories = this.site.categories;
     if (!categories || !categories.length)
         return '';
@@ -48,7 +45,6 @@ hexo.extend.helper.register('_list_categories', function (depth = 0) {
     return hierarchicalList(0);
 });
 hexo.extend.helper.register('_category_prev', function (name) {
-    // let hexo = this
     const categories = this.site.categories;
     if (!categories || !categories.length)
         return '';

package/scripts/plugin/lib/injects.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

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

@@ -0,0 +1,33 @@
+import { CONFIG } from '../globals/globalVars'
+import { init, pageviewCount } from '@waline/client'
+
+// await import('@waline/client/style')
+// fixme 处理样式引入问题
+
+export const walineComment = function () {
+  init({
+    el: '#comments',
+    serverURL: CONFIG.waline.serverURL,
+    lang: CONFIG.waline.lang,
+    locale: CONFIG.waline.locale,
+    emoji: CONFIG.waline.emoji,
+    meta: CONFIG.waline.meta,
+    requiredMeta: CONFIG.waline.requiredMeta,
+    wordLimit: CONFIG.waline.wordLimit,
+    pageSize: CONFIG.waline.pageSize,
+    pageview: CONFIG.waline.pageview,
+    path: window.location.pathname,
+    dark: 'html[data-theme="dark"]'
+  })
+}
+
+export const walinePageview = function () {
+  pageviewCount({
+    serverURL: CONFIG.waline.serverURL,
+    path: window.location.pathname
+  })
+}
+
+export const walineRecentComments = async function () {
+
+}