From fc901fbe6818064ab70d52db11cf49a4832e5773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?=
 <65991901+codercup@users.noreply.github.com>
Date: Sat, 1 Jun 2024 22:12:00 +0800
Subject: [PATCH 1/3] Merge pull request #95 from
 JinliangYan/fix-function-overloads
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(eslint): 函数重载飘红
---
 .eslintrc.cjs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 2371f0b..aff8be4 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -69,6 +69,9 @@ module.exports = {
     'no-unused-vars': 'off',
     'no-param-reassign': 'off',
     '@typescript-eslint/no-unused-vars': 'off',
+    // 避免 `eslint` 对于 `typescript` 函数重载的误报
+    'no-redeclare': 'off',
+    '@typescript-eslint/no-redeclare': 'error',
   },
   // eslint-import-resolver-typescript 插件，@see https://www.npmjs.com/package/eslint-import-resolver-typescript
   settings: {

From 352505643b1ac033ab8d08ed3af869c82c92ac31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Mon, 3 Jun 2024 12:32:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?build:=20@uni-helper/vite-plugin-uni-pages?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A80.2.20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json   | 2 +-
 pnpm-lock.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 738018c..e220469 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
     "@typescript-eslint/parser": "^6.15.0",
     "@uni-helper/vite-plugin-uni-layouts": "^0.1.7",
     "@uni-helper/vite-plugin-uni-manifest": "^0.2.3",
-    "@uni-helper/vite-plugin-uni-pages": "^0.2.15",
+    "@uni-helper/vite-plugin-uni-pages": "0.2.20",
     "@uni-helper/vite-plugin-uni-platform": "^0.0.4",
     "@unocss/preset-legacy-compat": "^0.59.1",
     "@vue/runtime-core": "^3.4.21",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3d094b2..f42523c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,7 +125,7 @@ devDependencies:
     specifier: ^0.2.3
     version: 0.2.6(vite@5.2.8)
   '@uni-helper/vite-plugin-uni-pages':
-    specifier: ^0.2.15
+    specifier: 0.2.20
     version: 0.2.20(@types/lodash-es@4.17.12)(eslint-import-resolver-typescript@3.6.1)(lodash-es@4.17.21)(lodash@4.17.21)(typescript@4.9.5)
   '@uni-helper/vite-plugin-uni-platform':
     specifier: ^0.0.4

From d70c8ed683e898e3b462b1a0395e6eaecba0be44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Mon, 3 Jun 2024 12:33:19 +0800
Subject: [PATCH 3/3] build: v2.4.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e220469..c397b41 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "unibest",
   "type": "commonjs",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "unibest - 最好的 uniapp 开发模板",
   "author": {
     "name": "codercup",