chore: update

Author: Xiphin

.github/workflows/auto-merge.yml

@@ -115,23 +115,23 @@ jobs:
           git merge main --no-ff -m "Auto merge main into base-uview-plus"
           git push origin base-uview-plus
 
-  merge-to-base-tm-ui:
-    name: Merge main into base-tm-ui
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
+  # merge-to-base-tm-ui:
+  #   name: Merge main into base-tm-ui
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+  #         token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
 
-      - name: Merge main into base-tm-ui
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git checkout base-tm-ui
-          git merge main --no-ff -m "Auto merge main into base-tm-ui"
-          git push origin base-tm-ui
+  #     - name: Merge main into base-tm-ui
+  #       run: |
+  #         git config user.name "GitHub Actions"
+  #         git config user.email "actions@github.com"
+  #         git checkout base-tm-ui
+  #         git merge main --no-ff -m "Auto merge main into base-tm-ui"
+  #         git push origin base-tm-ui
 
   merge-to-base-skiyee-ui:
     name: Merge main into base-skiyee-ui

.gitignore

@@ -28,10 +28,12 @@ docs/.vitepress/dist
 docs/.vitepress/cache
 
 src/types
+src/manifest.json
+src/pages.json
 
 # lock 文件还是不要了，我主要的版本写死就好了
-# pnpm-lock.yaml
-# package-lock.json
+pnpm-lock.yaml
+package-lock.json
 
 # TIPS：如果某些文件已经加入了版本管理，现在重新加入 .gitignore 是不生效的，需要执行下面的操作
 # `git rm -r --cached .` 然后提交 commit 即可。

.vscode/vue3.code-snippets

@@ -48,7 +48,20 @@
     "prefix": "sc",
     "body": [
       "<script lang=\"ts\" setup>",
-      "//$3",
+      "//$1",
+      "</script>\n"
+    ],
+  },
+  "Print unibest script with definePage": {
+    "scope": "vue",
+    "prefix": "scdp",
+    "body": [
+      "<script lang=\"ts\" setup>",
+      "definePage({",
+      "  style: {",
+      "    navigationBarTitleText: '$1',",
+      "  },",
+      "})",
       "</script>\n"
     ],
   },

env/.env

@@ -13,9 +13,13 @@ VITE_SERVER_BASEURL = 'https://ukw0y1.laf.run'
 # 后台上传地址
 VITE_UPLOAD_BASEURL = 'https://ukw0y1.laf.run/upload'
 
+# 注意，如果是微信小程序，还有一套请求地址的配置，在 `src/utils/index.ts` 中
+
 # h5是否需要配置代理
 VITE_APP_PROXY_ENABLE = true
 VITE_APP_PROXY_PREFIX = '/api'
+# 后端是否有统一前缀 /api，决定本地代码的时候是否需要去掉 /api 前缀。这里面默认是没有的，即前端会把/api 转发去掉
+VITE_SERVER_HAS_API_PREFIX = false
 
 # 第二个请求地址 (目前alova中可以使用)
 VITE_API_SECONDARY_URL = 'https://ukw0y1.laf.run'

eslint.config.mjs

@@ -15,8 +15,9 @@ export default uniHelper({
     'src/pages.json',
     'src/manifest.json',
     // 忽略自动生成文件
-    'src/service/app/**',
+    'src/service/**',
   ],
+  // https://eslint-config.antfu.me/rules
   rules: {
     'no-useless-return': 'off',
     'no-console': 'off',
@@ -34,6 +35,10 @@ export default uniHelper({
         externalIgnores: ['text'],
       },
     ],
+    // vue SFC 调换顺序改这里
+    'vue/block-order': ['error', {
+      order: [['script', 'template'], 'style'],
+    }],
   },
   formatters: {
     /**

index.html

@@ -14,7 +14,7 @@
           '" />',
       )
     </script>
-    <title>unibest</title>
+    <title>%VITE_APP_TITLE%</title>
     <!--preload-links-->
     <!--app-context-->
   </head>

package.json

@@ -1,8 +1,10 @@
 {
   "name": "unibest",
   "type": "module",
-  "version": "3.12.4",
-  "unibest-version": "3.12.4",
+  "version": "3.15.1",
+  "unibest-version": "3.15.1",
+  "update-time": "2025-09-11",
+  "packageManager": "pnpm@10.10.0",
   "description": "unibest - 最好的 uniapp 开发模板",
   "generate-time": "用户创建项目时生成",
   "author": {
@@ -21,7 +23,7 @@
   },
   "engines": {
     "node": ">=22",
-    "pnpm": ">=9 <=10.12"
+    "pnpm": ">=9"
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -86,48 +88,48 @@
     "build:quickapp-webview-union": "uni build -p quickapp-webview-union",
     "type-check": "vue-tsc --noEmit",
     "openapi-ts-request": "openapi-ts",
-    "prepare": "git init && husky",
+    "prepare": "git init && husky && node ./scripts/create-base-files.js",
     "lint": "eslint",
     "lint:fix": "eslint --fix"
   },
   "dependencies": {
     "@alova/adapter-uniapp": "^2.0.14",
     "@alova/shared": "^1.3.1",
-    "@dcloudio/uni-app": "3.0.0-4070520250711001",
-    "@dcloudio/uni-app-harmony": "3.0.0-4070520250711001",
-    "@dcloudio/uni-app-plus": "3.0.0-4070520250711001",
-    "@dcloudio/uni-components": "3.0.0-4070520250711001",
-    "@dcloudio/uni-h5": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-alipay": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-baidu": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-harmony": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-jd": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-kuaishou": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-lark": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-qq": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-toutiao": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-weixin": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-xhs": "3.0.0-4070520250711001",
-    "@dcloudio/uni-quickapp-webview": "3.0.0-4070520250711001",
+    "@dcloudio/uni-app": "3.0.0-4070620250821001",
+    "@dcloudio/uni-app-harmony": "3.0.0-4070620250821001",
+    "@dcloudio/uni-app-plus": "3.0.0-4070620250821001",
+    "@dcloudio/uni-components": "3.0.0-4070620250821001",
+    "@dcloudio/uni-h5": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-alipay": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-baidu": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-harmony": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-jd": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-kuaishou": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-lark": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-qq": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-toutiao": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-weixin": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-xhs": "3.0.0-4070620250821001",
+    "@dcloudio/uni-quickapp-webview": "3.0.0-4070620250821001",
     "@tanstack/vue-query": "^5.62.16",
     "abortcontroller-polyfill": "^1.7.8",
     "alova": "^3.3.3",
     "dayjs": "1.11.10",
     "js-cookie": "^3.0.5",
     "pinia": "2.0.36",
     "pinia-plugin-persistedstate": "3.2.1",
-    "vue": "3.4.21",
+    "vue": "^3.4.21",
     "wot-design-uni": "^1.11.1",
     "z-paging": "2.8.7"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@dcloudio/types": "^3.4.19",
-    "@dcloudio/uni-automator": "3.0.0-4070520250711001",
-    "@dcloudio/uni-cli-shared": "3.0.0-4070520250711001",
-    "@dcloudio/uni-stacktracey": "3.0.0-4070520250711001",
-    "@dcloudio/vite-plugin-uni": "3.0.0-4070520250711001",
+    "@dcloudio/types": "^3.4.8",
+    "@dcloudio/uni-automator": "3.0.0-4070620250821001",
+    "@dcloudio/uni-cli-shared": "3.0.0-4070620250821001",
+    "@dcloudio/uni-stacktracey": "3.0.0-4070620250821001",
+    "@dcloudio/vite-plugin-uni": "3.0.0-4070620250821001",
     "@esbuild/darwin-arm64": "0.20.2",
     "@esbuild/darwin-x64": "0.20.2",
     "@iconify-json/carbon": "^1.2.4",
@@ -146,7 +148,8 @@
     "@uni-ku/bundle-optimizer": "^1.3.3",
     "@uni-ku/root": "^1.3.4",
     "@unocss/eslint-plugin": "^66.2.3",
-    "@vue/runtime-core": "3.4.21",
+    "@unocss/preset-legacy-compat": "66.0.0",
+    "@vue/runtime-core": "^3.4.21",
     "@vue/tsconfig": "^0.1.3",
     "autoprefixer": "^10.4.20",
     "cross-env": "^10.0.0",

pages.config.ts

@@ -1,3 +1,4 @@
+import { isH5 } from '@uni-helper/uni-env'
 import { defineUniPages } from '@uni-helper/vite-plugin-uni-pages'
 import { tabBar } from './src/tabbar/config'
 
@@ -19,5 +20,6 @@ export default defineUniPages({
     },
   },
   // tabbar 的配置统一在 “./src/tabbar/config.ts” 文件中
-  tabBar: tabBar as any,
+  // 无tabbar模式下，h5 设置为 {} 为了防止浏览器报错导致白屏
+  tabBar: tabBar || (isH5 ? {} : undefined) as any,
 })