Compare commits

...

1 Commits

Author SHA1 Message Date
Emily Xiong fc3d9c5b9b fix(core): not load root env files when NX_LOAD_DOT_ENV_FILES is false 2024-10-22 16:07:04 -04:00
3 changed files with 9 additions and 10 deletions
+4 -3
View File
@@ -35,11 +35,12 @@ function main() {
const workspace = findWorkspaceRoot(process.cwd());
performance.mark('loading dotenv files:start');
if (workspace) {
if (workspace && process.env.NX_LOAD_DOT_ENV_FILES !== 'false') {
performance.mark('loading dotenv files:start');
loadRootEnvFiles(workspace.dir);
performance.mark('loading dotenv files:end');
}
performance.mark('loading dotenv files:end');
performance.measure(
'loading dotenv files',
'loading dotenv files:start',
@@ -11,7 +11,9 @@ import { TaskResult } from './life-cycle';
export async function initTasksRunner(nxArgs: NxArgs) {
performance.mark('init-local');
loadRootEnvFiles();
if (process.env.NX_LOAD_DOT_ENV_FILES !== 'false') {
loadRootEnvFiles();
}
const nxJson = readNxJson();
if (nxArgs.verbose) {
process.env.NX_VERBOSE_LOGGING = 'true';
+2 -6
View File
@@ -1,7 +1,6 @@
import { config as loadDotEnvFile } from 'dotenv';
import { expand } from 'dotenv-expand';
import { workspaceRoot } from './workspace-root';
import { join } from 'path';
import { loadAndExpandDotEnvFile } from '../tasks-runner/task-env';
/**
* This loads dotenv files from:
@@ -11,9 +10,6 @@ import { join } from 'path';
*/
export function loadRootEnvFiles(root = workspaceRoot) {
for (const file of ['.local.env', '.env.local', '.env']) {
const myEnv = loadDotEnvFile({
path: join(root, file),
});
expand(myEnv);
loadAndExpandDotEnvFile(join(root, file), process.env);
}
}