hexo-theme-shokax 0.5.0-dev-815e373 → 0.5.0-dev-31f9f21

package/README.md

@@ -9,6 +9,7 @@
 - 引入新的 Inject 类技术 (长期)
 - 引入新的工作流程
 - 引入 CI 自动测试
+- 重构 player (暂时移除)
 - 优化 menu 配置格式
 - 优化和异步化 Smart Bundle 技术
 - 优化 CSS 结构和加载

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,6 +382,7 @@ 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

package/_images.yml

@@ -1,9 +1,2 @@
 # 此images已失效,见https://github.com/theme-shoka-x/hexo-theme-shokaX/issues/6
-- 6833939bly1giciryrr3rj20zk0m8nhk.jpg
-- 6833939bly1gicis081o9j20zk0m8dmr.jpg
-- 6833939bly1gicis3attqj20zk0m8k7l.jpg
-- 6833939bly1giciszlczyj20zk0m816d.jpg
-- 6833939bly1gicit31ffoj20zk0m8naf.jpg
-- 6833939bly1gicit4jrvuj20zk0m8785.jpg
-- 6833939bly1gicitcxhpij20zk0m8hdt.jpg
 

package/layout/_partials/head/head.pug

@@ -45,6 +45,11 @@ 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")
+!= _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

@@ -134,6 +134,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-815e373",
+    "version": "0.5.0-dev-31f9f21",
     "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,17 @@
         "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/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 () {
@@ -74,7 +76,6 @@ export const walineRecentComments = async function () {
     commentTime.className = 'breadcrumb'
     commentTime.innerText = `${item.nick} @ ${item.time}`
     commentLink.href = root + item.href
-    commentLink['data-pjax-state'] = 'data-pjax-state'
     commentEl.className = 'item'
 
     commentText.appendChild(document.createElement('br'))

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

@@ -40,7 +40,6 @@ export const twikooRecentComments = async function () {
     commentTime.className = 'breadcrumb'
     commentTime.innerText = `${item.nick} @ ${item.time}`
     commentLink.href = root + item.href
-    commentLink['data-pjax-state'] = 'data-pjax-state'
     commentEl.className = 'item'
 
     commentText.appendChild(document.createElement('br'))

package/source/js/_app/globals/globalVars.ts

@@ -1,5 +1,3 @@
-import { $dom } from '../library/dom'
-import Pjax from 'theme-shokax-pjax'
 import initProto from '../library/proto'
 
 export const CONFIG = shokax_CONFIG
@@ -29,7 +27,6 @@ export let oWinHeight = window.innerHeight
 export let oWinWidth = window.innerWidth
 export let LOCAL_HASH = 0
 export let LOCAL_URL = window.location.href
-export let pjax:Pjax
 
 export function setSiteNavHeight (value:number):void {
   siteNavHeight = value
@@ -66,10 +63,6 @@ export function setLocalUrl (value:string):void {
   LOCAL_URL = value
 }
 
-export function setPjax (value:Pjax):void {
-  pjax = value
-}
-
 export function setOriginTitle (value:string):void {
   originTitle = value
 }

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/page/post.ts

@@ -231,15 +231,15 @@ export const postBeauty = () => {
     element.className = ['primary', 'success', 'info', 'warning', 'danger'][Math.floor(Math.random() * 5)]
   })
 
-  if (__shokax_player__) {
-    $dom.each('.md div.player', (element) => {
-      mediaPlayer(element, {
-        type: element.getAttribute('data-type'),
-        mode: 'order',
-        btns: []
-      }).player.load(JSON.parse(element.getAttribute('data-src'))).fetch()
-    })
-  }
+  // if (__shokax_player__) {
+  //   $dom.each('.md div.player', (element) => {
+  //     mediaPlayer(element, {
+  //       type: element.getAttribute('data-type'),
+  //       mode: 'order',
+  //       btns: []
+  //     }).player.load(JSON.parse(element.getAttribute('data-src'))).fetch()
+  //   })
+  // }
 
   const angleDown = document.querySelectorAll('.show-btn .i-angle-down')
   if (angleDown.length) {

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

@@ -5,7 +5,7 @@ import type { HitHighlightResult } from 'instantsearch.js/es/types/results'
 import instantsearch from 'instantsearch.js'
 import { liteClient as algoliasearch } from 'algoliasearch/lite'
 
-export function algoliaSearch (pjax) {
+export function algoliaSearch () {
   const search = instantsearch({
     indexName: CONFIG.search.indexName,
     searchClient: algoliasearch(CONFIG.search.appID, CONFIG.search.apiKey),
@@ -18,10 +18,6 @@ export function algoliaSearch (pjax) {
     }
   })
 
-  search.on('render', () => {
-    pjax.refresh(document.getElementById("search-hits"))
-  })
-
   // Registering Widgets
   search.addWidgets([
     configure({
@@ -105,7 +101,7 @@ export function algoliaSearch (pjax) {
     }
   })
   document.querySelector('.close-btn').addEventListener('click', onPopupClose)
-  window.addEventListener('pjax:success', onPopupClose)
+  // window.addEventListener('pjax:success', onPopupClose)
   window.addEventListener('keyup', (event) => {
     if (event.key === 'Escape') {
       onPopupClose()

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

@@ -45,13 +45,13 @@ export default function domInit () {
   goToComment.addEventListener('click', goToCommentHandle)
   showContents.addEventListener('click', sideBarToggleHandle)
 
-  if (__shokax_player__) {
-    mediaPlayer(toolPlayer)
-
-    document.querySelector('main').addEventListener('click', () => {
-      toolPlayer.player.mini()
-    })
-  }
+  // if (__shokax_player__) {
+  //   mediaPlayer(toolPlayer)
+  //
+  //   document.querySelector('main').addEventListener('click', () => {
+  //     toolPlayer.player.mini()
+  //   })
+  // }
 
   const createIntersectionObserver = () => {
     // waves在视口外时停止动画

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

@@ -1,47 +1,23 @@
-import { $dom } from '../library/dom'
 import { cardActive } from '../page/common'
-import { pageScroll, transition } from '../library/anime'
-import { vendorCss, vendorJs } from '../library/loadFile'
-import { pjaxScript } from '../library/scriptPjax'
 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');
-  // await import('katex/dist/katex.min.css')
-  // vendorJs('copy_tex')
+  // @ts-ignore
+  await import('katex/dist/katex.min.css')
   await import('katex/dist/contrib/copy-tex.mjs')
-  vendorCss('mermaid')
 
   // 懒加载背景图
   const lazyBg = new IntersectionObserver(function (entries, observer) {
@@ -61,10 +37,6 @@ export const siteRefresh = async (reload) => {
     lazyBg.observe(el)
   })
 
-  if (reload !== 1) {
-    $dom.each('script[data-pjax]', pjaxScript)
-  }
-
   setOriginTitle(document.title)
 
   resizeHandle()

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

@@ -1,11 +1,10 @@
 import domInit from './domInit'
-import { pjaxReload, siteRefresh } from './refresh'
+import { siteRefresh } from './refresh'
 import { cloudflareInit } from '../components/cloudflare'
-import { BODY, CONFIG, pjax, setPjax, setSiteSearch, siteSearch } from '../globals/globalVars'
+import { BODY, CONFIG, setSiteSearch, siteSearch } from '../globals/globalVars'
 import { autoDarkmode, themeColorListener } from '../globals/themeColor'
 import { resizeHandle, scrollHandle, visibilityListener } from '../globals/handles'
 import { pagePosition } from '../globals/tools'
-import Pjax from 'theme-shokax-pjax'
 import { initVue } from '../library/vue'
 import { $dom } from '../library/dom'
 import { createChild } from '../library/proto'
@@ -15,18 +14,6 @@ const siteInit = async () => {
   initVue()
   domInit()
 
-  setPjax(new Pjax({
-    selectors: [
-      'head title',
-      '.languages',
-      '.twikoo',
-      '.pjax',
-      '.leancloud-recent-comment',
-      'script[data-config]'
-    ],
-    cacheBust: false
-  }))
-
   CONFIG.quicklink.ignores = LOCAL.ignores
   import('quicklink').then(({listen}) => {
     listen(CONFIG.quicklink)
@@ -53,7 +40,7 @@ const siteInit = async () => {
       }
 
       import('../page/search').then(({algoliaSearch}) => {
-        algoliaSearch(pjax)
+        algoliaSearch()
       })
 
       // Handle and trigger popup window
@@ -83,13 +70,13 @@ const siteInit = async () => {
     passive: true
   })
 
-  window.addEventListener('pjax:send', pjaxReload, {
-    passive: true
-  })
+  // window.addEventListener('pjax:send', pjaxReload, {
+  //   passive: true
+  // })
 
-  window.addEventListener('pjax:success', siteRefresh, {
-    passive: true
-  }) // 默认会传入一个event参数
+  // window.addEventListener('pjax:success', siteRefresh, {
+  //   passive: true
+  // }) // 默认会传入一个event参数
 
   window.addEventListener('beforeunload', () => {
     pagePosition()

package/source/js/_app/player.ts

@@ -1,3 +1,5 @@
+// 临时性弃用，等待重构
+
 import { CONFIG, originTitle } from './globals/globalVars'
 import { showtip } from './globals/tools'
 import { pageScroll } from './library/anime'

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

@@ -1,47 +0,0 @@
-import { getScript } from './scriptPjax'
-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]) {
-    getScript(assetUrl('js', type),CONFIG['js'][type].sri, callback || function () {
-      window[type] = true
-    }, condition || window[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
-  }
-}

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

@@ -1,56 +0,0 @@
-export const getScript = (url: string,sri: string, callback?: Function, condition?: string): void => {
-  // url: 脚本文件的URL地址
-  // callback: 当脚本加载完成时要执行的回调函数
-  // condition: 可选的条件参数，如果存在，则执行callback
-  if (condition) {
-    // 如果条件存在，则执行回调函数
-    callback()
-  } else {
-    let script = document.createElement('script')
-
-    // @ts-ignore
-    script.onload = function (_, isAbort: boolean) {
-      // _: 事件对象
-      // isAbort: 是否中止
-      // @ts-ignore
-      if (isAbort || !script.readyState) {
-        console.log('abort!')
-        script.onload = null
-        script = undefined
-        if (!isAbort && callback) setTimeout(callback, 0)
-      }
-    }
-    script.src = url
-    script.integrity = sri
-    script.crossOrigin = 'anonymous'
-    document.head.appendChild(script)
-  }
-}
-
-export const pjaxScript = (element: HTMLScriptElement) => {
-  const { text, parentNode, id, className, type, src, dataset } = element
-  const code = text || element.textContent || element.innerHTML || ''
-  parentNode.removeChild(element)
-  const script = document.createElement('script')
-  if (id) {
-    script.id = id
-  }
-  if (className) {
-    script.className = className
-  }
-  if (type) {
-    script.type = type
-  }
-  if (src) {
-    // Force synchronous loading of peripheral JS.
-    script.src = src
-    script.async = false
-  }
-  if (dataset.pjax !== undefined) {
-    script.dataset.pjax = ''
-  }
-  if (code !== '') {
-    script.appendChild(document.createTextNode(code))
-  }
-  parentNode.appendChild(script)
-}