hexo-theme-shokax 0.4.17 → 0.4.19

package/README.md

@@ -1,3 +1,4 @@
+** [关于近期部分站点遭到全站复制的安全提示](https://github.com/theme-shoka-x/hexo-theme-shokaX/discussions/386) **
 # hexo-theme-shokaX
 ![LICENSE](	https://img.shields.io/github/license/theme-shoka-x/hexo-theme-shokaX)
 ![stars](https://img.shields.io/github/stars/theme-shoka-x/hexo-theme-shokaX)
@@ -27,7 +28,7 @@ shokaX的社区资源导航和插件仓库为[awesome-shokaX](https://github.com
 
 ## 🔧 如何安装?
 注意: 本项目需要 node.js 18.x 或更高版本才能运行 \
-见文档中[如何安装](https://docs-hexo.shokax.top/getting-started/)部分
+见文档中[如何安装](https://hexo.docs.shokax.top/getting-started/)部分
 
 ## 📚子项目
 - [ShokaX docs](https://github.com/theme-shoka-x/shokaX-docs) ShokaX 主题文档 (正在编写中，欢迎加入！)

package/_config.yml

@@ -34,6 +34,7 @@ experiments:
     enablePreload: true #是否开启预加载头图
     enableNextGradientCover: false # 使用CSS渐变作为上/下一页封面
   copyrightLength: 50 # 自定义复制时显示copyright的长度
+  antiFakeWebsite: true # 防止恶意网站伪装
 
 homeConfig:
   gradient: false # 使用CSS渐变作为文章封面
@@ -374,6 +375,14 @@ vendors:
       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"
   async_js:
     fancybox:
       source: cdnjs

package/languages/en.yml

@@ -67,6 +67,7 @@ footer:
   powered: "Powered by %s"
   total_views: Total Views
   total_visitors: Total Visitors
+  loading: "Loading..."
 
 counter:
   index:
@@ -109,6 +110,7 @@ symbol:
   comma: ", "
   period: ". "
   colon: ": "
+  space: " "
   year: "Y"
   month: "M"
 

package/languages/ja.yml

@@ -67,6 +67,7 @@ footer:
   powered: "Powered by %s"
   total_views: 閲覧合計数
   total_visitors: 合計閲覧者数
+  loading: "ローディング..."
 
 counter:
   index:
@@ -109,6 +110,7 @@ symbol:
   comma: "、"
   period: "。"
   colon: "："
+  space: " "
   year: 年
   month: 月
 

package/languages/zh-CN.yml

@@ -67,6 +67,7 @@ footer:
   powered: "基于 %s"
   total_views: 总访问量
   total_visitors: 总访客量
+  loading: "加载中..."
 
 counter:
   index:
@@ -109,6 +110,7 @@ symbol:
   comma: "，"
   period: "。"
   colon: "："
+  space: " "
   year: 年
   month: 月
 

package/languages/zh-HK.yml

@@ -67,6 +67,7 @@ footer:
   powered: "基於 %s"
   total_views: 總瀏覽次數
   total_visitors: 訪客總數
+  loading: "載入中..."
 
 counter:
   index:
@@ -109,6 +110,7 @@ symbol:
   comma: "，"
   period: "。"
   colon: "："
+  space: " "
   year: 年
   month: 月
 

package/languages/zh-TW.yml

@@ -67,6 +67,7 @@ footer:
   powered: "基於 %s"
   total_views: 總瀏覽次數
   total_visitors: 訪客總數
+  loading: "載入中..."
 
 counter:
   index:
@@ -109,6 +110,7 @@ symbol:
   comma: "，"
   period: "。"
   colon: "："
+  space: " "
   year: 年
   month: 月
 

package/layout/_partials/layout.pug

@@ -18,9 +18,11 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
         if enablePreload && enableCover
             if enableFixedCover
                 link(rel="preload" href=theme.homeConfig.fixedCover as="image" fetchpriority="high")
-            else
+            else if Array.isArray(covers)
                 each image in covers
-                    link(rel="preload" href=image as="image" fetchpriority="high")
+                    link(rel="preload" href!=image as="image" fetchpriority="high")
+            else
+                link(rel="preload" href!=covers as="image" fetchpriority="high")
 
         != partial('_partials/head/head_com.pug')
         != shokax_inject('head')
@@ -95,8 +97,8 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
         script(data-config type="text/javascript").
             var LOCAL = {
                 ispost: !{is_post()},
-                    path: `#{_permapath(page.path)}`,
-                    favicon: {
+                path: `#{_permapath(page.path)}`,
+                favicon: {
                     show: `#{__('favicon.show')}`,
                     hide: `#{__('favicon.hide')}`
                 },
@@ -134,6 +136,8 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
 
         != vendor_js('pace')
         != vendor_js('jquery')
+        != vendor_js('fancybox')
+        != vendor_js('justifiedGallery')
 
         if theme.polyfill.enable
             script(src=`https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?version=4.8.0&features=${theme.polyfill.features}` defer)
@@ -143,4 +147,3 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
         != shokax_inject('bodyEnd')
 
 
-

package/layout/_partials/post/footer.pug

@@ -1,16 +1,19 @@
 div(class="meta")
-    if date(post.date) !== date(post.updated) || time(post.date) !== time(post.updated)
-        if theme.twikoo.enable || theme.waline.pageview
+    if theme.twikoo.enable || theme.waline.pageview
+        span(class="item")
             span(class="icon")
                 i(class="ic i-eye")
-            span 此文章已被阅读次数:
+            span(class="text")
+                !=__('footer.total_views') + __('symbol.colon')
             - var prefixedPath = post.path.startsWith('/') ? post.path : '/' + post.path
-            span(id="twikoo_visitors" class="waline-pageview-count" data-path=prefixedPath) 正在加载...
+            span(id="twikoo_visitors" class="waline-pageview-count" data-path=prefixedPath)
+                !=__('footer.loading')
+    if date(post.date) !== date(post.updated) || time(post.date) !== time(post.updated)
         span(class="item")
             span(class="icon")
                 i(class="ic i-calendar-check")
             span(class="text")
-                != __('post.edited')
+                != __('post.edited') + __('symbol.space')
             time(title=__('post.modified') + __('symbol.colon') + full_date(post.updated) itemprop="dateModified" datetime=moment(post.updated).format())
                 != date(post.updated)
 

package/package.json

@@ -1,36 +1,36 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.4.17",
+    "version": "0.4.19",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
     "author": "zkz098",
     "license": "AGPL-3.0-or-later",
-    "packageManager": "pnpm@9.5.0",
+    "packageManager": "pnpm@9.15.4",
     "scripts": {
         "test": "tsc --build --verbose",
         "build": "node ./toolbox/compiler.mjs"
     },
     "devDependencies": {
         "@types/fancybox": "^3.5.7",
-        "@types/jquery": "^3.5.30",
+        "@types/jquery": "^3.5.32",
         "@types/js-yaml": "^4.0.9",
         "@types/katex": "^0.16.7",
-        "@types/node": "^22.5.5",
+        "@types/node": "^22.10.10",
         "@types/quicklink": "^2.3.4",
-        "@typescript-eslint/eslint-plugin": "^8.6.0",
-        "@typescript-eslint/parser": "^8.6.0",
-        "eslint": "^9.11.0",
+        "@typescript-eslint/eslint-plugin": "^8.21.0",
+        "@typescript-eslint/parser": "^8.21.0",
+        "eslint": "^9.19.0",
         "eslint-config-standard": "~17",
-        "eslint-plugin-vue": "^9.28.0",
-        "glob": "^11.0.0",
-        "typescript": "^5.6.2"
+        "eslint-plugin-vue": "^9.32.0",
+        "glob": "^11.0.1",
+        "typescript": "^5.7.3"
     },
     "dependencies": {
-        "@algolia/client-search": "^5.5.3",
-        "@waline/client": "^3.3.2",
-        "algoliasearch": "5.18.0",
-        "esbuild": "^0.24.0",
+        "@algolia/client-search": "^5.20.0",
+        "@waline/client": "^3.5.1",
+        "algoliasearch": "5.20.0",
+        "esbuild": "^0.24.2",
         "hexo": "^7.3.0",
         "hexo-algoliasearch": "^2.0.1",
         "hexo-feed": "^1.1.2",
@@ -38,14 +38,14 @@
         "hexo-pagination": "^4.0.0",
         "hexo-renderer-pug": "^3.0.0",
         "hexo-util": "^3.3.0",
-        "instantsearch.js": "^4.74.1",
+        "instantsearch.js": "^4.77.1",
         "js-yaml": "^4.1.0",
-        "katex": "^0.16.11",
+        "katex": "^0.16.21",
         "mouse-firework": "^0.0.6",
         "quicklink": "^2.3.0",
         "theme-shokax-anime": "^0.0.7",
         "theme-shokax-pjax": "^0.0.3",
-        "twikoo": "^1.6.39",
+        "twikoo": "^1.6.41",
         "unlazy": "^0.12.1"
     },
     "engines": {

package/scripts/generaters/script.js

@@ -39,10 +39,6 @@ hexo.extend.generator.register("script", function(locals) {
     darkmode: theme.darkmode,
     auto_dark: theme.auto_dark,
     auto_scroll: theme.auto_scroll,
-    js: {
-      copy_tex: (0, import_utils.getVendorLink)(hexo, theme.vendors.async_js.copy_tex),
-      fancybox: (0, import_utils.getVendorLink)(hexo, theme.vendors.async_js.fancybox)
-    },
     css: {
       katex: (0, import_utils.getVendorLink)(hexo, theme.vendors.css.katex),
       mermaid: {
@@ -137,6 +133,7 @@ hexo.extend.generator.register("script", function(locals) {
       __shokax_fancybox__: theme.modules.fancybox ? "true" : "false",
       __shokax_waline__: theme.waline.enable ? "true" : "false",
       __shokax_twikoo__: theme.twikoo.enable ? "true" : "false",
+      __shokax_antiFakeWebsite__: theme.experiments.antiFakeWebsite ? "true" : "false",
       shokax_CONFIG: JSON.stringify(siteConfig),
       shokax_siteURL: "'" + config.url + "'"
     }

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

@@ -132,3 +132,4 @@ declare const __shokax_waline__:boolean
 declare const __shokax_twikoo__:boolean
 declare const shokax_CONFIG:configType
 declare const shokax_siteURL:string
+declare const __shokax_antiFakeWebsite__:boolean

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

@@ -7,70 +7,61 @@ export const postFancybox = (p:string) => {
   if (document.querySelector(p + ' .md img')) {
     vendorCss('fancybox')
     vendorCss('justifiedGallery')
-    vendorJs('jquery', ()=>{
-      vendorJs('justifiedGallery',()=>{
-        vendorJs('fancybox', () => {
-          const q = jQuery.noConflict()
+    $dom.each(p + ' p.gallery', (element) => {
+      const box = document.createElement('div')
+      box.className = 'gallery'
+      box.setAttribute('data-height', String(element.getAttribute('data-height') || 220))
 
-          $dom.each(p + ' p.gallery', (element) => {
-            const box = document.createElement('div')
-            box.className = 'gallery'
-            box.setAttribute('data-height', String(element.getAttribute('data-height') || 220))
+      box.innerHTML = element.innerHTML.replace(/<br>/g, '')
 
-            box.innerHTML = element.innerHTML.replace(/<br>/g, '')
-
-            element.parentNode.insertBefore(box, element)
-            element.remove()
-          })
-
-          $dom.each(p + ' .md img:not(.emoji):not(.vemoji)', (element) => {
-            const $image = q(element)
-            const imageLink = $image.attr('data-src') || $image.attr('src') // 替换
-            const $imageWrapLink = $image.wrap('<a class="fancybox" href="' + imageLink + '" itemscope itemtype="https://schema.org/ImageObject" itemprop="url"></a>').parent('a')
-            let info; let captionClass = 'image-info'
-            if (!$image.is('a img')) {
-              $image.data('safe-src', imageLink)
-              if (!$image.is('.gallery img')) {
-                $imageWrapLink.attr('data-fancybox', 'default').attr('rel', 'default')
-              } else {
-                captionClass = 'jg-caption'
-              }
-            }
-            if ((info = element.getAttribute('title'))) {
-              $imageWrapLink.attr('data-caption', info)
-              const para = document.createElement('span')
-              const txt = document.createTextNode(info)
-              para.appendChild(txt)
-              para.addClass(captionClass)
-              insertAfter(element, para)
-            }
-          })
+      element.parentNode.insertBefore(box, element)
+      element.remove()
+    })
 
-          $dom.each(p + ' div.gallery', (el, i) => {
-            // @ts-ignore
-            q(el).justifiedGallery({
-              rowHeight: q(el).data('height') || 120,
-              rel: 'gallery-' + i
-            }).on('jg.complete', function () {
-              q(this).find('a').each((k, ele) => {
-                ele.setAttribute('data-fancybox', 'gallery-' + i)
-              })
-            })
-          })
+    $dom.each(p + ' .md img:not(.emoji):not(.vemoji)', (element) => {
+      const $image = $(element)
+      const imageLink = $image.attr('data-src') || $image.attr('src') // 替换
+      const $imageWrapLink = $image.wrap('<a class="fancybox" href="' + imageLink + '" itemscope itemtype="https://schema.org/ImageObject" itemprop="url"></a>').parent('a')
+      let info; let captionClass = 'image-info'
+      if (!$image.is('a img')) {
+        $image.data('safe-src', imageLink)
+        if (!$image.is('.gallery img')) {
+          $imageWrapLink.attr('data-fancybox', 'default').attr('rel', 'default')
+        } else {
+          captionClass = 'jg-caption'
+        }
+      }
+      if ((info = element.getAttribute('title'))) {
+        $imageWrapLink.attr('data-caption', info)
+        const para = document.createElement('span')
+        const txt = document.createTextNode(info)
+        para.appendChild(txt)
+        para.addClass(captionClass)
+        insertAfter(element, para)
+      }
+    })
 
-          q.fancybox.defaults.hash = false
-          q(p + ' .fancybox').fancybox({
-            loop: true,
-            // @ts-ignore
-            helpers: {
-              overlay: {
-                locked: false
-              }
-            }
-          })
-          // @ts-ignore
-        }, window.jQuery)
+    $dom.each(p + ' div.gallery', (el, i) => {
+      // @ts-ignore
+      $(el).justifiedGallery({
+        rowHeight: $(el).data('height') || 120,
+        rel: 'gallery-' + i
+      }).on('jg.complete', function () {
+        $(this).find('a').each((k, ele) => {
+          ele.setAttribute('data-fancybox', 'gallery-' + i)
+        })
       })
     })
+
+    $.fancybox.defaults.hash = false
+    $(p + ' .fancybox').fancybox({
+      loop: true,
+      // @ts-ignore
+      helpers: {
+        overlay: {
+          locked: false
+        }
+      }
+    })
   }
 }

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

@@ -34,12 +34,18 @@ export const pjaxReload = () => {
 }
 
 export const siteRefresh = async (reload) => {
+  if (__shokax_antiFakeWebsite__) {
+    if (window.location.origin !== CONFIG.hostname && window.location.origin !== "http://localhost:4000") {
+      window.location.href = CONFIG.hostname
+      /*! 我知道你正在试图去除这段代码，虽然我无法阻止你，但我劝你好自为之 */
+      alert('检测到非法仿冒网站，已自动跳转回正确首页;\nWe have detected a fake website, and you have been redirected to the correct homepage.')
+    }
+  }
+
   setLocalHash(0)
   setLocalUrl(window.location.href)
 
   vendorCss('katex');
-  // await import('katex/dist/katex.min.css')
-  // vendorJs('copy_tex')
   await import('katex/dist/contrib/copy-tex.mjs')
   vendorCss('mermaid')
 

package/source/js/_app/pjax/siteInit.ts

@@ -99,6 +99,14 @@ const siteInit = async () => {
 
 cloudflareInit()
 
+if (__shokax_antiFakeWebsite__) {
+  if (window.location.origin !== CONFIG.hostname && window.location.origin !== "http://localhost:4000") {
+    window.location.href = CONFIG.hostname
+    /*! 我知道你正在试图去除这段代码，虽然我无法阻止你，但我劝你好自为之 */
+    alert('检测到非法仿冒网站，已自动跳转回正确首页;\nWe have detected a fake website, and you have been redirected to the correct homepage.')
+  }
+}
+
 window.addEventListener('DOMContentLoaded', siteInit, {
   passive: true
 })