From f6208a191dbfc254cd527151abbfa6b117bd52fd Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 17 Jun 2025 18:09:51 +0800
Subject: [PATCH 01/11] =?UTF-8?q?feat(build):=20=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0package.json=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E6=88=B3=E7=9A=84vite=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
添加updatePackageJson插件,在构建时自动更新package.json中的时间戳字段
---
scripts/updatePackageJson.ts | 31 +++++++++++++++++++++++++++++++
src/pages.json | 1 +
vite.config.ts | 2 ++
3 files changed, 34 insertions(+)
create mode 100644 scripts/updatePackageJson.ts
diff --git a/scripts/updatePackageJson.ts b/scripts/updatePackageJson.ts
new file mode 100644
index 0000000..22a13fc
--- /dev/null
+++ b/scripts/updatePackageJson.ts
@@ -0,0 +1,31 @@
+// src/plugins/updatePackageJson.ts
+import { Plugin } from 'vite'
+import fs from 'fs/promises'
+import path from 'path'
+
+const updatePackageJson = (): Plugin => {
+ return {
+ name: 'update-package-json',
+ async buildStart() {
+ const packageJsonPath = path.resolve(process.cwd(), 'package.json')
+
+ try {
+ // 读取并解析 package.json
+ const content = await fs.readFile(packageJsonPath, 'utf-8')
+ const packageJson = JSON.parse(content)
+
+ // 更新时间戳(使用 ISO 格式或自定义格式)
+ packageJson['update-time'] = new Date().toISOString().split('T')[0] // YYYY-MM-DD
+
+ // 写回文件(保持 2 空格缩进)
+ await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n', 'utf-8')
+
+ console.log(`[update-package-json] 更新时间戳: ${packageJson['update-time']}`)
+ } catch (error) {
+ console.error('[update-package-json] 插件执行失败:', error)
+ }
+ },
+ }
+}
+
+export default updatePackageJson
diff --git a/src/pages.json b/src/pages.json
index d8c43f9..f5d9e48 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -44,6 +44,7 @@
}
]
},
+ "__esModule": true,
"pages": [
{
"path": "pages/index/index",
diff --git a/vite.config.ts b/vite.config.ts
index 6111304..3175df7 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -21,6 +21,7 @@ import AutoImport from 'unplugin-auto-import/vite'
import ViteRestart from 'vite-plugin-restart'
import { copyNativeRes } from './vite-plugins/copyNativeRes'
import Components from '@uni-helper/vite-plugin-uni-components'
+import updatePackageJson from './scripts/updatePackageJson'
// https://vitejs.dev/config/
export default async ({ command, mode }) => {
@@ -129,6 +130,7 @@ export default async ({ command, mode }) => {
dts: 'src/types/components.d.ts', // 自动生成的组件类型声明文件路径(用于 TypeScript 支持)
}),
Uni(),
+ updatePackageJson(),
],
define: {
__UNI_PLATFORM__: JSON.stringify(UNI_PLATFORM),
From 39f4ba793dc9846d7400327b3dd869ad9ba7b44a Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 17 Jun 2025 18:11:15 +0800
Subject: [PATCH 02/11] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20package.jso?=
=?UTF-8?q?n=20=E4=B8=AD=E7=9A=84=20update-time=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index ad88c87..eb46774 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"type": "commonjs",
"version": "2.12.2",
"description": "unibest - 最好的 uniapp 开发模板",
- "update-time": "2025-05-28",
+ "update-time": "2025-06-17",
"author": {
"name": "feige996",
"zhName": "菲鸽",
From 968a0908764afcb87a489004686edb1e4d9f4fdc Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 17 Jun 2025 18:11:41 +0800
Subject: [PATCH 03/11] =?UTF-8?q?refactor(vite):=20=E5=B0=86=20updatePacka?=
=?UTF-8?q?geJson=20=E6=8F=92=E4=BB=B6=E4=BB=8E=20scripts=20=E7=A7=BB?=
=?UTF-8?q?=E5=8A=A8=E5=88=B0=20vite-plugins=20=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
{scripts => vite-plugins}/updatePackageJson.ts | 0
vite.config.ts | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename {scripts => vite-plugins}/updatePackageJson.ts (100%)
diff --git a/scripts/updatePackageJson.ts b/vite-plugins/updatePackageJson.ts
similarity index 100%
rename from scripts/updatePackageJson.ts
rename to vite-plugins/updatePackageJson.ts
diff --git a/vite.config.ts b/vite.config.ts
index 3175df7..3efc208 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -20,8 +20,8 @@ import { visualizer } from 'rollup-plugin-visualizer'
import AutoImport from 'unplugin-auto-import/vite'
import ViteRestart from 'vite-plugin-restart'
import { copyNativeRes } from './vite-plugins/copyNativeRes'
+import updatePackageJson from './vite-plugins/updatePackageJson'
import Components from '@uni-helper/vite-plugin-uni-components'
-import updatePackageJson from './scripts/updatePackageJson'
// https://vitejs.dev/config/
export default async ({ command, mode }) => {
From c6d4a469688bd176c578ddabfc7056e031bb61a5 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 17 Jun 2025 18:15:08 +0800
Subject: [PATCH 04/11] =?UTF-8?q?fix(vite-plugins):=20=E4=BB=85=E5=9C=A8?=
=?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E6=9E=84=E5=BB=BA=E6=97=B6?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0package.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vite-plugins/updatePackageJson.ts | 3 +++
1 file changed, 3 insertions(+)
diff --git a/vite-plugins/updatePackageJson.ts b/vite-plugins/updatePackageJson.ts
index 22a13fc..0d2282f 100644
--- a/vite-plugins/updatePackageJson.ts
+++ b/vite-plugins/updatePackageJson.ts
@@ -7,6 +7,9 @@ const updatePackageJson = (): Plugin => {
return {
name: 'update-package-json',
async buildStart() {
+ // 只在生产环境构建时执行
+ if (process.env.NODE_ENV !== 'production') return
+
const packageJsonPath = path.resolve(process.cwd(), 'package.json')
try {
From 2f2a14cd06d4101cb8a620e470530ed632175f8f Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 17 Jun 2025 18:16:32 +0800
Subject: [PATCH 05/11] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E5=BA=9F?=
=?UTF-8?q?=E5=BC=83=E4=BB=93=E5=BA=93=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BB=8E?=
=?UTF-8?q?repository-deprecated=E5=88=B0repository-old?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index eb46774..6c8a288 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,10 @@
"license": "MIT",
"repository": "https://github.com/feige996/unibest",
"repository-gitee": "https://gitee.com/feige996/unibest",
- "repository-deprecated": "https://github.com/codercup/unibest",
+ "repository-old": "https://github.com/codercup/unibest",
"bugs": {
- "url": "https://github.com/feige996/unibest/issues"
+ "url": "https://github.com/feige996/unibest/issues",
+ "old-url": "https://github.com/codercup/unibest/issues"
},
"homepage": "https://feige996.github.io/unibest/",
"engines": {
From 7dd210e42708b54872085057e6361e2943df6b0b Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 17 Jun 2025 18:17:37 +0800
Subject: [PATCH 06/11] =?UTF-8?q?docs(package.json):=20=E4=BF=AE=E5=A4=8Db?=
=?UTF-8?q?ugs.url=E5=AD=97=E6=AE=B5=E7=9A=84=E5=91=BD=E5=90=8D=E9=94=99?=
=?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 6c8a288..a681422 100644
--- a/package.json
+++ b/package.json
@@ -11,15 +11,15 @@
"github": "https://github.com/feige996",
"gitee": "https://gitee.com/feige996"
},
+ "homepage": "https://unibest.tech",
"license": "MIT",
"repository": "https://github.com/feige996/unibest",
"repository-gitee": "https://gitee.com/feige996/unibest",
"repository-old": "https://github.com/codercup/unibest",
"bugs": {
"url": "https://github.com/feige996/unibest/issues",
- "old-url": "https://github.com/codercup/unibest/issues"
+ "url-old": "https://github.com/codercup/unibest/issues"
},
- "homepage": "https://feige996.github.io/unibest/",
"engines": {
"node": ">=18",
"pnpm": ">=7.30"
From 4445e18b0208261b62af2127b32b49dfc784154f Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 17 Jun 2025 22:35:29 +0800
Subject: [PATCH 07/11] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E4=B8=AD=E5=BF=83=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=92=8C=E9=9A=90=E7=A7=81=E5=BC=B9=E7=AA=97=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
删除与用户中心相关的所有页面,包括个人资料、修改密码、关于我们等
移除不再使用的隐私协议弹窗组件及相关样式文件
清理路由配置中不再需要的页面路径
---
pages.config.ts | 6 -
src/components/privacy-popup/index.scss | 47 --
.../privacy-popup/privacy-popup.vue | 144 -----
src/pages.json | 42 --
src/pages/login/index.vue | 584 ------------------
src/pages/mine/about/index.vue | 173 ------
src/pages/mine/index.vue | 374 -----------
src/pages/mine/info/index.vue | 190 ------
src/pages/mine/password/index.vue | 203 ------
9 files changed, 1763 deletions(-)
delete mode 100644 src/components/privacy-popup/index.scss
delete mode 100644 src/components/privacy-popup/privacy-popup.vue
delete mode 100644 src/pages/login/index.vue
delete mode 100644 src/pages/mine/about/index.vue
delete mode 100644 src/pages/mine/index.vue
delete mode 100644 src/pages/mine/info/index.vue
delete mode 100644 src/pages/mine/password/index.vue
diff --git a/pages.config.ts b/pages.config.ts
index 547d0da..c801b46 100644
--- a/pages.config.ts
+++ b/pages.config.ts
@@ -40,12 +40,6 @@ export default defineUniPages({
pagePath: 'pages/about/about',
text: '关于',
},
- {
- iconPath: 'static/tabbar/personal.png',
- selectedIconPath: 'static/tabbar/personalHL.png',
- pagePath: 'pages/mine/index',
- text: '我的',
- },
],
},
})
diff --git a/src/components/privacy-popup/index.scss b/src/components/privacy-popup/index.scss
deleted file mode 100644
index 8cba003..0000000
--- a/src/components/privacy-popup/index.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@import 'wot-design-uni/components/wd-button/index.scss';
-:deep(.wd-privacy-popup) {
- width: 600rpx;
- padding: 0 24rpx;
- box-sizing: border-box;
- border-radius: 32rpx;
- overflow: hidden;
-}
-
-.wd-privacy-popup {
- &__header {
- width: 100%;
- height: 128rpx;
- line-height: 128rpx;
- color: rgba(0, 0, 0, 0.85);
- font-size: 30rpx;
- padding: 0 12rpx;
- box-sizing: border-box;
- }
-
- &__container {
- width: 100%;
- box-sizing: border-box;
- padding: 0 12rpx;
- margin-bottom: 32rpx;
-
- font-size: 28rpx;
- line-height: 1.8;
- color: #3e3e3e;
- text-align: left;
- font-weight: 550;
- &-protocol {
- color: #4d80f0;
- }
- }
-
- &__footer {
- display: flex;
- justify-content: space-between;
- padding-bottom: 36rpx;
-
- button {
- border: none;
- outline: none;
- }
- }
-}
\ No newline at end of file
diff --git a/src/components/privacy-popup/privacy-popup.vue b/src/components/privacy-popup/privacy-popup.vue
deleted file mode 100644
index 9bf9ec9..0000000
--- a/src/components/privacy-popup/privacy-popup.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages.json b/src/pages.json
index f5d9e48..0ba59a0 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -35,12 +35,6 @@
"selectedIconPath": "static/tabbar/exampleHL.png",
"pagePath": "pages/about/about",
"text": "关于"
- },
- {
- "iconPath": "static/tabbar/personal.png",
- "selectedIconPath": "static/tabbar/personalHL.png",
- "pagePath": "pages/mine/index",
- "text": "我的"
}
]
},
@@ -61,42 +55,6 @@
"navigationBarTitleText": "关于",
"navigationStyle": "custom"
}
- },
- {
- "path": "pages/login/index",
- "type": "page",
- "style": {
- "navigationBarTitleText": "登录",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/mine/index",
- "type": "page",
- "style": {
- "navigationBarTitleText": "我的"
- }
- },
- {
- "path": "pages/mine/about/index",
- "type": "page",
- "style": {
- "navigationBarTitleText": "关于我们"
- }
- },
- {
- "path": "pages/mine/info/index",
- "type": "page",
- "style": {
- "navigationBarTitleText": "个人资料"
- }
- },
- {
- "path": "pages/mine/password/index",
- "type": "page",
- "style": {
- "navigationBarTitleText": "修改密码"
- }
}
],
"subPackages": []
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
deleted file mode 100644
index 5195f14..0000000
--- a/src/pages/login/index.vue
+++ /dev/null
@@ -1,584 +0,0 @@
-
-{
- style: {
- navigationBarTitleText: '登录',
- navigationStyle: 'custom',
- },
-}
-
-
-
-
-
-
-
-
-
-
- 欢迎登录
- 请输入您的账号和密码
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 登录
-
-
-
-
-
- 或
-
-
-
- 微信一键登录
-
-
-
-
-
-
-
-
- 我已阅读并同意
- 《用户协议》
- 和
- 《隐私政策》
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/mine/about/index.vue b/src/pages/mine/about/index.vue
deleted file mode 100644
index d7e152a..0000000
--- a/src/pages/mine/about/index.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-
-{
- style: {
- navigationBarTitleText: '关于我们',
- },
-}
-
-
-
-
-
-
-
-
-
-
- {{ appTitle }}
- 版本 {{ packageJson.version }}
-
-
-
-
- 联系我们
-
-
-
- 客服电话:400-XXX-XXXX
-
-
-
- 邮箱:support@unibest.tech
-
-
-
- 地址:中国·深圳
-
-
-
-
-
-
- Copyright © 2025-{{ currentYear }} {{ appTitle }}
- All Rights Reserved
-
-
-
-
-
-
-
-
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
deleted file mode 100644
index 11cbc1e..0000000
--- a/src/pages/mine/index.vue
+++ /dev/null
@@ -1,374 +0,0 @@
-
-{
- style: {
- navigationBarTitleText: '我的',
- },
-}
-
-
-
-
- {{ JSON.stringify(userInfo) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ userInfo.username }}
-
- ID: {{ userInfo.id }}
-
-
-
-
-
-
- 账号管理
-
-
-
-
-
-
-
-
-
-
-
-
-
- 通用设置
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 退出登录
- 登录
-
-
-
-
-
-
-
-
diff --git a/src/pages/mine/info/index.vue b/src/pages/mine/info/index.vue
deleted file mode 100644
index 2feb64d..0000000
--- a/src/pages/mine/info/index.vue
+++ /dev/null
@@ -1,190 +0,0 @@
-
-{
- style: {
- navigationBarTitleText: '个人资料',
- },
-}
-
-
-
-
-
-
-
-
-
-
- 昵称
-
-
-
-
-
- 性别
-
- 男
- 女
-
-
-
-
-
-
-
- 保存修改
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/mine/password/index.vue b/src/pages/mine/password/index.vue
deleted file mode 100644
index a92d2d5..0000000
--- a/src/pages/mine/password/index.vue
+++ /dev/null
@@ -1,203 +0,0 @@
-
-{
- style: {
- navigationBarTitleText: '修改密码',
- },
-}
-
-
-
-
-
-
-
-
-
-
- 旧密码
-
-
-
- 新密码
-
-
-
- 确认密码
-
-
-
-
-
-
-
- 保存修改
-
-
-
-
-
-
-
-
-
From 136fb5d50719c9df766ec5f8f9b5423ffbbfd8e4 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 17 Jun 2025 22:36:31 +0800
Subject: [PATCH 08/11] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=8F=B7=E8=87=B32.13.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index a681422..4be7ef6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "unibest",
"type": "commonjs",
- "version": "2.12.2",
+ "version": "2.13.0",
"description": "unibest - 最好的 uniapp 开发模板",
"update-time": "2025-06-17",
"author": {
From 47d8401c47fe536a011aa9c3979807a131b4f140 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 17 Jun 2025 22:57:37 +0800
Subject: [PATCH 09/11] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20package.jso?=
=?UTF-8?q?n=20=E7=89=88=E6=9C=AC=E5=8F=B7=E8=87=B3=202.13.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 4be7ef6..671661d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "unibest",
"type": "commonjs",
- "version": "2.13.0",
+ "version": "2.13.1",
"description": "unibest - 最好的 uniapp 开发模板",
"update-time": "2025-06-17",
"author": {
From 33638c5a9efaa7b80cb84932505f12c7dbefea0c Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Fri, 20 Jun 2025 10:43:18 +0800
Subject: [PATCH 10/11] =?UTF-8?q?build:=20=E6=B7=BB=E5=8A=A0=20prettier=20?=
=?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=B9=B6=E5=8D=87=E7=BA=A7=E8=87=B3=203.5.3?=
=?UTF-8?q?=20=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 1 +
pnpm-lock.yaml | 23 +++++++++++++----------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/package.json b/package.json
index 671661d..b9f8d09 100644
--- a/package.json
+++ b/package.json
@@ -149,6 +149,7 @@
"postcss": "^8.4.49",
"postcss-html": "^1.7.0",
"postcss-scss": "^4.0.9",
+ "prettier": "^3.5.3",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "1.77.8",
"terser": "^5.36.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7797e83..693dc14 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -186,6 +186,9 @@ importers:
postcss-scss:
specifier: ^4.0.9
version: 4.0.9(postcss@8.4.49)
+ prettier:
+ specifier: ^3.5.3
+ version: 3.5.3
rollup-plugin-visualizer:
specifier: ^5.12.0
version: 5.12.0(rollup@4.41.1)
@@ -4635,8 +4638,8 @@ packages:
resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
engines: {node: ^10 || ^12 || >=14}
- prettier@3.3.2:
- resolution: {integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==}
+ prettier@3.5.3:
+ resolution: {integrity: sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==}
engines: {node: '>=14'}
hasBin: true
@@ -8010,10 +8013,10 @@ snapshots:
'@polka/url@1.0.0-next.29': {}
- '@prettier/sync@0.5.2(prettier@3.3.2)':
+ '@prettier/sync@0.5.2(prettier@3.5.3)':
dependencies:
make-synchronized: 0.2.9
- prettier: 3.3.2
+ prettier: 3.5.3
'@quansync/fs@0.1.3':
dependencies:
@@ -8128,7 +8131,7 @@ snapshots:
'@tootallnate/once@1.1.2': {}
- '@trivago/prettier-plugin-sort-imports@5.2.1(@vue/compiler-sfc@3.5.15)(prettier@3.3.2)':
+ '@trivago/prettier-plugin-sort-imports@5.2.1(@vue/compiler-sfc@3.5.15)(prettier@3.5.3)':
dependencies:
'@babel/generator': 7.26.2
'@babel/parser': 7.26.2
@@ -8136,7 +8139,7 @@ snapshots:
'@babel/types': 7.26.0
javascript-natural-sort: 0.7.1
lodash: 4.17.21
- prettier: 3.3.2
+ prettier: 3.5.3
optionalDependencies:
'@vue/compiler-sfc': 3.5.15
transitivePeerDependencies:
@@ -11012,8 +11015,8 @@ snapshots:
openapi-ts-request@1.1.2(@types/node@20.17.9)(@vue/compiler-sfc@3.5.15)(chokidar@3.6.0)(typescript@5.7.2):
dependencies:
- '@prettier/sync': 0.5.2(prettier@3.3.2)
- '@trivago/prettier-plugin-sort-imports': 5.2.1(@vue/compiler-sfc@3.5.15)(prettier@3.3.2)
+ '@prettier/sync': 0.5.2(prettier@3.5.3)
+ '@trivago/prettier-plugin-sort-imports': 5.2.1(@vue/compiler-sfc@3.5.15)(prettier@3.5.3)
axios: 1.7.9
bing-translate-api: 4.0.2
chalk: 4.1.2
@@ -11027,7 +11030,7 @@ snapshots:
minimatch: 10.0.1
mockjs: 1.1.0
nunjucks: 3.2.4(chokidar@3.6.0)
- prettier: 3.3.2
+ prettier: 3.5.3
reserved-words: 0.1.2
rimraf: 6.0.1
swagger2openapi: 7.0.8
@@ -11294,7 +11297,7 @@ snapshots:
picocolors: 1.1.1
source-map-js: 1.2.1
- prettier@3.3.2: {}
+ prettier@3.5.3: {}
pretty-format@27.5.1:
dependencies:
From 29f526242da271f779d8f3e6d5f37f5bf9b8c719 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Fri, 20 Jun 2025 10:45:22 +0800
Subject: [PATCH 11/11] =?UTF-8?q?ci:=20=E7=A7=BB=E9=99=A4=E4=B8=8D?=
=?UTF-8?q?=E5=86=8D=E9=9C=80=E8=A6=81=E7=9A=84=E8=87=AA=E5=8A=A8=E5=90=88?=
=?UTF-8?q?=E5=B9=B6=E5=88=B0main=E7=9A=84=E5=B7=A5=E4=BD=9C=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/auto-merge.yml | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 0c12579..f548d8b 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -7,24 +7,6 @@ on:
workflow_dispatch: # 手动触发
jobs:
- merge-to-main:
- name: Merge base into main
- runs-on: ubuntu-latest
- steps:
- - name: Checkout repository
- uses: actions/checkout@v4
- with:
- fetch-depth: 0
- token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
-
- - name: Merge base into main
- run: |
- git config user.name "GitHub Actions"
- git config user.email "actions@github.com"
- git checkout main
- git merge base --no-ff -m "Auto merge base into main"
- git push origin main
-
merge-to-i18n:
name: Merge base into i18n
runs-on: ubuntu-latest