nx 19.7.0-canary.20240828-13170da → 19.7.0-canary.20240829-0ef6892

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.7.0-canary.20240828-13170da",
+  "version": "19.7.0-canary.20240829-0ef6892",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.7.0-canary.20240828-13170da"
+    "@nrwl/tao": "19.7.0-canary.20240829-0ef6892"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.7.0-canary.20240828-13170da",
-    "@nx/nx-darwin-arm64": "19.7.0-canary.20240828-13170da",
-    "@nx/nx-linux-x64-gnu": "19.7.0-canary.20240828-13170da",
-    "@nx/nx-linux-x64-musl": "19.7.0-canary.20240828-13170da",
-    "@nx/nx-win32-x64-msvc": "19.7.0-canary.20240828-13170da",
-    "@nx/nx-linux-arm64-gnu": "19.7.0-canary.20240828-13170da",
-    "@nx/nx-linux-arm64-musl": "19.7.0-canary.20240828-13170da",
-    "@nx/nx-linux-arm-gnueabihf": "19.7.0-canary.20240828-13170da",
-    "@nx/nx-win32-arm64-msvc": "19.7.0-canary.20240828-13170da",
-    "@nx/nx-freebsd-x64": "19.7.0-canary.20240828-13170da"
+    "@nx/nx-darwin-x64": "19.7.0-canary.20240829-0ef6892",
+    "@nx/nx-darwin-arm64": "19.7.0-canary.20240829-0ef6892",
+    "@nx/nx-linux-x64-gnu": "19.7.0-canary.20240829-0ef6892",
+    "@nx/nx-linux-x64-musl": "19.7.0-canary.20240829-0ef6892",
+    "@nx/nx-win32-x64-msvc": "19.7.0-canary.20240829-0ef6892",
+    "@nx/nx-linux-arm64-gnu": "19.7.0-canary.20240829-0ef6892",
+    "@nx/nx-linux-arm64-musl": "19.7.0-canary.20240829-0ef6892",
+    "@nx/nx-linux-arm-gnueabihf": "19.7.0-canary.20240829-0ef6892",
+    "@nx/nx-win32-arm64-msvc": "19.7.0-canary.20240829-0ef6892",
+    "@nx/nx-freebsd-x64": "19.7.0-canary.20240829-0ef6892"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json

@@ -282,6 +282,13 @@
         "applyChanges": {
           "type": "boolean",
           "description": "Whether to automatically apply sync generator changes when running tasks. If not set, the user will be prompted. If set to `true`, the user will not be prompted and the changes will be applied. If set to `false`, the user will not be prompted and the changes will not be applied."
+        },
+        "disabledTaskSyncGenerators": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of registered task sync generators to disable."
         }
       },
       "additionalProperties": false

package/src/command-line/sync/sync.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.syncHandler = syncHandler;
 const ora = require("ora");
+const nx_json_1 = require("../../config/nx-json");
 const project_graph_1 = require("../../project-graph/project-graph");
 const output_1 = require("../../utils/output");
 const params_1 = require("../../utils/params");
@@ -10,7 +11,17 @@ const chalk = require("chalk");
 function syncHandler(options) {
     return (0, params_1.handleErrors)(options.verbose, async () => {
         const projectGraph = await (0, project_graph_1.createProjectGraphAsync)();
-        const syncGenerators = await (0, sync_generators_1.collectAllRegisteredSyncGenerators)(projectGraph);
+        const nxJson = (0, nx_json_1.readNxJson)();
+        const syncGenerators = await (0, sync_generators_1.collectAllRegisteredSyncGenerators)(projectGraph, nxJson);
+        if (!syncGenerators.length) {
+            output_1.output.success({
+                title: options.check
+                    ? 'The workspace is up to date'
+                    : 'The workspace is already up to date',
+                bodyLines: ['There are no sync generators to run.'],
+            });
+            return 0;
+        }
         const results = await (0, sync_generators_1.getSyncGeneratorChanges)(syncGenerators);
         if (!results.length) {
             output_1.output.success({

package/src/config/nx-json.d.ts

@@ -286,11 +286,15 @@ export interface NxSyncConfiguration {
     };
     /**
      * Whether to automatically apply sync generator changes when running tasks.
-     * If not set, the user will be prompted.
+     * If not set, the user will be prompted in interactive mode.
      * If set to `true`, the user will not be prompted and the changes will be applied.
      * If set to `false`, the user will not be prompted and the changes will not be applied.
      */
     applyChanges?: boolean;
+    /**
+     * List of registered task sync generators to disable.
+     */
+    disabledTaskSyncGenerators?: string[];
 }
 /**
  * Nx.json configuration

package/src/daemon/server/sync-generators.js

@@ -21,6 +21,7 @@ let registeredSyncGenerators;
 let scheduledTimeoutId;
 let storedProjectGraphHash;
 let storedNxJsonHash;
+let storedDisabledTaskSyncGeneratorsHash;
 const log = (...messageParts) => {
     logger_1.serverLogger.log('[SYNC]:', ...messageParts);
 };
@@ -107,6 +108,10 @@ function collectAndScheduleSyncGenerators(projectGraph) {
     // a change imply we need to re-run all the generators
     // make sure to schedule all the collected generators
     scheduledGenerators.clear();
+    if (!registeredSyncGenerators.size) {
+        // there are no generators to run
+        return;
+    }
     for (const generator of registeredSyncGenerators) {
         scheduledGenerators.add(generator);
     }
@@ -144,16 +149,19 @@ async function getCachedRegisteredSyncGenerators() {
     return [...registeredSyncGenerators];
 }
 function collectAllRegisteredSyncGenerators(projectGraph) {
+    const nxJson = (0, nx_json_1.readNxJson)();
     const projectGraphHash = hashProjectGraph(projectGraph);
-    if (storedProjectGraphHash !== projectGraphHash) {
+    const disabledTaskSyncGeneratorsHash = (0, file_hasher_1.hashArray)(nxJson.sync?.disabledTaskSyncGenerators?.sort() ?? []);
+    if (projectGraphHash !== storedProjectGraphHash ||
+        disabledTaskSyncGeneratorsHash !== storedDisabledTaskSyncGeneratorsHash) {
         storedProjectGraphHash = projectGraphHash;
+        storedDisabledTaskSyncGeneratorsHash = disabledTaskSyncGeneratorsHash;
         registeredTaskSyncGenerators =
-            (0, sync_generators_1.collectRegisteredTaskSyncGenerators)(projectGraph);
+            (0, sync_generators_1.collectEnabledTaskSyncGeneratorsFromProjectGraph)(projectGraph, nxJson);
     }
     else {
         log('project graph hash is the same, not collecting task sync generators');
     }
-    const nxJson = (0, nx_json_1.readNxJson)();
     const nxJsonHash = (0, file_hasher_1.hashArray)(nxJson.sync?.globalGenerators?.sort() ?? []);
     if (storedNxJsonHash !== nxJsonHash) {
         storedNxJsonHash = nxJsonHash;

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)) {
@@ -115,27 +90,16 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
     }
     else {
         const usesGithub = schema.github ?? (await (0, url_shorten_1.repoUsesGithub)(schema.github));
-        let responseFromCreateNxCloudWorkspaceV1;
         let responseFromCreateNxCloudWorkspaceV2;
         // do NOT create Nx Cloud token (createNxCloudWorkspace)
         // if user is using github and is running nx-connect
         if (!(usesGithub && schema.installationSource === 'nx-connect')) {
-            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;
         }
     }
 }

package/src/nx-cloud/update-manager.d.ts

@@ -11,7 +11,7 @@ export interface NxCloudClient {
     configureLightClientRequire: () => (paths: string[]) => void;
     commands: Record<string, () => Promise<void>>;
     nxCloudTasksRunner: TasksRunner<CloudTaskRunnerOptions>;
-    remoteCache: RemoteCacheV2;
+    getRemoteCache: () => RemoteCacheV2;
 }
 export declare function verifyOrUpdateNxCloudClient(options: CloudTaskRunnerOptions): Promise<{
     nxCloudClient: NxCloudClient;

package/src/plugins/js/project-graph/build-dependencies/target-project-locator.js

@@ -18,6 +18,13 @@ const defaultNpmResolutionCache = new Map();
 const builtInModuleSet = new Set([
     ...node_module_1.builtinModules,
     ...node_module_1.builtinModules.map((x) => `node:${x}`),
+    // These are missing in the builtinModules list
+    // See: https://github.com/nodejs/node/issues/42785
+    // TODO(v20): We should be safe to use `isBuiltin` function instead of keep the set here (https://nodejs.org/api/module.html#moduleisbuiltinmodulename)
+    'test',
+    'node:test',
+    'node:sea',
+    'node:sqlite',
 ]);
 function isBuiltinModuleImport(importExpr) {
     const packageName = (0, get_package_name_from_import_path_1.getPackageNameFromImportPath)(importExpr);
@@ -265,7 +272,7 @@ class TargetProjectLocator {
             // Resolve the main entry point of the package
             const pathOfFileInPackage = packageJsonPath ?? (0, resolve_relative_to_dir_1.resolveRelativeToDir)(packageName, relativeToDir);
             let dir = (0, node_path_1.dirname)(pathOfFileInPackage);
-            while (dir !== (0, node_path_1.parse)(dir).root) {
+            while (dir !== (0, node_path_1.dirname)(dir)) {
                 const packageJsonPath = (0, node_path_1.join)(dir, 'package.json');
                 try {
                     const parsedPackageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);

package/src/tasks-runner/cache.js

@@ -81,8 +81,8 @@ class DbCache {
         if ((0, nx_cloud_utils_1.isNxCloudUsed)(nxJson)) {
             const options = (0, get_cloud_options_1.getCloudOptions)();
             const { nxCloudClient } = await (0, update_manager_1.verifyOrUpdateNxCloudClient)(options);
-            if (nxCloudClient.remoteCache) {
-                return nxCloudClient.remoteCache;
+            if (nxCloudClient.getRemoteCache) {
+                return nxCloudClient.getRemoteCache();
             }
             else {
                 // old nx cloud instance

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

@@ -121,16 +121,7 @@ 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);
     // collect unique syncGenerators from the tasks
-    const uniqueSyncGenerators = new Set();
-    for (const { target } of Object.values(taskGraph.tasks)) {
-        const { syncGenerators } = projectGraph.nodes[target.project].data.targets[target.target];
-        if (!syncGenerators) {
-            continue;
-        }
-        for (const generator of syncGenerators) {
-            uniqueSyncGenerators.add(generator);
-        }
-    }
+    const uniqueSyncGenerators = (0, sync_generators_1.collectEnabledTaskSyncGeneratorsFromTaskGraph)(taskGraph, projectGraph, nxJson);
     if (!uniqueSyncGenerators.size) {
         // There are no sync generators registered in the tasks to run
         return { projectGraph, taskGraph };

package/src/utils/sync-generators.d.ts

@@ -1,5 +1,7 @@
 import type { GeneratorCallback } from '../config/misc-interfaces';
+import { type NxJsonConfiguration } from '../config/nx-json';
 import type { ProjectGraph } from '../config/project-graph';
+import type { TaskGraph } from '../config/task-graph';
 import type { ProjectConfiguration } from '../config/workspace-json-project-json';
 import { FsTree, type FileChange, type Tree } from '../generators/tree';
 export type SyncGeneratorResult = void | {
@@ -15,8 +17,9 @@ export type SyncGeneratorChangesResult = {
 };
 export declare function getSyncGeneratorChanges(generators: string[]): Promise<SyncGeneratorChangesResult[]>;
 export declare function flushSyncGeneratorChanges(results: SyncGeneratorChangesResult[]): Promise<void>;
-export declare function collectAllRegisteredSyncGenerators(projectGraph: ProjectGraph): Promise<string[]>;
+export declare function collectAllRegisteredSyncGenerators(projectGraph: ProjectGraph, nxJson: NxJsonConfiguration): Promise<string[]>;
 export declare function runSyncGenerator(tree: FsTree, generatorSpecifier: string, projects: Record<string, ProjectConfiguration>): Promise<SyncGeneratorChangesResult>;
-export declare function collectRegisteredTaskSyncGenerators(projectGraph: ProjectGraph): Set<string>;
-export declare function collectRegisteredGlobalSyncGenerators(nxJson?: import("../config/nx-json").NxJsonConfiguration<string[] | "*">): Set<string>;
+export declare function collectEnabledTaskSyncGeneratorsFromProjectGraph(projectGraph: ProjectGraph, nxJson: NxJsonConfiguration): Set<string>;
+export declare function collectEnabledTaskSyncGeneratorsFromTaskGraph(taskGraph: TaskGraph, projectGraph: ProjectGraph, nxJson: NxJsonConfiguration): Set<string>;
+export declare function collectRegisteredGlobalSyncGenerators(nxJson?: NxJsonConfiguration<string[] | "*">): Set<string>;
 export declare function syncGeneratorResultsToMessageLines(results: SyncGeneratorChangesResult[]): string[];

package/src/utils/sync-generators.js

@@ -4,7 +4,8 @@ exports.getSyncGeneratorChanges = getSyncGeneratorChanges;
 exports.flushSyncGeneratorChanges = flushSyncGeneratorChanges;
 exports.collectAllRegisteredSyncGenerators = collectAllRegisteredSyncGenerators;
 exports.runSyncGenerator = runSyncGenerator;
-exports.collectRegisteredTaskSyncGenerators = collectRegisteredTaskSyncGenerators;
+exports.collectEnabledTaskSyncGeneratorsFromProjectGraph = collectEnabledTaskSyncGeneratorsFromProjectGraph;
+exports.collectEnabledTaskSyncGeneratorsFromTaskGraph = collectEnabledTaskSyncGeneratorsFromTaskGraph;
 exports.collectRegisteredGlobalSyncGenerators = collectRegisteredGlobalSyncGenerators;
 exports.syncGeneratorResultsToMessageLines = syncGeneratorResultsToMessageLines;
 const perf_hooks_1 = require("perf_hooks");
@@ -39,10 +40,10 @@ async function flushSyncGeneratorChanges(results) {
         await client_1.daemonClient.flushSyncGeneratorChangesToDisk(results.map((r) => r.generatorName));
     }
 }
-async function collectAllRegisteredSyncGenerators(projectGraph) {
+async function collectAllRegisteredSyncGenerators(projectGraph, nxJson) {
     if (!client_1.daemonClient.enabled()) {
         return [
-            ...collectRegisteredTaskSyncGenerators(projectGraph),
+            ...collectEnabledTaskSyncGeneratorsFromProjectGraph(projectGraph, nxJson),
             ...collectRegisteredGlobalSyncGenerators(),
         ];
     }
@@ -69,17 +70,38 @@ async function runSyncGenerator(tree, generatorSpecifier, projects) {
         outOfSyncMessage,
     };
 }
-function collectRegisteredTaskSyncGenerators(projectGraph) {
+function collectEnabledTaskSyncGeneratorsFromProjectGraph(projectGraph, nxJson) {
     const taskSyncGenerators = new Set();
+    const disabledTaskSyncGenerators = new Set(nxJson.sync?.disabledTaskSyncGenerators ?? []);
     for (const { data: { targets }, } of Object.values(projectGraph.nodes)) {
         if (!targets) {
             continue;
         }
         for (const target of Object.values(targets)) {
-            if (!target.syncGenerators) {
+            if (!target.syncGenerators?.length) {
                 continue;
             }
             for (const generator of target.syncGenerators) {
+                if (!disabledTaskSyncGenerators.has(generator) &&
+                    !taskSyncGenerators.has(generator)) {
+                    taskSyncGenerators.add(generator);
+                }
+            }
+        }
+    }
+    return taskSyncGenerators;
+}
+function collectEnabledTaskSyncGeneratorsFromTaskGraph(taskGraph, projectGraph, nxJson) {
+    const taskSyncGenerators = new Set();
+    const disabledTaskSyncGenerators = new Set(nxJson.sync?.disabledTaskSyncGenerators ?? []);
+    for (const { target } of Object.values(taskGraph.tasks)) {
+        const { syncGenerators } = projectGraph.nodes[target.project].data.targets[target.target];
+        if (!syncGenerators?.length) {
+            continue;
+        }
+        for (const generator of syncGenerators) {
+            if (!disabledTaskSyncGenerators.has(generator) &&
+                !taskSyncGenerators.has(generator)) {
                 taskSyncGenerators.add(generator);
             }
         }