nx 19.7.0-canary.20240903-9039e5e → 19.7.0-canary.20240905-ccda7f9

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js

@@ -42,6 +42,18 @@ function getNxInitDate() {
         return null;
     }
 }
+async function createNxCloudWorkspaceV1(workspaceName, installationSource, nxInitDate) {
+    const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
+    const response = await require('axios').post(`${apiUrl}/nx-cloud/create-org-and-workspace`, {
+        workspaceName,
+        installationSource,
+        nxInitDate,
+    });
+    if (response.data.message) {
+        throw new Error(response.data.message);
+    }
+    return response.data;
+}
 async function createNxCloudWorkspaceV2(workspaceName, installationSource, nxInitDate) {
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
     const response = await require('axios').post(`${apiUrl}/nx-cloud/v2/create-org-and-workspace`, {
@@ -69,6 +81,19 @@ async function printSuccessMessage(token, installationSource, usesGithub) {
     });
     return connectCloudUrl;
 }
+function addNxCloudOptionsToNxJson(tree, token, directory = '') {
+    const nxJsonPath = (0, path_1.join)(directory, 'nx.json');
+    if (tree.exists(nxJsonPath)) {
+        (0, json_1.updateJson)(tree, (0, path_1.join)(directory, 'nx.json'), (nxJson) => {
+            const overrideUrl = process.env.NX_CLOUD_API || process.env.NRWL_API;
+            if (overrideUrl) {
+                nxJson.nxCloudUrl = overrideUrl;
+            }
+            nxJson.nxCloudAccessToken = token;
+            return nxJson;
+        });
+    }
+}
 function addNxCloudIdToNxJson(tree, nxCloudId, directory = '') {
     const nxJsonPath = (0, path_1.join)(directory, 'nx.json');
     if (tree.exists(nxJsonPath)) {
@@ -89,6 +114,7 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
         return null;
     }
     const isGitHubDetected = schema.github ?? (await (0, url_shorten_1.repoUsesGithub)(schema.github));
+    let responseFromCreateNxCloudWorkspaceV1;
     let responseFromCreateNxCloudWorkspaceV2;
     /**
      * Do not create an Nx Cloud token if the user is using GitHub and
@@ -98,12 +124,22 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
         isGitHubDetected &&
         schema.installationSource === 'nx-connect')
         return null;
-    responseFromCreateNxCloudWorkspaceV2 = await createNxCloudWorkspaceV2(getRootPackageName(tree), schema.installationSource, getNxInitDate());
-    addNxCloudIdToNxJson(tree, responseFromCreateNxCloudWorkspaceV2?.nxCloudId, schema.directory);
-    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
-        silent: schema.hideFormatLogs,
-    });
-    return responseFromCreateNxCloudWorkspaceV2.nxCloudId;
+    if (process.env.NX_ENABLE_LOGIN === 'true') {
+        responseFromCreateNxCloudWorkspaceV2 = await createNxCloudWorkspaceV2(getRootPackageName(tree), schema.installationSource, getNxInitDate());
+        addNxCloudIdToNxJson(tree, responseFromCreateNxCloudWorkspaceV2?.nxCloudId, schema.directory);
+        await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
+            silent: schema.hideFormatLogs,
+        });
+        return responseFromCreateNxCloudWorkspaceV2.nxCloudId;
+    }
+    else {
+        responseFromCreateNxCloudWorkspaceV1 = await createNxCloudWorkspaceV1(getRootPackageName(tree), schema.installationSource, getNxInitDate());
+        addNxCloudOptionsToNxJson(tree, responseFromCreateNxCloudWorkspaceV1?.token, schema.directory);
+        await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
+            silent: schema.hideFormatLogs,
+        });
+        return responseFromCreateNxCloudWorkspaceV1.token;
+    }
 }
 async function connectToNxCloudGenerator(tree, options) {
     await connectToNxCloud(tree, options);

package/src/tasks-runner/run-command.js

@@ -120,6 +120,9 @@ async function runCommand(projectsToRun, currentProjectGraph, { nxJson }, nxArgs
 }
 async function ensureWorkspaceIsInSyncAndGetGraphs(projectGraph, nxJson, projectNames, nxArgs, overrides, extraTargetDependencies, extraOptions) {
     let taskGraph = createTaskGraphAndRunValidations(projectGraph, extraTargetDependencies ?? {}, projectNames, nxArgs, overrides, extraOptions);
+    if (nxArgs.skipSync) {
+        return { projectGraph, taskGraph };
+    }
     // collect unique syncGenerators from the tasks
     const uniqueSyncGenerators = (0, sync_generators_1.collectEnabledTaskSyncGeneratorsFromTaskGraph)(taskGraph, projectGraph, nxJson);
     if (!uniqueSyncGenerators.size) {
@@ -134,7 +137,7 @@ async function ensureWorkspaceIsInSyncAndGetGraphs(projectGraph, nxJson, project
     }
     const outOfSyncTitle = 'The workspace is out of sync';
     const resultBodyLines = [...(0, sync_generators_1.syncGeneratorResultsToMessageLines)(results), ''];
-    const fixMessage = 'You can manually run `nx sync` to update your workspace or you can set `sync.applyChanges` to `true` in your `nx.json` to apply the changes automatically when running tasks.';
+    const fixMessage = 'You can manually run `nx sync` to update your workspace or you can set `sync.applyChanges` to `true` in your `nx.json` to apply the changes automatically when running tasks in interactive environments.';
     const willErrorOnCiMessage = 'Please note that this will be an error on CI.';
     if ((0, is_ci_1.isCI)() || !process.stdout.isTTY) {
         // If the user is running in CI or is running in a non-TTY environment we

package/src/utils/command-line-utils.d.ts

@@ -30,6 +30,7 @@ export interface NxArgs {
     type?: string;
     batch?: boolean;
     excludeTaskDependencies?: boolean;
+    skipSync?: boolean;
 }
 export declare function createOverrides(__overrides_unparsed__?: string[]): Record<string, any>;
 export declare function getBaseRef(nxJson: NxJsonConfiguration): string;