nx 19.7.0-canary.20240904-f39b995 → 19.7.0-canary.20240906-a3c2db8

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

@@ -42,18 +42,6 @@ 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`, {
@@ -81,19 +69,6 @@ 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)) {
@@ -124,22 +99,12 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
         isGitHubDetected &&
         schema.installationSource === 'nx-connect')
         return null;
-    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;
-    }
+    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;
 }
 async function connectToNxCloudGenerator(tree, options) {
     await connectToNxCloud(tree, options);

package/src/tasks-runner/cache.d.ts

@@ -10,6 +10,7 @@ export type TaskWithCachedResult = {
     task: Task;
     cachedResult: CachedResult;
 };
+export declare function getCache(options: DefaultTasksRunnerOptions): DbCache | Cache;
 export declare class DbCache {
     private readonly options;
     private cache;
@@ -20,6 +21,7 @@ export declare class DbCache {
         nxCloudRemoteCache: RemoteCache;
     });
     get(task: Task): Promise<CachedResult | null>;
+    private applyRemoteCacheResults;
     put(task: Task, terminalOutput: string | null, outputs: string[], code: number): Promise<void>;
     copyFilesFromCache(_: string, cachedResult: CachedResult, outputs: string[]): Promise<void>;
     removeOldCacheRecords(): void;

package/src/tasks-runner/cache.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cache = exports.DbCache = void 0;
+exports.getCache = getCache;
 const workspace_root_1 = require("../utils/workspace-root");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -15,6 +16,16 @@ const nx_cloud_utils_1 = require("../utils/nx-cloud-utils");
 const nx_json_1 = require("../config/nx-json");
 const update_manager_1 = require("../nx-cloud/update-manager");
 const get_cloud_options_1 = require("../nx-cloud/utilities/get-cloud-options");
+function getCache(options) {
+    return process.env.NX_DB_CACHE === 'true'
+        ? new DbCache({
+            // Remove this in Nx 21
+            nxCloudRemoteCache: (0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())
+                ? options.remoteCache
+                : null,
+        })
+        : new Cache(options);
+}
 class DbCache {
     async setup() {
         this.remoteCache = await this.getRemoteCache();
@@ -37,7 +48,7 @@ class DbCache {
             // attempt remote cache
             const res = await this.remoteCache.retrieve(task.hash, this.cache.cacheDirectory);
             if (res) {
-                this.cache.applyRemoteCacheResults(task.hash, res);
+                this.applyRemoteCacheResults(task.hash, res);
                 return {
                     ...res,
                     remote: true,
@@ -51,6 +62,9 @@ class DbCache {
             return null;
         }
     }
+    applyRemoteCacheResults(hash, res) {
+        return this.cache.applyRemoteCacheResults(hash, res);
+    }
     async put(task, terminalOutput, outputs, code) {
         return tryAndRetry(async () => {
             this.cache.put(task.hash, terminalOutput, outputs, code);

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/tasks-runner/task-orchestrator.js

@@ -15,8 +15,6 @@ const task_env_1 = require("./task-env");
 const workspace_root_1 = require("../utils/workspace-root");
 const output_1 = require("../utils/output");
 const params_1 = require("../utils/params");
-const nx_cloud_utils_1 = require("../utils/nx-cloud-utils");
-const nx_json_1 = require("../config/nx-json");
 class TaskOrchestrator {
     // endregion internal state
     constructor(hasher, initiatingProject, projectGraph, taskGraph, options, bail, daemon, outputStyle) {
@@ -28,14 +26,7 @@ class TaskOrchestrator {
         this.bail = bail;
         this.daemon = daemon;
         this.outputStyle = outputStyle;
-        this.cache = process.env.NX_DB_CACHE === 'true'
-            ? new cache_1.DbCache({
-                // Remove this in Nx 21
-                nxCloudRemoteCache: (0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())
-                    ? this.options.remoteCache
-                    : null,
-            })
-            : new cache_1.Cache(this.options);
+        this.cache = (0, cache_1.getCache)(this.options);
         this.forkedProcessTaskRunner = new forked_process_task_runner_1.ForkedProcessTaskRunner(this.options);
         this.tasksSchedule = new tasks_schedule_1.TasksSchedule(this.projectGraph, this.taskGraph, this.options);
         // region internal state

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;