fix(core): expand env variables on load and unload

Env variables using other variables were not unloaded from the environment
and further customizations were impossible in more specific env files.

e2e/nx/src/extras.test.ts

@@ -2,12 +2,13 @@ import { parseJson } from '@nx/devkit';
 import {
   checkFilesExist,
   cleanupProject,
-  getSelectedPackageManager,
+  expectTestsPass,
   isNotWindows,
   newProject,
   readFile,
   readJson,
   runCLI,
+  runCLIAsync,
   uniq,
   updateFile,
   updateJson,
@@ -293,7 +294,7 @@ describe('Extra Nx Misc Tests', () => {
   });
 
   describe('Env File', () => {
-    it('should have the right env', () => {
+    it('should have the right env', async () => {
       const appName = uniq('app');
       runCLI(
         `generate @nx/react:app ${appName} --style=css --bundler=webpack --no-interactive`
@@ -334,8 +335,21 @@ describe('Extra Nx Misc Tests', () => {
     });
   `
       );
-      const unitTestsOutput = runCLI(`test ${appName}`);
-      expect(unitTestsOutput).toContain('Successfully ran target test');
+      expectTestsPass(await runCLIAsync(`test ${appName}`));
+
+      updateFile('.env', (content) => {
+        content = content.replace('firstname', 'firstname2');
+        content = content.replace('lastname', 'lastname2');
+        return content;
+      });
+      updateFile(`apps/${appName}/src/app/app.spec.tsx`, (content) => {
+        content = content.replace(
+          'Welcome firstname lastname',
+          'Welcome firstname2 lastname2'
+        );
+        return content;
+      });
+      expectTestsPass(await runCLIAsync(`test ${appName}`));
     });
   });
 

package.json

@@ -161,7 +161,7 @@
     "czg": "^1.4.0",
     "detect-port": "^1.5.1",
     "dotenv": "~16.3.1",
-    "dotenv-expand": "^10.0.0",
+    "dotenv-expand": "~11.0.6",
     "ejs": "^3.1.7",
     "enhanced-resolve": "^5.8.3",
     "esbuild": "0.19.5",

packages/nx/package.json

@@ -46,7 +46,7 @@
     "cli-spinners": "2.6.1",
     "cliui": "^8.0.1",
     "dotenv": "~16.3.1",
-    "dotenv-expand": "~10.0.0",
+    "dotenv-expand": "~11.0.6",
     "enquirer": "~2.3.6",
     "figures": "3.2.0",
     "flat": "^5.0.2",

packages/nx/src/tasks-runner/task-env.ts

@@ -184,10 +184,7 @@ function loadDotEnvFilesForTask(
       override: false,
     });
     environmentVariables = {
-      ...expand({
-        ...myEnv,
-        ignoreProcessEnv: true, // Do not override existing env variables as we load
-      }).parsed,
+      ...expand(myEnv).parsed,
       ...environmentVariables,
     };
   }
@@ -198,7 +195,12 @@ function loadDotEnvFilesForTask(
 function unloadDotEnvFiles(environmentVariables: NodeJS.ProcessEnv) {
   const unloadDotEnvFile = (filename: string) => {
     let parsedDotEnvFile: NodeJS.ProcessEnv = {};
-    loadDotEnvFile({ path: filename, processEnv: parsedDotEnvFile });
+    const myEnv = loadDotEnvFile({
+      path: filename,
+      processEnv: parsedDotEnvFile,
+      override: false,
+    });
+    parsedDotEnvFile = { ...expand(myEnv).parsed, ...parsedDotEnvFile };
     Object.keys(parsedDotEnvFile).forEach((envVarKey) => {
       if (environmentVariables[envVarKey] === parsedDotEnvFile[envVarKey]) {
         delete environmentVariables[envVarKey];