nx 19.6.0-beta.4 → 19.6.0-beta.6

package/bin/post-install.js

@@ -28,6 +28,7 @@ const logger_1 = require("../src/utils/logger");
             if ((0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())) {
                 tasks.push((0, update_manager_1.verifyOrUpdateNxCloudClient)((0, get_cloud_options_1.getCloudOptions)()));
             }
+            process.env.NX_DAEMON = 'false';
             await Promise.all(tasks.map((promise) => {
                 return promise.catch((e) => {
                     if (process.env.NX_VERBOSE_LOGGING === 'true') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.6.0-beta.4",
+  "version": "19.6.0-beta.6",
   "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.6.0-beta.4"
+    "@nrwl/tao": "19.6.0-beta.6"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.6.0-beta.4",
-    "@nx/nx-darwin-arm64": "19.6.0-beta.4",
-    "@nx/nx-linux-x64-gnu": "19.6.0-beta.4",
-    "@nx/nx-linux-x64-musl": "19.6.0-beta.4",
-    "@nx/nx-win32-x64-msvc": "19.6.0-beta.4",
-    "@nx/nx-linux-arm64-gnu": "19.6.0-beta.4",
-    "@nx/nx-linux-arm64-musl": "19.6.0-beta.4",
-    "@nx/nx-linux-arm-gnueabihf": "19.6.0-beta.4",
-    "@nx/nx-win32-arm64-msvc": "19.6.0-beta.4",
-    "@nx/nx-freebsd-x64": "19.6.0-beta.4"
+    "@nx/nx-darwin-x64": "19.6.0-beta.6",
+    "@nx/nx-darwin-arm64": "19.6.0-beta.6",
+    "@nx/nx-linux-x64-gnu": "19.6.0-beta.6",
+    "@nx/nx-linux-x64-musl": "19.6.0-beta.6",
+    "@nx/nx-win32-x64-msvc": "19.6.0-beta.6",
+    "@nx/nx-linux-arm64-gnu": "19.6.0-beta.6",
+    "@nx/nx-linux-arm64-musl": "19.6.0-beta.6",
+    "@nx/nx-linux-arm-gnueabihf": "19.6.0-beta.6",
+    "@nx/nx-win32-arm64-msvc": "19.6.0-beta.6",
+    "@nx/nx-freebsd-x64": "19.6.0-beta.6"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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/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)) {

package/src/utils/sync-generators.js

@@ -130,7 +130,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) {