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.

package.json

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

packages/nx/package.json

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

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

@@ -165,19 +165,15 @@ function loadDotEnvFilesForTask(
   ];
 
   for (const file of dotEnvFiles) {
-    const myEnv = loadDotEnvFile({
-      path: file,
+    expand({
+      ...loadDotEnvFile({
+        path: file,
+        processEnv: environmentVariables,
+        // Do not override existing env variables as we load
+        override: false,
+      }),
       processEnv: environmentVariables,
-      // 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,
-    };
   }
 
   return environmentVariables;
@@ -186,7 +182,14 @@ function loadDotEnvFilesForTask(
 function unloadDotEnvFiles(environmentVariables: NodeJS.ProcessEnv) {
   const unloadDotEnvFile = (filename: string) => {
     let parsedDotEnvFile: NodeJS.ProcessEnv = {};
-    loadDotEnvFile({ path: filename, processEnv: parsedDotEnvFile });
+    expand({
+      ...loadDotEnvFile({
+        path: filename,
+        processEnv: parsedDotEnvFile,
+        override: false,
+      }),
+      processEnv: parsedDotEnvFile,
+    });
     Object.keys(parsedDotEnvFile).forEach((envVarKey) => {
       if (environmentVariables[envVarKey] === parsedDotEnvFile[envVarKey]) {
         delete environmentVariables[envVarKey];