Merge 8ffcfa73ed into 810398abb8

.env-config.ts

@@ -9,6 +9,12 @@ const serviceEnv: ServiceEnv = {
     secondUrl: 'http://localhost:8081',
     secondUrlPattern: '/second-url-pattern'
   },
+  uat: {
+    url: 'http://localhost:8080',
+    urlPattern: '/url-pattern',
+    secondUrl: 'http://localhost:8081',
+    secondUrlPattern: '/second-url-pattern'
+  },
   test: {
     url: 'http://localhost:8080',
     urlPattern: '/url-pattern',

.env.development

@@ -1 +1,2 @@
 VITE_HTTP_PROXY=Y
+VITE_MODE=DEV_DEV_DEV

.env.production

@@ -4,3 +4,4 @@ VITE_COMPRESS=N
 
 # gzip | brotliCompress | deflate | deflateRaw
 VITE_COMPRESS_TYPE=gzip
+VITE_MODE=PRD_PRD_PRD

.env.uat

@@ -0,0 +1,5 @@
+VITE_HTTP_PROXY=Y
+
+VITE_MODE=UAT_UAT_UAT_UAT
+
+

build/plugins/index.ts

@@ -9,24 +9,13 @@ import unplugin from './unplugin';
 import mock from './mock';
 import visualizer from './visualizer';
 import compress from './compress';
-import pwa from './pwa';
 
 /**
  * vite插件
  * @param viteEnv - 环境变量配置
  */
 export function setupVitePlugins(viteEnv: ImportMetaEnv): (PluginOption | PluginOption[])[] {
-  const plugins = [
+  const plugins = [vue(), vueJsx(), html(viteEnv), ...unplugin(viteEnv), unocss(), mock, progress(), routerPage()];
-    vue(),
-    vueJsx(),
-    html(viteEnv),
-    ...unplugin(viteEnv),
-    unocss(),
-    mock,
-    progress(),
-    routerPage(),
-    pwa()
-  ];
 
   if (viteEnv.VITE_VISUALIZER === 'Y') {
     plugins.push(visualizer as PluginOption);

build/plugins/pwa.ts

@@ -1,31 +0,0 @@
-import { VitePWA } from 'vite-plugin-pwa';
-
-export default function setupVitePwa() {
-  return VitePWA({
-    registerType: 'autoUpdate',
-    includeAssets: ['favicon.ico'],
-    manifest: {
-      name: 'SoybeanAdmin',
-      short_name: 'SoybeanAdmin',
-      theme_color: '#fff',
-      icons: [
-        {
-          src: '/logo.png',
-          sizes: '192x192',
-          type: 'image/png'
-        },
-        {
-          src: '/logo.png',
-          sizes: '512x512',
-          type: 'image/png'
-        },
-        {
-          src: '/logo.png',
-          sizes: '512x512',
-          type: 'image/png',
-          purpose: 'any maskable'
-        }
-      ]
-    }
-  });
-}

package.json

@@ -36,6 +36,7 @@
   ],
   "scripts": {
     "dev": "cross-env VITE_SERVICE_ENV=dev vite",
+    "dev:uat": "cross-env VITE_SERVICE_ENV=uat vite --mode uat",
     "dev:test": "cross-env VITE_SERVICE_ENV=test vite",
     "dev:prod": "cross-env VITE_SERVICE_ENV=prod vite",
     "build": "npm run typecheck && cross-env VITE_SERVICE_ENV=prod vite build",
@@ -122,7 +123,6 @@
     "vite-plugin-html": "^3.2.0",
     "vite-plugin-mock": "^2.9.6",
     "vite-plugin-progress": "^0.0.6",
-    "vite-plugin-pwa": "^0.13.3",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-tsc": "^1.0.9",
     "zx": "^7.1.1"

src/App.vue

@@ -16,7 +16,7 @@
 import { dateZhCN, zhCN } from 'naive-ui';
 import { subscribeStore, useThemeStore } from '@/store';
 import { useGlobalEvents } from '@/composables';
-
+console.log(import.meta.env);
 const theme = useThemeStore();
 
 subscribeStore();

src/typings/env.d.ts

@@ -1,10 +1,11 @@
 /**
  *后台服务的环境类型
  * - dev: 后台开发环境
+ * - uat: 后台uat环境
  * - test: 后台测试环境
  * - prod: 后台生产环境
  */
-type ServiceEnvType = 'dev' | 'test' | 'prod';
+type ServiceEnvType = 'dev' | 'test' | 'uat' | 'prod';
 
 /** 后台服务的环境配置 */
 interface ServiceEnvConfig {

vite.config.ts

@@ -3,6 +3,8 @@ import { createViteProxy, getRootPath, getSrcPath, setupVitePlugins, viteDefine
 import { getServiceEnvConfig } from './.env-config';
 
 export default defineConfig(configEnv => {
+  // 加载 envDir 中的 .env 文件。默认情况下只有前缀为 VITE_ 会被加载，除非更改了 prefixes 配置。
+
   const viteEnv = loadEnv(configEnv.mode, process.cwd()) as unknown as ImportMetaEnv;
 
   const rootPath = getRootPath();
@@ -11,6 +13,10 @@ export default defineConfig(configEnv => {
   const isOpenProxy = viteEnv.VITE_HTTP_PROXY === 'Y';
   const envConfig = getServiceEnvConfig(viteEnv);
 
+  console.log(configEnv);
+  console.log(viteEnv);
+  console.log(envConfig);
+
   return {
     base: viteEnv.VITE_BASE_URL,
     resolve: {