nx 19.6.0-canary.20240813-c72ba9b → 19.6.0-rc.0

package/src/daemon/server/project-graph-incremental-recomputation.js

@@ -146,7 +146,7 @@ async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
         perf_hooks_1.performance.mark('hash-watched-changes-start');
         const updatedFiles = [...collectedUpdatedFiles.values()];
         const deletedFiles = [...collectedDeletedFiles.values()];
-        let updatedFileHashes = (0, workspace_context_1.updateFilesInContext)(updatedFiles, deletedFiles);
+        let updatedFileHashes = (0, workspace_context_1.updateFilesInContext)(workspace_root_1.workspaceRoot, updatedFiles, deletedFiles);
         perf_hooks_1.performance.mark('hash-watched-changes-end');
         perf_hooks_1.performance.measure('hash changed files from watcher', 'hash-watched-changes-start', 'hash-watched-changes-end');
         logger_1.serverLogger.requestLog(`Updated workspace context based on watched changes, recomputing project graph...`);

package/src/project-graph/project-graph.js

@@ -225,7 +225,7 @@ async function createProjectGraphAndSourceMapsAsync(opts = {
             return projectGraphAndSourceMaps;
         }
         catch (e) {
-            if (e.message.indexOf('inotify_add_watch') > -1) {
+            if (e.message && e.message.indexOf('inotify_add_watch') > -1) {
                 // common errors with the daemon due to OS settings (cannot watch all the files available)
                 output_1.output.note({
                     title: `Unable to start Nx Daemon due to the limited amount of inotify watches, continuing without the daemon.`,

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

@@ -118,9 +118,6 @@ 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 (process.env.NX_ENABLE_SYNC_GENERATORS !== 'true') {
-        return { projectGraph, taskGraph };
-    }
     // collect unique syncGenerators from the tasks
     const uniqueSyncGenerators = new Set();
     for (const { target } of Object.values(taskGraph.tasks)) {
@@ -143,7 +140,7 @@ async function ensureWorkspaceIsInSyncAndGetGraphs(projectGraph, nxJson, project
         return { projectGraph, taskGraph };
     }
     const outOfSyncTitle = 'The workspace is out of sync';
-    const resultBodyLines = (0, sync_generators_1.syncGeneratorResultsToMessageLines)(results);
+    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 willErrorOnCiMessage = 'Please note that this will be an error on CI.';
     if ((0, is_ci_1.isCI)() || !process.stdout.isTTY) {
@@ -211,23 +208,28 @@ Please make sure to commit the changes to your repository.`);
     return { projectGraph, taskGraph };
 }
 async function promptForApplyingSyncGeneratorChanges() {
-    const promptConfig = {
-        name: 'applyChanges',
-        type: 'select',
-        message: 'Would you like to sync the changes to get your worskpace up to date?',
-        choices: [
-            {
-                name: 'yes',
-                message: 'Yes, sync the changes and run the tasks',
-            },
-            {
-                name: 'no',
-                message: 'No, run the tasks without syncing the changes',
-            },
-        ],
-        footer: () => chalk.dim('\nYou can skip this prompt by setting the `sync.applyChanges` option in your `nx.json`.'),
-    };
-    return await (0, enquirer_1.prompt)([promptConfig]).then(({ applyChanges }) => applyChanges === 'yes');
+    try {
+        const promptConfig = {
+            name: 'applyChanges',
+            type: 'select',
+            message: 'Would you like to sync the changes to get your worskpace up to date?',
+            choices: [
+                {
+                    name: 'yes',
+                    message: 'Yes, sync the changes and run the tasks',
+                },
+                {
+                    name: 'no',
+                    message: 'No, run the tasks without syncing the changes',
+                },
+            ],
+            footer: () => chalk.dim('\nYou can skip this prompt by setting the `sync.applyChanges` option in your `nx.json`.'),
+        };
+        return await (0, enquirer_1.prompt)([promptConfig]).then(({ applyChanges }) => applyChanges === 'yes');
+    }
+    catch {
+        process.exit(1);
+    }
 }
 function setEnvVarsBasedOnArgs(nxArgs, loadDotEnvFiles) {
     if (nxArgs.outputStyle == 'stream' ||

package/src/utils/sync-generators.js

@@ -103,7 +103,6 @@ function syncGeneratorResultsToMessageLines(results) {
         if (result.outOfSyncMessage) {
             messageLines.push(result.outOfSyncMessage);
         }
-        messageLines.push('');
     }
     return messageLines;
 }
@@ -130,7 +129,7 @@ async function flushSyncGeneratorChangesToDisk(results) {
         }
     }
     // Update the context files
-    await (0, workspace_context_1.updateContextWithChangedFiles)(createdFiles, updatedFiles, deletedFiles);
+    await (0, workspace_context_1.updateContextWithChangedFiles)(workspace_root_1.workspaceRoot, createdFiles, updatedFiles, deletedFiles);
     perf_hooks_1.performance.mark('flush-sync-generator-changes-to-disk:end');
     perf_hooks_1.performance.measure('flush sync generator changes to disk', 'flush-sync-generator-changes-to-disk:start', 'flush-sync-generator-changes-to-disk:end');
 }

package/src/utils/workspace-context.d.ts

@@ -11,8 +11,8 @@ export declare function getNxWorkspaceFilesFromContext(workspaceRoot: string, pr
 export declare function globWithWorkspaceContextSync(workspaceRoot: string, globs: string[], exclude?: string[]): string[];
 export declare function globWithWorkspaceContext(workspaceRoot: string, globs: string[], exclude?: string[]): Promise<string[]>;
 export declare function hashWithWorkspaceContext(workspaceRoot: string, globs: string[], exclude?: string[]): Promise<string>;
-export declare function updateContextWithChangedFiles(createdFiles: string[], updatedFiles: string[], deletedFiles: string[]): Promise<void>;
-export declare function updateFilesInContext(updatedFiles: string[], deletedFiles: string[]): Record<string, string>;
+export declare function updateContextWithChangedFiles(workspaceRoot: string, createdFiles: string[], updatedFiles: string[], deletedFiles: string[]): Promise<void>;
+export declare function updateFilesInContext(workspaceRoot: string, updatedFiles: string[], deletedFiles: string[]): Record<string, string>;
 export declare function getAllFileDataInContext(workspaceRoot: string): Promise<import("../native").FileData[]>;
 export declare function getFilesInDirectoryUsingContext(workspaceRoot: string, dir: string): Promise<string[]>;
 export declare function updateProjectFiles(projectRootMappings: Record<string, string>, rustReferences: NxWorkspaceFilesExternals, updatedFiles: Record<string, string>, deletedFiles: string[]): import("../native").UpdatedWorkspaceFiles;

package/src/utils/workspace-context.js

@@ -57,9 +57,9 @@ async function hashWithWorkspaceContext(workspaceRoot, globs, exclude) {
     }
     return client_1.daemonClient.hashGlob(globs, exclude);
 }
-async function updateContextWithChangedFiles(createdFiles, updatedFiles, deletedFiles) {
+async function updateContextWithChangedFiles(workspaceRoot, createdFiles, updatedFiles, deletedFiles) {
     if (!client_1.daemonClient.enabled()) {
-        updateFilesInContext([...createdFiles, ...updatedFiles], deletedFiles);
+        updateFilesInContext(workspaceRoot, [...createdFiles, ...updatedFiles], deletedFiles);
     }
     else if ((0, is_on_daemon_1.isOnDaemon)()) {
         // make sure to only import this when running on the daemon
@@ -72,7 +72,8 @@ async function updateContextWithChangedFiles(createdFiles, updatedFiles, deleted
         await client_1.daemonClient.updateWorkspaceContext(createdFiles, updatedFiles, deletedFiles);
     }
 }
-function updateFilesInContext(updatedFiles, deletedFiles) {
+function updateFilesInContext(workspaceRoot, updatedFiles, deletedFiles) {
+    ensureContextAvailable(workspaceRoot);
     return workspaceContext?.incrementalUpdate(updatedFiles, deletedFiles);
 }
 async function getAllFileDataInContext(workspaceRoot) {