nx 22.0.1 → 22.0.2

package/src/daemon/server/server.js

@@ -54,6 +54,7 @@ const handle_flush_sync_generator_changes_to_disk_1 = require("./handle-flush-sy
 const run_tasks_execution_hooks_1 = require("../message-types/run-tasks-execution-hooks");
 const handle_tasks_execution_hooks_1 = require("./handle-tasks-execution-hooks");
 const register_project_graph_listener_1 = require("../message-types/register-project-graph-listener");
+const v8_1 = require("v8");
 let performanceObserver;
 let workspaceWatcherError;
 let outputsWatcherError;
@@ -99,32 +100,41 @@ async function handleMessage(socket, data) {
     (0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
     const unparsedPayload = data;
     let payload;
+    let mode = 'json';
     try {
-        payload = JSON.parse(unparsedPayload);
+        // JSON Message
+        if ((0, consume_messages_from_socket_1.isJsonMessage)(unparsedPayload)) {
+            payload = JSON.parse(unparsedPayload);
+        }
+        else {
+            // V8 Serialized Message
+            payload = (0, v8_1.deserialize)(Buffer.from(unparsedPayload, 'binary'));
+            mode = 'v8';
+        }
     }
     catch (e) {
         await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Invalid payload from the client`, new Error(`Unsupported payload sent to daemon server: ${unparsedPayload}`));
     }
     if (payload.type === 'PING') {
-        await handleResult(socket, 'PING', () => Promise.resolve({ response: JSON.stringify(true), description: 'ping' }));
+        await handleResult(socket, 'PING', () => Promise.resolve({ response: true, description: 'ping' }), mode);
     }
     else if (payload.type === 'REQUEST_PROJECT_GRAPH') {
-        await handleResult(socket, 'REQUEST_PROJECT_GRAPH', () => (0, handle_request_project_graph_1.handleRequestProjectGraph)());
+        await handleResult(socket, 'REQUEST_PROJECT_GRAPH', () => (0, handle_request_project_graph_1.handleRequestProjectGraph)(), mode);
     }
     else if (payload.type === 'HASH_TASKS') {
-        await handleResult(socket, 'HASH_TASKS', () => (0, handle_hash_tasks_1.handleHashTasks)(payload));
+        await handleResult(socket, 'HASH_TASKS', () => (0, handle_hash_tasks_1.handleHashTasks)(payload), mode);
     }
     else if (payload.type === 'PROCESS_IN_BACKGROUND') {
-        await handleResult(socket, 'PROCESS_IN_BACKGROUND', () => (0, handle_process_in_background_1.handleProcessInBackground)(payload));
+        await handleResult(socket, 'PROCESS_IN_BACKGROUND', () => (0, handle_process_in_background_1.handleProcessInBackground)(payload), mode);
     }
     else if (payload.type === 'RECORD_OUTPUTS_HASH') {
-        await handleResult(socket, 'RECORD_OUTPUTS_HASH', () => (0, handle_outputs_tracking_1.handleRecordOutputsHash)(payload));
+        await handleResult(socket, 'RECORD_OUTPUTS_HASH', () => (0, handle_outputs_tracking_1.handleRecordOutputsHash)(payload), mode);
     }
     else if (payload.type === 'OUTPUTS_HASHES_MATCH') {
-        await handleResult(socket, 'OUTPUTS_HASHES_MATCH', () => (0, handle_outputs_tracking_1.handleOutputsHashesMatch)(payload));
+        await handleResult(socket, 'OUTPUTS_HASHES_MATCH', () => (0, handle_outputs_tracking_1.handleOutputsHashesMatch)(payload), mode);
     }
     else if (payload.type === 'REQUEST_SHUTDOWN') {
-        await handleResult(socket, 'REQUEST_SHUTDOWN', () => (0, handle_request_shutdown_1.handleRequestShutdown)(server, numberOfOpenConnections));
+        await handleResult(socket, 'REQUEST_SHUTDOWN', () => (0, handle_request_shutdown_1.handleRequestShutdown)(server, numberOfOpenConnections), mode);
     }
     else if (payload.type === 'REGISTER_FILE_WATCHER') {
         file_watcher_sockets_1.registeredFileWatcherSockets.push({ socket, config: payload.config });
@@ -133,61 +143,61 @@ async function handleMessage(socket, data) {
         project_graph_listener_sockets_1.registeredProjectGraphListenerSockets.push(socket);
     }
     else if ((0, glob_1.isHandleGlobMessage)(payload)) {
-        await handleResult(socket, glob_1.GLOB, () => (0, handle_glob_1.handleGlob)(payload.globs, payload.exclude));
+        await handleResult(socket, glob_1.GLOB, () => (0, handle_glob_1.handleGlob)(payload.globs, payload.exclude), mode);
     }
     else if ((0, glob_1.isHandleMultiGlobMessage)(payload)) {
-        await handleResult(socket, glob_1.MULTI_GLOB, () => (0, handle_glob_1.handleMultiGlob)(payload.globs, payload.exclude));
+        await handleResult(socket, glob_1.MULTI_GLOB, () => (0, handle_glob_1.handleMultiGlob)(payload.globs, payload.exclude), mode);
     }
     else if ((0, get_nx_workspace_files_1.isHandleNxWorkspaceFilesMessage)(payload)) {
-        await handleResult(socket, get_nx_workspace_files_1.GET_NX_WORKSPACE_FILES, () => (0, handle_nx_workspace_files_1.handleNxWorkspaceFiles)(payload.projectRootMap));
+        await handleResult(socket, get_nx_workspace_files_1.GET_NX_WORKSPACE_FILES, () => (0, handle_nx_workspace_files_1.handleNxWorkspaceFiles)(payload.projectRootMap), mode);
     }
     else if ((0, get_files_in_directory_1.isHandleGetFilesInDirectoryMessage)(payload)) {
-        await handleResult(socket, get_files_in_directory_1.GET_FILES_IN_DIRECTORY, () => (0, handle_get_files_in_directory_1.handleGetFilesInDirectory)(payload.dir));
+        await handleResult(socket, get_files_in_directory_1.GET_FILES_IN_DIRECTORY, () => (0, handle_get_files_in_directory_1.handleGetFilesInDirectory)(payload.dir), mode);
     }
     else if ((0, get_context_file_data_1.isHandleContextFileDataMessage)(payload)) {
-        await handleResult(socket, get_context_file_data_1.GET_CONTEXT_FILE_DATA, () => (0, handle_context_file_data_1.handleContextFileData)());
+        await handleResult(socket, get_context_file_data_1.GET_CONTEXT_FILE_DATA, () => (0, handle_context_file_data_1.handleContextFileData)(), mode);
     }
     else if ((0, hash_glob_1.isHandleHashGlobMessage)(payload)) {
-        await handleResult(socket, hash_glob_1.HASH_GLOB, () => (0, handle_hash_glob_1.handleHashGlob)(payload.globs, payload.exclude));
+        await handleResult(socket, hash_glob_1.HASH_GLOB, () => (0, handle_hash_glob_1.handleHashGlob)(payload.globs, payload.exclude), mode);
     }
     else if ((0, hash_glob_1.isHandleHashMultiGlobMessage)(payload)) {
-        await handleResult(socket, hash_glob_1.HASH_GLOB, () => (0, handle_hash_glob_1.handleHashMultiGlob)(payload.globGroups));
+        await handleResult(socket, hash_glob_1.HASH_GLOB, () => (0, handle_hash_glob_1.handleHashMultiGlob)(payload.globGroups), mode);
     }
     else if ((0, task_history_1.isHandleGetFlakyTasksMessage)(payload)) {
-        await handleResult(socket, task_history_1.GET_FLAKY_TASKS, () => (0, handle_task_history_1.handleGetFlakyTasks)(payload.hashes));
+        await handleResult(socket, task_history_1.GET_FLAKY_TASKS, () => (0, handle_task_history_1.handleGetFlakyTasks)(payload.hashes), mode);
     }
     else if ((0, task_history_1.isHandleGetEstimatedTaskTimings)(payload)) {
-        await handleResult(socket, task_history_1.GET_ESTIMATED_TASK_TIMINGS, () => (0, handle_task_history_1.handleGetEstimatedTaskTimings)(payload.targets));
+        await handleResult(socket, task_history_1.GET_ESTIMATED_TASK_TIMINGS, () => (0, handle_task_history_1.handleGetEstimatedTaskTimings)(payload.targets), mode);
     }
     else if ((0, task_history_1.isHandleWriteTaskRunsToHistoryMessage)(payload)) {
-        await handleResult(socket, task_history_1.RECORD_TASK_RUNS, () => (0, handle_task_history_1.handleRecordTaskRuns)(payload.taskRuns));
+        await handleResult(socket, task_history_1.RECORD_TASK_RUNS, () => (0, handle_task_history_1.handleRecordTaskRuns)(payload.taskRuns), mode);
     }
     else if ((0, force_shutdown_1.isHandleForceShutdownMessage)(payload)) {
-        await handleResult(socket, 'FORCE_SHUTDOWN', () => (0, handle_force_shutdown_1.handleForceShutdown)(server));
+        await handleResult(socket, 'FORCE_SHUTDOWN', () => (0, handle_force_shutdown_1.handleForceShutdown)(server), mode);
     }
     else if ((0, get_sync_generator_changes_1.isHandleGetSyncGeneratorChangesMessage)(payload)) {
-        await handleResult(socket, get_sync_generator_changes_1.GET_SYNC_GENERATOR_CHANGES, () => (0, handle_get_sync_generator_changes_1.handleGetSyncGeneratorChanges)(payload.generators));
+        await handleResult(socket, get_sync_generator_changes_1.GET_SYNC_GENERATOR_CHANGES, () => (0, handle_get_sync_generator_changes_1.handleGetSyncGeneratorChanges)(payload.generators), mode);
     }
     else if ((0, flush_sync_generator_changes_to_disk_1.isHandleFlushSyncGeneratorChangesToDiskMessage)(payload)) {
-        await handleResult(socket, flush_sync_generator_changes_to_disk_1.FLUSH_SYNC_GENERATOR_CHANGES_TO_DISK, () => (0, handle_flush_sync_generator_changes_to_disk_1.handleFlushSyncGeneratorChangesToDisk)(payload.generators));
+        await handleResult(socket, flush_sync_generator_changes_to_disk_1.FLUSH_SYNC_GENERATOR_CHANGES_TO_DISK, () => (0, handle_flush_sync_generator_changes_to_disk_1.handleFlushSyncGeneratorChangesToDisk)(payload.generators), mode);
     }
     else if ((0, get_registered_sync_generators_1.isHandleGetRegisteredSyncGeneratorsMessage)(payload)) {
-        await handleResult(socket, get_registered_sync_generators_1.GET_REGISTERED_SYNC_GENERATORS, () => (0, handle_get_registered_sync_generators_1.handleGetRegisteredSyncGenerators)());
+        await handleResult(socket, get_registered_sync_generators_1.GET_REGISTERED_SYNC_GENERATORS, () => (0, handle_get_registered_sync_generators_1.handleGetRegisteredSyncGenerators)(), mode);
     }
     else if ((0, update_workspace_context_1.isHandleUpdateWorkspaceContextMessage)(payload)) {
-        await handleResult(socket, update_workspace_context_1.UPDATE_WORKSPACE_CONTEXT, () => (0, handle_update_workspace_context_1.handleUpdateWorkspaceContext)(payload.createdFiles, payload.updatedFiles, payload.deletedFiles));
+        await handleResult(socket, update_workspace_context_1.UPDATE_WORKSPACE_CONTEXT, () => (0, handle_update_workspace_context_1.handleUpdateWorkspaceContext)(payload.createdFiles, payload.updatedFiles, payload.deletedFiles), mode);
     }
     else if ((0, run_tasks_execution_hooks_1.isHandlePreTasksExecutionMessage)(payload)) {
-        await handleResult(socket, run_tasks_execution_hooks_1.PRE_TASKS_EXECUTION, () => (0, handle_tasks_execution_hooks_1.handleRunPreTasksExecution)(payload.context));
+        await handleResult(socket, run_tasks_execution_hooks_1.PRE_TASKS_EXECUTION, () => (0, handle_tasks_execution_hooks_1.handleRunPreTasksExecution)(payload.context), mode);
     }
     else if ((0, run_tasks_execution_hooks_1.isHandlePostTasksExecutionMessage)(payload)) {
-        await handleResult(socket, run_tasks_execution_hooks_1.POST_TASKS_EXECUTION, () => (0, handle_tasks_execution_hooks_1.handleRunPostTasksExecution)(payload.context));
+        await handleResult(socket, run_tasks_execution_hooks_1.POST_TASKS_EXECUTION, () => (0, handle_tasks_execution_hooks_1.handleRunPostTasksExecution)(payload.context), mode);
     }
     else {
         await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Invalid payload from the client`, new Error(`Unsupported payload sent to daemon server: ${unparsedPayload}`));
     }
 }
-async function handleResult(socket, type, hrFn) {
+async function handleResult(socket, type, hrFn, mode) {
     let hr;
     const startMark = new Date();
     try {
@@ -201,10 +211,13 @@ async function handleResult(socket, type, hrFn) {
         await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, hr.description, hr.error);
     }
     else {
-        await (0, shutdown_utils_1.respondToClient)(socket, hr.response, hr.description);
+        const response = typeof hr.response === 'string'
+            ? hr.response
+            : serializeUnserializedResult(hr.response, mode);
+        await (0, shutdown_utils_1.respondToClient)(socket, response, hr.description);
     }
     const endMark = new Date();
-    logger_1.serverLogger.log(`Handled ${type}. Handling time: ${doneHandlingMark.getTime() - startMark.getTime()}. Response time: ${endMark.getTime() - doneHandlingMark.getTime()}.`);
+    logger_1.serverLogger.log(`Handled ${mode} message ${type}. Handling time: ${doneHandlingMark.getTime() - startMark.getTime()}. Response time: ${endMark.getTime() - doneHandlingMark.getTime()}.`);
 }
 function handleInactivityTimeout() {
     if ((0, file_watcher_sockets_1.hasRegisteredFileWatcherSockets)() ||
@@ -415,3 +428,11 @@ async function startServer() {
         }
     });
 }
+function serializeUnserializedResult(response, mode) {
+    if (mode === 'json') {
+        return JSON.stringify(response);
+    }
+    else {
+        return (0, v8_1.serialize)(response).toString('binary');
+    }
+}

package/src/daemon/server/shutdown-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shutdown-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/shutdown-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAI1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAQ5C,eAAO,MAAM,4BAA4B,EAAG,QAAiB,CAAC;AAI9D,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,QAErD;AAED,wBAAgB,kBAAkB,YAEjC;AAID,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,OAAO,QAE3D;AAED,wBAAgB,wBAAwB,YAEvC;AAED,UAAU,oCAAoC;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC3B;AAED,wBAAsB,8BAA8B,CAAC,EACnD,MAAM,EACN,MAAM,EACN,OAAO,GACR,EAAE,oCAAoC,iBAmCtC;AAID,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAK3D;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,oBAcpB;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,KAAK,iBAsBb"}
+{"version":3,"file":"shutdown-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/shutdown-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAI1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAS5C,eAAO,MAAM,4BAA4B,EAAG,QAAiB,CAAC;AAI9D,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,OAAO,QAErD;AAED,wBAAgB,kBAAkB,YAEjC;AAID,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,OAAO,QAE3D;AAED,wBAAgB,wBAAwB,YAEvC;AAED,UAAU,oCAAoC;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC3B;AAED,wBAAsB,8BAA8B,CAAC,EACnD,MAAM,EACN,MAAM,EACN,OAAO,GACR,EAAE,oCAAoC,iBAmCtC;AAID,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI,CAK3D;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,oBAcpB;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,KAAK,iBAsBb"}

package/src/daemon/server/shutdown-utils.js

@@ -16,6 +16,7 @@ const cache_1 = require("../cache");
 const error_types_1 = require("../../project-graph/error-types");
 const db_connection_1 = require("../../utils/db-connection");
 const get_plugins_1 = require("../../project-graph/plugins/get-plugins");
+const consume_messages_from_socket_1 = require("../../utils/consume-messages-from-socket");
 exports.SERVER_INACTIVITY_TIMEOUT_MS = 10800000; // 10800000 ms = 3 hours
 let watcherInstance;
 function storeWatcherInstance(instance) {
@@ -70,7 +71,7 @@ function respondToClient(socket, response, description) {
         if (description) {
             logger_1.serverLogger.requestLog(`Responding to the client.`, description);
         }
-        socket.write(`${response}${String.fromCodePoint(4)}`, (err) => {
+        socket.write(response + consume_messages_from_socket_1.MESSAGE_END_SEQ, (err) => {
             if (err) {
                 console.error(err);
             }

package/src/daemon/socket-utils.d.ts

@@ -10,4 +10,15 @@ export declare const getForkedProcessOsSocketPath: (id: string) => string;
 export declare const getPluginOsSocketPath: (id: string) => string;
 export declare function killSocketOrPath(): void;
 export declare function serializeResult(error: Error | null, serializedProjectGraph: string | null, serializedSourceMaps: string | null): string | null;
+/**
+ * Helper to serialize data either using v8 serialization or JSON serialization, based on
+ * the user's preference and the success of each method. Should only be used by "client" side
+ * connections, daemon or other servers should respond based on the type of serialization used
+ * by the client it is communicating with.
+ *
+ * @param data Data to serialize
+ * @param force Forces one serialization method over the other
+ * @returns Serialized data as a string
+ */
+export declare function serialize(data: any, force?: 'v8' | 'json'): string;
 //# sourceMappingURL=socket-utils.d.ts.map

package/src/daemon/socket-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/socket-utils.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,SAAS,SAAyB,CAAC;AAEhD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,cAM/B,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,IAAI,MAAM,WAMtD,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,IAAI,MAAM,WAM/C,CAAC;AAgBF,wBAAgB,gBAAgB,IAAI,IAAI,CAIvC;AAGD,wBAAgB,eAAe,CAC7B,KAAK,EAAE,KAAK,GAAG,IAAI,EACnB,sBAAsB,EAAE,MAAM,GAAG,IAAI,EACrC,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAClC,MAAM,GAAG,IAAI,CAKf"}
+{"version":3,"file":"socket-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/socket-utils.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,SAAS,SAAyB,CAAC;AAEhD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,cAM/B,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,IAAI,MAAM,WAMtD,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,IAAI,MAAM,WAM/C,CAAC;AAgBF,wBAAgB,gBAAgB,IAAI,IAAI,CAIvC;AAGD,wBAAgB,eAAe,CAC7B,KAAK,EAAE,KAAK,GAAG,IAAI,EACnB,sBAAsB,EAAE,MAAM,GAAG,IAAI,EACrC,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAClC,MAAM,GAAG,IAAI,CAKf;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CA4BlE"}

package/src/daemon/socket-utils.js

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPluginOsSocketPath = exports.getForkedProcessOsSocketPath = exports.getFullOsSocketPath = exports.isWindows = void 0;
 exports.killSocketOrPath = killSocketOrPath;
 exports.serializeResult = serializeResult;
+exports.serialize = serialize;
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
 const tmp_dir_1 = require("./tmp-dir");
 const serializable_error_1 = require("../utils/serializable-error");
+const is_v8_serializer_enabled_1 = require("./is-v8-serializer-enabled");
+const v8_1 = require("v8");
 exports.isWindows = (0, os_1.platform)() === 'win32';
 /**
  * For IPC with the daemon server we use unix sockets or windows named pipes, depending on the user's operating system.
@@ -53,3 +56,41 @@ function serializeResult(error, serializedProjectGraph, serializedSourceMaps) {
     // We do not want to repeat work `JSON.stringify`ing an object containing the potentially large project graph so merge as strings
     return `{ "error": ${JSON.stringify(error ? (0, serializable_error_1.createSerializableError)(error) : error)}, "projectGraph": ${serializedProjectGraph}, "sourceMaps": ${serializedSourceMaps} }`;
 }
+/**
+ * Helper to serialize data either using v8 serialization or JSON serialization, based on
+ * the user's preference and the success of each method. Should only be used by "client" side
+ * connections, daemon or other servers should respond based on the type of serialization used
+ * by the client it is communicating with.
+ *
+ * @param data Data to serialize
+ * @param force Forces one serialization method over the other
+ * @returns Serialized data as a string
+ */
+function serialize(data, force) {
+    if (force === 'v8' || (0, is_v8_serializer_enabled_1.isV8SerializerEnabled)()) {
+        try {
+            return (0, v8_1.serialize)(data).toString('binary');
+        }
+        catch (e) {
+            if (force !== 'v8') {
+                console.warn(`Data could not be serialized using v8 serialization: ${e}. Falling back to JSON serialization.`);
+                // Fall back to JSON serialization
+                return JSON.stringify(data);
+            }
+            throw e;
+        }
+    }
+    else {
+        try {
+            return JSON.stringify(data);
+        }
+        catch (e) {
+            if (force !== 'json') {
+                // Fall back to v8 serialization
+                console.warn(`Data could not be serialized using JSON.stringify: ${e}. Falling back to v8 serialization.`);
+                return (0, v8_1.serialize)(data).toString('binary');
+            }
+            throw e;
+        }
+    }
+}

package/src/devkit-internals.d.ts

@@ -29,4 +29,5 @@ export { isCI } from './utils/is-ci';
 export { isUsingPrettierInTree } from './utils/is-using-prettier';
 export { readYamlFile } from './utils/fileutils';
 export { globalSpinner } from './utils/spinner';
+export { signalToCode } from './utils/exit-codes';
 //# sourceMappingURL=devkit-internals.d.ts.map

package/src/devkit-internals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devkit-internals.d.ts","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-internals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gDAAgD,EAAE,MAAM,gDAAgD,CAAC;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kDAAkD,EAClD,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"devkit-internals.d.ts","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-internals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gDAAgD,EAAE,MAAM,gDAAgD,CAAC;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kDAAkD,EAClD,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC"}

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.globalSpinner = exports.readYamlFile = exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.getIgnoreObjectForTree = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.signalToCode = exports.globalSpinner = exports.readYamlFile = exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.getIgnoreObjectForTree = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -63,3 +63,5 @@ var fileutils_1 = require("./utils/fileutils");
 Object.defineProperty(exports, "readYamlFile", { enumerable: true, get: function () { return fileutils_1.readYamlFile; } });
 var spinner_1 = require("./utils/spinner");
 Object.defineProperty(exports, "globalSpinner", { enumerable: true, get: function () { return spinner_1.globalSpinner; } });
+var exit_codes_1 = require("./utils/exit-codes");
+Object.defineProperty(exports, "signalToCode", { enumerable: true, get: function () { return exit_codes_1.signalToCode; } });

package/src/plugins/js/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/plugins/js/index.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,kBAAkB,EAIlB,aAAa,EACd,MAAM,6BAA6B,CAAC;AAkBrC,eAAO,MAAM,IAAI,oCAAoC,CAAC;AAStD,eAAO,MAAM,aAAa,EAAE,aAK3B,CAAC;AA8CF,eAAO,MAAM,kBAAkB,EAAE,kBAkDhC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/plugins/js/index.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,kBAAkB,EAIlB,aAAa,EACd,MAAM,6BAA6B,CAAC;AAkBrC,eAAO,MAAM,IAAI,oCAAoC,CAAC;AAKtD,eAAO,MAAM,aAAa,EAAE,aAK3B,CAAC;AAkDF,eAAO,MAAM,kBAAkB,EAAE,kBAgDhC,CAAC"}

package/src/plugins/js/index.js

@@ -16,7 +16,8 @@ const lock_file_1 = require("./lock-file/lock-file");
 const build_dependencies_1 = require("./project-graph/build-dependencies/build-dependencies");
 const config_1 = require("./utils/config");
 exports.name = 'nx/js/dependencies-and-lockfile';
-let parsedLockFile = {};
+// Separate in-memory caches
+let cachedExternalNodes;
 exports.createNodesV2 = [
     (0, globs_1.combineGlobPatterns)(lock_file_1.LOCKFILES),
     (files, _, context) => {
@@ -38,15 +39,16 @@ function internalCreateNodes(lockFile, _, context) {
         ? (0, fs_1.readFileSync)(lockFilePath, 'utf-8')
         : (0, bun_parser_1.readBunLockFile)(lockFilePath);
     const lockFileHash = getLockFileHash(lockFileContents);
-    if (!lockFileNeedsReprocessing(lockFileHash)) {
-        const nodes = readCachedParsedLockFile().externalNodes;
-        parsedLockFile.externalNodes = nodes;
+    if (!lockFileNeedsReprocessing(lockFileHash, externalNodesHashFile)) {
+        const nodes = readCachedExternalNodes();
+        cachedExternalNodes = nodes;
         return {
             externalNodes: nodes,
         };
     }
     const externalNodes = (0, lock_file_1.getLockFileNodes)(packageManager, lockFileContents, lockFileHash, context);
-    parsedLockFile.externalNodes = externalNodes;
+    cachedExternalNodes = externalNodes;
+    writeExternalNodesCache(lockFileHash, externalNodes);
     return {
         externalNodes,
     };
@@ -58,19 +60,18 @@ const createDependencies = (_, ctx) => {
     // lockfile may not exist yet
     if (pluginConfig.analyzeLockfile &&
         (0, lock_file_1.lockFileExists)(packageManager) &&
-        parsedLockFile.externalNodes) {
+        cachedExternalNodes) {
         const lockFilePath = (0, path_1.join)(workspace_root_1.workspaceRoot, (0, lock_file_1.getLockFileName)(packageManager));
         const lockFileContents = packageManager !== 'bun'
             ? (0, fs_1.readFileSync)(lockFilePath, 'utf-8')
             : (0, bun_parser_1.readBunLockFile)(lockFilePath);
         const lockFileHash = getLockFileHash(lockFileContents);
-        if (!lockFileNeedsReprocessing(lockFileHash)) {
-            lockfileDependencies = readCachedParsedLockFile().dependencies ?? [];
+        if (!lockFileNeedsReprocessing(lockFileHash, dependenciesHashFile)) {
+            lockfileDependencies = readCachedDependencies();
         }
         else {
             lockfileDependencies = (0, lock_file_1.getLockFileDependencies)(packageManager, lockFileContents, lockFileHash, ctx);
-            parsedLockFile.dependencies = lockfileDependencies;
-            writeLastProcessedLockfileHash(lockFileHash, parsedLockFile);
+            writeDependenciesCache(lockFileHash, lockfileDependencies);
         }
     }
     perf_hooks_1.performance.mark('build typescript dependencies - start');
@@ -83,21 +84,34 @@ exports.createDependencies = createDependencies;
 function getLockFileHash(lockFileContents) {
     return (0, file_hasher_1.hashArray)([versions_1.nxVersion, lockFileContents]);
 }
-function lockFileNeedsReprocessing(lockHash) {
+function lockFileNeedsReprocessing(lockHash, hashFilePath) {
     try {
-        return (0, fs_1.readFileSync)(lockFileHashFile).toString() !== lockHash;
+        return (0, fs_1.readFileSync)(hashFilePath).toString() !== lockHash;
     }
     catch {
         return true;
     }
 }
-function writeLastProcessedLockfileHash(hash, lockFile) {
-    (0, fs_1.mkdirSync)((0, path_1.dirname)(lockFileHashFile), { recursive: true });
-    (0, fs_1.writeFileSync)(cachedParsedLockFile, JSON.stringify(lockFile, null, 2));
-    (0, fs_1.writeFileSync)(lockFileHashFile, hash);
+// External nodes cache functions
+function writeExternalNodesCache(hash, nodes) {
+    (0, fs_1.mkdirSync)((0, path_1.dirname)(externalNodesHashFile), { recursive: true });
+    (0, fs_1.writeFileSync)(externalNodesCache, JSON.stringify(nodes, null, 2));
+    (0, fs_1.writeFileSync)(externalNodesHashFile, hash);
 }
-function readCachedParsedLockFile() {
-    return JSON.parse((0, fs_1.readFileSync)(cachedParsedLockFile).toString());
+function readCachedExternalNodes() {
+    return JSON.parse((0, fs_1.readFileSync)(externalNodesCache).toString());
 }
-const lockFileHashFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'lockfile.hash');
-const cachedParsedLockFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'parsed-lock-file.json');
+// Dependencies cache functions
+function writeDependenciesCache(hash, dependencies) {
+    (0, fs_1.mkdirSync)((0, path_1.dirname)(dependenciesHashFile), { recursive: true });
+    (0, fs_1.writeFileSync)(dependenciesCache, JSON.stringify(dependencies, null, 2));
+    (0, fs_1.writeFileSync)(dependenciesHashFile, hash);
+}
+function readCachedDependencies() {
+    return JSON.parse((0, fs_1.readFileSync)(dependenciesCache).toString());
+}
+// Cache file paths
+const externalNodesHashFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'lockfile-nodes.hash');
+const dependenciesHashFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'lockfile-dependencies.hash');
+const externalNodesCache = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'parsed-lock-file.nodes.json');
+const dependenciesCache = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'parsed-lock-file.dependencies.json');

package/src/plugins/js/lock-file/pnpm-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA2B3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAS1C;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAU/B;AAkUD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,MAAM,CAqCR"}
+{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA2B3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAS1C;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAU/B;AAkUD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,MAAM,CAuCR"}

package/src/plugins/js/lock-file/pnpm-parser.js

@@ -287,8 +287,10 @@ function stringifyPnpmLockfile(graph, rootLockFileContent, packageJson, workspac
     const workspaceDependencyImporters = {};
     for (const [packageName, importerPath] of Object.entries(requiredImporters)) {
         const baseImporter = importers[importerPath];
-        workspaceDependencyImporters[`workspace_modules/${packageName}`] =
-            baseImporter;
+        if (baseImporter) {
+            workspaceDependencyImporters[`workspace_modules/${packageName}`] =
+                baseImporter;
+        }
     }
     const output = {
         ...data,
@@ -423,7 +425,7 @@ function mapRootSnapshot(packageJson, rootImporters, packages, graph, lockfileVe
                 let version = packageJson[depType][packageName];
                 const manager = (0, catalog_1.getCatalogManager)(workspaceRoot);
                 if (manager?.isCatalogReference(version)) {
-                    version = manager.resolveCatalogReference(packageName, version, workspaceRoot);
+                    version = manager.resolveCatalogReference(workspaceRoot, packageName, version);
                     if (!version) {
                         throw new Error(`Could not resolve catalog reference for package ${packageName}@${version}.`);
                     }

package/src/plugins/js/lock-file/project-graph-pruning.js

@@ -42,7 +42,7 @@ function normalizeDependencies(packageJson, graph, workspacePackages, workspaceR
         let resolvedVersionRange = versionRange;
         const manager = (0, catalog_1.getCatalogManager)(workspaceRootPath);
         if (manager?.isCatalogReference(versionRange)) {
-            const resolvedVersionRange = manager.resolveCatalogReference(packageName, versionRange, workspaceRootPath);
+            resolvedVersionRange = manager.resolveCatalogReference(workspaceRootPath, packageName, versionRange);
             if (!resolvedVersionRange) {
                 throw new Error(`Could not resolve catalog reference for ${packageName}@${versionRange}.`);
             }

package/src/project-graph/plugins/isolation/messaging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messaging.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/plugins/isolation/messaging.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"messaging.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/plugins/isolation/messaging.ts"],"names":[],"mappings":"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"}

package/src/project-graph/plugins/isolation/messaging.js

@@ -4,6 +4,7 @@ exports.isPluginWorkerMessage = isPluginWorkerMessage;
 exports.isPluginWorkerResult = isPluginWorkerResult;
 exports.consumeMessage = consumeMessage;
 exports.sendMessageOverSocket = sendMessageOverSocket;
+const consume_messages_from_socket_1 = require("../../../utils/consume-messages-from-socket");
 function isPluginWorkerMessage(message) {
     return (typeof message === 'object' &&
         'type' in message &&
@@ -46,5 +47,5 @@ async function consumeMessage(socket, raw, handlers) {
     }
 }
 function sendMessageOverSocket(socket, message) {
-    socket.write(JSON.stringify(message) + String.fromCodePoint(4));
+    socket.write(JSON.stringify(message) + consume_messages_from_socket_1.MESSAGE_END_SEQ);
 }

package/src/project-graph/plugins/isolation/plugin-pool.js

@@ -166,7 +166,7 @@ function createWorkerHandler(worker, pending, onload, onloadError, socket) {
                 }
             },
             createDependenciesResult: ({ tx, ...result }) => {
-                const { resolver, rejector } = pending.get(tx);
+                const { resolver, rejector } = getPendingPromise(tx, pending);
                 if (result.success) {
                     resolver(result.dependencies);
                 }
@@ -175,7 +175,7 @@ function createWorkerHandler(worker, pending, onload, onloadError, socket) {
                 }
             },
             createNodesResult: ({ tx, ...result }) => {
-                const { resolver, rejector } = pending.get(tx);
+                const { resolver, rejector } = getPendingPromise(tx, pending);
                 if (result.success) {
                     resolver(result.result);
                 }
@@ -184,7 +184,7 @@ function createWorkerHandler(worker, pending, onload, onloadError, socket) {
                 }
             },
             createMetadataResult: ({ tx, ...result }) => {
-                const { resolver, rejector } = pending.get(tx);
+                const { resolver, rejector } = getPendingPromise(tx, pending);
                 if (result.success) {
                     resolver(result.metadata);
                 }
@@ -193,7 +193,7 @@ function createWorkerHandler(worker, pending, onload, onloadError, socket) {
                 }
             },
             preTasksExecutionResult: ({ tx, ...result }) => {
-                const { resolver, rejector } = pending.get(tx);
+                const { resolver, rejector } = getPendingPromise(tx, pending);
                 if (result.success) {
                     resolver(result.mutations);
                 }
@@ -202,7 +202,7 @@ function createWorkerHandler(worker, pending, onload, onloadError, socket) {
                 }
             },
             postTasksExecutionResult: ({ tx, ...result }) => {
-                const { resolver, rejector } = pending.get(tx);
+                const { resolver, rejector } = getPendingPromise(tx, pending);
                 if (result.success) {
                     resolver();
                 }
@@ -220,6 +220,20 @@ function createWorkerExitHandler(worker, pendingPromises) {
         }
     };
 }
+function getPendingPromise(tx, pending) {
+    const pendingPromise = pending.get(tx);
+    if (!pendingPromise) {
+        throw new Error(`No pending promise found for transaction "${tx}". This may indicate a bug in the plugin pool. Currently pending promises:\n` +
+            Array.from(pending.keys())
+                .map((t) => `  -  ${t}`)
+                .join('\n'));
+    }
+    const { rejector, resolver } = pendingPromise;
+    return {
+        rejector,
+        resolver,
+    };
+}
 function registerPendingPromise(tx, pending, callback, context) {
     let resolver, rejector, timeout;
     const promise = new Promise((res, rej) => {

package/src/project-graph/plugins/loaded-nx-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loaded-nx-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/loaded-nx-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAKhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EACV,yBAAyB,EACzB,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,yBAAyB,EACzB,wBAAwB,EACxB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAItB,qBAAa,cAAc;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE;QACrB,WAAW,EAAE,MAAM;QAGnB,EAAE,EAAE,CACF,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,oBAAoB,KAC1B,OAAO,CACV,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAC1E;KACF,CAAC;IACF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAAC;IAC1C,QAAQ,CAAC,cAAc,CAAC,EAAE,CACxB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,qBAAqB,KAC3B,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAC3B,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;gBAEhB,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,mBAAmB;CAqFtE"}
+{"version":3,"file":"loaded-nx-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/loaded-nx-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAKhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EACV,yBAAyB,EACzB,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,yBAAyB,EACzB,wBAAwB,EACxB,gBAAgB,EACjB,MAAM,cAAc,CAAC;AAItB,qBAAa,cAAc;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE;QACrB,WAAW,EAAE,MAAM;QAGnB,EAAE,EAAE,CACF,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,oBAAoB,KAC1B,OAAO,CACV,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAC1E;KACF,CAAC;IACF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAAC;IAC1C,QAAQ,CAAC,cAAc,CAAC,EAAE,CACxB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,qBAAqB,KAC3B,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAC3B,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAChC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAC5B,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;gBAEhB,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,mBAAmB;CAuFtE"}

package/src/project-graph/plugins/loaded-nx-plugin.js

@@ -66,6 +66,8 @@ class LoadedNxPlugin {
                     });
                 }
                 await plugin.preTasksExecution(this.options, context);
+                // This doesn't revert env changes, as the proxy still updates
+                // originalEnv, rather it removes the proxy.
                 process.env = originalEnv;
                 return updates;
             };

package/src/project-graph/plugins/resolve-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/resolve-plugin.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAIrF,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EAAE;;;;GAgBhB;AAqBD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC9C,IAAI,SAAgB,GACnB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,oBAAoB,CAAA;CAAE,GAAG,IAAI,CAE9D;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EAAE,EACf,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC9C,IAAI,EAAE,MAAM;;;;EAmCb"}
+{"version":3,"file":"resolve-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/resolve-plugin.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAOrF,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EAAE;;;;GAiBhB;AAqBD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC9C,IAAI,SAAgB,GACnB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,oBAAoB,CAAA;CAAE,GAAG,IAAI,CAE9D;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EAAE,EACf,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAC9C,IAAI,EAAE,MAAM;;;;EAmCb"}

package/src/project-graph/plugins/resolve-plugin.js

@@ -13,14 +13,16 @@ const workspace_root_1 = require("../../utils/workspace-root");
 const find_project_for_path_1 = require("../utils/find-project-for-path");
 const retrieve_workspace_files_1 = require("../utils/retrieve-workspace-files");
 let projectsWithoutInference;
+let projectsWithoutInferencePromise = null;
 async function resolveNxPlugin(moduleName, root, paths) {
     try {
         require.resolve(moduleName);
     }
     catch {
         // If a plugin cannot be resolved, we will need projects to resolve it
-        projectsWithoutInference ??=
-            await (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
+        projectsWithoutInferencePromise ??=
+            (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
+        projectsWithoutInference ??= await projectsWithoutInferencePromise;
     }
     const { pluginPath, name, shouldRegisterTSTranspiler } = getPluginPathAndName(moduleName, paths, projectsWithoutInference, root);
     return { pluginPath, name, shouldRegisterTSTranspiler };

package/src/project-graph/utils/project-configuration-utils.d.ts

@@ -71,5 +71,5 @@ export declare function readTargetDefaultsForTarget(targetName: string, targetDe
  * @param project The project that the target belongs to
  * @returns The normalized target configuration
  */
-export declare function normalizeTarget(target: TargetConfiguration, project: ProjectConfiguration, workspaceRoot: string, projectsMap: Record<string, ProjectConfiguration>): TargetConfiguration<any>;
+export declare function normalizeTarget(target: TargetConfiguration, project: ProjectConfiguration, workspaceRoot: string, projectsMap: Record<string, ProjectConfiguration>, errorMsgKey: string): TargetConfiguration<any>;
 //# sourceMappingURL=project-configuration-utils.d.ts.map