hexo-theme-shokax 0.4.13 → 0.4.15

package/_config.yml

@@ -27,6 +27,13 @@ experiments:
   optimizeLongPosts: false # 优化长文章，这能让长文章的FPS提升70%-150%并解决假死问题，但存在一些副作用
   # 具体见https://docs.kaitaku.xyz/guide/theme.html#%E9%95%BF%E6%96%87%E7%AB%A0%E4%BC%98%E5%8C%96
   mobileWidth: 820px # 移动版和桌面版导航栏最短切换长度
+  # 使用 Cloudflare Rocket 或其他优化功能时需开启下列补丁，否则主题无法渲染
+  cloudflarePatch: false
+  coverConfig:
+    enableCover: true # 是否开启头图
+    enablePreload: true #是否开启预加载头图
+    enableNextGradientCover: false # 使用CSS渐变作为上/下一页封面
+  copyrightLength: 50 # 自定义复制时显示copyright的长度
 
 homeConfig:
   gradient: false # 使用CSS渐变作为文章封面
@@ -95,13 +102,13 @@ polyfill:
 # 参阅 https://github.com/D-Sketon/mouse-firework
 fireworks:
   enable: true
-  options: 
+  options:
     excludeElements: ["a"]
     particles:
       - shape: circle
         move: ["emit"]
         easing: easeOutExpo
-        colors: 
+        colors:
           - "rgba(255,182,185,.9)"
           - "rgba(250,227,217,.9)"
           - "rgba(187,222,214,.9)"
@@ -221,7 +228,6 @@ summary:
     remote: "https://api.openai.com"
     apikey: "key"
 
-
 # Social Links
 # Usage: `Key: permalink || icon || color`
 # Key is the link label showing to end users.
@@ -397,4 +403,4 @@ vendors:
     justifiedGallery:
       source: cdnjs
       url: justifiedGallery/3.8.1/css/justifiedGallery.min.css
-      sri: "sha384-V/1Ew9pYm8xpy/L9i078ZXT6HSEOrGC6KNFYLbXOdtqb3+c6brpGqVzZtEPSQOiz"
+      sri: "sha384-V/1Ew9pYm8xpy/L9i078ZXT6HSEOrGC6KNFYLbXOdtqb3+c6brpGqVzZtEPSQOiz"

package/layout/_partials/head/head.pug

@@ -45,6 +45,9 @@ if fontConfig
 != preloadjs()
 != load_async_css()
 
+if theme.experiments.cloudflarePatch
+    != _js('cf-patch.js')
+
 include pwa.pug
 
 - var qw = theme?.qweather?.enable

package/layout/_partials/layout.pug

@@ -8,16 +8,19 @@ if (theme.quicklink.ignores)
 
 - var covers = _cover_index(page, 6)
 - var enableFixedCover = theme.homeConfig?.fixedCover
+- var enablePreload = theme.experiments?.coverConfig?.enablePreload
+- var enableCover = theme.experiments?.coverConfig?.enableCover
 
 doctype html
 html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'filter: grayscale(1);':'' )
     head
         != partial('_partials/head/head.pug', {}, {cache: true})
-        if enableFixedCover
-            link(rel="preload" href=theme.homeConfig.fixedCover as="image" fetchpriority="high")
-        else
-            each image in covers
-                link(rel="preload" href=image as="image" fetchpriority="high")
+        if enablePreload && enableCover
+            if enableFixedCover
+                link(rel="preload" href=theme.homeConfig.fixedCover as="image" fetchpriority="high")
+            else
+                each image in covers
+                    link(rel="preload" href=image as="image" fetchpriority="high")
 
         != partial('_partials/head/head_com.pug')
         != shokax_inject('head')
@@ -44,17 +47,18 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
 
                     != partial('_partials/header.pug', {}, {cache: true})
                 div(id="imgs" class="pjax")
-                    if theme.homeConfig.gradient || enableFixedCover
-                        //- cover不可用时用Bing随机图片代替
-                        - var coverImage = theme.homeConfig?.fixedCover || "https://7ed.net/bing/api"
-                        img(src=coverImage loading="eager" decoding="async" fetchpriority="high" alt=title)
-                    else
-                        if covers.length === 6
-                            ul
-                                each image in covers
-                                    li(class="item" style=`background-image: url("${image}");`)
+                    if enableCover
+                        if theme.homeConfig.gradient || enableFixedCover
+                            //- cover不可用时用Bing随机图片代替
+                            - var coverImage = theme.homeConfig?.fixedCover || "https://7ed.net/bing/api"
+                            img(src=coverImage loading="eager" decoding="async" fetchpriority="high" alt=title)
                         else
-                            img(src=covers loading="eager" decoding="async" fetchpriority="high" alt=title)
+                            if covers.length === 6
+                                ul
+                                    each image in covers
+                                        li(class="item" style=`background-image: url("${image}");`)
+                            else
+                                img(src=covers loading="eager" decoding="async" fetchpriority="high" alt=title)
             div(id="waves")
                 svg(class="waves" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 24 150 28" preserveAspectRatio="none" shape-rendering="auto")
                     defs

package/layout/_partials/post/nav.pug

@@ -1,8 +1,12 @@
 mixin navpost(item, type)
+    - var enableNextGradientCover = theme?.experiments?.coverConfig?.enableNextGradientCover
     - var postText = item.title || item.link || __('post.untitled')
     - var lastcat = item.categories.last()
     - var itemlink = `<span class="type">${__('post.' + type)}</span>${lastcat && lastcat.name ? `<span class="category"><i class="ic i-flag"></i>${lastcat.name}</span>` : ''}<h3>${postText}</h3>`
-    != _url(item.path, itemlink, {itemprop: 'url', rel: type, 'data-background-image': _cover(item), title: postText})
+    if enableNextGradientCover
+        != _url(item.path, itemlink, {itemprop: 'url', rel: type, title: postText, style: `background-image: linear-gradient(to bottom right, ${random_color()}, ${random_color()});`})
+    else
+        != _url(item.path, itemlink, {itemprop: 'url', rel: type, 'data-background-image': _cover(item), title: postText})
 
 div(class="post-nav")
     div(class="item left")

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.4.13",
+    "version": "0.4.15",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
@@ -30,7 +30,7 @@
         "@algolia/client-search": "^5.5.3",
         "@waline/client": "^3.3.2",
         "algoliasearch": "5.5.3",
-        "esbuild": "^0.23.1",
+        "esbuild": "^0.24.0",
         "hexo": "^7.3.0",
         "hexo-algoliasearch": "^2.0.1",
         "hexo-feed": "^1.1.2",
@@ -46,8 +46,7 @@
         "theme-shokax-anime": "^0.0.7",
         "theme-shokax-pjax": "^0.0.3",
         "twikoo": "^1.6.39",
-        "unlazy": "^0.11.3",
-        "vue": "^3.5.7"
+        "unlazy": "^0.11.3"
     },
     "engines": {
         "node": ">=18.0.0"

package/scripts/generaters/script.js

@@ -64,6 +64,9 @@ hexo.extend.generator.register("script", function(locals) {
       priority: theme.quicklink.priority
     },
     playerAPI: theme.playerAPI,
+    experiments: {
+      copyrightLength: theme.experiments.copyrightLength
+    },
     audio: void 0,
     fireworks: theme.fireworks && theme.fireworks.enable && theme.fireworks.options ? theme.fireworks.options : void 0,
     waline: {
@@ -93,10 +96,12 @@ hexo.extend.generator.register("script", function(locals) {
   if (theme?.audio) {
     siteConfig.audio = theme.audio;
   }
-  let enterPoint;
+  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";
     enterPoint = "themes/shokaX/source/js/_app/pjax/siteInit.ts";
   } else {
+    patchDir = "node_modules/hexo-theme-shokax/source/js/_app/components/cloudflare.ts";
     enterPoint = "node_modules/hexo-theme-shokax/source/js/_app/pjax/siteInit.ts";
   }
   (0, import_esbuild.buildSync)({
@@ -134,9 +139,6 @@ hexo.extend.generator.register("script", function(locals) {
       __shokax_twikoo__: theme.twikoo.enable ? "true" : "false",
       shokax_CONFIG: JSON.stringify(siteConfig),
       shokax_siteURL: "'" + config.url + "'"
-    },
-    alias: {
-      "algoliasearch/lite": "algoliasearch/dist/algoliasearch-lite.esm.browser.js"
     }
   });
   const res = [];
@@ -167,5 +169,31 @@ hexo.extend.generator.register("script", function(locals) {
       });
     }
   });
+  if (theme.experiments.cloudflarePatch) {
+    const result = (0, import_esbuild.buildSync)({
+      entryPoints: [patchDir],
+      bundle: true,
+      platform: "browser",
+      format: "iife",
+      tsconfigRaw: {
+        compilerOptions: {
+          target: "ES2022",
+          esModuleInterop: true,
+          module: "ESNext",
+          moduleResolution: "Node",
+          skipLibCheck: true
+        }
+      },
+      target: ["es2022"],
+      minify: true,
+      outfile: "cf-patch.js"
+    });
+    res.push({
+      path: theme.js + "/cf-patch.js",
+      data: function() {
+        return result;
+      }
+    });
+  }
   return res;
 });

package/scripts/plugin/index.js

@@ -31,6 +31,9 @@ var fs = __toESM(require("node:fs"));
 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");
   }

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

@@ -0,0 +1,19 @@
+// rocket-loader & Auto minify(cloudflare) 补丁
+// cloudflare 的上述功能会导致DOMContentLoaded事件无法触发，此补丁会将DOMContentLoaded重定向为load事件
+function cloudflareInit () {
+  let inCloudFlare = true
+  window.addEventListener('DOMContentLoaded', function () {
+    inCloudFlare = false
+  })
+
+  if (document.readyState === 'loading') {
+    window.addEventListener('load', function () {
+      if (inCloudFlare) {
+        window.dispatchEvent(new Event('DOMContentLoaded'))
+        console.log('%c ☁️cloudflare patch ' + '%c running', 'color: white; background: #ff8c00; padding: 5px 3px;', 'padding: 4px;border:1px solid #ff8c00')
+      }
+    })
+  }
+}
+
+cloudflareInit()

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

@@ -115,6 +115,9 @@ interface configType {
     priority: boolean
   }
   playerAPI: string
+  experiments: {
+    copyrightLength: number;
+  }
 }
 // esbuild 静态常量
 declare const __shokax_player__:boolean

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

@@ -1,21 +1,3 @@
-// rocket-loader & Auto minify(cloudflare) 补丁
-// cloudflare 的上述功能会导致DOMContentLoaded事件无法触发，此补丁会将DOMContentLoaded重定向为load事件
-export function cloudflareInit () {
-  let inCloudFlare = true
-  window.addEventListener('DOMContentLoaded', function () {
-    inCloudFlare = false
-  })
-
-  if (document.readyState === 'loading') {
-    window.addEventListener('load', function () {
-      if (inCloudFlare) {
-        window.dispatchEvent(new Event('DOMContentLoaded'))
-        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,sri: string, callback?: Function, condition?: string): void => {
   // url: 脚本文件的URL地址
   // callback: 当脚本加载完成时要执行的回调函数

package/source/js/_app/page/post.ts

@@ -1,7 +1,7 @@
 import { $dom } from '../library/dom'
 import { postFancybox } from './fancybox'
 import { clipBoard, showtip } from '../globals/tools'
-import { BODY } from '../globals/globalVars'
+import { CONFIG, BODY } from '../globals/globalVars'
 import { pageScroll, transition } from '../library/anime'
 import { mediaPlayer } from '../player'
 import { getDisplay, setDisplay, wrapObject } from '../library/proto'
@@ -22,7 +22,7 @@ export const postBeauty = () => {
     }
 
     const copyright = document.getElementById('copyright')
-    if (window.getSelection().toString().length > 30 && copyright) {
+    if (window.getSelection().toString().length > CONFIG.experiments.copyrightLength && copyright) {
       event.preventDefault()
       const author = '# ' + (copyright.querySelector('.author') as HTMLElement).innerText
       const link = '# ' + (copyright.querySelector('.link') as HTMLElement).innerText

package/source/js/_app/page/search.ts

@@ -1,10 +1,9 @@
-import { BODY, CONFIG, setSiteSearch, siteSearch } from '../globals/globalVars'
+import { CONFIG, siteSearch } from '../globals/globalVars'
 import { transition } from '../library/anime'
-import { $dom } from '../library/dom'
 import { searchBox, configure, stats, hits, pagination } from 'instantsearch.js/es/widgets'
 import type { HitHighlightResult } from 'instantsearch.js/es/types/results'
 import instantsearch from 'instantsearch.js'
-import algoliasearch from 'algoliasearch/lite'
+import { liteClient as algoliasearch } from 'algoliasearch/lite'
 
 export function algoliaSearch (pjax) {
   const search = instantsearch({