Home Verkennen Help
Inloggen
pengjq
/
yudao-ui-admin-uniapp
Volgen 1
Ster 0
Vork 0
Bestanden Kwesties 0 Pull-aanvragen 0 Wiki
Bladeren bron

Merge branch 'base'

菲鸽 1 jaar geleden
bovenliggende
7d3a955389 f322199fb6
commit
c6c0a2d1f5
4 gewijzigde bestanden met toevoegingen van 324 en 313 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 1 1
      index.html
  2. 23 21
      package.json
  3. 293 289
      pnpm-lock.yaml
  4. 7 2
      vite.config.ts

+ 1 - 1
index.html
Bestand weergeven 

@@ -1,5 +1,5 @@
 
 <!doctype html>
 
-<html build-date="%BUILD_TIME%">
 
+<html build-time="%BUILD_TIME%" build-branch="%BUILD_BRANCH%">
 
   <head>
 
     <meta charset="UTF-8" />
 
     <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />

+ 23 - 21
package.json
Bestand weergeven 

@@ -1,7 +1,7 @@
 
 {
 
   "name": "unibest",
 
   "type": "commonjs",
 
-  "version": "2.4.1",
 
+  "version": "2.4.2",
 
   "description": "unibest - 最好的 uniapp 开发模板",
 
   "author": {
 
     "name": "codercup",
 
@@ -80,26 +80,28 @@
 
     "bin-wrapper": "npm:bin-wrapper-china"
 
   },
 
   "dependencies": {
 
-    "@dcloudio/uni-app": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-app-plus": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-components": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-h5": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-mp-alipay": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-mp-baidu": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-mp-jd": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-mp-kuaishou": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-mp-lark": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-mp-qq": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-mp-toutiao": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-mp-weixin": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-mp-xhs": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-quickapp-webview": "3.0.0-4010420240430001",
 
+    "@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",
 
     "dayjs": "1.11.10",
 
     "pinia": "2.0.36",
 
     "pinia-plugin-persistedstate": "3.2.1",
 
     "qs": "6.5.3",
 
-    "vue": "3.4.26",
 
+    "vue": "3.4.21",
 
+    "vue-i18n": "^9.1.9",
 
     "wot-design-uni": "^1.2.20",
 
     "z-paging": "^2.7.10"
 
   },
 
@@ -107,10 +109,10 @@
 
     "@commitlint/cli": "^18.4.3",
 
     "@commitlint/config-conventional": "^18.4.3",
 
     "@dcloudio/types": "^3.4.8",
 
-    "@dcloudio/uni-automator": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-cli-shared": "3.0.0-4010420240430001",
 
-    "@dcloudio/uni-stacktracey": "3.0.0-4010420240430001",
 
-    "@dcloudio/vite-plugin-uni": "3.0.0-4010420240430001",
 
+    "@dcloudio/uni-automator": "3.0.0-alpha-4010520240507001",
 
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-4010520240507001",
 
+    "@dcloudio/uni-stacktracey": "3.0.0-alpha-4010520240507001",
 
+    "@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",
 
@@ -124,7 +126,7 @@
 
     "@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",
 
+    "@vue/runtime-core": "^3.4.27",
 
     "@vue/tsconfig": "^0.1.3",
 
     "autoprefixer": "^10.4.16",
 
     "commitlint": "^18.4.3",

File diff suppressed because it is too large
+ 293 - 289
pnpm-lock.yaml


+ 7 - 2
vite.config.ts
Bestand weergeven 

@@ -1,4 +1,5 @@
 
 import path from 'node:path'
 
+import { execSync } from 'node:child_process'
 
 import dayjs from 'dayjs'
 
 import { defineConfig, loadEnv } from 'vite'
 
 import Uni from '@dcloudio/vite-plugin-uni'
 
@@ -87,11 +88,15 @@ export default ({ command, mode }) => {
 
         // 通过这个插件，在修改vite.config.js文件则不需要重新运行也生效配置
 
         restart: ['vite.config.js'],
 
       }),
 
-      // h5环境增加编译时间
 
+      // h5环境增加 BUILD_TIME 和 BUILD_BRANCH
 
       UNI_PLATFORM === 'h5' && {
 
         name: 'html-transform',
 
         transformIndexHtml(html) {
 
-          return html.replace('%BUILD_TIME%', dayjs().format('YYYY-MM-DD HH:mm:ss'))
 
+          const branch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim()
 
+          console.log('branch -> ', branch)
 
+          return html
 
+            .replace('%BUILD_TIME%', dayjs().format('YYYY-MM-DD HH:mm:ss'))
 
+            .replace('%BUILD_BRANCH%', branch)
 
         },
 
       },
 
       // 打包分析插件，h5 + 生产环境才弹出