From 402e14500af2b0b47de62a5bc56a392a5502a35a Mon Sep 17 00:00:00 2001
From: jack zhang <1098626505@qq.com>
Date: Sat, 27 Apr 2024 15:03:18 +0800
Subject: [PATCH] fix: env bug (#4191)

---
 packages/core/build/src/buildClient.ts  |  8 ++------
 packages/core/build/src/buildEsm.ts     |  8 ++------
 packages/core/build/src/buildPlugin.ts  |  8 ++------
 packages/core/build/src/utils/utils.ts  | 10 ++++++++++
 packages/core/cli/src/commands/build.js |  1 +
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/packages/core/build/src/buildClient.ts b/packages/core/build/src/buildClient.ts
index 1ca0d73093..0dbce15caf 100644
--- a/packages/core/build/src/buildClient.ts
+++ b/packages/core/build/src/buildClient.ts
@@ -7,7 +7,7 @@ import { build as viteBuild } from 'vite';
 import { libInjectCss } from 'vite-plugin-lib-inject-css';
 
 import { globExcludeFiles } from './constant';
-import { PkgLog, UserConfig } from './utils';
+import { PkgLog, UserConfig, getEnvDefine } from './utils';
 
 export async function buildClient(cwd: string, userConfig: UserConfig, sourcemap: boolean = false, log: PkgLog) {
   log('build client');
@@ -33,11 +33,7 @@ function buildClientEsm(cwd: string, userConfig: UserConfig, sourcemap: boolean,
   return viteBuild(
     userConfig.modifyViteConfig({
       mode: process.env.NODE_ENV || 'production',
-      define: {
-        'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production'),
-        'process.env.__TEST__': false,
-        'process.env.__E2E__': process.env.__E2E__ ? true : false,
-      },
+      define: getEnvDefine(),
       build: {
         minify: process.env.NODE_ENV === 'production',
         outDir,
diff --git a/packages/core/build/src/buildEsm.ts b/packages/core/build/src/buildEsm.ts
index 9daaa83f7c..1c6591f03e 100644
--- a/packages/core/build/src/buildEsm.ts
+++ b/packages/core/build/src/buildEsm.ts
@@ -1,6 +1,6 @@
 
 import path from 'path';
-import { PkgLog, UserConfig } from './utils';
+import { PkgLog, UserConfig, getEnvDefine } from './utils';
 import { build as viteBuild } from 'vite';
 import fg from 'fast-glob';
 
@@ -48,11 +48,7 @@ function build(cwd: string, entry: string, outDir: string, userConfig: UserConfi
   return viteBuild(
     userConfig.modifyViteConfig({
       mode: process.env.NODE_ENV || 'production',
-      define: {
-        'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production'),
-        'process.env.__TEST__': false,
-        'process.env.__E2E__': process.env.__E2E__ ? true : false,
-      },
+      define: getEnvDefine(),
       build: {
         minify: false,
         outDir,
diff --git a/packages/core/build/src/buildPlugin.ts b/packages/core/build/src/buildPlugin.ts
index bd49798305..a420f42878 100644
--- a/packages/core/build/src/buildPlugin.ts
+++ b/packages/core/build/src/buildPlugin.ts
@@ -9,7 +9,7 @@ import { build as viteBuild } from 'vite';
 import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
 
 import { EsbuildSupportExts, globExcludeFiles } from './constant';
-import { PkgLog, UserConfig, getPackageJson } from './utils';
+import { PkgLog, UserConfig, getEnvDefine, getPackageJson } from './utils';
 import {
   buildCheck,
   checkFileSize,
@@ -312,11 +312,7 @@ export async function buildPluginClient(cwd: string, userConfig: UserConfig, sou
 
   await viteBuild(userConfig.modifyViteConfig({
     mode: process.env.NODE_ENV || 'production',
-    define: {
-      'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production'),
-      'process.env.__TEST__': false,
-      'process.env.__E2E__': process.env.__E2E__ ? true : false,
-    },
+    define: getEnvDefine(),
     logLevel: 'warn',
     build: {
       minify: process.env.NODE_ENV === 'production',
diff --git a/packages/core/build/src/utils/utils.ts b/packages/core/build/src/utils/utils.ts
index 2af0748685..182ba7881d 100644
--- a/packages/core/build/src/utils/utils.ts
+++ b/packages/core/build/src/utils/utils.ts
@@ -95,3 +95,13 @@ export function readFromCache(key: string) {
   }
   return {};
 }
+
+
+export function getEnvDefine() {
+  return {
+    'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production'),
+    'process.env.__TEST__': false,
+    'process.env.__E2E__': process.env.__E2E__ ? true : false,
+    'process.env.APP_ENV': process.env.APP_ENV,
+  }
+}
diff --git a/packages/core/cli/src/commands/build.js b/packages/core/cli/src/commands/build.js
index 267abd837e..e0f4dee892 100644
--- a/packages/core/cli/src/commands/build.js
+++ b/packages/core/cli/src/commands/build.js
@@ -26,6 +26,7 @@ module.exports = (cli) => {
         if (options.watch) return;
       }
       process.env['VITE_CJS_IGNORE_WARNING'] = 'true';
+      process.env.APP_ENV = 'production';
 
       await run('nocobase-build', [
         ...pkgs,