hexo-theme-shokax 0.3.8 → 0.3.10

package/README.md

@@ -1,3 +1,6 @@
+# 公告
+[关于ShokaX markdown扩展特性的讨论](https://github.com/theme-shoka-x/hexo-theme-shokaX/discussions/177) \
+[关于删除部分评论系统的讨论](https://github.com/theme-shoka-x/hexo-theme-shokaX/discussions/175)
 # 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)
@@ -77,10 +80,13 @@ AGPL许可证主要目的是限制修改后的分发行为，避免未经许可
 | hexo-theme-shoka | amehime           | 本项目的父主题            |
 
 ## 开发者们
-[![](https://contributors-img.web.app/image?repo=theme-shoka-x/hexo-theme-shokaX)](https://github.com/theme-shoka-x/hexo-theme-shokaX/graphs/contributors)
+Hexo 主题： \
+[![](https://contributors-img.web.app/image?repo=theme-shoka-x/hexo-theme-shokaX)](https://github.com/theme-shoka-x/hexo-theme-shokaX/graphs/contributors) \
+ShokaX 文档： \
+[![](https://contributors-img.web.app/image?repo=theme-shoka-x/shokaX-docs)](https://github.com/theme-shoka-x/shokaX-docs/graphs/contributors) \
 
 ## 特别鸣谢
 [<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" width="25%">](https://jb.gg/OpenSourceSupport)
 
 ## 其他信息
-![Star history chart](https://api.star-history.com/svg?repos=theme-shoka-x/hexo-theme-shokaX&type=Date)
+![Star history chart](https://api.star-history.com/svg?repos=theme-shoka-x/hexo-theme-shokaX&type=Date)

package/_config.yml

@@ -183,29 +183,6 @@ waline:
   pageSize: 10 # 每页评论条数
   pageview: false # 是否开启浏览量统计,可独立开启
 
-# https://github.com/gitalk/gitalk/blob/master/readme-cn.md
-gitalk:
-  clientID:
-  clientSecret:
-  repo:
-  owner:
-  admin:
-  proxy: # 选填
-
-# https://giscus.app/zh-CN
-giscus:
-  repo:
-  repoId:
-  category:
-  categoryId:
-  mapping:
-  strict:
-  reactionsEnabled:
-  emitMetadata:
-  inputPosition:
-  commentTheme:
-  lang:
-
 summary:
   enable: false
   introduce: "我是基于ChatGPT-turbo-3.5实现的AI助手，在此网站上负责整理和概括文章" # AI自我介绍

package/layout/_mixin/comment.pug

@@ -1,6 +1,6 @@
 mixin CommentRender()
     != shokax_inject('comment')
-    - var tk = theme?.twikoo?.enable,wl = theme?.waline?.enable,gt=theme?.gitalk?.enable,gs=theme?.giscus?.enable
+    - var tk = theme?.twikoo?.enable,wl = theme?.waline?.enable
     if page.comment !== false && !theme.experiments.disableThemeComment
         if tk
             div(class="wrap" id="tcomments")
@@ -37,38 +37,5 @@ mixin CommentRender()
                         dark: 'html[data-theme="dark"]'
                     });
                 }, 1000)
-        else if gt
-            div(class="wrap" id="gtcomments")
-            script(type="text/javascript" data-pjax).
-                const gproxy = theme.gitalk.proxy || undefined
-                const gitalk = new Gitalk({
-                    clientID: '#{theme.gitalk.clientID}',
-                    clientSecret: '#{theme.gitalk.clientSecret}',
-                    repo: '#{theme.gitalk.repo}',
-                    owner: '#{theme.gitalk.owner}',
-                    admin: #{theme.gitalk.admin},
-                    id: location.pathname,      // Ensure uniqueness and length less than 50
-                    distractionFreeMode: false,  // Facebook-like distraction free mode
-                    proxy: "#{gproxy}"
-                });
-                gitalk.render("gtcomments")
-        else if gs
-            div(class="wrap giscus" id="gscomments")
-            script( src="https://giscus.app/client.js"
-                    data-repo="#{theme.giscus.repo}"
-                    data-repo-id="#{theme.giscus.repoId}"
-                    data-category="#{theme.giscus.category}"
-                    data-category-id="#{theme.giscus.categoryId}"
-                    data-mapping="#{theme.giscus.mapping}"
-                    data-strict="#{theme.giscus.strict}"
-                    data-reactions-enabled="#{theme.giscus.reactionsEnabled}"
-                    data-emit-metadata="#{theme.giscus.emitMetadata}"
-                    data-input-position="#{theme.giscus.inputPosition}"
-                    data-theme="#{theme.giscus.commentTheme}"
-                    data-lang="#{theme.giscus.lang}"
-                    data-loading="lazy"
-                    crossorigin="anonymous"
-                    async
-                    )
 
 

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_index(item) +'" alt="article cover">', {itemprop: 'url', title: postText})
+                != _url(link1, '<img data-src="'+ _cover(item) +'" alt="article cover">', {itemprop: 'url', title: postText})
         div(class="info")
             +PMRender(item)
             h3

package/layout/_partials/head/head.pug

@@ -3,7 +3,7 @@
 - var siteTitle = config.title,noBaiduT = theme?.seo?.disable_baidu_transformation
 - var feedLink = full_url_for("/feed.json")
 - var tk= theme?.twikoo?.enable
-- var wl = theme.waline.enable,gt=theme?.gitalk?.enable
+- var wl = theme.waline.enable
 meta(charset="UTF-8")
 meta(name="viewport" content="width=device-width,initial-scale=1,maximum-scale=2")
 meta(name="theme-color" content="#222")
@@ -54,9 +54,6 @@ if tk
     script(src=theme.twikoo.link)
 else if wl
     link(rel="stylesheet" href="https://unpkg.com/@waline/client@v2/dist/waline.css")
-else if gt
-    link(rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css")
-    script(src="https://unpkg.com/gitalk/dist/gitalk.min.js")
 
 - var qw = theme?.qweather?.enable
 if qw

package/layout/_partials/layout.pug

@@ -2,7 +2,7 @@ include ../_mixin/breadcrumb.pug
 include ../_mixin/sidebar.pug
 include ../_mixin/widgets.pug
 
-- var ignores = []
+- ignores = []
 if (theme.quicklink.ignores)
     - ignores.push(theme.quicklink.ignores)
 
@@ -40,7 +40,7 @@ html(lang=page.language?page.language:config.language, style=theme.grayMode ? 'f
                         - var coverImage = theme.experiments.fixedCover || "https://7ed.net/bing/api"
                         img(src=coverImage)
                     else
-                        - var covers = _cover(page, 6)
+                        - var covers = _cover_index(page, 6)
                         if covers.length === 6
                             ul
                                 each image in covers

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.3.8",
+    "version": "0.3.10",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/theme-shoka-x/hexo-theme-shokaX",
@@ -18,30 +18,31 @@
         "@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",
+        "@types/node": "^20.10.6",
+        "@typescript-eslint/eslint-plugin": "^6.17.0",
+        "@typescript-eslint/parser": "^6.17.0",
         "chai": "^4.3.10",
-        "eslint": "^8.54.0",
+        "eslint": "^8.56.0",
         "eslint-config-standard": "~17",
         "eslint-plugin-chai-friendly": "^0.7.2",
-        "eslint-plugin-import": "^2.29.0",
-        "eslint-plugin-n": "^16.3.1",
+        "eslint-plugin-import": "^2.29.1",
+        "eslint-plugin-n": "^16.6.1",
         "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-vue": "^9.18.1",
+        "eslint-plugin-vue": "^9.19.2",
         "hexo-fs": "^4.1.1",
         "hexo-util": "^3.1.0",
-        "instantsearch.js": "^4.60.0",
+        "instantsearch.js": "^4.63.0",
+        "jsdom": "^23.1.0",
         "mocha": "^10.2.0",
-        "typescript": "^5.3.2",
-        "vue": "^3.3.9",
-        "jsdom": "^23.0.0"
+        "typescript": "^5.3.3",
+        "vue": "^3.4.5"
     },
     "dependencies": {
-        "esbuild": "^0.19.7",
+        "esbuild": "^0.19.11",
+        "hexo": "^7.0.0",
         "js-yaml": "^4.1.0",
         "lozad": "^1.16.0",
-        "theme-shokax-anime": "^0.0.4",
+        "theme-shokax-anime": "^0.0.6",
         "theme-shokax-pjax": "^0.0.2"
     },
     "engines": {

package/scripts/generaters/config.js

@@ -30,7 +30,7 @@ hexo.extend.filter.register('before_generate', () => {
             hexo.theme.config.style[style] = path_1.default.resolve(hexo.base_dir, custom_file);
         }
     }
-    if (data.images && data.images.length >= 6) {
+    if (data.images && data.images.length > 0) {
         hexo.theme.config.image_list = data.images;
     }
     else {

package/scripts/generaters/index.js

@@ -15,7 +15,7 @@ hexo.extend.generator.register('index', function (locals) {
     let pages;
     const config = hexo.config;
     const sticky = locals.posts.find({ sticky: true }).sort(config.index_generator.order_by);
-    const posts = locals.posts.find({ sticky: { $exists: false } }).sort(config.index_generator.order_by);
+    const posts = locals.posts.find({ sticky: { $in: [false, undefined] } }).sort(config.index_generator.order_by);
     const paginationDir = config.pagination_dir || 'page';
     const path = config.index_generator.path || '';
     const categories = locals.categories;
@@ -96,7 +96,8 @@ hexo.extend.generator.register('index', function (locals) {
                 data: {
                     __index: true,
                     catlist,
-                    sticky
+                    sticky,
+                    current: 1,
                 }
             }];
     }

package/scripts/generaters/pages.js

@@ -1,16 +1,17 @@
-'use strict';
-hexo.extend.generator.register('pages', function (locals) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+hexo.extend.generator.register('pages', function () {
     const config = hexo.config;
     return [
         {
             path: config.category_dir + '/index.html',
             data: { type: 'categories' },
-            layout: ['page']
+            layout: 'page'
         },
         {
             path: config.tag_dir + '/index.html',
             data: { type: 'tags' },
-            layout: ['page']
+            layout: 'page'
         }
     ];
 });

package/scripts/helpers/engine.js

@@ -27,8 +27,11 @@ const randomBG = function (count = 1, image_server = null, image_list = []) {
         }
     };
     if (count && count > 1) {
-        const shuffled = image_list.slice(0);
-        i = image_list.length;
+        let shuffled = image_list.slice(0);
+        while (shuffled.length <= 6) {
+            shuffled = shuffled.concat(image_list.slice(0));
+        }
+        i = shuffled.length;
         const min = i - count;
         let temp;
         let index;

package/scripts/helpers/list_categories.js

@@ -1,6 +1,4 @@
 'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("hexo-fs");
 const prepareQuery = (categories, parent) => {
     const query = {
         parent: undefined
@@ -47,32 +45,6 @@ hexo.extend.helper.register('_list_categories', function (depth = 0) {
     };
     return hierarchicalList(0);
 });
-hexo.extend.helper.register('_categories', function () {
-    const categories = this.site.categories;
-    if (!categories || !categories.length)
-        return '';
-    const pangu = {
-        spacing: data => {
-            return data;
-        }
-    };
-    const result = {};
-    categories.forEach((cat, i) => {
-        const child = prepareQuery(categories, cat._id);
-        const cover = 'source/_posts' + cat.path.replace(this.config.category_dir, '') + 'cover.jpg';
-        if (fs.existsSync(cover)) {
-            const className = cat.slug.split('/');
-            className.pop();
-            cat.class = className.join(' ');
-            cat.name = pangu.spacing(cat.name);
-            if (child.length !== 0) {
-                cat.child = child;
-            }
-            result[cat._id] = cat;
-        }
-    });
-    return result;
-});
 hexo.extend.helper.register('_category_prev', function (name) {
     const categories = this.site.categories;
     if (!categories || !categories.length)

package/scripts/plugin/check.js

@@ -1,6 +1,6 @@
 let findProblem = false;
 hexo.on('generateBefore', function () {
-    if (hexo.config.highlight.enable || hexo.config.prismjs.enable) {
+    if (hexo.config.syntax_highlighter) {
         findProblem = true;
         hexo.log.error('[SXEC 101] Highlight.js or Prismjs enabled. The code block will render incomplete');
     }
@@ -18,7 +18,7 @@ Some features will be disabled or render incorrectly`);
         hexo.log.warn('[SXEC 201] Essential information(title, desc, lang, etc) config incorrectly, Page will render incorrectly');
     }
     if (hexo.theme.config.gitalk.clientID || hexo.theme.config.giscus.repo) {
-        hexo.log.info('You are using an untested feature and there may be undiscovered issues');
+        hexo.log.warn('You are using an deprecated feature and it was removed in the v0.3.10');
     }
 });
 hexo.on('generateAfter', function () {

package/scripts/tags/links.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -14,47 +14,29 @@ function linkGrid(args, content) {
     if (args[0]) {
         const filepath = node_path_1.default.join(hexo.source_dir, args[0]);
         if (node_fs_1.default.existsSync(filepath)) {
-            content = node_fs_1.default.readFileSync(filepath);
+            content = node_fs_1.default.readFileSync(filepath, { encoding: 'utf-8' });
         }
     }
     if (!content) {
         return;
     }
-    const siteHost = new URL(hexo.config.url).hostname || hexo.config.url;
     const list = js_yaml_1.default.load(content);
     let result = '';
     list.forEach((item) => {
         if (!item.url || !item.site) {
             return;
         }
-        let urlparam = {
-            protocol: undefined,
-            hostname: undefined
-        };
-        if (item.url) {
-            urlparam = new URL(item.url, hexo.config.url);
-        }
         let item_image = item.image || theme.assets + '/404.png';
         if (!item_image.startsWith('//') && !item_image.startsWith('http')) {
             item_image = theme.statics + item_image;
         }
         item.color = item.color ? ` style="--block-color:${item.color};"` : '';
         result += `<div class="item" title="${item.owner || item.site}"${item.color}>`;
-        if (urlparam.protocol && urlparam.hostname !== siteHost) {
-            const durl = Buffer.from(item.url).toString('base64');
-            result += `<span class="image" data-url="${durl}" data-background-image="${item_image}"></span>
-          <div class="info">
-          <span class="title" data-url="${durl}">${item.site}</span>
-          <p class="desc">${item.desc || item.url}</p>
-          </div></div>`;
-        }
-        else {
-            result += `<a href="${item.url}" class="image" data-background-image="${item_image}"></a>
-          <div class="info">
-          <a href="${item.url}" class="title">${item.site}</a>
-          <p class="desc">${item.desc || item.url}</p>
-          </div></div>`;
-        }
+        result += `<a href="${item.url}" class="image" data-background-image="${item_image}"></a>
+        <div class="info">
+        <a href="${item.url}" class="title">${item.site}</a>
+        <p class="desc">${item.desc || item.url}</p>
+        </div></div>`;
     });
     return `<div class="links">${result}</div>`;
 }

package/source/js/_app/fireworks.js

@@ -9,7 +9,7 @@ const canvasEl = document.createElement('canvas');
 canvasEl.style.cssText = 'position:fixed;top:0;left:0;pointer-events:none;z-index:9999999';
 document.body.appendChild(canvasEl);
 const ctx = canvasEl.getContext('2d');
-const numberOfParticules = 30;
+const numberOfParticles = 30;
 let pointerX = 0;
 let pointerY = 0;
 const tap = 'click';
@@ -25,7 +25,7 @@ function updateCoords(e) {
     pointerX = e.clientX || (e.touches && e.touches[0].clientX);
     pointerY = e.clientY || (e.touches && e.touches[0].clientY);
 }
-function setParticuleDirection(p) {
+function setParticleDirection(p) {
     const angle = theme_shokax_anime_1.default.random(0, 360) * Math.PI / 180;
     const value = theme_shokax_anime_1.default.random(50, 180);
     const radius = [-1, 1][theme_shokax_anime_1.default.random(0, 1)] * value;
@@ -34,7 +34,7 @@ function setParticuleDirection(p) {
         y: p.y + radius * Math.sin(angle)
     };
 }
-function createParticule(x, y) {
+function createParticle(x, y) {
     const p = {
         x,
         y,
@@ -50,7 +50,7 @@ function createParticule(x, y) {
     };
     p.color = colors[theme_shokax_anime_1.default.random(0, colors.length - 1)];
     p.radius = theme_shokax_anime_1.default.random(16, 32);
-    p.endPos = setParticuleDirection(p);
+    p.endPos = setParticleDirection(p);
     return p;
 }
 function createCircle(x, y) {
@@ -74,22 +74,22 @@ function createCircle(x, y) {
     };
     return p;
 }
-function renderParticule(targets) {
+function renderParticle(targets) {
     for (const target of targets) {
         target.draw();
     }
 }
-function animateParticules(x, y) {
+function animateParticles(x, y) {
     const circle = createCircle(x, y);
-    const particules = [];
-    for (let i = 0; i < numberOfParticules; i++) {
-        particules.push(createParticule(x, y));
+    const particles = [];
+    for (let i = 0; i < numberOfParticles; i++) {
+        particles.push(createParticle(x, y));
     }
     (0, theme_shokax_anime_1.default)().timeline().add({
-        targets: particules,
+        targets: particles,
         duration: theme_shokax_anime_1.default.random(1200, 1800),
         easing: 'easeOutExpo',
-        update: renderParticule,
+        update: renderParticle,
         x: p => p.endPos.x,
         y: p => p.endPos.y,
         radius: 0.1
@@ -97,7 +97,7 @@ function animateParticules(x, y) {
         targets: circle,
         duration: theme_shokax_anime_1.default.random(1200, 1800),
         easing: 'easeOutExpo',
-        update: renderParticule,
+        update: renderParticle,
         radius: theme_shokax_anime_1.default.random(80, 160),
         lineWidth: 0,
         alpha: {
@@ -133,7 +133,7 @@ function initFireworks() {
         }
         render.play();
         updateCoords(e);
-        animateParticules(pointerX, pointerY);
+        animateParticles(pointerX, pointerY);
     }, false);
     setCanvasSize();
     window.addEventListener('resize', setCanvasSize, false);

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

@@ -81,7 +81,7 @@ const transition = (target, type, complete, begin) => {
 };
 exports.transition = transition;
 const pageScroll = (target, offset, complete) => {
-    const opt = {
+    (0, theme_shokax_anime_1.default)({
         targets: typeof offset === 'number' && typeof target !== 'number' ? target.parentNode : document.scrollingElement,
         duration: 500,
         easing: 'easeInOutQuad',
@@ -89,7 +89,6 @@ const pageScroll = (target, offset, complete) => {
         complete() {
             complete && complete();
         }
-    };
-    (0, theme_shokax_anime_1.default)(opt).play();
+    }).play();
 };
 exports.pageScroll = pageScroll;