hexo-theme-shokax 0.3.11 → 0.3.12

package/_config.yml

@@ -348,58 +348,27 @@ quicklink:
 #! DO NOT EDIT THE FOLLOWING `vendors` SETTINGS
 #! UNLESS YOU KNOW WHAT YOU ARE DOING
 #! ---------------------------------------------------------------
-advVendors:
-  enable: true
-  github: "https://cdn.jsdelivr.net/gh/"
-  combine: "https://cdn.jsdelivr.net/"
-  npm: "https://unpkg.com/"
-  js:
-    pace:
-      src: bytedance:pace/1.0.2/pace.min.js
-    fetch:
-      src: npm:whatwg-fetch@3.4.0/dist/fetch.umd.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
-    quicklink:
-      src: bytedance:quicklink/2.2.0/quicklink.umd.min.js
-    fancybox:
-      src: 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
-      async: true
-    copy_tex:
-      src: bytedance:KaTeX/0.15.2/contrib/copy-tex.min.js
-      async: true
-  css:
-    katex:
-      src: npm:katex@0.16.7/dist/katex.min.css
-    comment:
-      src: css/comment.css
-    fancybox:
-      src: combine:npm/@fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css,npm/justifiedGallery@3.8.1/dist/css/justifiedGallery.min.css
-vendorsList:
-  js:
-    - pace
-    - algolia
-    - instantsearch
-    - quicklink
-    - fancybox
-    - copy_tex
-
 vendors:
+  cdns:
+    npm_webcache: https://npm.webcache.cn
+    bytedance: https://lf9-cdn-tos.bytecdntp.com/cdn/expire-6-M
+    cdnjs_webcache: https://cdnjs.webstatic.cn/ajax/libs
+    cdnjs: https://cdnjs.cloudflare.com/ajax/libs
+    unpkg: https://unpkg.com
+  js:
+    pace: bytedance|pace/1.2.4/pace.min.js
+#    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
+#    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
+    copy_tex: npm_webcache|katex@0.16.7/contrib/copy-tex.min.js
   css:
-    katex: npm/katex@0.16.7/dist/katex.min.css # ok
+    katex: npm_webcache|katex@0.16.7/dist/katex.min.css
     comment: css/comment.css
-    fancybox: combine/npm/@fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css,npm/justifiedGallery@3.8.1/dist/css/justifiedGallery.min.css # notok
-
-  js:
-    pace: npm/pace-js@1.0.2/pace.min.js # ok
-    fetch: npm/whatwg-fetch@3.4.0/dist/fetch.umd.min.js # ok
-    algolia: npm/algoliasearch@4/dist/algoliasearch-lite.umd.js # ok
-    instantsearch: npm/instantsearch.js@4/dist/instantsearch.production.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 弃用
-    copy_tex: npm/katex@0.16.7/dist/contrib/copy-tex.min.js # ok
-    chart: npm/frappe-charts@1.5.0/dist/frappe-charts.min.iife.min.js # ok
-
+    fancybox: npm_webcache|@fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css
+    justifiedGallery: npm_webcache|justifiedGallery@3.8.1/dist/css/justifiedGallery.min.css

package/layout/_mixin/comment.pug

@@ -19,7 +19,7 @@ mixin CommentRender()
             - var meta = JSON.stringify(theme.waline.meta)
             - var requiredMeta = JSON.stringify(theme.waline.requiredMeta)
             script(type="module" data-pjax).
-                import { init } from 'https://unpkg.com/@waline/client@v2/dist/waline.mjs';
+                import { init } from 'https://npm.webcache.cn/@waline/client@v2/dist/waline.mjs';
 
                 setTimeout(function () {
                     init({

package/layout/_partials/head/head.pug

@@ -43,17 +43,12 @@ if fontConfig
     != _vendor_font()
 != _css('app.css')
 
-- var debugVue = theme?.experiments?.debug
-if debugVue
-    script(src="https://cdn.staticfile.org/vue/3.2.45/vue.global.js")
-else
-    script(src="https://cdn.staticfile.org/vue/3.2.45/vue.global.prod.js")
 include pwa.pug
 if tk
     != _css("twikoo.css")
-    script(src=theme.twikoo.link)
+    script(src=theme.twikoo.link )
 else if wl
-    link(rel="stylesheet" href="https://unpkg.com/@waline/client@v2/dist/waline.css")
+    link(rel="stylesheet" href="https://npm.webcache.cn/@waline/client@v2/dist/waline.css" media="none" onload="this.media='all'")
 
 - var qw = theme?.qweather?.enable
 if qw

package/layout/_partials/layout.pug

@@ -92,7 +92,6 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
                     empty: "!{__('search.empty')}",
                     stats: "!{__('search.stats')}"
                 },
-                chart: #{!!page.chart},
                 copy_tex: #{!!page.math},
                 katex: #{!!page.math},
                 mermaid: #{!!page.mermaid},
@@ -119,11 +118,12 @@ 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}`)
 
-        if theme.advVendors.enable
-            each i in _list_vendor_js()
-                != _adv_vendor_js(i)
+        - debugVue = theme?.experiments?.debug
+        if debugVue
+            script(src="https://cdn.bootcdn.net/ajax/libs/vue/3.3.4/vue.global.min.js")
         else
-            != _vendor_js()
+            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})

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.3.11",
+    "version": "0.3.12",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
@@ -11,38 +11,32 @@
         "build": "cd ./source && tsc --build --verbose && cd ../scripts && tsc --build --verbose"
     },
     "devDependencies": {
-        "@types/chai": "^4.3.11",
         "@types/fancybox": "^3.5.6",
-        "@types/hexo": "^3.8.12",
         "@types/jquery": "^3.5.29",
         "@types/js-yaml": "^4.0.9",
         "@types/lozad": "^1.16.4",
-        "@types/mocha": "^10.0.6",
-        "@types/node": "^20.10.6",
-        "@typescript-eslint/eslint-plugin": "^6.18.0",
-        "@typescript-eslint/parser": "^6.18.0",
-        "chai": "^5.0.0",
+        "@types/node": "^20.11.5",
+        "@typescript-eslint/eslint-plugin": "^6.19.0",
+        "@typescript-eslint/parser": "^6.19.0",
         "eslint": "^8.56.0",
         "eslint-config-standard": "~17",
-        "eslint-plugin-chai-friendly": "^0.7.2",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-n": "^16.6.1",
+        "eslint-plugin-n": "^16.6.2",
         "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-vue": "^9.19.2",
-        "hexo-fs": "^4.1.1",
-        "hexo-util": "^3.1.0",
-        "instantsearch.js": "^4.63.0",
-        "jsdom": "^23.1.0",
-        "mocha": "^10.2.0",
+        "eslint-plugin-vue": "^9.20.1",
+        "instantsearch.js": "^4.64.0",
         "typescript": "^5.3.3",
-        "vue": "^3.4.5"
+        "vue": "^3.4.15"
     },
     "dependencies": {
         "esbuild": "^0.19.11",
-        "hexo": "^7.0.0",
+        "hexo": "7.0.0",
+        "hexo-fs": "^4.1.1",
+        "hexo-pagination": "^3.0.0",
+        "hexo-util": "^3.2.0",
         "js-yaml": "^4.1.0",
         "lozad": "^1.16.0",
-        "mouse-firework": "^0.0.3",
+        "mouse-firework": "^0.0.4",
         "theme-shokax-anime": "^0.0.6",
         "theme-shokax-pjax": "^0.0.3"
     },

package/scripts/generaters/script.js

@@ -22,19 +22,20 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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 */
-// import env from '../../package.json'
+const package_json_1 = __importDefault(require("../../package.json"));
 const fs = __importStar(require("hexo-fs"));
 const esbuild_1 = require("esbuild");
-const env = {
-    version: '0.3.10'
-};
+const utils_1 = require("../utils");
 hexo.extend.generator.register('script', function (locals) {
     const config = hexo.config;
     const theme = hexo.theme.config;
     const siteConfig = {
-        version: env.version,
+        version: package_json_1.default.version,
         hostname: config.url,
         root: config.root,
         statics: theme.statics,
@@ -46,15 +47,14 @@ hexo.extend.generator.register('script', function (locals) {
         auto_dark: theme.auto_dark,
         auto_scroll: theme.auto_scroll,
         js: {
-            chart: theme.vendors.js.chart,
-            copy_tex: theme.vendors.js.copy_tex,
-            fancybox: theme.vendors.js.fancybox
+            copy_tex: (0, utils_1.getVendorLink)(hexo, theme.vendors.async_js.copy_tex),
+            fancybox: (0, utils_1.getVendorLink)(hexo, theme.vendors.async_js.fancybox)
         },
         css: {
-            // valine: theme.css + '/comment.css',
-            katex: theme.vendors.css.katex,
+            katex: (0, utils_1.getVendorLink)(hexo, theme.vendors.css.katex),
             mermaid: theme.css + '/mermaid.css',
-            fancybox: theme.vendors.css.fancybox
+            fancybox: (0, utils_1.getVendorLink)(hexo, theme.vendors.css.fancybox),
+            justifiedGallery: (0, utils_1.getVendorLink)(hexo, theme.vendors.css.justifiedGallery)
         },
         loader: theme.loader,
         search: null,
@@ -99,7 +99,8 @@ hexo.extend.generator.register('script', function (locals) {
         bundle: true,
         outfile: 'shokax_temp.js',
         platform: 'browser',
-        target: ['es2021'],
+        format: 'iife',
+        target: ['es2022'],
         minify: true
     });
     text += fs.readFileSync('shokax_temp.js');

package/scripts/helpers/asset.js

@@ -1,11 +1,12 @@
 "use strict";
 /* global hexo */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// import theme_env from '../../package.json'
+const package_json_1 = __importDefault(require("../../package.json"));
 const hexo_util_1 = require("hexo-util");
-const theme_env = {
-    version: '0.3.10'
-};
+const utils_1 = require("../utils");
 hexo.extend.helper.register('_new_comments', function (mode) {
     const root = this.config.url.replace(/^(https?:\/\/)?[^\/]*/, '');
     if (mode === 'twikoo') {
@@ -45,14 +46,14 @@ hexo.extend.helper.register('_new_comments', function (mode) {
         return `
     <script type="module" data-pjax>
         let items = []
-        import { RecentComments } from 'https://unpkg.com/@waline/client@v2/dist/waline.mjs'
+        import { RecentComments } from 'https://npm.webcache.cn/@waline/client@v2/dist/waline.mjs'
         RecentComments({
           serverURL: '${hexo.theme.config.waline.serverURL.replace(/\/+$/, '')}',
           count: 10,
         }).then(({ comments }) => {
           comments.forEach(function (item) {
               let cText = (item.orig.length > 50) ? item.orig.substring(0,50)+'...' : item.orig
-              item.url = item.url !== '/' ?  '/' + item.url : item.url;
+              item.url = item.url.startsWith('/') ? item.url : '/' + item.url;
               const siteLink = item.url + "#" + item.objectId
               items.push({
                   href: siteLink,
@@ -86,7 +87,7 @@ hexo.extend.helper.register('hexo_env', function (type) {
     return this.env[type];
 });
 hexo.extend.helper.register('theme_env', function (type) {
-    return theme_env[type];
+    return package_json_1.default[type];
 });
 hexo.extend.helper.register('_vendor_font', () => {
     const config = hexo.theme.config.font;
@@ -116,91 +117,27 @@ hexo.extend.helper.register('_vendor_font', () => {
         })
         : '';
 });
-// TODO 废弃方法
-hexo.extend.helper.register('_vendor_js', () => {
-    const config = hexo.theme.config.vendors.js;
-    if (!config)
-        return '';
-    // Get a font list from config
-    let vendorJs = ['pace', 'pjax', 'fetch', 'anime', 'algolia', 'instantsearch', 'lazyload', 'quicklink'].map(item => {
-        if (config[item]) {
-            return config[item];
-        }
-        return '';
-    });
-    vendorJs = vendorJs.filter(item => item !== '');
-    // @ts-ignore
-    vendorJs = [...new Set(vendorJs)];
-    // @ts-ignore
-    vendorJs = vendorJs.join(',');
-    return vendorJs ? (0, hexo_util_1.htmlTag)('script', { src: `https://cdn.jsdelivr.net/combine/${vendorJs}` }, '') : '';
-});
 hexo.extend.helper.register('_css', function (...urls) {
     const { statics, css } = hexo.theme.config;
     return urls.map(url => (0, hexo_util_1.htmlTag)('link', {
         rel: 'stylesheet',
-        href: hexo_util_1.url_for.call(this, `${statics}${css}/${url}?v=${theme_env.version}`)
+        href: hexo_util_1.url_for.call(this, `${statics}${css}/${url}?v=${package_json_1.default.version}`)
     })).join('');
 });
 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=${theme_env.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}`) }, '')).join('');
 });
-hexo.extend.helper.register('_list_vendor_js', () => {
-    return hexo.theme.config.vendorsList.js;
-});
-hexo.extend.helper.register('_adv_vendor_js', function (js_name) {
-    const srcHelpers = (src) => { return src.endsWith('/') ? src : src + '/'; };
-    const config = hexo.theme.config.advVendors.js[js_name];
-    const themeConfig = hexo.theme.config;
-    const src = config.src;
-    const publicCdns = {
-        npm: srcHelpers(themeConfig.advVendors.npm),
-        gh: srcHelpers(themeConfig.advVendors.github),
-        combine: srcHelpers(themeConfig.advVendors.combine),
-        bytedance: 'https://lf9-cdn-tos.bytecdntp.com/cdn/expire-6-M/',
-        baomitu: 'https://lib.baomitu.com/'
-    };
-    let result;
-    if (src.startsWith('http')) {
-        result = src;
-    }
-    else if (src.startsWith('combine:')) {
-        hexo.log.info('The combine feature is not recommended!');
-        result = publicCdns.combine + src;
-    }
-    else if (src.startsWith('npm:')) {
-        result = publicCdns.npm + src.substring(4);
-    }
-    else if (src.startsWith('gh:')) {
-        result = publicCdns.gh + src.substring(3);
-    }
-    else if (src.startsWith('bytedance:')) {
-        result = publicCdns.bytedance + src.substring(10);
-    }
-    else if (src.startsWith('baomitu:')) {
-        result = publicCdns.baomitu + src.substring(8);
-    }
-    else {
-        result = '/' + src;
-    }
-    const attr = {
-        src: result,
-        integrity: undefined,
-        async: undefined
-    };
-    if (config.async)
-        attr.async = 'async';
-    if (config['data-pjax'])
-        attr['data-pjax'] = 'data-pjax';
-    if (config['hash-value'])
-        attr.integrity = config['hash-value'];
-    if (config.deferLoad) {
-        return (0, hexo_util_1.htmlTag)('script', { 'data-pjax': true }, `
-        const script=document.createElement("script");script.src="${result}",script.async=true,document.body.appendChild(script)
-        `);
+hexo.extend.helper.register('vendor_js', function () {
+    const vendors = hexo.theme.config.vendors;
+    let res = '';
+    for (const jsSync in vendors.js) {
+        res += (0, hexo_util_1.htmlTag)('script', { src: (0, utils_1.getVendorLink)(hexo, vendors.js[jsSync]) }, '');
     }
-    return (0, hexo_util_1.htmlTag)('script', attr, '');
+    // for (const jsAsync in vendors.async_js) {
+    //   res += htmlTag('script', { src: getVendorLink(hexo, vendors.async_js[jsAsync]), async: true }, '')
+    // }
+    return res;
 });
 hexo.extend.helper.register('_striptags', function (data) {
     return (0, hexo_util_1.stripHTML)(data);

package/scripts/plugin/index.js

@@ -32,11 +32,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const injects_1 = __importDefault(require("./lib/injects"));
-const node_https_1 = require("node:https");
-// @ts-ignore
-// import { version } from '../../package.json'
+const package_json_1 = require("../../package.json");
 const fs = __importStar(require("node:fs"));
-const version = '0.3.10';
 hexo.on('generateBefore', () => {
     // 加载`theme_injects`过滤器
     (0, injects_1.default)(hexo);
@@ -49,19 +46,11 @@ hexo.on('generateBefore', () => {
 });
 hexo.on('generateAfter', () => {
     // 检查版本更新
-    (0, node_https_1.get)('https://api.github.com/repos/theme-shoka-x/hexo-theme-shokaX/releases/latest', {
-        headers: {
-            'User-Agent': 'Theme ShokaX Client'
-        }
-    }, (res) => {
-        let result = '';
-        res.on('data', (data) => {
-            result += data;
-        });
-        res.on('end', () => {
+    fetch('https://api.github.com/repos/theme-shoka-x/hexo-theme-shokaX/releases/latest').then((res) => {
+        res.json().then((resp) => {
             try {
-                const latest = JSON.parse(result).tag_name.replace('v', '').split('.');
-                const current = version.split('.');
+                const latest = resp.tag_name.replace('v', '').split('.');
+                const current = package_json_1.version.split('.');
                 let isOutdated = false;
                 for (let i = 0; i < Math.max(latest.length, current.length); i++) {
                     if (!current[i] || latest[i] > current[i]) {
@@ -77,13 +66,13 @@ hexo.on('generateAfter', () => {
                     hexo.log.warn('Visit https://github.com/theme-shoka-x/hexo-theme-shokaX/releases for more information.');
                 }
             }
-            catch (err) {
-                hexo.log.error('Failed to detect version info. Error message:');
-                hexo.log.error(err);
+            catch (e) {
+                hexo.log.warn('Failed to detect version info. Error message:');
+                hexo.log.warn(e);
             }
+        }).catch((e) => {
+            hexo.log.warn('Failed to detect version info. Error message:');
+            hexo.log.warn(e);
         });
-    }).on('error', err => {
-        hexo.log.error('Failed to detect version info. Error message:');
-        hexo.log.error(err);
     });
 });

package/scripts/utils.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVendorLink = void 0;
+function getVendorLink(hexo, source) {
+    const VendorsCfg = hexo.theme.config.vendors;
+    const tagIdx = source.indexOf('|');
+    if (tagIdx !== -1) {
+        return `${VendorsCfg.cdns[source.substring(0, tagIdx)]}/${source.substring(tagIdx + 1)}`;
+    }
+    else {
+        return source;
+    }
+}
+exports.getVendorLink = getVendorLink;

package/source/js/_app/library/loadFile.js

@@ -4,15 +4,15 @@ import { getScript } from './scriptPjax';
  */
 const assetUrl = (asset, type) => {
     const str = CONFIG[asset][type];
+    if (str.includes('http')) {
+        return str;
+    }
     if (str.includes('gh') || str.includes('combine')) {
         return `https://cdn.jsdelivr.net/${str}`;
     }
     if (str.includes('npm')) {
         return `https://cdn.jsdelivr.net/${str}`;
     }
-    if (str.includes('http')) {
-        return str;
-    }
     return `/${str}`;
 };
 export const vendorJs = (type, callback, condition) => {

package/source/js/_app/page/fancybox.js

@@ -3,6 +3,7 @@ import { vendorCss, vendorJs } from '../library/loadFile';
 export const postFancybox = (p) => {
     if ($dom(p + ' .md img')) {
         vendorCss('fancybox');
+        vendorCss('justifiedGallery');
         vendorJs('fancybox', () => {
             const q = jQuery.noConflict();
             $dom.each(p + ' p.gallery', (element) => {

package/source/js/_app/pjax/refresh.js

@@ -30,7 +30,6 @@ export const siteRefresh = (reload) => {
     vendorCss('katex');
     vendorJs('copy_tex');
     vendorCss('mermaid');
-    vendorJs('chart');
     if (reload !== 1) {
         $dom.each('script[data-pjax]', pjaxScript);
     }