nx 19.4.0-canary.20240626-3a2e8d4 → 19.4.0-canary.20240627-c2c6a13

package/src/tasks-runner/task-env.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnvVariablesForTask = exports.getTaskSpecificEnv = exports.getEnvVariablesForBatchProcess = void 0;
+exports.unloadDotEnvFile = exports.loadAndExpandDotEnvFile = exports.getEnvVariablesForTask = exports.getTaskSpecificEnv = exports.getEnvVariablesForBatchProcess = void 0;
 const dotenv_1 = require("dotenv");
 const dotenv_expand_1 = require("dotenv-expand");
 const workspace_root_1 = require("../utils/workspace-root");
@@ -75,9 +75,42 @@ function getNxEnvVariablesForTask(task, forceColor, skipNxCache, captureStderr,
         ...env,
     };
 }
-function loadDotEnvFilesForTask(task, environmentVariables) {
+/**
+ * This function loads a .env file and expands the variables in it.
+ * It is going to override existing environmentVariables.
+ * @param filename
+ * @param environmentVariables
+ */
+function loadAndExpandDotEnvFile(filename, environmentVariables, override = false) {
+    const myEnv = (0, dotenv_1.config)({
+        path: filename,
+        processEnv: environmentVariables,
+        override,
+    });
+    return (0, dotenv_expand_1.expand)({
+        ...myEnv,
+        processEnv: environmentVariables,
+    });
+}
+exports.loadAndExpandDotEnvFile = loadAndExpandDotEnvFile;
+/**
+ * This function unloads a .env file and removes the variables in it from the environmentVariables.
+ * @param filename
+ * @param environmentVariables
+ */
+function unloadDotEnvFile(filename, environmentVariables, override = false) {
+    const parsedDotEnvFile = {};
+    loadAndExpandDotEnvFile(filename, parsedDotEnvFile, override);
+    Object.keys(parsedDotEnvFile).forEach((envVarKey) => {
+        if (environmentVariables[envVarKey] === parsedDotEnvFile[envVarKey]) {
+            delete environmentVariables[envVarKey];
+        }
+    });
+}
+exports.unloadDotEnvFile = unloadDotEnvFile;
+function getEnvFilesForTask(task) {
     // Collect dot env files that may pertain to a task
-    const dotEnvFiles = [
+    return [
         // Load DotEnv Files for a configuration in the project root
         ...(task.target.configuration
             ? [
@@ -122,35 +155,17 @@ function loadDotEnvFilesForTask(task, environmentVariables) {
         `.env.local`,
         `.env`,
     ];
+}
+function loadDotEnvFilesForTask(task, environmentVariables) {
+    const dotEnvFiles = getEnvFilesForTask(task);
     for (const file of dotEnvFiles) {
-        const myEnv = (0, dotenv_1.config)({
-            path: file,
-            processEnv: environmentVariables,
-            // Do not override existing env variables as we load
-            override: false,
-        });
-        environmentVariables = {
-            ...(0, dotenv_expand_1.expand)({
-                ...myEnv,
-                ignoreProcessEnv: true, // Do not override existing env variables as we load
-            }).parsed,
-            ...environmentVariables,
-        };
+        loadAndExpandDotEnvFile(file, environmentVariables);
     }
     return environmentVariables;
 }
 function unloadDotEnvFiles(environmentVariables) {
-    const unloadDotEnvFile = (filename) => {
-        let parsedDotEnvFile = {};
-        (0, dotenv_1.config)({ path: filename, processEnv: parsedDotEnvFile });
-        Object.keys(parsedDotEnvFile).forEach((envVarKey) => {
-            if (environmentVariables[envVarKey] === parsedDotEnvFile[envVarKey]) {
-                delete environmentVariables[envVarKey];
-            }
-        });
-    };
     for (const file of ['.env', '.local.env', '.env.local']) {
-        unloadDotEnvFile(file);
+        unloadDotEnvFile(file, environmentVariables);
     }
     return environmentVariables;
 }

package/src/utils/git-utils.d.ts

@@ -1,4 +1,4 @@
 export declare function getGithubSlugOrNull(): string | null;
 export declare function extractUserAndRepoFromGitHubUrl(gitRemotes: string): string | null;
-export declare function commitChanges(commitMessage: string): string | null;
+export declare function commitChanges(commitMessage: string, directory?: string): string | null;
 export declare function getLatestCommitSha(): string | null;

package/src/utils/git-utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLatestCommitSha = exports.commitChanges = exports.extractUserAndRepoFromGitHubUrl = exports.getGithubSlugOrNull = void 0;
 const child_process_1 = require("child_process");
+const devkit_exports_1 = require("../devkit-exports");
 function getGithubSlugOrNull() {
     try {
         const gitRemote = (0, child_process_1.execSync)('git remote -v').toString();
@@ -38,17 +39,27 @@ function parseGitHubUrl(url) {
     }
     return null;
 }
-function commitChanges(commitMessage) {
+function commitChanges(commitMessage, directory) {
     try {
         (0, child_process_1.execSync)('git add -A', { encoding: 'utf8', stdio: 'pipe' });
         (0, child_process_1.execSync)('git commit --no-verify -F -', {
             encoding: 'utf8',
             stdio: 'pipe',
             input: commitMessage,
+            cwd: directory,
         });
     }
     catch (err) {
-        throw new Error(`Error committing changes:\n${err.stderr}`);
+        if (directory) {
+            // We don't want to throw during create-nx-workspace
+            // because maybe there was an error when setting up git
+            // initially.
+            devkit_exports_1.logger.verbose(`Git may not be set up correctly for this new workspace.
+        ${err}`);
+        }
+        else {
+            throw new Error(`Error committing changes:\n${err.stderr}`);
+        }
     }
     return getLatestCommitSha();
 }

package/src/utils/nx-cloud-utils.d.ts

@@ -1,4 +1,4 @@
 import { NxJsonConfiguration } from '../config/nx-json';
-export declare function isNxCloudUsed(nxJson: NxJsonConfiguration): string | boolean;
+export declare function isNxCloudUsed(nxJson: NxJsonConfiguration): boolean;
 export declare function getNxCloudUrl(nxJson: NxJsonConfiguration): string;
 export declare function getNxCloudToken(nxJson: NxJsonConfiguration): string;

package/src/utils/nx-cloud-utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNxCloudToken = exports.getNxCloudUrl = exports.isNxCloudUsed = void 0;
 function isNxCloudUsed(nxJson) {
-    return (process.env.NX_CLOUD_ACCESS_TOKEN ||
+    return (!!process.env.NX_CLOUD_ACCESS_TOKEN ||
         !!nxJson.nxCloudAccessToken ||
         !!Object.values(nxJson.tasksRunnerOptions ?? {}).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud'));
 }