Skip to content

Commit 3b8737c

Browse files
committed
fix(env-dir): remove MODERN_ENV_DIR fallback behavior
Co-Authored-By: Aiden
1 parent 2c60c77 commit 3b8737c

File tree

3 files changed

+2
-18
lines changed

3 files changed

+2
-18
lines changed

packages/server/core/src/adapters/node/helper/loadEnv.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import type { ServerBaseOptions } from '../../../serverBase';
1111
export async function loadServerEnv(options: ServerBaseOptions) {
1212
const { pwd, envDir } = options;
1313
const serverEnv = process.env.MODERN_ENV;
14-
const resolvedEnvDir = envDir ?? process.env.MODERN_ENV_DIR;
15-
const envDirectory = resolveInsideOrFallback(pwd, resolvedEnvDir, pwd);
14+
const envDirectory = resolveInsideOrFallback(pwd, envDir, pwd);
1615
const defaultEnvPath = path.resolve(envDirectory, `.env`);
1716
const serverEnvPath = path.resolve(envDirectory, `.env.${serverEnv}`);
1817

packages/server/core/tests/adapters/loadEnv.test.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,4 @@ describe('test load serve env file', () => {
6666
delete process.env.USER_NAME;
6767
delete process.env.ENV;
6868
});
69-
70-
it('should load env from MODERN_ENV_DIR when envDir is not provided', async () => {
71-
process.env.MODERN_ENV = 'prod';
72-
process.env.MODERN_ENV_DIR = 'env';
73-
await loadServerEnv({
74-
pwd: envPwd,
75-
} as any);
76-
77-
expect(process.env.USER_NAME).toBe('dir_prod_root');
78-
expect(process.env.ENV).toBe('dir_prod');
79-
80-
delete process.env.USER_NAME;
81-
delete process.env.ENV;
82-
delete process.env.MODERN_ENV_DIR;
83-
});
8469
});

packages/toolkit/plugin/src/cli/run/create.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export const createCli = <Extends extends CLIPluginExtends>() => {
7777
setProgramVersion(version);
7878

7979
const envName = metaName === 'modern-js' ? 'MODERN' : metaName;
80-
const envDir = options.envDir ?? process.env.MODERN_ENV_DIR;
80+
const envDir = options.envDir;
8181
const envCwd = ensureAbsolutePath(appDirectory, envDir || '.');
8282

8383
if (!isPathInside(appDirectory, envCwd)) {

0 commit comments

Comments
 (0)