hexo-theme-shokax 0.2.3 → 0.2.4

package/README.md

@@ -5,6 +5,7 @@
 ![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)
 ![version](https://shields.io/npm/v/hexo-theme-shokax)
+![build](https://img.shields.io/github/actions/workflow/status/theme-shoka-x/hexo-theme-shokaX/build-theme.yml)
 
 语言(language): 简体中文 | [English](./README_en.md) \
 此项目是shoka的一个二次开发版(算精神续作),致力于提高性能和优化魔改体验 \

package/_config.yml

@@ -344,7 +344,7 @@ advVendors:
     fetch:
       src: npm:whatwg-fetch@3.4.0/dist/fetch.umd.js
     anime:
-      src: bytedance:animejs/3.2.0/anime.min.js
+      src: npm:theme-shokax-anime@latest/anime.shokax.min.js
     algolia:
       src: bytedance:algoliasearch/4.12.1/algoliasearch-lite.umd.min.js
     instantsearch:
@@ -394,7 +394,7 @@ vendors:
     pace: npm/pace-js@1.0.2/pace.min.js # ok
     pjax: npm/pjax@0.2.8/pjax.min.js # ok
     fetch: npm/whatwg-fetch@3.4.0/dist/fetch.umd.min.js # ok
-    anime: npm/animejs@3.2.0/lib/anime.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

package/package.json

@@ -1,49 +1,48 @@
 {
     "name": "hexo-theme-shokax",
-    "version": "0.2.3",
+    "version": "0.2.4",
     "description": "a hexo theme based on shoka",
     "main": "index.js",
     "repository": "https://github.com/zkz098/hexo-theme-shokaX",
     "author": "Chou kaitaku",
     "license": "GPL-3.0-or-later",
     "scripts": {
-        "test": "cd ./source/js && tsc",
+        "test": "tsc",
         "build": "pnpm install && tsc",
         "docs:dev": "vuepress dev docs",
         "docs:build": "vuepress build docs"
     },
     "devDependencies": {
         "@algolia/client-search": "^4",
-        "@types/animejs": "^3.1.7",
         "@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/node": "^18.15.6",
-        "@types/shelljs": "^0.8.11",
-        "@typescript-eslint/eslint-plugin": "^5.56.0",
-        "@typescript-eslint/parser": "^5.56.0",
+        "@types/node": "^18.15.13",
+        "@typescript-eslint/eslint-plugin": "^5.59.0",
+        "@typescript-eslint/parser": "^5.59.0",
         "@vuepress/client": "2.0.0-beta.61",
         "@vuepress/plugin-docsearch": "2.0.0-beta.61",
-        "algoliasearch": "^4.16.0",
-        "eslint": "^8.36.0",
+        "algoliasearch": "^4.17.0",
+        "eslint": "^8.39.0",
         "eslint-config-standard": "^17.0.0",
         "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-n": "^15.6.1",
+        "eslint-plugin-n": "^15.7.0",
         "eslint-plugin-promise": "^6.1.1",
-        "eslint-plugin-vue": "^9.10.0",
+        "eslint-plugin-vue": "^9.11.0",
         "hexo-fs": "^4.1.1",
         "hexo-util": "^3.0.1",
-        "instantsearch.js": "^4.53.0",
+        "instantsearch.js": "^4.54.1",
         "pjax": "^0.2.8",
-        "typescript": "^5.0.2",
+        "theme-shokax-anime": "^0.0.4",
+        "typescript": "^5.0.4",
         "vue": "^3.2.47",
         "vuepress": "2.0.0-beta.61",
-        "vuepress-plugin-sitemap2": "2.0.0-beta.197"
+        "vuepress-plugin-sitemap2": "2.0.0-beta.205"
     },
     "dependencies": {
         "js-yaml": "^4.1.0",
-        "sass": "^1.60.0"
+        "sass": "^1.62.0"
     }
 }

package/scripts/generaters/config.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const hexo_util_1 = __importDefault(require("hexo-util"));
-const hexo_fs_1 = __importDefault(require("hexo-fs"));
+const node_fs_1 = __importDefault(require("node:fs"));
 const path_1 = __importDefault(require("path"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 hexo.extend.filter.register('before_generate', () => {
@@ -26,7 +26,7 @@ hexo.extend.filter.register('before_generate', () => {
     hexo.theme.config.style = {};
     for (const style of ['iconfont', 'colors', 'custom']) {
         const custom_file = 'source/_data/' + style + '.styl';
-        if (hexo_fs_1.default.existsSync(custom_file)) {
+        if (node_fs_1.default.existsSync(custom_file)) {
             hexo.theme.config.style[style] = path_1.default.resolve(hexo.base_dir, custom_file);
         }
     }
@@ -34,6 +34,6 @@ hexo.extend.filter.register('before_generate', () => {
         hexo.theme.config.image_list = data.images;
     }
     else {
-        hexo.theme.config.image_list = js_yaml_1.default.load(hexo_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')));
     }
 });

package/scripts/generaters/images.js

@@ -1,22 +1,19 @@
 'use strict';
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const hexo_fs_1 = __importDefault(require("hexo-fs"));
+const fs = require("hexo-fs");
 hexo.extend.generator.register('images', function (locals) {
     const theme = hexo.theme.config;
     const dir = 'source/_data/' + theme.assets + '/';
-    if (!hexo_fs_1.default.existsSync(dir)) {
+    if (!fs.existsSync(dir)) {
         return;
     }
     const result = [];
-    const files = hexo_fs_1.default.listDirSync(dir);
+    const files = fs.listDirSync(dir);
     files.forEach((file) => {
         result.push({
             path: theme.assets + '/' + file,
             data: function () {
-                return hexo_fs_1.default.createReadStream(dir + file);
+                return fs.createReadStream(dir + file);
             }
         });
     });

package/scripts/generaters/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const hexo_fs_1 = __importDefault(require("hexo-fs"));
+const fs = require("hexo-fs");
 const hexo_pagination_1 = __importDefault(require("hexo-pagination"));
 hexo.config.index_generator = Object.assign({
     per_page: typeof hexo.config.per_page === 'undefined' ? 10 : hexo.config.per_page,
@@ -31,27 +31,27 @@ hexo.extend.generator.register('index', function (locals) {
     if (categories && categories.length) {
         categories.forEach((cat) => {
             const cover = `source/_posts/${cat.slug}`;
-            if (hexo_fs_1.default.existsSync(cover + '/cover.avif')) {
+            if (fs.existsSync(cover + '/cover.avif')) {
                 covers.push({
                     path: cat.slug + '/cover.avif',
                     data: function () {
-                        return hexo_fs_1.default.createReadStream(cover + '/cover.avif');
+                        return fs.createReadStream(cover + '/cover.avif');
                     }
                 });
             }
-            else if (hexo_fs_1.default.existsSync(cover + '/cover.webp')) {
+            else if (fs.existsSync(cover + '/cover.webp')) {
                 covers.push({
                     path: cat.slug + '/cover.webp',
                     data: function () {
-                        return hexo_fs_1.default.createReadStream(cover + '/cover.webp');
+                        return fs.createReadStream(cover + '/cover.webp');
                     }
                 });
             }
-            else if (hexo_fs_1.default.existsSync(cover + '/cover.jpg')) {
+            else if (fs.existsSync(cover + '/cover.jpg')) {
                 covers.push({
                     path: cat.slug + '/cover.jpg',
                     data: function () {
-                        return hexo_fs_1.default.createReadStream(cover + '/cover.jpg');
+                        return fs.createReadStream(cover + '/cover.jpg');
                     }
                 });
                 const topcat = getTopcat(cat);

package/scripts/generaters/script.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const package_json_1 = __importDefault(require("../../package.json"));
-const hexo_fs_1 = __importDefault(require("hexo-fs"));
+const fs = require("hexo-fs");
 hexo.extend.generator.register('script', function (locals) {
     const log = hexo.log || console.log;
     const config = hexo.config;
@@ -61,27 +61,27 @@ hexo.extend.generator.register('script', function (locals) {
     }
     let text = '';
     ['library', 'global', 'page', 'vue', 'components'].forEach(function (item) {
-        if (hexo_fs_1.default.existsSync(`themes/shokaX/source/js/_app/${item}.js`)) {
-            text += hexo_fs_1.default.readFileSync(`themes/shokaX/source/js/_app/${item}.js`).toString();
+        if (fs.existsSync(`themes/shokaX/source/js/_app/${item}.js`)) {
+            text += fs.readFileSync(`themes/shokaX/source/js/_app/${item}.js`).toString();
         }
         else {
-            text += hexo_fs_1.default.readFileSync(`node_modules/hexo-theme-shokax/source/js/_app/${item}.js`).toString();
+            text += fs.readFileSync(`node_modules/hexo-theme-shokax/source/js/_app/${item}.js`).toString();
         }
     });
     if (!theme.experiments?.noPlayer) {
-        if (hexo_fs_1.default.existsSync('themes/shokaX/source/js/_app/player.js')) {
-            text += hexo_fs_1.default.readFileSync('themes/shokaX/source/js/_app/player.js').toString();
+        if (fs.existsSync('themes/shokaX/source/js/_app/player.js')) {
+            text += fs.readFileSync('themes/shokaX/source/js/_app/player.js').toString();
         }
         else {
-            text += hexo_fs_1.default.readFileSync('node_modules/hexo-theme-shokax/source/js/_app/player.js').toString();
+            text += fs.readFileSync('node_modules/hexo-theme-shokax/source/js/_app/player.js').toString();
         }
     }
     if (theme.fireworks && theme.fireworks.enable) {
-        if (hexo_fs_1.default.existsSync('themes/shokaX/source/js/_app/fireworks.js')) {
-            text += hexo_fs_1.default.readFileSync('themes/shokaX/source/js/_app/fireworks.js').toString();
+        if (fs.existsSync('themes/shokaX/source/js/_app/fireworks.js')) {
+            text += fs.readFileSync('themes/shokaX/source/js/_app/fireworks.js').toString();
         }
         else {
-            text += hexo_fs_1.default.readFileSync('node_modules/hexo-theme-shokax/source/js/_app/fireworks.js').toString();
+            text += fs.readFileSync('node_modules/hexo-theme-shokax/source/js/_app/fireworks.js').toString();
         }
         siteConfig.fireworks = theme.fireworks.color || ['rgba(255,182,185,.9)', 'rgba(250,227,217,.9)', 'rgba(187,222,214,.9)', 'rgba(138,198,209,.9)'];
     }

package/scripts/helpers/list_categories.js

@@ -1,9 +1,6 @@
 'use strict';
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const hexo_fs_1 = __importDefault(require("hexo-fs"));
+const fs = require("hexo-fs");
 const prepareQuery = (categories, parent) => {
     const query = {
         parent: undefined
@@ -63,7 +60,7 @@ hexo.extend.helper.register('_categories', function () {
     categories.forEach((cat, i) => {
         const child = prepareQuery(categories, cat._id);
         const cover = 'source/_posts' + cat.path.replace(this.config.category_dir, '') + 'cover.jpg';
-        if (hexo_fs_1.default.existsSync(cover)) {
+        if (fs.existsSync(cover)) {
             const className = cat.slug.split('/');
             className.pop();
             cat.class = className.join(' ');

package/source/css/_mixins.styl

@@ -1,4 +1,4 @@
-$mobile-wdith = hexo-config('experiments.mobileWidth')
+$mobile-wdith = unquote(hexo-config('experiments.mobileWidth'))
 
 the-transition(duration = .2s, function = ease-in-out, delay = 0s, property = all) {
   transition:property duration function delay;

package/source/js/_app/fireworks.js

@@ -77,9 +77,9 @@ function createCircle(x, y) {
     };
     return p;
 }
-function renderParticule(anim) {
-    for (let i = 0; i < anim.animatables.length; i++) {
-        anim.animatables[i].target.draw();
+function renderParticule(targets) {
+    for (const target of targets) {
+        target.draw();
     }
 }
 function animateParticules(x, y) {
@@ -88,31 +88,31 @@ function animateParticules(x, y) {
     for (let i = 0; i < numberOfParticules; i++) {
         particules.push(createParticule(x, y));
     }
-    anime.timeline().add({
+    anime().timeline().add({
         targets: particules,
+        duration: anime.random(1200, 1800),
+        easing: 'easeOutExpo',
+        update: renderParticule,
         x: function (p) {
             return p.endPos.x;
         },
         y: function (p) {
             return p.endPos.y;
         },
-        radius: 0.1,
-        duration: anime.random(1200, 1800),
-        easing: 'easeOutExpo',
-        update: renderParticule
+        radius: 0.1
     }).add({
         targets: circle,
+        duration: anime.random(1200, 1800),
+        easing: 'easeOutExpo',
+        update: renderParticule,
         radius: anime.random(80, 160),
         lineWidth: 0,
         alpha: {
             value: 0,
             easing: 'linear',
             duration: anime.random(600, 800)
-        },
-        duration: anime.random(1200, 1800),
-        easing: 'easeOutExpo',
-        update: renderParticule
-    }, 0);
+        }
+    }).play();
 }
 const render = anime({
     duration: Infinity,
@@ -127,7 +127,7 @@ const hasAncestor = function (node, name) {
             break;
         if (node.nodeName === name)
             return true;
-    } while (node = node.parentNode);
+    } while ((node = node.parentNode) !== null);
     return false;
 };
 document.addEventListener(tap, function (e) {

package/source/js/_app/library.js

@@ -192,7 +192,7 @@ const vendorCss = function (type, condition) {
         window['css' + type] = true;
     }
 };
-const transition = (target, type, complete) => {
+const transition = (target, type, complete, begin) => {
     let animation;
     let display = 'none';
     switch (type) {
@@ -236,14 +236,14 @@ const transition = (target, type, complete) => {
                 begin: function (anim) {
                     target.display('block');
                 },
-                translateX: [100, 0],
+                translateX: ['100%', '0%'],
                 opacity: [0, 1]
             };
             display = 'block';
             break;
         case 'slideRightOut':
             animation = {
-                translateX: [0, 100],
+                translateX: ['0%', '100%'],
                 opacity: [1, 0]
             };
             break;
@@ -255,11 +255,15 @@ const transition = (target, type, complete) => {
     anime(Object.assign({
         targets: target,
         duration: 200,
-        easing: 'linear'
-    }, animation)).finished.then(function () {
-        target.display(display);
-        complete && complete();
-    });
+        easing: 'linear',
+        begin: function () {
+            begin && begin();
+        },
+        complete: function () {
+            target.display(display);
+            complete && complete();
+        }
+    }, animation)).play();
 };
 const pjaxScript = function (element) {
     const { text, parentNode, id, className, type, src, dataset } = element;
@@ -297,5 +301,5 @@ const pageScroll = function (target, offset, complete) {
             complete && complete();
         }
     };
-    anime(opt);
+    anime(opt).play();
 };

package/source/js/_app/page.js

@@ -616,7 +616,7 @@ const domInit = function () {
 const pjaxReload = function () {
     pagePosition();
     if (sideBar.hasClass('on')) {
-        transition(sideBar, function () {
+        transition(sideBar, 0, function () {
             sideBar.removeClass('on');
             menuToggle.removeClass('close');
         });

package/source/js/_app/vue.js

@@ -37,6 +37,8 @@ Vue.createApp({
             }
             transition(neko, 1, function () {
                 setTimeout(c, 210);
+            }, function () {
+                neko.display('block');
             });
         }
     }