hexo-theme-shokax 0.5.0-dev-58aa58e → 0.5.0-dev-4774f82

package/_config.yml

@@ -374,7 +374,6 @@ vendors:
       source: cdnjs
       url: jquery/3.5.1/jquery.min.js
       sri: "sha384-ZvpUoO/+PpLXR1lu4jmpXWu80pZlYUAfxl5NsBMWOEPSjUn/6Z/hRTt8+pR6L4N2"
-  async_js:
     fancybox:
       source: cdnjs
       url: fancybox/3.5.7/jquery.fancybox.min.js
@@ -383,10 +382,19 @@ vendors:
       source: cdnjs
       url: justifiedGallery/3.8.1/js/jquery.justifiedGallery.min.js
       sri: "sha384-TOxsBplaL96/QDWPIUg+ye3v89qSE3s22XNtJMmCeZEep3cVDmXy1zEfZvVv+y2m"
+  async_js:
     copy_tex:
       source: cdnjs
       url: KaTeX/0.16.9/contrib/copy-tex.min.js
       sri: "sha384-ww/583aHhxWkz5DEVn6OKtNiIaLi2iBRNZXfJRiY1Ai7tnJ9UXpEsyvOITVpTl4A"
+    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"
   css:
     katex:
       source: cdnjs

package/layout/_partials/head/head.pug

@@ -45,6 +45,12 @@ if fontConfig
 != preloadjs()
 != load_async_css()
 
+// 临时处理
+link(rel="stylesheet" media="none" onload="this.media='all'" href="https://s4.zstatic.net/ajax/libs/fancybox/3.5.7/jquery.fancybox.min.css")
+link(rel="stylesheet" media="none" onload="this.media='all'" href="https://s4.zstatic.net/ajax/libs/justifiedGallery/3.8.1/css/justifiedGallery.min.css")
+link(rel="stylesheet" media="none" onload="this.media='all'" href="https://s4.zstatic.net/ajax/libs/KaTeX/0.16.9/katex.min.css")
+//link(rel="stylesheet" media="none" onload="this.media='all'" href="https://s4.zstatic.net/ajax/libs/KaTeX/0.16.9/katex.min.css")
+!= _css('mermaid.css')
 if theme.experiments.cloudflarePatch
     != _js('cf-patch.js')
 

package/layout/_partials/head/pwa.pug

@@ -2,7 +2,7 @@
 - var timeNow = new Date().getTime()
 if theme.pwa.enable
     - var sworker = theme.pwa.serviceworker
-    script(data-pjax async).
+    script(async).
          if ('serviceWorker' in navigator) {
             navigator.serviceWorker.register("/#{sworker}?time=#{timeNow}").then(async (reg) => {
                     if (window.localStorage.getItem('install') !== 'true') {

package/layout/_partials/layout.pug

@@ -2,10 +2,6 @@ include ../_mixin/breadcrumb.pug
 include ../_mixin/sidebar.pug
 include ../_mixin/widgets.pug
 
-- ignores = []
-if (theme.quicklink.ignores)
-    - ignores.push(theme.quicklink.ignores)
-
 - var covers = _cover_index(page, 6)
 - var enableFixedCover = theme.homeConfig?.fixedCover
 - var enablePreload = theme.experiments?.coverConfig?.enablePreload
@@ -120,12 +116,7 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
                     essay: `#{__('quiz.essay')}`,
                     gap_fill: `#{__('quiz.gap_fill')}`,
                     mistake: `#{__('quiz.mistake')}`
-                },
-                ignores: [
-                    (uri) => uri.includes('#'),
-                    (uri) => new RegExp(LOCAL.path + '$').test(uri),
-                        !{JSON.stringify(ignores)}
-                ]
+                }
             };
 
         != partial('_partials/third-party/baidu-analytics.pug', {}, {cache: true})
@@ -134,6 +125,8 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
 
         != vendor_js('pace')
         != vendor_js('jquery')
+        != vendor_js('justifiedGallery')
+        != vendor_js('fancybox')
 
         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/layout/_partials/third-party/baidu-analytics.pug

@@ -1,6 +1,6 @@
 - var hmSrc = `https://hm.baidu.com/hm.js?${ theme.visitor.baiduAnalytics }`
 if theme.visitor.baiduAnalytics
-    script(data-pjax=true).
+    script.
         var _hmt = _hmt || [];
         (function () {
             const hm = document.createElement("script");

package/layout/_partials/third-party/google-analytics.pug

@@ -1,7 +1,7 @@
 - var googleId = theme.visitor.googleAnalytics 
 if googleId
     script(async, src=`https://www.googletagmanager.com/gtag/js?id=${ googleId }`)
-    script(data-pjax=true).
+    script.
         window.dataLayer = window.dataLayer || [];
         function gtag() {
             dataLayer.push(arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.5.0-dev-58aa58e",
+    "version": "0.5.0-dev-4774f82",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
@@ -13,23 +13,23 @@
     },
     "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.8.6",
         "@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.12.2",
+        "@typescript-eslint/parser": "^8.12.2",
+        "eslint": "^9.13.0",
         "eslint-config-standard": "~17",
-        "eslint-plugin-vue": "^9.28.0",
+        "eslint-plugin-vue": "^9.30.0",
         "glob": "^11.0.0",
-        "typescript": "^5.6.2"
+        "typescript": "^5.6.3"
     },
     "dependencies": {
-        "@algolia/client-search": "^5.5.3",
+        "@algolia/client-search": "^5.12.0",
         "@waline/client": "^3.3.2",
-        "algoliasearch": "5.10.2",
+        "algoliasearch": "5.12.0",
         "esbuild": "^0.24.0",
         "hexo": "^7.3.0",
         "hexo-algoliasearch": "^2.0.1",
@@ -38,18 +38,16 @@
         "hexo-pagination": "^4.0.0",
         "hexo-renderer-pug": "^3.0.0",
         "hexo-util": "^3.3.0",
-        "instantsearch.js": "^4.74.1",
+        "instantsearch.js": "^4.75.3",
         "js-yaml": "^4.1.0",
         "katex": "^0.16.11",
         "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",
         "unlazy": "^0.11.3"
     },
     "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
     },
     "engineStrict": true,
     "pnpm": {

package/scripts/generaters/script.js

@@ -59,10 +59,6 @@ hexo.extend.generator.register("script", function(locals) {
       enable: theme.outime.enable,
       days: theme.outime.days
     },
-    quicklink: {
-      timeout: theme.quicklink.timeout,
-      priority: theme.quicklink.priority
-    },
     playerAPI: theme.playerAPI,
     experiments: {
       copyrightLength: theme.experiments.copyrightLength

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

@@ -1,6 +1,8 @@
 import { CONFIG } from '../globals/globalVars'
 import { init, RecentComments } from '@waline/client'
+// @ts-ignore
 import { pageviewCount } from '@waline/client/pageview'
+// @ts-ignore
 await import('@waline/client/style')
 
 export const walineComment = function () {

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

@@ -109,11 +109,6 @@ interface configType {
     region: string
   }
   walinePageView: boolean
-  quicklink: {
-    ignores: any
-    timeout: number
-    priority: boolean
-  }
   playerAPI: string
   experiments: {
     copyrightLength: number;

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

@@ -1,76 +1,66 @@
 import { $dom } from '../library/dom'
-import { vendorCss, vendorJs } from '../library/loadFile'
 import { insertAfter } from '../library/proto'
 
 // TODO 使用PhotoSwipe替换Fancybox
 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()
+    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 = 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)
+      }
+    })
 
-          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
+      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)
+        })
       })
     })
+
+    q.fancybox.defaults.hash = false
+    q(p + ' .fancybox').fancybox({
+      loop: true,
+      // @ts-ignore
+      helpers: {
+        overlay: {
+          locked: false
+        }
+      }
+    })
   }
 }

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

@@ -1,46 +1,21 @@
-import { $dom } from '../library/dom'
 import { cardActive } from '../page/common'
-import { pageScroll, transition } from '../library/anime'
-import { vendorCss, vendorJs } from '../library/loadFile'
 import { resizeHandle } from '../globals/handles'
 import {
-  CONFIG,
-  loadCat,
-  menuToggle,
   setLocalHash, setLocalUrl, setOriginTitle,
-  sideBar,
-  toolPlayer
 } from '../globals/globalVars'
-import { pagePosition, positionInit } from '../globals/tools'
+import { positionInit } from '../globals/tools'
 import { menuActive, sideBarTab, sidebarTOC } from '../components/sidebar'
 import { Loader, isOutime } from '../globals/thirdparty'
 import { tabFormat } from '../page/tab'
 import { lazyLoad } from 'unlazy'
 
-export const pjaxReload = () => {
-  pagePosition()
-
-  if (sideBar.hasClass('on')) {
-    transition(sideBar, 0, () => {
-      sideBar.removeClass('on')
-      menuToggle.removeClass('close')
-    }) // 'transition.slideRightOut'
-  }
-  const mainNode = document.getElementById('main')
-  mainNode.innerHTML = ''
-  mainNode.appendChild(loadCat.lastChild.cloneNode(true))
-  pageScroll(0)
-}
-
 export const siteRefresh = async (reload) => {
   setLocalHash(0)
   setLocalUrl(window.location.href)
 
-  vendorCss('katex');
+  // @ts-ignore
   // await import('katex/dist/katex.min.css')
-  // vendorJs('copy_tex')
   await import('katex/dist/contrib/copy-tex.mjs')
-  vendorCss('mermaid')
 
   // 懒加载背景图
   const lazyBg = new IntersectionObserver(function (entries, observer) {
@@ -118,10 +93,15 @@ export const siteRefresh = async (reload) => {
     tabFormat()
   }
 
-  if (__shokax_player__) {
-    toolPlayer.player.load(LOCAL.audio || CONFIG.audio || {})
+  // if (__shokax_player__) {
+  //   toolPlayer.player.load(LOCAL.audio || CONFIG.audio || {})
+  // }
+  if (sessionStorage.getItem('loaded') === 'true') {
+    Loader.hide(30)
+  } else {
+    sessionStorage.setItem('loaded', 'true')
+    Loader.hide(500)
   }
-  Loader.hide(100)
 
   setTimeout(() => {
     positionInit()

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

@@ -14,11 +14,6 @@ const siteInit = async () => {
   initVue()
   domInit()
 
-  CONFIG.quicklink.ignores = LOCAL.ignores
-  import('quicklink').then(({listen}) => {
-    listen(CONFIG.quicklink)
-  })
-
   autoDarkmode()
 
   if (__shokax_VL__) {
@@ -70,18 +65,11 @@ const siteInit = async () => {
     passive: true
   })
 
-  // window.addEventListener('pjax:send', pjaxReload, {
-  //   passive: true
-  // })
-
-  // window.addEventListener('pjax:success', siteRefresh, {
-  //   passive: true
-  // }) // 默认会传入一个event参数
-
   window.addEventListener('beforeunload', () => {
     pagePosition()
   })
   await siteRefresh(1)
+  // TODO 修复内页跳转后重复出现加载动画的问题
 }
 
 cloudflareInit()

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

@@ -1,44 +0,0 @@
-import { CONFIG } from '../globals/globalVars'
-import { createChild } from './proto'
-
-/**
- * 用途是根据不同的资源名称和类型生成相应的资源 URL。
- */
-const assetUrl = (asset: string, type: string): string => {
-  const str = CONFIG[asset][type].url as string
-  if (str.startsWith('https')) {
-    return 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}`
-}
-
-export const vendorJs = (type: string, callback?: Function, condition?: string) => {
-  if (LOCAL[type]) {
-    assetUrl('js', type)
-  }
-}
-
-export const vendorCss = (type: string, condition?: string): void => {
-  if (window['css' + type]) {
-    return
-  }
-
-  if (LOCAL[type]) {
-    const attr:any = {
-      rel: 'stylesheet',
-      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
-  }
-}