nx 22.7.0-beta.13 → 22.7.0-beta.15

package/dist/src/command-line/migrate/migrate.js

@@ -741,7 +741,37 @@ async function downloadPackageMigrationsFromRegistry(packageName, packageVersion
     }
     return result;
 }
+function createConcurrencyLimiter(concurrency) {
+    const queue = [];
+    let active = 0;
+    function next() {
+        while (queue.length > 0 && active < concurrency) {
+            active++;
+            queue.shift()();
+        }
+    }
+    return function limit(fn) {
+        return new Promise((resolve, reject) => {
+            queue.push(() => {
+                fn()
+                    .then(resolve, reject)
+                    .finally(() => {
+                    active--;
+                    next();
+                });
+            });
+            next();
+        });
+    };
+}
+const installConcurrencyLimit = process.env.NX_MIGRATE_INSTALL_CONCURRENCY
+    ? createConcurrencyLimiter(Math.max(1, Math.floor(Number(process.env.NX_MIGRATE_INSTALL_CONCURRENCY)) || 1))
+    : null;
 async function getPackageMigrationsUsingInstall(packageName, packageVersion) {
+    const run = () => getPackageMigrationsUsingInstallImpl(packageName, packageVersion);
+    return installConcurrencyLimit ? installConcurrencyLimit(run) : run();
+}
+async function getPackageMigrationsUsingInstallImpl(packageName, packageVersion) {
     const { dir, cleanup } = (0, package_manager_1.createTempNpmDirectory)();
     let result;
     if ((0, provenance_1.getNxPackageGroup)().includes(packageName)) {

package/dist/src/daemon/client/client.d.ts

@@ -37,7 +37,6 @@ export declare class DaemonClient {
     enabled(): boolean;
     reset(): void;
     private getSocketPath;
-    private parseMessage;
     requestShutdown(): Promise<void>;
     getProjectGraphAndSourceMaps(): Promise<{
         projectGraph: ProjectGraph;

package/dist/src/daemon/client/client.js

@@ -6,7 +6,6 @@ const child_process_1 = require("child_process");
 const promises_1 = require("fs/promises");
 const net_1 = require("net");
 const node_fs_1 = require("node:fs");
-const node_v8_1 = require("node:v8");
 const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
 const configuration_1 = require("../../config/configuration");
@@ -143,11 +142,6 @@ class DaemonClient {
             throw daemonProcessException('Unable to connect to daemon: no socket path available');
         }
     }
-    parseMessage(message) {
-        return (0, consume_messages_from_socket_1.isJsonMessage)(message)
-            ? JSON.parse(message)
-            : (0, node_v8_1.deserialize)(Buffer.from(message, 'binary'));
-    }
     async requestShutdown() {
         return this.sendToDaemonViaQueue({ type: 'REQUEST_SHUTDOWN' });
     }
@@ -221,7 +215,7 @@ class DaemonClient {
             const socketPath = this.getSocketPath();
             this.fileWatcherMessenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)(socketPath)).listen((message) => {
                 try {
-                    const parsedMessage = this.parseMessage(message);
+                    const parsedMessage = (0, consume_messages_from_socket_1.parseMessage)(message);
                     // Notify all callbacks
                     for (const cb of this.fileWatcherCallbacks.values()) {
                         cb(null, parsedMessage);
@@ -307,7 +301,7 @@ class DaemonClient {
             const socketPath = this.getSocketPath();
             this.fileWatcherMessenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)(socketPath)).listen((message) => {
                 try {
-                    const parsedMessage = this.parseMessage(message);
+                    const parsedMessage = (0, consume_messages_from_socket_1.parseMessage)(message);
                     for (const cb of this.fileWatcherCallbacks.values()) {
                         cb(null, parsedMessage);
                     }
@@ -375,7 +369,7 @@ class DaemonClient {
             const socketPath = this.getSocketPath();
             this.projectGraphListenerMessenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)(socketPath)).listen((message) => {
                 try {
-                    const parsedMessage = this.parseMessage(message);
+                    const parsedMessage = (0, consume_messages_from_socket_1.parseMessage)(message);
                     // Notify all callbacks
                     for (const cb of this.projectGraphListenerCallbacks.values()) {
                         cb(null, parsedMessage);
@@ -459,7 +453,7 @@ class DaemonClient {
             // Try to reconnect
             this.projectGraphListenerMessenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)(socketPath)).listen((message) => {
                 try {
-                    const parsedMessage = this.parseMessage(message);
+                    const parsedMessage = (0, consume_messages_from_socket_1.parseMessage)(message);
                     for (const cb of this.projectGraphListenerCallbacks.values()) {
                         cb(null, parsedMessage);
                     }
@@ -894,9 +888,7 @@ class DaemonClient {
     handleMessage(serializedResult) {
         try {
             perf_hooks_1.performance.mark('result-parse-start-' + this.currentMessage.type);
-            const parsedResult = (0, consume_messages_from_socket_1.isJsonMessage)(serializedResult)
-                ? JSON.parse(serializedResult)
-                : (0, node_v8_1.deserialize)(Buffer.from(serializedResult, 'binary'));
+            const parsedResult = (0, consume_messages_from_socket_1.parseMessage)(serializedResult);
             perf_hooks_1.performance.mark('result-parse-end-' + this.currentMessage.type);
             perf_hooks_1.performance.measure('deserialize daemon response - ' + this.currentMessage.type, 'result-parse-start-' + this.currentMessage.type, 'result-parse-end-' + this.currentMessage.type);
             if (parsedResult.error) {

package/dist/src/hasher/task-hasher.js

@@ -242,7 +242,8 @@ function expandSingleProjectInputs(inputs, namedInputs) {
                 d.runtime ||
                 d.externalDependencies ||
                 d.dependentTasksOutputFiles ||
-                d.workingDirectory) {
+                d.workingDirectory ||
+                d.json) {
                 expanded.push(d);
             }
             else {

package/dist/src/plugins/js/lock-file/utils/pnpm-normalizer.js

@@ -45,7 +45,25 @@ function loadPnpmHoistedDepsDefinition() {
  */
 function parseAndNormalizePnpmLockfile(content) {
     const { load } = require('@zkochan/js-yaml');
-    return convertToLockfileObject(load(content));
+    return convertToLockfileObject(load(extractMainLockfileDocument(content)));
+}
+// https://github.com/pnpm/pnpm/blob/main/lockfile/fs/src/yamlDocuments.ts
+const YAML_DOCUMENT_START = '---\n';
+const YAML_DOCUMENT_SEPARATOR = '\n---\n';
+// pnpm 11 writes a two-document lockfile when `managePackageManagerVersions` is
+// enabled: the first document holds package-manager metadata, and the second
+// holds the workspace lockfile. Mirror pnpm's own positional extraction so we
+// always read the workspace document.
+// https://github.com/pnpm/pnpm/blob/main/lockfile/fs/src/yamlDocuments.ts
+function extractMainLockfileDocument(content) {
+    if (!content.startsWith(YAML_DOCUMENT_START)) {
+        return content;
+    }
+    const separatorIndex = content.indexOf(YAML_DOCUMENT_SEPARATOR, YAML_DOCUMENT_START.length);
+    if (separatorIndex === -1) {
+        return '';
+    }
+    return content.slice(separatorIndex + YAML_DOCUMENT_SEPARATOR.length);
 }
 // https://github.com/pnpm/pnpm/blob/50e37072f42bcca6d393a74bed29f7f0e029805d/lockfile/lockfile-file/src/write.ts#L22
 const LOCKFILE_YAML_FORMAT = {

package/dist/src/project-graph/plugins/isolation/isolated-plugin.js

@@ -47,7 +47,7 @@ class IsolatedPlugin {
         this.responseHandlers = new Map();
         this.exitHandler = null;
         this.handleSocketData = (raw) => {
-            const message = JSON.parse(raw);
+            const message = (0, consume_messages_from_socket_1.parseMessage)(raw);
             if (!(0, messaging_1.isPluginWorkerResult)(message)) {
                 return;
             }

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

@@ -4,6 +4,7 @@ exports.isPluginWorkerMessage = isPluginWorkerMessage;
 exports.isPluginWorkerResult = isPluginWorkerResult;
 exports.consumeMessage = consumeMessage;
 exports.sendMessageOverSocket = sendMessageOverSocket;
+const socket_utils_1 = require("../../../daemon/socket-utils");
 const consume_messages_from_socket_1 = require("../../../utils/consume-messages-from-socket");
 // =============================================================================
 // TYPE GUARDS
@@ -69,5 +70,6 @@ async function consumeMessage(socket, raw, handlers) {
  * Sends a message over the socket with proper formatting.
  */
 function sendMessageOverSocket(socket, message) {
-    socket.write(JSON.stringify(message) + consume_messages_from_socket_1.MESSAGE_END_SEQ);
+    socket.write((0, socket_utils_1.serialize)(message));
+    socket.write(consume_messages_from_socket_1.MESSAGE_END_SEQ);
 }

package/dist/src/project-graph/plugins/isolation/plugin-worker.js

@@ -33,7 +33,7 @@ const server = (0, net_1.createServer)((socket) => {
         'This likely indicates that the host process was terminated before the worker could be instructed to load the plugin. ' +
         'If you are seeing this issue, please report it to the Nx team at https://github.com/nrwl/nx/issues.');
     socket.on('data', (0, consume_messages_from_socket_1.consumeMessagesFromSocket)((raw) => {
-        const message = JSON.parse(raw.toString());
+        const message = (0, consume_messages_from_socket_1.parseMessage)(raw);
         if (!(0, messaging_1.isPluginWorkerMessage)(message)) {
             return;
         }

package/dist/src/tasks-runner/pseudo-ipc.js

@@ -65,7 +65,7 @@ class PseudoIPCServer {
     }
     registerChildMessages(socket) {
         socket.on('data', (0, consume_messages_from_socket_1.consumeMessagesFromSocket)(async (rawMessage) => {
-            const { type, message } = JSON.parse(rawMessage);
+            const { type, message } = (0, consume_messages_from_socket_1.parseMessage)(rawMessage);
             if (type === 'TO_PARENT_FROM_CHILDREN') {
                 for (const childMessage of this.childMessages) {
                     childMessage.onMessage(message);
@@ -91,14 +91,14 @@ class PseudoIPCServer {
     }
     sendMessageToChildren(message) {
         this.sockets.forEach((socket) => {
-            socket.write(JSON.stringify({ type: 'TO_CHILDREN_FROM_PARENT', message }));
+            socket.write((0, socket_utils_1.serialize)({ type: 'TO_CHILDREN_FROM_PARENT', message }));
             // send EOT to indicate that the message has been fully written
             socket.write(consume_messages_from_socket_1.MESSAGE_END_SEQ);
         });
     }
     sendMessageToChild(id, message) {
         this.sockets.forEach((socket) => {
-            socket.write(JSON.stringify({ type: 'TO_CHILDREN_FROM_PARENT', id, message }));
+            socket.write((0, socket_utils_1.serialize)({ type: 'TO_CHILDREN_FROM_PARENT', id, message }));
             socket.write(consume_messages_from_socket_1.MESSAGE_END_SEQ);
         });
     }
@@ -121,12 +121,12 @@ class PseudoIPCClient {
         this.socket = (0, net_1.connect)(this.path);
     }
     sendMessageToParent(message) {
-        this.socket.write(JSON.stringify({ type: 'TO_PARENT_FROM_CHILDREN', message }));
+        this.socket.write((0, socket_utils_1.serialize)({ type: 'TO_PARENT_FROM_CHILDREN', message }));
         // send EOT to indicate that the message has been fully written
         this.socket.write(consume_messages_from_socket_1.MESSAGE_END_SEQ);
     }
     notifyChildIsReady(id) {
-        this.socket.write(JSON.stringify({
+        this.socket.write((0, socket_utils_1.serialize)({
             type: 'CHILD_READY',
             message: id,
         }));
@@ -135,7 +135,7 @@ class PseudoIPCClient {
     }
     onMessageFromParent(forkId, onMessage, onClose = () => { }, onError = (err) => { }) {
         this.socket.on('data', (0, consume_messages_from_socket_1.consumeMessagesFromSocket)(async (rawMessage) => {
-            const { id, type, message } = JSON.parse(rawMessage);
+            const { id, type, message } = (0, consume_messages_from_socket_1.parseMessage)(rawMessage);
             if (type === 'TO_CHILDREN_FROM_PARENT') {
                 if (id && id === forkId) {
                     onMessage(message);

package/dist/src/tasks-runner/task-orchestrator.js

@@ -159,7 +159,7 @@ class TaskOrchestrator {
                     .map((id) => this.taskGraph.tasks[id])
                     .filter((t) => !t.hash &&
                     this.taskGraph.dependencies[t.id].every((depId) => this.completedTasks.has(depId)));
-                if (unhashed.length > 1) {
+                if (unhashed.length > 0) {
                     const perTaskEnvs = {};
                     for (const task of unhashed) {
                         perTaskEnvs[task.id] = (0, task_env_1.getTaskSpecificEnv)(task, this.projectGraph);
@@ -561,6 +561,9 @@ class TaskOrchestrator {
         const cacheableTasks = tasks.filter((t) => (0, utils_1.isCacheableTask)(t, this.options));
         if (cacheableTasks.length === 0)
             return [];
+        // Wait for any queued processTask promises to settle so task.hash is
+        // populated before cache.getBatch maps it into a Rust String.
+        await Promise.all(cacheableTasks.map((t) => this.processedTasks.get(t.id)));
         const cacheHits = await this.fetchCacheHits(cacheableTasks);
         if (cacheHits.length === 0)
             return [];

package/dist/src/utils/consume-messages-from-socket.d.ts

@@ -1,3 +1,9 @@
 export declare const MESSAGE_END_SEQ: string;
 export declare function consumeMessagesFromSocket(callback: (message: string) => void): (data: any) => void;
 export declare function isJsonMessage(message: string): boolean;
+/**
+ * Parse a message that was produced by `serialize()` in
+ * `daemon/socket-utils.ts`. Auto-detects JSON vs. v8-serialized payloads using
+ * `isJsonMessage()` and decodes the binary path via `v8.deserialize`.
+ */
+export declare function parseMessage<T = unknown>(message: string): T;

package/dist/src/utils/consume-messages-from-socket.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MESSAGE_END_SEQ = void 0;
 exports.consumeMessagesFromSocket = consumeMessagesFromSocket;
 exports.isJsonMessage = isJsonMessage;
+exports.parseMessage = parseMessage;
 const string_decoder_1 = require("string_decoder");
+const v8_1 = require("v8");
 const VERY_END_CODE = 4;
 exports.MESSAGE_END_SEQ = 'NX_MSG_END' + String.fromCharCode(VERY_END_CODE);
 function consumeMessagesFromSocket(callback) {
@@ -42,3 +44,13 @@ function isJsonMessage(message) {
         // numbers
         /^[0-9]+(\.?[0-9]+)?$/.test(message));
 }
+/**
+ * Parse a message that was produced by `serialize()` in
+ * `daemon/socket-utils.ts`. Auto-detects JSON vs. v8-serialized payloads using
+ * `isJsonMessage()` and decodes the binary path via `v8.deserialize`.
+ */
+function parseMessage(message) {
+    return isJsonMessage(message)
+        ? JSON.parse(message)
+        : (0, v8_1.deserialize)(Buffer.from(message, 'binary'));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.7.0-beta.13",
+  "version": "22.7.0-beta.15",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
@@ -171,16 +171,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.7.0-beta.13",
-    "@nx/nx-darwin-x64": "22.7.0-beta.13",
-    "@nx/nx-freebsd-x64": "22.7.0-beta.13",
-    "@nx/nx-linux-arm-gnueabihf": "22.7.0-beta.13",
-    "@nx/nx-linux-arm64-gnu": "22.7.0-beta.13",
-    "@nx/nx-linux-arm64-musl": "22.7.0-beta.13",
-    "@nx/nx-linux-x64-gnu": "22.7.0-beta.13",
-    "@nx/nx-linux-x64-musl": "22.7.0-beta.13",
-    "@nx/nx-win32-arm64-msvc": "22.7.0-beta.13",
-    "@nx/nx-win32-x64-msvc": "22.7.0-beta.13"
+    "@nx/nx-darwin-arm64": "22.7.0-beta.15",
+    "@nx/nx-darwin-x64": "22.7.0-beta.15",
+    "@nx/nx-freebsd-x64": "22.7.0-beta.15",
+    "@nx/nx-linux-arm-gnueabihf": "22.7.0-beta.15",
+    "@nx/nx-linux-arm64-gnu": "22.7.0-beta.15",
+    "@nx/nx-linux-arm64-musl": "22.7.0-beta.15",
+    "@nx/nx-linux-x64-gnu": "22.7.0-beta.15",
+    "@nx/nx-linux-x64-musl": "22.7.0-beta.15",
+    "@nx/nx-win32-arm64-msvc": "22.7.0-beta.15",
+    "@nx/nx-win32-x64-msvc": "22.7.0-beta.15"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",