fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-07 22:49:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: env bug (#4191)

Browse Source
This commit is contained in:
jack zhang 2024-04-27 15:03:18 +08:00 committed by GitHub
parent 69baf99b66
commit 402e14500a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/build/src/buildClient.ts
View File

@ -7,7 +7,7 @@ import { build as viteBuild } from 'vite';
import { libInjectCss } from 'vite-plugin-lib-inject-css'; import { libInjectCss } from 'vite-plugin-lib-inject-css';
import { globExcludeFiles } from './constant'; 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) { export async function buildClient(cwd: string, userConfig: UserConfig, sourcemap: boolean = false, log: PkgLog) {
log('build client'); log('build client');
@ -33,11 +33,7 @@ function buildClientEsm(cwd: string, userConfig: UserConfig, sourcemap: boolean,
return viteBuild( return viteBuild(
userConfig.modifyViteConfig({ userConfig.modifyViteConfig({
mode: process.env.NODE_ENV || 'production', mode: process.env.NODE_ENV || 'production',
define: { define: getEnvDefine(),
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production'),
'process.env.__TEST__': false,
'process.env.__E2E__': process.env.__E2E__ ? true : false,
},
build: { build: {
minify: process.env.NODE_ENV === 'production', minify: process.env.NODE_ENV === 'production',
outDir, outDir,

8
packages/core/build/src/buildEsm.ts
View File

@ -1,6 +1,6 @@
import path from 'path'; import path from 'path';
import { PkgLog, UserConfig } from './utils'; import { PkgLog, UserConfig, getEnvDefine } from './utils';
import { build as viteBuild } from 'vite'; import { build as viteBuild } from 'vite';
import fg from 'fast-glob'; import fg from 'fast-glob';
@ -48,11 +48,7 @@ function build(cwd: string, entry: string, outDir: string, userConfig: UserConfi
return viteBuild( return viteBuild(
userConfig.modifyViteConfig({ userConfig.modifyViteConfig({
mode: process.env.NODE_ENV || 'production', mode: process.env.NODE_ENV || 'production',
define: { define: getEnvDefine(),
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production'),
'process.env.__TEST__': false,
'process.env.__E2E__': process.env.__E2E__ ? true : false,
},
build: { build: {
minify: false, minify: false,
outDir, outDir,

8
packages/core/build/src/buildPlugin.ts
View File

@ -9,7 +9,7 @@ import { build as viteBuild } from 'vite';
import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js'; import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
import { EsbuildSupportExts, globExcludeFiles } from './constant'; import { EsbuildSupportExts, globExcludeFiles } from './constant';
import { PkgLog, UserConfig, getPackageJson } from './utils'; import { PkgLog, UserConfig, getEnvDefine, getPackageJson } from './utils';
import { import {
buildCheck, buildCheck,
checkFileSize, checkFileSize,
@ -312,11 +312,7 @@ export async function buildPluginClient(cwd: string, userConfig: UserConfig, sou
await viteBuild(userConfig.modifyViteConfig({ await viteBuild(userConfig.modifyViteConfig({
mode: process.env.NODE_ENV || 'production', mode: process.env.NODE_ENV || 'production',
define: { define: getEnvDefine(),
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'production'),
'process.env.__TEST__': false,
'process.env.__E2E__': process.env.__E2E__ ? true : false,
},
logLevel: 'warn', logLevel: 'warn',
build: { build: {
minify: process.env.NODE_ENV === 'production', minify: process.env.NODE_ENV === 'production',

10
packages/core/build/src/utils/utils.ts
View File

@ -95,3 +95,13 @@ export function readFromCache(key: string) {
} }
return {}; 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,
}
}

1
packages/core/cli/src/commands/build.js
View File

@ -26,6 +26,7 @@ module.exports = (cli) => {
if (options.watch) return; if (options.watch) return;
} }
process.env['VITE_CJS_IGNORE_WARNING'] = 'true'; process.env['VITE_CJS_IGNORE_WARNING'] = 'true';
process.env.APP_ENV = 'production';
await run('nocobase-build', [ await run('nocobase-build', [
...pkgs, ...pkgs,