hexo-theme-shokax 0.3.5 → 0.3.7

package/README.md

@@ -1,6 +1,3 @@
-# 📣 公告
-* [ShokaX 正在寻找社区维护者](https://github.com/theme-shoka-x/hexo-theme-shokaX/discussions/137)
-
 # 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)
@@ -44,11 +41,6 @@ SXC install shokaX
 ```
 [点此](https://docs.kaitaku.xyz/guide/#%E9%85%8D%E7%BD%AE%E4%B8%BB%E9%A2%98)以进行下一步配置
 
-github仓库建议通过右边的 releases 下载,步骤为:
-- 点击 Releases 的 Latest 版本
-- 下载 Assets 中的 `Source code(zip)`
-- 解压即可作为主题使用
-
 ## 📚子项目
 - [ShokaX docs](https://github.com/theme-shoka-x/shokaX-docs) ShokaX 主题文档 (正在编写中，欢迎加入！)
 - [HRMNMI](https://github.com/theme-shoka-x/hexo-renderer-multi-next-markdown-it) ShokaX 正在使用的 markdown 渲染器 (等待重构)

package/README_en.MD

@@ -37,11 +37,6 @@ Note: This project requires node.js 18.x or higher to run. \
 It is recommended to use [ShokaX-CLI](https://github.com/zkz098/shokaX-CLI) \
 [Click here](https://docs.kaitaku.xyz/guide/#%E9%85%8D%E7%BD%AE%E4%B8%BB%E9%A2%98) for the next configuration steps.
 
-For the GitHub repository, it is recommended to download from the releases on the right side, with the following steps:
-- Click on the Latest version in Releases
-- Download `Source code(zip)` from Assets
-- Unzip to use as a theme
-
 ## 📚 Sub-projects
 - [ShokaX docs](https://github.com/theme-shoka-x/shokaX-docs) ShokaX Theme Documentation (work in progress, contributions welcome!)
 - [HRMNMI](https://github.com/theme-shoka-x/hexo-renderer-multi-next-markdown-it) The markdown renderer used by ShokaX (awaiting refactoring)

package/UsageRestrictions.md

@@ -20,4 +20,7 @@
 - 取消您获取 ShokaX 社区支持和进行协作的权利；(社区管理)
 - 追究法律责任，包括要求赔偿因违规行为给 ShokaX 项目组造成的损失。(依照相关法律而定)
 
-当发生纠纷时，全部由甲方(即zkz098)所在地负责，适用中华人民共和国法律。
+当发生纠纷时，全部由甲方(即zkz098)所在地负责，适用中华人民共和国法律。
+
+此文件及其后续更新适用于所有版本的 ShokaX，无论其发行版内携带哪种版本的此文件或不携带此文件，均以 Github main分支储存的最新版为准。
+如果本文件内容与 Github main 分支最新版有冲突的，本文件冲突部分无效，按照 Github main 分支最新版执行 

package/_config.yml

@@ -358,18 +358,12 @@ advVendors:
   js:
     pace:
       src: bytedance:pace/1.0.2/pace.min.js
-#    pjax:
-#      src: npm:theme-shokax-pjax@latest/pjax.shokax.min.js
     fetch:
       src: npm:whatwg-fetch@3.4.0/dist/fetch.umd.js
-#    anime:
-#      src: npm:theme-shokax-anime@latest/anime.shokax.min.js
     algolia:
       src: bytedance:algoliasearch/4.12.1/algoliasearch-lite.umd.min.js
     instantsearch:
       src: bytedance:instantsearch.js/4.39.0/instantsearch.production.min.js
-#    lazyload:
-#      src: bytedance:lozad.js/1.16.0/lozad.min.js
     quicklink:
       src: bytedance:quicklink/2.2.0/quicklink.umd.min.js
     fancybox:
@@ -388,11 +382,8 @@ advVendors:
 vendorsList:
   js:
     - pace
-#    - pjax
-#    - anime
     - algolia
     - instantsearch
-#    - lazyload
     - quicklink
     - fancybox
     - copy_tex
@@ -405,15 +396,12 @@ vendors:
 
   js:
     pace: npm/pace-js@1.0.2/pace.min.js # ok
-#    pjax: npm/theme-shokax-pjax@latest/pjax.shokax.min.js # ok
     fetch: npm/whatwg-fetch@3.4.0/dist/fetch.umd.min.js # ok
-#    anime: npm/theme-shokax-anime@latest/anime.shokax.min.js
     algolia: npm/algoliasearch@4/dist/algoliasearch-lite.umd.js # ok
     instantsearch: npm/instantsearch.js@4/dist/instantsearch.production.min.js # ok
-#    lazyload: npm/lozad@1/dist/lozad.min.js # ok
     quicklink: npm/quicklink@2/dist/quicklink.umd.js # ok
     fancybox: combine/npm/jquery@3.5.1/dist/jquery.min.js,npm/@fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.js,npm/justifiedGallery@3.8.1/dist/js/jquery.justifiedGallery.min.js # notok
-    valine: gh/amehime/MiniValine@4.2.2-beta10/dist/MiniValine.min.js # TODO 弃用
+#    valine: gh/amehime/MiniValine@4.2.2-beta10/dist/MiniValine.min.js # TODO 弃用
     copy_tex: npm/katex@0.16.7/dist/contrib/copy-tex.min.js # ok
     chart: npm/frappe-charts@1.5.0/dist/frappe-charts.min.iife.min.js # ok
 

package/layout/_mixin/segment.pug

@@ -11,7 +11,7 @@ mixin SMRender(item)
             div(class="cover" style=`background: linear-gradient(to bottom right, ${random_color()}, ${random_color()});`)
         else
             div(class="cover")
-                != _url(link1, '<img data-src="'+ _cover(item) +'" alt="article cover">', {itemprop: 'url', title: postText})
+                != _url(link1, '<img data-src="'+ _cover_index(item) +'" alt="article cover">', {itemprop: 'url', title: postText})
         div(class="info")
             +PMRender(item)
             h3

package/layout/_partials/footer.pug

@@ -1,7 +1,7 @@
 div(class="status")
     div(class="copyright")
         - var copyright_year = date(null, 'YYYY')
-        if theme.footer.since && theme.footer.since != copyright_year
+        if theme.footer.since && theme.footer.since !== copyright_year
             != `© ${theme.footer.since} -`
         span(itemprop="copyrightYear")
             != copyright_year

package/layout/_partials/layout.pug

@@ -92,7 +92,6 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
                     empty: "!{__('search.empty')}",
                     stats: "!{__('search.stats')}"
                 },
-                valine: #{page.valine ? _safedump(page.valine) : true},
                 chart: #{!!page.chart},
                 copy_tex: #{!!page.math},
                 katex: #{!!page.math},

package/layout/_partials/post/footer.pug

@@ -1,5 +1,5 @@
 div(class="meta")
-    if date(post.date) != date(post.updated) || time(post.date) != time(post.updated)
+    if date(post.date) !== date(post.updated) || time(post.date) !== time(post.updated)
         if theme.twikoo.enable || theme.waline.pageview
             span(class="icon")
                 i(class="ic i-eye")
@@ -14,7 +14,7 @@ div(class="meta")
                 != date(post.updated)
     if theme.waline.pageview && !theme.waline.enable && !theme.twikoo.enable
         script(type = "module" data-pjax).
-            import { pageviewCount } from 'https://unpkg.com/@waline/client/dist/pageview.mjs';
+            import { pageviewCount } from 'https://unpkg.com/@waline/client@2/dist/pageview.mjs';
 
             const path = document.getElementById("twikoo_visitors").getAttribute("data-path");
             pageviewCount({

package/layout/_partials/sidebar/menu.pug

@@ -7,7 +7,7 @@ mixin item(name, path, parent, sublist)
     - var menuText = __('menu.' + name).replace('menu.', '')
     if parent
         li(class="item dropdown")
-            if itemURL == '/'
+            if itemURL === '/'
                 a(href="javascript:void(0);")
                     != menuIcon + menuText
             else
@@ -18,7 +18,7 @@ mixin item(name, path, parent, sublist)
                     - var itemURL = path[0].trim()
                     - if (itemURL==='/') itemURL='javascript:void(0)'
                     - var menuText = __('menu.' + subname).replace('menu.', '')
-                    if subname == 'default'
+                    if subname === 'default'
                         - var menuText = __('menu.' + name).replace('menu.', '')
                     else
                         - var menuIcon = '<i class="ic i-' + trimn(path[1]) + '"></i>'
@@ -29,9 +29,9 @@ mixin item(name, path, parent, sublist)
             != _url(itemURL, menuIcon + menuText, {rel: 'section'})
 
 each value, name in theme.menu
-    if value == '[object Object]'
+    if value.toString() === '[object Object]'
         each subvalue, subname in value
-            if subname == 'default'
+            if subname === 'default'
                 +item(name, subvalue, true, value)
     else
         +item(name, value)

package/layout/_partials/third-party/clarity.pug

@@ -3,6 +3,6 @@ if code
     script.
         (function(c,l,a,r,i,t,y){
             c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
-            t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i;
+            t=l.createElement(r);t.async=true;t.src="https://www.clarity.ms/tag/"+i;
             y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);
         })(window, document, "clarity", "script", "#{code}");

package/layout/archive.pug

@@ -98,7 +98,7 @@ block content
                         if post.categories && post.categories.length
                             - var cat_length = post.categories.length
                             each cat,index in post.categories.toArray()
-                                if index == cat_length && cat.name !== page.category
+                                if index === cat_length && cat.name !== page.category
                                     span
                                         a(href=url_for(cat.path)) #{cat.name}
                     div(class="title")

package/layout/category.pug

@@ -26,25 +26,20 @@ block content
             if post.categories && post.categories.length
                 - var cat_length = post.categories.length
                 each cat,index in post.categories.toArray()
-                    if cat.name == page.title
-                        - var lastcat = ""
-                        - var lastcatslug = ""
+                    if cat.name === page.title
+                        - lastcat = ""
+                        - lastcatslug = ""
                     else
-                        - var lastcat = true
-                        mixin lastcat
-                            != lastcat
-                            a(href=url_for(cat.path))
-                                != cat.name
-                            small
-                                if index >= post.categories.toArray().length
-                                    != cat.length
-                                else
-                                    #{'/'}
-                    - var lastcatslug = lastcatslug + cat.slug
+                        - lastcat += `<a href=${url_for(cat.path)}>${cat.name}</a><small>`
+                        if index >= post.categories.toArray().length - 1
+                            - lastcat = lastcat+' ( '+cat.length+' ) '+`</small>`
+                        else
+                            - lastcat = lastcat+'/'+`</small>`
+                    - lastcatslug = lastcatslug + cat.slug
             if lastcat && lastcatslug && lastcatslug !== current
                 h3(class="item section")
-                    +lastcat
-                - var current = lastcatslug
+                    !=lastcat
+                - current = lastcatslug
             article(class="item normal" itemscope itemtype="http://schema.org/Article")
                 div(class="meta")
                     time(

package/layout/index.pug

@@ -5,7 +5,7 @@ include _mixin/segment.pug
 
 block content
     div(class="index wrap")
-        if page.current == 1
+        if page.current === 1
             if page.sticky.length > 0
                 h2(class="divider")
                     != __('index.sticky')
@@ -22,7 +22,7 @@ block content
         - var pagePosts = page?.posts?.length
         if pagePosts > 0
             - var posts = page.posts.toArray()
-            if page.current == 1
+            if page.current === 1
                 h2(class="divider")
                     != __('index.posts')
             div(class="segments posts")

package/layout/tag.pug

@@ -27,7 +27,7 @@ block content
                     if post.categories && post.categories.length
                         - var cat_length = post.categories.length
                         each cat,index in post.categories.toArray()
-                            if index == cat_length && cat.name !== page.category
+                            if index === cat_length && cat.name !== page.category
                                 span
                                     a(href=url_for(cat.path))
                                         != cat.name

package/package.json

@@ -1,44 +1,44 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.3.5",
+    "version": "0.3.7",
     "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",
     "scripts": {
-        "test": "mocha test --coverage",
+        "test": "mocha test",
         "build": "pnpm install && tsc"
     },
     "devDependencies": {
-        "@types/chai": "^4.3.5",
-        "@types/fancybox": "^3.5.3",
-        "@types/hexo": "^3.8.8",
-        "@types/jquery": "^3.5.16",
-        "@types/js-yaml": "^4.0.5",
-        "@types/lozad": "^1.16.1",
-        "@types/mocha": "^10.0.1",
-        "@types/node": "^20.4.4",
-        "@typescript-eslint/eslint-plugin": "^6.2.0",
-        "@typescript-eslint/parser": "^6.2.0",
-        "chai": "^4.3.7",
-        "eslint": "^8.45.0",
-        "eslint-config-standard": "*",
+        "@types/chai": "^4.3.11",
+        "@types/fancybox": "^3.5.6",
+        "@types/hexo": "^3.8.12",
+        "@types/jquery": "^3.5.29",
+        "@types/js-yaml": "^4.0.9",
+        "@types/lozad": "^1.16.4",
+        "@types/mocha": "^10.0.6",
+        "@types/node": "^20.10.0",
+        "@typescript-eslint/eslint-plugin": "^6.12.0",
+        "@typescript-eslint/parser": "^6.12.0",
+        "chai": "^4.3.10",
+        "eslint": "^8.54.0",
+        "eslint-config-standard": "~17",
         "eslint-plugin-chai-friendly": "^0.7.2",
-        "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-n": "^16.0.1",
+        "eslint-plugin-import": "^2.29.0",
+        "eslint-plugin-n": "^16.3.1",
         "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-vue": "^9.15.1",
+        "eslint-plugin-vue": "^9.18.1",
         "hexo-fs": "^4.1.1",
         "hexo-util": "^3.1.0",
-        "instantsearch.js": "^4.56.7",
+        "instantsearch.js": "^4.60.0",
         "mocha": "^10.2.0",
-        "typescript": "^5.1.6",
-        "vue": "^3.3.4",
+        "typescript": "^5.3.2",
+        "vue": "^3.3.9",
         "jsdom": "^22.1.0"
     },
     "dependencies": {
-        "esbuild": "^0.19.2",
+        "esbuild": "^0.19.7",
         "js-yaml": "^4.1.0",
         "lozad": "^1.16.0",
         "theme-shokax-anime": "^0.0.4",

package/scripts/generaters/config.js

@@ -34,6 +34,12 @@ hexo.extend.filter.register('before_generate', () => {
         hexo.theme.config.image_list = data.images;
     }
     else {
-        hexo.theme.config.image_list = js_yaml_1.default.load(node_fs_1.default.readFileSync(path_1.default.join(__dirname, '../../_images.yml')));
+        hexo.theme.config.image_list = js_yaml_1.default.load(node_fs_1.default.readFileSync(path_1.default.join(__dirname, '../../_images.yml'), { encoding: 'utf-8' }));
+    }
+    if (node_fs_1.default.existsSync(path_1.default.join(__dirname, '../../_images_index.yml'))) {
+        hexo.theme.config.index_images = js_yaml_1.default.load(node_fs_1.default.readFileSync(path_1.default.join(__dirname, '../../_images_index.yml'), { encoding: 'utf-8' }));
+    }
+    else {
+        hexo.theme.config.index_images = [];
     }
 });

package/scripts/generaters/script.js

@@ -27,7 +27,6 @@ hexo.extend.generator.register('script', function (locals) {
             fancybox: theme.vendors.js.fancybox
         },
         css: {
-            valine: theme.css + '/comment.css',
             katex: theme.vendors.css.katex,
             mermaid: theme.css + '/mermaid.css',
             fancybox: theme.vendors.css.fancybox
@@ -46,7 +45,9 @@ hexo.extend.generator.register('script', function (locals) {
         disableVL: theme.disableVL,
         noPlayer: theme.experiments?.noPlayer,
         audio: undefined,
-        fireworks: undefined
+        fireworks: (theme.fireworks && theme.fireworks.enable)
+            ? (theme.fireworks.color || ['rgba(255,182,185,.9)', 'rgba(250,227,217,.9)', 'rgba(187,222,214,.9)', 'rgba(138,198,209,.9)'])
+            : undefined
     };
     if (config?.algolia) {
         siteConfig.search = {

package/scripts/helpers/engine.js

@@ -109,6 +109,18 @@ hexo.extend.helper.register('_cover', function (item, num) {
         return randomBG(num || 1, image_server, image_list);
     }
 });
+hexo.extend.helper.register('_cover_index', function (item) {
+    const { index_images, image_list, image_server } = hexo.theme.config;
+    if (item.cover) {
+        return this._image_url(item.cover, item.path);
+    }
+    else if (item.photos && item.photos.length > 0) {
+        return this._image_url(item.photos[0], item.path);
+    }
+    else {
+        return randomBG(1, image_server, index_images.length === 0 ? image_list : index_images);
+    }
+});
 hexo.extend.helper.register('_permapath', function (str) {
     const { permalink } = hexo.config;
     let url = str.replace(/index\.html$/, '');

package/source/js/_app/library/anime.js

@@ -82,7 +82,7 @@ const transition = (target, type, complete, begin) => {
 exports.transition = transition;
 const pageScroll = (target, offset, complete) => {
     const opt = {
-        targets: typeof offset === 'number' ? target.parentNode : document.scrollingElement,
+        targets: typeof offset === 'number' && typeof target !== 'number' ? target.parentNode : document.scrollingElement,
         duration: 500,
         easing: 'easeInOutQuad',
         scrollTop: offset || (typeof target === 'number' ? target : (target ? target.getTop() + document.documentElement.scrollTop - globalVars_1.siteNavHeight : 0)),

package/source/js/_app/page/comment.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const dom_1 = require("../library/dom");
 const anime_1 = require("../library/anime");
 const globalVars_1 = require("../globals/globalVars");
-const loadFile_1 = require("../library/loadFile");
 function loadComments() {
     const element = (0, dom_1.$dom)('#comments');
     if (!element) {
@@ -15,7 +14,6 @@ function loadComments() {
     }
     const io = new IntersectionObserver((entries, observer) => {
         const entry = entries[0];
-        (0, loadFile_1.vendorCss)('valine');
         if (entry.isIntersecting || entry.intersectionRatio > 0) {
             (0, anime_1.transition)((0, dom_1.$dom)('#comments'), 'bounceUpIn');
             observer.disconnect();

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

@@ -15,7 +15,6 @@ const fireworks_1 = require("../fireworks");
 const theme_shokax_pjax_1 = __importDefault(require("theme-shokax-pjax"));
 const vue_1 = require("../library/vue");
 const siteInit = () => {
-    (0, scriptPjax_1.cloudflareInit)();
     (0, domInit_1.default)();
     (0, vue_1.initVue)();
     (0, globalVars_1.setPjax)(new theme_shokax_pjax_1.default({
@@ -47,6 +46,7 @@ const siteInit = () => {
     });
     (0, refresh_1.siteRefresh)(1);
 };
+(0, scriptPjax_1.cloudflareInit)();
 window.addEventListener('DOMContentLoaded', siteInit, {
     passive: true
 });

package/source/js/_app/player.js

@@ -369,11 +369,11 @@ const mediaPlayer = (t, config) => {
                 ['music.163.com.*artist.*id=(\\d+)', 'netease', 'artist'],
                 ['music.163.com.*playlist.*id=(\\d+)', 'netease', 'playlist'],
                 ['music.163.com.*discover/toplist.*id=(\\d+)', 'netease', 'playlist'],
-                ['y.qq.com.*song/(\\w+).html', 'tencent', 'song'],
-                ['y.qq.com.*album/(\\w+).html', 'tencent', 'album'],
-                ['y.qq.com.*singer/(\\w+).html', 'tencent', 'artist'],
-                ['y.qq.com.*playsquare/(\\w+).html', 'tencent', 'playlist'],
-                ['y.qq.com.*playlist/(\\w+).html', 'tencent', 'playlist'],
+                ['y.qq.com.*song/(\\w+)(.html)?', 'tencent', 'song'],
+                ['y.qq.com.*album/(\\w+)(.html)?', 'tencent', 'album'],
+                ['y.qq.com.*singer/(\\w+)(.html)?', 'tencent', 'artist'],
+                ['y.qq.com.*playsquare/(\\w+)(.html)?', 'tencent', 'playlist'],
+                ['y.qq.com.*playlist/(\\w+)(.html)?', 'tencent', 'playlist'],
                 ['xiami.com.*song/(\\w+)', 'xiami', 'song'],
                 ['xiami.com.*album/(\\w+)', 'xiami', 'album'],
                 ['xiami.com.*artist/(\\w+)', 'xiami', 'artist'],

package/.eslintrc.cjs

@@ -1,32 +0,0 @@
-module.exports = {
-  parser: '@typescript-eslint/parser',
-  env: {
-    browser: true,
-    commonjs: true,
-    es6: true,
-    node: true
-  },
-  extends: [
-    'standard',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:vue/vue3-recommended',
-    'plugin:chai-friendly/recommended'
-  ],
-  plugins: [
-    '@typescript-eslint',
-    'vue',
-    'chai-friendly'
-  ],
-  parserOptions: {
-    ecmaVersion: 12
-  },
-  rules: {
-    camelcase: 'off',
-    'n/no-callback-literal': 'off',
-    '@typescript-eslint/ban-types': 'off',
-    '@typescript-eslint/ban-ts-comment': 'off',
-    '@typescript-eslint/no-var-requires': 'off',
-    '@typescript-eslint/no-unused-vars': 'off',
-    'prefer-const': 'off'
-  }
-}