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,
@@ -294,48 +295,33 @@ describe('Extra Nx Misc Tests', () => {
 
   describe('Env File', () => {
     it('should have the right env', () => {
-      const appName = uniq('app');
+      const libName = uniq('lib');
       runCLI(
-        `generate @nx/react:app ${appName} --style=css --bundler=webpack --no-interactive`
+        `generate @nx/js:lib ${libName} --bundler=none --unitTestRunner=none --no-interactive`
       );
       updateFile(
         '.env',
         `FIRSTNAME="firstname"
-  LASTNAME="lastname"
-  NX_USERNAME=$FIRSTNAME $LASTNAME`
+LASTNAME="lastname"
+NX_USERNAME=$FIRSTNAME $LASTNAME`
       );
-      updateFile(
-        `apps/${appName}/src/app/app.tsx`,
-        `
-      import NxWelcome from './nx-welcome';
-  
-      export function App() {
-        return (
-          <>
-            <NxWelcome title={process.env.NX_USERNAME} />
-          </>
-        );
-      }
-  
-      export default App;
-    `
-      );
-      updateFile(
-        `apps/${appName}/src/app/app.spec.tsx`,
-        `import { render } from '@testing-library/react';
-  
-    import App from './app';
-    
-    describe('App', () => {
-      it('should have a greeting as the title', () => {
-        const { getByText } = render(<App />);
-        expect(getByText(/Welcome firstname lastname/gi)).toBeTruthy();
+      updateJson(join('libs', libName, 'project.json'), (config) => {
+        config.targets.echo = {
+          command: 'echo $NX_USERNAME',
+        };
+        return config;
       });
-    });
-  `
-      );
-      const unitTestsOutput = runCLI(`test ${appName}`);
-      expect(unitTestsOutput).toContain('Successfully ran target test');
+
+      let result = runCLI(`run ${libName}:echo`);
+      expect(result).toContain('firstname lastname');
+
+      updateFile('.env', (content) => {
+        content = content.replace('firstname', 'firstname2');
+        content = content.replace('lastname', 'lastname2');
+        return content;
+      });
+      result = runCLI(`run ${libName}:echo`);
+      expect(result).toContain('firstname2 lastname2');
     });
   });
 

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

@@ -183,13 +183,10 @@ function loadDotEnvFilesForTask(
       // Do not override existing env variables as we load
       override: false,
     });
-    environmentVariables = {
-      ...expand({
-        ...myEnv,
-        ignoreProcessEnv: true, // Do not override existing env variables as we load
-      }).parsed,
-      ...environmentVariables,
-    };
+    expand({
+      ...myEnv,
+      processEnv: environmentVariables,
+    });
   }
 
   return environmentVariables;
@@ -198,7 +195,15 @@ 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,
+    });
+    expand({
+      ...myEnv,
+      processEnv: parsedDotEnvFile,
+    });
     Object.keys(parsedDotEnvFile).forEach((envVarKey) => {
       if (environmentVariables[envVarKey] === parsedDotEnvFile[envVarKey]) {
         delete environmentVariables[envVarKey];