From 32263070c29768fd6cede088bc747658b2004550 Mon Sep 17 00:00:00 2001
From: hymbz <hymbz3516@gmail.com>
Date: Mon, 15 Apr 2024 15:49:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=80=9A=E7=9F=A5=E7=9A=84=E6=A0=BC=E5=BC=8F=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .xo-config.cjs                        |  1 +
 ComicRead.user.js                     |  4 ++--
 docs/.other/Dev.md                    |  3 +++
 rollup.config.ts                      |  5 ++---
 src/rollup-plugin/index.ts            |  4 ++--
 src/rollup-plugin/rollup-solid-svg.ts | 13 ++++++-------
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.xo-config.cjs b/.xo-config.cjs
index 0888a536..de6b4961 100644
--- a/.xo-config.cjs
+++ b/.xo-config.cjs
@@ -2,6 +2,7 @@ module.exports = {
   prettier: true,
   plugins: ["i18next", "jsdoc", "solid"],
   extends: ["plugin:solid/typescript", "plugin:jsdoc/recommended"],
+  ignores: ["*.js"],
 
   rules: {
     // 不限制文件名的大小写样式
diff --git a/ComicRead.user.js b/ComicRead.user.js
index ae0bdca9..bba99e33 100644
--- a/ComicRead.user.js
+++ b/ComicRead.user.js
@@ -6835,9 +6835,9 @@ const useFab = async initProps => {
 
 var _tmpl$$1 = /*#__PURE__*/web.template(\`<h2>🥳 ComicRead 已更新到 v\`),
   _tmpl$2 = /*#__PURE__*/web.template(\`<h3>新增\`),
-  _tmpl$3 = /*#__PURE__*/web.template(\`<ul><li>kemono.su 新增是否加载原图的开关 (<a href=https://github.com/hymbz/ComicReadScript/commit/0fc6ea98ff349b4931b22d8803c03d8a7e141d4d>0fc6ea9</a>), closes <a href=https://github.com/hymbz/ComicReadScript/issues/158>#158\`),
+  _tmpl$3 = /*#__PURE__*/web.template(\`<ul><li>kemono.su 新增是否加载原图的开关\`),
   _tmpl$4 = /*#__PURE__*/web.template(\`<h3>修复\`),
-  _tmpl$5 = /*#__PURE__*/web.template(\`<ul><li>修复双页模式下两页图片中间有缝隙的 bug (<a href=https://github.com/hymbz/ComicReadScript/commit/0e00e7be57f90efe205ae6a265e4229424e7fbd2>0e00e7b</a>), closes <a href=https://github.com/hymbz/8/issues/pid64549617>8#pid64549617\`);
+  _tmpl$5 = /*#__PURE__*/web.template(\`<ul><li>修复双页模式下两页图片中间有缝隙的 bug\`);
 
 /** 重命名配置项 */
 const renameOption = async (name, list) => {
diff --git a/docs/.other/Dev.md b/docs/.other/Dev.md
index 440db1e8..05cf6c8a 100644
--- a/docs/.other/Dev.md
+++ b/docs/.other/Dev.md
@@ -1,5 +1,8 @@
 ## TODO
 
+- 卷轴模式优化
+  <!-- https://sleazyfork.org/zh-CN/scripts/374903-comicread/discussions/237728 -->
+
 ## 调试
 
 ```bash
diff --git a/rollup.config.ts b/rollup.config.ts
index 78a90007..abe4f3b1 100644
--- a/rollup.config.ts
+++ b/rollup.config.ts
@@ -42,9 +42,8 @@ const latestChangeHtml = await (() => {
             .replaceAll('Bug Fixes', '修复')
             .replaceAll('Performance Improvements', '优化');
         case '*':
-          return mdText.replace(
-            // eslint-disable-next-line unicorn/better-regex
-            /(?<=^\* ):\w+?: |(?<=^.*)\(\[\w+\]\(.+?\)\).*/,
+          return mdText.replaceAll(
+            /(?<=^\* ):\w+?: |(?<=^.*)\(\[\w+]\(.+?\)\).*/g,
             '',
           );
         default:
diff --git a/src/rollup-plugin/index.ts b/src/rollup-plugin/index.ts
index 5c0823e6..ef4e2ccc 100644
--- a/src/rollup-plugin/index.ts
+++ b/src/rollup-plugin/index.ts
@@ -35,13 +35,13 @@ const extractI18n: OutputPluginOption = {
                 .filter((l) => l !== 'zh')
                 .map(
                   (langName) =>
-                    `case '${langName}': return '${byPath(
+                    `case '${langName}': return '${byPath<string>(
                       langMap[langName],
                       key,
                     )}';`,
                 )
                 .join('')}
-              default: return '${byPath(langMap.zh, key)}';
+              default: return '${byPath<string>(langMap.zh, key)}';
             }
           })`,
       );
diff --git a/src/rollup-plugin/rollup-solid-svg.ts b/src/rollup-plugin/rollup-solid-svg.ts
index f5e13295..0a7e39ac 100644
--- a/src/rollup-plugin/rollup-solid-svg.ts
+++ b/src/rollup-plugin/rollup-solid-svg.ts
@@ -1,9 +1,8 @@
-/* eslint-disable import/no-extraneous-dependencies */
 import { readFile } from 'node:fs/promises';
-import type { TransformResult } from 'rollup';
-import type { Config } from 'svgo';
-import { optimize } from 'svgo';
-import type { Plugin } from 'vite';
+
+import { type TransformResult } from 'rollup';
+import { type Config, optimize } from 'svgo';
+import { type Plugin } from 'vite';
 import solid from 'vite-plugin-solid';
 
 /** svgo 配置 */
@@ -47,8 +46,8 @@ export function solidSvg(): Plugin {
       code = optimized || code;
 
       return `export default (props = {}) => ${code
-        .replace(/([{}])/g, "{'$1'}")
-        .replace(/<!--\s*([\s\S]*?)\s*-->/g, '{/* $1 */}')
+        .replaceAll(/([{}])/g, "{'$1'}")
+        .replaceAll(/<!--\s*([\s\S]*?)\s*-->/g, '{/* $1 */}')
         .replace(/(?<=<svg.*?)(>)/i, ' {...props}>')}`;
     },