nx 22.7.0-beta.13 → 22.7.0-beta.14

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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.7.0-beta.13",
+  "version": "22.7.0-beta.14",
   "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.14",
+    "@nx/nx-darwin-x64": "22.7.0-beta.14",
+    "@nx/nx-freebsd-x64": "22.7.0-beta.14",
+    "@nx/nx-linux-arm-gnueabihf": "22.7.0-beta.14",
+    "@nx/nx-linux-arm64-gnu": "22.7.0-beta.14",
+    "@nx/nx-linux-arm64-musl": "22.7.0-beta.14",
+    "@nx/nx-linux-x64-gnu": "22.7.0-beta.14",
+    "@nx/nx-linux-x64-musl": "22.7.0-beta.14",
+    "@nx/nx-win32-arm64-msvc": "22.7.0-beta.14",
+    "@nx/nx-win32-x64-msvc": "22.7.0-beta.14"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",