hexo-theme-shokax 0.4.6 → 0.4.8

package/_config.yml

@@ -44,16 +44,11 @@ modules:
   quiz: true # 启用文章内问题扩展支持
   fancybox: true # 启用 fancybox 支持（不建议禁用）
 
-styles:
-  postprocess: true # 启用后处理器
-  modules:
-    mermaid: false
-
 # 优化性能区
 performance:
   # 使用preconnect预加载的网址(不建议超过三个)
   preConnect:
-    - "https://lf9-cdn-tos.bytecdntp.com"
+    - "https://s4.zstatic.net"
     - "https://at.alicdn.com"
   # 使用dns-prefetch预解析的网址
   dnsPrefetch:
@@ -364,18 +359,43 @@ quicklink:
 #! ---------------------------------------------------------------
 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
+    cdnjs: https://s4.zstatic.net/ajax/libs
   js:
-    pace: bytedance|pace/1.2.4/pace.min.js
+    pace:
+      source: cdnjs
+      url: pace/1.2.4/pace.min.js
+      sri: "sha384-k6YtvFUEIuEFBdrLKJ3YAUbBki333tj1CSUisai5Cswsg9wcLNaPzsTHDswp4Az8"
   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/dist/contrib/copy-tex.min.js
+    jquery:
+      source: cdnjs
+      url: jquery/3.5.1/jquery.min.js
+      sri: "sha384-ZvpUoO/+PpLXR1lu4jmpXWu80pZlYUAfxl5NsBMWOEPSjUn/6Z/hRTt8+pR6L4N2"
+    fancybox:
+      source: cdnjs
+      url: fancybox/3.5.7/jquery.fancybox.min.js
+      sri: "sha384-Zm+UU4tdcfAm29vg+MTbfu//q5B/lInMbMCr4T8c9rQFyOv6PlfQYpB5wItcXWe7"
+    justifiedGallery:
+      source: cdnjs
+      url: justifiedGallery/3.8.1/js/jquery.justifiedGallery.min.js
+      sri: "sha384-TOxsBplaL96/QDWPIUg+ye3v89qSE3s22XNtJMmCeZEep3cVDmXy1zEfZvVv+y2m"
+    copy_tex:
+      source: cdnjs
+      url: KaTeX/0.16.9/contrib/copy-tex.min.js
+      sri: "sha384-ww/583aHhxWkz5DEVn6OKtNiIaLi2iBRNZXfJRiY1Ai7tnJ9UXpEsyvOITVpTl4A"
   css:
-    katex: npm_webcache|katex@0.16.7/dist/katex.min.css
-    comment: css/comment.css
-    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
+    katex:
+      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
+      sri: "sha384-Q8BgkilbsFGYNNiDqJm69hvDS7NCJWOodvfK/cwTyQD4VQA0qKzuPpvqNER1UC0F"
+    justifiedGallery:
+      source: cdnjs
+      url: justifiedGallery/3.8.1/css/justifiedGallery.min.css
+      sri: "sha384-V/1Ew9pYm8xpy/L9i078ZXT6HSEOrGC6KNFYLbXOdtqb3+c6brpGqVzZtEPSQOiz"

package/layout/_partials/layout.pug

@@ -128,7 +128,7 @@ 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()
+        != vendor_js('pace')
         if theme.polyfill.enable
             script(src=`https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?version=4.8.0&features=${theme.polyfill.features}` defer)
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.4.6",
+    "version": "0.4.8",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
@@ -31,13 +31,12 @@
     "dependencies": {
         "@algolia/client-search": "^4.24.0",
         "@waline/client": "^3.2.6",
-        "algoliasearch": "4.23.3",
-        "esbuild": "^0.21.5",
-        "hexo": "^7.2.0",
+        "algoliasearch": "4.24.0",
+        "esbuild": "^0.23.0",
+        "hexo": "^7.3.0",
         "hexo-algoliasearch": "^2.0.1",
         "hexo-feed": "^1.1.2",
         "hexo-fs": "^4.1.3",
-        "hexo-lightning-minify": "^0.1.5",
         "hexo-pagination": "^3.0.0",
         "hexo-renderer-pug": "^3.0.0",
         "hexo-util": "^3.3.0",

package/scripts/generaters/script.js

@@ -29,7 +29,11 @@ hexo.extend.generator.register('script', function (locals) {
         },
         css: {
             katex: (0, utils_1.getVendorLink)(hexo, theme.vendors.css.katex),
-            mermaid: theme.css + '/mermaid.css',
+            mermaid: {
+                url: theme.css + '/mermaid.css',
+                local: true,
+                sri: ''
+            },
             fancybox: (0, utils_1.getVendorLink)(hexo, theme.vendors.css.fancybox),
             justifiedGallery: (0, utils_1.getVendorLink)(hexo, theme.vendors.css.justifiedGallery)
         },

package/scripts/helpers/asset.js

@@ -57,13 +57,9 @@ 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}`), type: 'module', fetchpriority: 'high', defer: true }, '')).join('');
 });
-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]), async: true }, '');
-    }
-    return res;
+hexo.extend.helper.register('vendor_js', function (vendor) {
+    const res = (0, utils_1.getVendorLink)(hexo, hexo.theme.config.vendors.js[vendor]);
+    return (0, hexo_util_1.htmlTag)('script', { src: res.url, integrity: res.sri, crossorigin: 'anonymous', fetchpriority: 'high' }, '');
 });
 hexo.extend.helper.register('_striptags', function (data) {
     return (0, hexo_util_1.stripHTML)(data);

package/scripts/utils.js

@@ -2,12 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVendorLink = getVendorLink;
 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)}`;
+    const vendorsCfg = hexo.theme.config.vendors;
+    if (source.source === "local") {
+        return {
+            url: source.url,
+            local: true,
+            sri: ''
+        };
     }
     else {
-        return source;
+        return {
+            url: vendorsCfg.cdns[source.source] + '/' + source.url,
+            local: false,
+            sri: source.sri
+        };
     }
 }

package/source/js/_app/library/declare.d.ts

@@ -1,6 +1,9 @@
-/*
-对注释的说明: 部分注释为openai-chatgpt生成的注释,可能存在描述或语义的问题
- */
+type vendorUrl = {
+  url: string
+  local: boolean
+  sri?: string
+}
+
 interface AudioItem {
   title: string;
   list: string[];
@@ -80,14 +83,14 @@ interface configType {
     switch: boolean
   }
   js: {
-    copy_tex: string
-    fancybox: string
+    copy_tex: vendorUrl
+    fancybox: vendorUrl
   }
   css: {
-    valine: string
-    katex: string
-    mermaid: string
-    fancybox: string
+    valine: vendorUrl
+    katex: vendorUrl
+    mermaid: vendorUrl
+    fancybox: vendorUrl
   }
   search: any,
   waline: {

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

@@ -4,28 +4,22 @@ import { createChild } from './proto'
 
 /**
  * 用途是根据不同的资源名称和类型生成相应的资源 URL。
- * @deprecated Use smart bundle and import() instead.
  */
 const assetUrl = (asset: string, type: string): string => {
-  const str = CONFIG[asset][type]
-  if (str.includes('http')) {
+  const str = CONFIG[asset][type].url as string
+  if (str.startsWith('https')) {
     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.startsWith('http')) {
+    console.warn(`Upgrade vendor ${asset}/${type} to HTTPS, Please use HTTPS url instead of HTTP url.`)
+    return str.replace('http', 'https')
   }
   return `/${str}`
 }
 
-/**
- @deprecated Use smart bundle and import() instead. Will be removed in the v0.5
- */
 export const vendorJs = (type: string, callback?: Function, condition?: string) => {
   if (LOCAL[type]) {
-    getScript(assetUrl('js', type), callback || function () {
+    getScript(assetUrl('js', type),CONFIG['js'][type].sri, callback || function () {
       window[type] = true
     }, condition || window[type])
   }
@@ -37,10 +31,16 @@ export const vendorCss = (type: string, condition?: string): void => {
   }
 
   if (LOCAL[type]) {
-    createChild(document.head, 'link', {
+    const attr:any = {
       rel: 'stylesheet',
-      href: assetUrl('css', type)
-    })
+      href: assetUrl('css', type),
+    }
+    const vendor = CONFIG['css'][type] as vendorUrl
+    if (!vendor.local) {
+      attr.integrity = vendor.sri
+      attr.crossOrigin = 'anonymous'
+    }
+    createChild(document.head, 'link', attr)
 
     window['css' + type] = true
   }

package/source/js/_app/library/scriptPjax.ts

@@ -10,13 +10,13 @@ export function cloudflareInit () {
     window.addEventListener('load', function () {
       if (inCloudFlare) {
         window.dispatchEvent(new Event('DOMContentLoaded'))
-        console.log('%c ☁️cloudflare patch ' + '%c running(rocket & minify)', 'color: white; background: #ff8c00; padding: 5px 3px;', 'padding: 4px;border:1px solid #ff8c00')
+        console.log('%c ☁️cloudflare patch ' + '%c running', 'color: white; background: #ff8c00; padding: 5px 3px;', 'padding: 4px;border:1px solid #ff8c00')
       }
     })
   }
 }
 
-export const getScript = (url: string, callback?: Function, condition?: string): void => {
+export const getScript = (url: string,sri: string, callback?: Function, condition?: string): void => {
   // url: 脚本文件的URL地址
   // callback: 当脚本加载完成时要执行的回调函数
   // condition: 可选的条件参数，如果存在，则执行callback
@@ -39,6 +39,8 @@ export const getScript = (url: string, callback?: Function, condition?: string):
       }
     }
     script.src = url
+    script.integrity = sri
+    script.crossOrigin = 'anonymous'
     document.head.appendChild(script)
   }
 }

package/toolbox/compiler.mjs

@@ -1,16 +1,12 @@
 /*
 ShokaX ToolBox - Compiler
 compatibility: ShokaX v0.4.x
-NEED PNPM INSTALLED
  */
 import path from "node:path";
 import fs from 'fs/promises'
 import child_process from 'child_process'
-import {hoistDeps} from "./lib.mjs";
 
 const CONFIG = {
-  depsHoist: true,
-  minify: false,
   legacyScript: true,
 }
 
@@ -46,10 +42,10 @@ if (CONFIG.legacyScript) {
     } else if (sPath.startsWith('file:\\')) {
         sPath = sPath.slice(8); // 去除 'file:\'
     }
-    child_process.exec('pnpm install',{
+    child_process.exec('npm install',{
         cwd: path.join(sPath,'./../')
     }, (code, stdout, stderr) => {
-        child_process.exec('pnpm --package=typescript dlx tsc --build'.trim(), {
+        child_process.exec('"yes" | npx -p typescript tsc --build'.trim(), {
             cwd: sPath
         }, async (code, stdout, stderr) => {
             console.log('Deleting typescript files...')
@@ -61,15 +57,6 @@ if (CONFIG.legacyScript) {
     throw Error('Not implemented yet.')
 }
 
-if (CONFIG.depsHoist) {
-    try {
-        await hoistDeps()
-        console.log('Finished hoisting dependencies.')
-    } catch (e) {
-        console.log('Skipping hoisting dependencies.')
-    }
-}
-
 console.log('Done.')