@nx/workspace 23.2.0-pr.36838.ef8e258 → 23.2.0-rc.0

package/dist/src/generators/infer-targets/infer-targets.js

@@ -36,38 +36,69 @@ async function convertToInferredGenerator(tree, options) {
         return;
     }
     const tasks = [];
-    for (const generatorCollection of generatorsToRun) {
-        try {
-            const generator = generatorCollectionChoices.get(generatorCollection);
-            if (generator) {
-                const generatorFactory = generator.implementationFactory();
-                const callback = await generatorFactory(tree, {
-                    project: options.project,
-                    skipFormat: options.skipFormat,
-                });
-                if (callback) {
-                    const task = await callback();
-                    if (typeof task === 'function')
-                        tasks.push(task);
+    // Each conversion checks nx.json's plugins array to decide whether it can
+    // centralize shared configuration, but every later conversion in this loop
+    // appends its own plugin registration afterwards. A batch session defers
+    // centralization to a single finalize pass that observes the finished array,
+    // so every conversion in the batch can centralize; a lone conversion already
+    // sees the finished array and takes the inline path.
+    const session = generatorsToRun.length > 1 ? (0, internal_1.openBatchConversionSession)(tree) : undefined;
+    try {
+        for (const generatorCollection of generatorsToRun) {
+            try {
+                const generator = generatorCollectionChoices.get(generatorCollection);
+                if (generator) {
+                    const generatorFactory = generator.implementationFactory();
+                    const runGenerator = () => generatorFactory(tree, {
+                        project: options.project,
+                        skipFormat: options.skipFormat,
+                    });
+                    const callback = session
+                        ? await session.runChild(runGenerator)
+                        : await runGenerator();
+                    if (callback) {
+                        tasks.push(async () => {
+                            try {
+                                const task = await callback();
+                                if (typeof task === 'function')
+                                    await task();
+                            }
+                            catch (e) {
+                                devkit_1.output.error({
+                                    title: `${generatorCollection}:convert-to-inferred - Failed`,
+                                });
+                                throw e;
+                            }
+                        });
+                    }
+                    devkit_1.output.success({
+                        title: `${generatorCollection}:convert-to-inferred - Success`,
+                    });
                 }
-                devkit_1.output.success({
-                    title: `${generatorCollection}:convert-to-inferred - Success`,
-                });
-            }
-        }
-        catch (e) {
-            if (e instanceof internal_1.NoTargetsToMigrateError) {
-                devkit_1.output.note({
-                    title: `${generatorCollection}:convert-to-inferred - Skipped (No targets to migrate)`,
-                });
             }
-            else {
-                devkit_1.output.error({
-                    title: `${generatorCollection}:convert-to-inferred - Failed`,
-                });
-                throw e;
+            catch (e) {
+                if (e instanceof internal_1.NoTargetsToMigrateError) {
+                    devkit_1.output.note({
+                        title: `${generatorCollection}:convert-to-inferred - Skipped (No targets to migrate)`,
+                    });
+                }
+                else {
+                    devkit_1.output.error({
+                        title: `${generatorCollection}:convert-to-inferred - Failed`,
+                    });
+                    throw e;
+                }
             }
         }
+        if (session) {
+            // Never throws: a failed finalize downgrades to a warning and leaves the
+            // conservative per-project configuration, so the queued callbacks below
+            // still run.
+            await (0, internal_1.finalizeBatchConversion)(tree, session);
+        }
+    }
+    finally {
+        session?.close();
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "23.2.0-pr.36838.ef8e258",
+  "version": "23.2.0-rc.0",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -84,11 +84,11 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "23.2.0-pr.36838.ef8e258",
-    "@nx/devkit": "23.2.0-pr.36838.ef8e258"
+    "nx": "23.2.0-rc.0",
+    "@nx/devkit": "23.2.0-rc.0"
   },
   "devDependencies": {
-    "nx": "23.2.0-pr.36838.ef8e258"
+    "nx": "23.2.0-rc.0"
   },
   "publishConfig": {
     "access": "public"