Merge branch 'base'

package.json

@@ -22,7 +22,9 @@
     "pnpm": ">=7.30"
   },
   "scripts": {
-    "upgrade": "npx @dcloudio/uvm@latest",
+    "uvm": "npx @dcloudio/uvm@latest",
+    "uvm-rm": "node ./scripts/postupgrade.js",
+    "postuvm": "echo upgrade uni-app success!",
     "dev:app": "uni -p app",
     "dev:app-android": "uni -p app-android",
     "dev:app-ios": "uni -p app-ios",
@@ -81,33 +83,22 @@
   },
   "dependencies": {
     "@dcloudio/uni-app": "3.0.0-alpha-4010520240507001",
-    "@dcloudio/uni-app-harmony": "3.0.0-alpha-4010520240507001",
     "@dcloudio/uni-app-plus": "3.0.0-alpha-4010520240507001",
     "@dcloudio/uni-components": "3.0.0-alpha-4010520240507001",
     "@dcloudio/uni-h5": "3.0.0-alpha-4010520240507001",
-    "@dcloudio/uni-mp-alipay": "3.0.0-alpha-4010520240507001",
-    "@dcloudio/uni-mp-baidu": "3.0.0-alpha-4010520240507001",
-    "@dcloudio/uni-mp-jd": "3.0.0-alpha-4010520240507001",
-    "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-4010520240507001",
-    "@dcloudio/uni-mp-lark": "3.0.0-alpha-4010520240507001",
-    "@dcloudio/uni-mp-qq": "3.0.0-alpha-4010520240507001",
-    "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-4010520240507001",
     "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4010520240507001",
-    "@dcloudio/uni-mp-xhs": "3.0.0-alpha-4010520240507001",
-    "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-4010520240507001",
-    "czg": "^1.9.2",
+    "czg": "^1.9.3",
     "dayjs": "1.11.10",
     "pinia": "2.0.36",
     "pinia-plugin-persistedstate": "3.2.1",
     "qs": "6.5.3",
     "vue": "3.4.21",
-    "vue-i18n": "^9.1.9",
-    "wot-design-uni": "^1.2.20",
+    "wot-design-uni": "^1.2.26",
     "z-paging": "^2.7.10"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
+    "@commitlint/cli": "^18.6.1",
+    "@commitlint/config-conventional": "^18.6.3",
     "@dcloudio/types": "^3.4.8",
     "@dcloudio/uni-automator": "3.0.0-alpha-4010520240507001",
     "@dcloudio/uni-cli-shared": "3.0.0-alpha-4010520240507001",
@@ -115,49 +106,49 @@
     "@dcloudio/vite-plugin-uni": "3.0.0-alpha-4010520240507001",
     "@esbuild/darwin-arm64": "0.20.2",
     "@esbuild/darwin-x64": "0.20.2",
-    "@iconify-json/carbon": "^1.1.27",
-    "@rollup/rollup-darwin-x64": "^4.17.2",
-    "@types/node": "^20.11.5",
+    "@iconify-json/carbon": "^1.1.35",
+    "@rollup/rollup-darwin-x64": "^4.18.0",
+    "@types/node": "^20.14.2",
     "@types/wechat-miniprogram": "^3.4.7",
-    "@typescript-eslint/eslint-plugin": "^6.15.0",
-    "@typescript-eslint/parser": "^6.15.0",
-    "@uni-helper/vite-plugin-uni-layouts": "^0.1.7",
-    "@uni-helper/vite-plugin-uni-manifest": "^0.2.3",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "@uni-helper/vite-plugin-uni-layouts": "^0.1.10",
+    "@uni-helper/vite-plugin-uni-manifest": "^0.2.6",
     "@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.27",
+    "@unocss/preset-legacy-compat": "^0.59.4",
+    "@vue/runtime-core": "^3.4.29",
     "@vue/tsconfig": "^0.1.3",
-    "autoprefixer": "^10.4.16",
-    "commitlint": "^18.4.3",
-    "eslint": "^8.56.0",
+    "autoprefixer": "^10.4.19",
+    "commitlint": "^18.6.1",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-prettier": "^5.1.0",
-    "eslint-plugin-vue": "^9.19.2",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-vue": "^9.26.0",
     "husky": "^8.0.3",
-    "lint-staged": "^15.2.0",
-    "postcss": "^8.4.32",
-    "postcss-html": "^1.5.0",
+    "lint-staged": "^15.2.7",
+    "postcss": "^8.4.38",
+    "postcss-html": "^1.7.0",
     "postcss-scss": "^4.0.9",
-    "rollup-plugin-visualizer": "^5.11.0",
-    "sass": "^1.69.5",
-    "stylelint": "^16.0.2",
+    "rollup-plugin-visualizer": "^5.12.0",
+    "sass": "^1.77.5",
+    "stylelint": "^16.6.1",
     "stylelint-config-html": "^1.1.0",
-    "stylelint-config-recess-order": "^4.4.0",
+    "stylelint-config-recess-order": "^4.6.0",
     "stylelint-config-recommended": "^14.0.0",
     "stylelint-config-recommended-scss": "^14.0.0",
     "stylelint-config-recommended-vue": "^1.5.0",
     "stylelint-prettier": "^5.0.0",
-    "terser": "^5.26.0",
+    "terser": "^5.31.1",
     "typescript": "^4.9.5",
-    "unocss": "^0.58.0",
+    "unocss": "^0.58.9",
     "unocss-applet": "^0.7.8",
-    "unplugin-auto-import": "^0.17.2",
+    "unplugin-auto-import": "^0.17.6",
     "vite": "5.2.8",
     "vite-plugin-restart": "^0.4.0",
-    "vue-tsc": "^1.8.25"
+    "vue-tsc": "^1.8.27"
   }
 }

scripts/postupgrade.js

@@ -0,0 +1,36 @@
+// # 执行 `pnpm upgrade` 后会升级 `uniapp` 相关依赖
+// # 在升级完后，会自动添加很多无用依赖，这需要删除以减小依赖包体积
+// # 只需要执行下面的命令即可
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { exec } = require('child_process')
+
+// 定义要执行的命令
+const dependencies = [
+  '@dcloudio/uni-app-harmony',
+  // TODO: 如果需要某个平台的小程序，请手动删除或注释掉
+  '@dcloudio/uni-mp-alipay',
+  '@dcloudio/uni-mp-baidu',
+  '@dcloudio/uni-mp-jd',
+  '@dcloudio/uni-mp-kuaishou',
+  '@dcloudio/uni-mp-lark',
+  '@dcloudio/uni-mp-qq',
+  '@dcloudio/uni-mp-toutiao',
+  '@dcloudio/uni-mp-xhs',
+  '@dcloudio/uni-quickapp-webview',
+  // i18n模板要注释掉下面的
+  'vue-i18n',
+]
+
+// 使用exec执行命令
+exec(`pnpm un ${dependencies.join(' ')}`, (error, stdout, stderr) => {
+  if (error) {
+    // 如果有错误，打印错误信息
+    console.error(`执行出错: ${error}`)
+    return
+  }
+  // 打印正常输出
+  console.log(`stdout: ${stdout}`)
+  // 如果有错误输出，也打印出来
+  console.error(`stderr: ${stderr}`)
+})