@nx/devkit 19.4.0-beta.1 → 19.4.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "19.4.0-beta.1",
+  "version": "19.4.0-beta.2",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
   "repository": {
@@ -36,7 +36,7 @@
     "semver": "^7.5.3",
     "yargs-parser": "21.1.1",
     "minimatch": "9.0.3",
-    "@nrwl/devkit": "19.4.0-beta.1"
+    "@nrwl/devkit": "19.4.0-beta.2"
   },
   "peerDependencies": {
     "nx": ">= 17 <= 20"

package/src/generators/plugin-migrations/aggregate-log-util.js

@@ -34,6 +34,9 @@ class AggregatedLog {
         this.logs.clear();
     }
     flushLogs() {
+        if (this.logs.size === 0) {
+            return;
+        }
         let fullLog = '';
         for (const executorName of this.logs.keys()) {
             fullLog = `${fullLog}${devkit_exports_1.output.bold(`Encountered the following while migrating '${executorName}':\r\n`)}`;

package/src/generators/plugin-migrations/executor-to-plugin-migrator.d.ts

@@ -1,10 +1,23 @@
-import { ProjectGraph, TargetConfiguration, Tree, CreateNodes, CreateNodesV2 } from 'nx/src/devkit-exports';
-type PluginOptionsBuilder<T> = (targetName: string) => T;
+import type { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json';
+import { type CreateNodes, type CreateNodesV2, type ProjectGraph, type TargetConfiguration, type Tree } from 'nx/src/devkit-exports';
 type PostTargetTransformer = (targetConfiguration: TargetConfiguration, tree: Tree, projectDetails: {
     projectName: string;
     root: string;
-}, inferredTargetConfiguration: TargetConfiguration) => TargetConfiguration;
-type SkipTargetFilter = (targetConfiguration: TargetConfiguration) => [boolean, string];
-export declare function migrateExecutorToPlugin<T>(tree: Tree, projectGraph: ProjectGraph, executor: string, pluginPath: string, pluginOptionsBuilder: PluginOptionsBuilder<T>, postTargetTransformer: PostTargetTransformer, createNodes: CreateNodesV2<T>, specificProjectToMigrate?: string, skipTargetFilter?: SkipTargetFilter): Promise<Map<string, Set<string>>>;
-export declare function migrateExecutorToPluginV1<T>(tree: Tree, projectGraph: ProjectGraph, executor: string, pluginPath: string, pluginOptionsBuilder: PluginOptionsBuilder<T>, postTargetTransformer: PostTargetTransformer, createNodes: CreateNodes<T>, specificProjectToMigrate?: string, skipTargetFilter?: SkipTargetFilter): Promise<Map<string, Set<string>>>;
+}, inferredTargetConfiguration: TargetConfiguration) => TargetConfiguration | Promise<TargetConfiguration>;
+type SkipTargetFilter = (targetConfiguration: TargetConfiguration) => false | string;
+type SkipProjectFilter = (projectConfiguration: ProjectConfiguration) => false | string;
+export declare function migrateProjectExecutorsToPlugin<T>(tree: Tree, projectGraph: ProjectGraph, pluginPath: string, createNodesV2: CreateNodesV2<T>, defaultPluginOptions: T, migrations: Array<{
+    executors: string[];
+    targetPluginOptionMapper: (targetName: string) => Partial<T>;
+    postTargetTransformer: PostTargetTransformer;
+    skipProjectFilter?: SkipProjectFilter;
+    skipTargetFilter?: SkipTargetFilter;
+}>, specificProjectToMigrate?: string): Promise<Map<string, Record<string, string>>>;
+export declare function migrateProjectExecutorsToPluginV1<T>(tree: Tree, projectGraph: ProjectGraph, pluginPath: string, createNodes: CreateNodes<T>, defaultPluginOptions: T, migrations: Array<{
+    executors: string[];
+    targetPluginOptionMapper: (targetName: string) => Partial<T>;
+    postTargetTransformer: PostTargetTransformer;
+    skipProjectFilter?: SkipProjectFilter;
+    skipTargetFilter?: SkipTargetFilter;
+}>, specificProjectToMigrate?: string): Promise<Map<string, Record<string, string>>>;
 export {};

package/src/generators/plugin-migrations/executor-to-plugin-migrator.js

@@ -1,16 +1,16 @@
 "use strict";
-var _ExecutorToPluginMigrator_instances, _ExecutorToPluginMigrator_projectGraph, _ExecutorToPluginMigrator_executor, _ExecutorToPluginMigrator_pluginPath, _ExecutorToPluginMigrator_pluginOptionsBuilder, _ExecutorToPluginMigrator_postTargetTransformer, _ExecutorToPluginMigrator_skipTargetFilter, _ExecutorToPluginMigrator_specificProjectToMigrate, _ExecutorToPluginMigrator_nxJson, _ExecutorToPluginMigrator_targetDefaultsForExecutor, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, _ExecutorToPluginMigrator_pluginToAddForTarget, _ExecutorToPluginMigrator_createNodes, _ExecutorToPluginMigrator_createNodesV2, _ExecutorToPluginMigrator_createNodesResultsForTargets, _ExecutorToPluginMigrator_init, _ExecutorToPluginMigrator_migrateTarget, _ExecutorToPluginMigrator_migrateProject, _ExecutorToPluginMigrator_mergeInputs, _ExecutorToPluginMigrator_pluginRequiresIncludes, _ExecutorToPluginMigrator_addPlugins, _ExecutorToPluginMigrator_getTargetAndProjectsToMigrate, _ExecutorToPluginMigrator_getTargetDefaultsForExecutor, _ExecutorToPluginMigrator_getCreatedTargetForProjectRoot, _ExecutorToPluginMigrator_getCreateNodesResults;
+var _ExecutorToPluginMigrator_instances, _ExecutorToPluginMigrator_projectGraph, _ExecutorToPluginMigrator_executor, _ExecutorToPluginMigrator_pluginPath, _ExecutorToPluginMigrator_pluginOptionsBuilder, _ExecutorToPluginMigrator_postTargetTransformer, _ExecutorToPluginMigrator_skipTargetFilter, _ExecutorToPluginMigrator_skipProjectFilter, _ExecutorToPluginMigrator_specificProjectToMigrate, _ExecutorToPluginMigrator_nxJson, _ExecutorToPluginMigrator_targetDefaultsForExecutor, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, _ExecutorToPluginMigrator_pluginToAddForTarget, _ExecutorToPluginMigrator_createNodes, _ExecutorToPluginMigrator_createNodesV2, _ExecutorToPluginMigrator_createNodesResultsForTargets, _ExecutorToPluginMigrator_skippedProjects, _ExecutorToPluginMigrator_init, _ExecutorToPluginMigrator_migrateTarget, _ExecutorToPluginMigrator_migrateProject, _ExecutorToPluginMigrator_mergeInputs, _ExecutorToPluginMigrator_getTargetAndProjectsToMigrate, _ExecutorToPluginMigrator_getTargetDefaultsForExecutor, _ExecutorToPluginMigrator_getCreatedTargetForProjectRoot, _ExecutorToPluginMigrator_getCreateNodesResults;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrateExecutorToPluginV1 = exports.migrateExecutorToPlugin = void 0;
+exports.migrateProjectExecutorsToPluginV1 = exports.migrateProjectExecutorsToPlugin = void 0;
 const tslib_1 = require("tslib");
 const minimatch_1 = require("minimatch");
 const node_assert_1 = require("node:assert");
-const executor_options_utils_1 = require("../executor-options-utils");
-const plugin_migration_utils_1 = require("./plugin-migration-utils");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
+const executor_options_utils_1 = require("../executor-options-utils");
+const plugin_migration_utils_1 = require("./plugin-migration-utils");
 class ExecutorToPluginMigrator {
-    constructor(tree, projectGraph, executor, pluginPath, pluginOptionsBuilder, postTargetTransformer, createNodes, createNodesV2, specificProjectToMigrate, skipTargetFilter) {
+    constructor(tree, projectGraph, executor, pluginPath, pluginOptionsBuilder, postTargetTransformer, createNodes, createNodesV2, specificProjectToMigrate, filters) {
         _ExecutorToPluginMigrator_instances.add(this);
         _ExecutorToPluginMigrator_projectGraph.set(this, void 0);
         _ExecutorToPluginMigrator_executor.set(this, void 0);
@@ -18,6 +18,7 @@ class ExecutorToPluginMigrator {
         _ExecutorToPluginMigrator_pluginOptionsBuilder.set(this, void 0);
         _ExecutorToPluginMigrator_postTargetTransformer.set(this, void 0);
         _ExecutorToPluginMigrator_skipTargetFilter.set(this, void 0);
+        _ExecutorToPluginMigrator_skipProjectFilter.set(this, void 0);
         _ExecutorToPluginMigrator_specificProjectToMigrate.set(this, void 0);
         _ExecutorToPluginMigrator_nxJson.set(this, void 0);
         _ExecutorToPluginMigrator_targetDefaultsForExecutor.set(this, void 0);
@@ -26,6 +27,7 @@ class ExecutorToPluginMigrator {
         _ExecutorToPluginMigrator_createNodes.set(this, void 0);
         _ExecutorToPluginMigrator_createNodesV2.set(this, void 0);
         _ExecutorToPluginMigrator_createNodesResultsForTargets.set(this, void 0);
+        _ExecutorToPluginMigrator_skippedProjects.set(this, void 0);
         this.tree = tree;
         tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_projectGraph, projectGraph, "f");
         tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_executor, executor, "f");
@@ -35,40 +37,41 @@ class ExecutorToPluginMigrator {
         tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_createNodes, createNodes, "f");
         tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_createNodesV2, createNodesV2, "f");
         tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_specificProjectToMigrate, specificProjectToMigrate, "f");
-        tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_skipTargetFilter, skipTargetFilter ?? ((...args) => [false, '']), "f");
+        tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_skipProjectFilter, filters?.skipProjectFilter ?? ((...args) => false), "f");
+        tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_skipTargetFilter, filters?.skipTargetFilter ?? ((...args) => false), "f");
     }
     async run() {
         await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_init).call(this);
         if (tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, "f").size > 0) {
             for (const targetName of tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, "f").keys()) {
-                tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_migrateTarget).call(this, targetName);
+                await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_migrateTarget).call(this, targetName);
             }
-            await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_addPlugins).call(this);
         }
         return tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, "f");
     }
 }
-_ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrator_executor = new WeakMap(), _ExecutorToPluginMigrator_pluginPath = new WeakMap(), _ExecutorToPluginMigrator_pluginOptionsBuilder = new WeakMap(), _ExecutorToPluginMigrator_postTargetTransformer = new WeakMap(), _ExecutorToPluginMigrator_skipTargetFilter = new WeakMap(), _ExecutorToPluginMigrator_specificProjectToMigrate = new WeakMap(), _ExecutorToPluginMigrator_nxJson = new WeakMap(), _ExecutorToPluginMigrator_targetDefaultsForExecutor = new WeakMap(), _ExecutorToPluginMigrator_targetAndProjectsToMigrate = new WeakMap(), _ExecutorToPluginMigrator_pluginToAddForTarget = new WeakMap(), _ExecutorToPluginMigrator_createNodes = new WeakMap(), _ExecutorToPluginMigrator_createNodesV2 = new WeakMap(), _ExecutorToPluginMigrator_createNodesResultsForTargets = new WeakMap(), _ExecutorToPluginMigrator_instances = new WeakSet(), _ExecutorToPluginMigrator_init = async function _ExecutorToPluginMigrator_init() {
+_ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrator_executor = new WeakMap(), _ExecutorToPluginMigrator_pluginPath = new WeakMap(), _ExecutorToPluginMigrator_pluginOptionsBuilder = new WeakMap(), _ExecutorToPluginMigrator_postTargetTransformer = new WeakMap(), _ExecutorToPluginMigrator_skipTargetFilter = new WeakMap(), _ExecutorToPluginMigrator_skipProjectFilter = new WeakMap(), _ExecutorToPluginMigrator_specificProjectToMigrate = new WeakMap(), _ExecutorToPluginMigrator_nxJson = new WeakMap(), _ExecutorToPluginMigrator_targetDefaultsForExecutor = new WeakMap(), _ExecutorToPluginMigrator_targetAndProjectsToMigrate = new WeakMap(), _ExecutorToPluginMigrator_pluginToAddForTarget = new WeakMap(), _ExecutorToPluginMigrator_createNodes = new WeakMap(), _ExecutorToPluginMigrator_createNodesV2 = new WeakMap(), _ExecutorToPluginMigrator_createNodesResultsForTargets = new WeakMap(), _ExecutorToPluginMigrator_skippedProjects = new WeakMap(), _ExecutorToPluginMigrator_instances = new WeakSet(), _ExecutorToPluginMigrator_init = async function _ExecutorToPluginMigrator_init() {
     const nxJson = (0, devkit_exports_1.readNxJson)(this.tree);
     nxJson.plugins ??= [];
     tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_nxJson, nxJson, "f");
     tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, new Map(), "f");
     tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_pluginToAddForTarget, new Map(), "f");
     tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_createNodesResultsForTargets, new Map(), "f");
+    tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_skippedProjects, new Set(), "f");
     tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_getTargetDefaultsForExecutor).call(this);
     tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_getTargetAndProjectsToMigrate).call(this);
     await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_getCreateNodesResults).call(this);
-}, _ExecutorToPluginMigrator_migrateTarget = function _ExecutorToPluginMigrator_migrateTarget(targetName) {
+}, _ExecutorToPluginMigrator_migrateTarget = async function _ExecutorToPluginMigrator_migrateTarget(targetName) {
     const include = [];
     for (const projectName of tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, "f").get(targetName)) {
-        include.push(tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_migrateProject).call(this, projectName, targetName));
+        include.push(await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_migrateProject).call(this, projectName, targetName));
     }
     tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginToAddForTarget, "f").set(targetName, {
         plugin: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginPath, "f"),
         options: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginOptionsBuilder, "f").call(this, targetName),
         include,
     });
-}, _ExecutorToPluginMigrator_migrateProject = function _ExecutorToPluginMigrator_migrateProject(projectName, targetName) {
+}, _ExecutorToPluginMigrator_migrateProject = async function _ExecutorToPluginMigrator_migrateProject(projectName, targetName) {
     const projectFromGraph = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_projectGraph, "f").nodes[projectName];
     const projectConfig = (0, devkit_exports_1.readProjectConfiguration)(this.tree, projectName);
     const createdTarget = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_getCreatedTargetForProjectRoot).call(this, targetName, projectFromGraph.data.root);
@@ -79,7 +82,7 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
     if (projectTarget.inputs && createdTarget.inputs) {
         tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_mergeInputs).call(this, projectTarget, createdTarget);
     }
-    projectTarget = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_postTargetTransformer, "f").call(this, projectTarget, this.tree, { projectName, root: projectFromGraph.data.root }, createdTarget);
+    projectTarget = await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_postTargetTransformer, "f").call(this, projectTarget, this.tree, { projectName, root: projectFromGraph.data.root }, createdTarget);
     if (projectTarget.options &&
         Object.keys(projectTarget.options).length === 0) {
         delete projectTarget.options;
@@ -130,72 +133,28 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
             ...inferredTargetExternalDependencyInput.externalDependencies,
         ]));
     }
-}, _ExecutorToPluginMigrator_pluginRequiresIncludes = async function _ExecutorToPluginMigrator_pluginRequiresIncludes(targetName, plugin) {
-    const loadedPlugin = new devkit_internals_1.LoadedNxPlugin({
-        createNodesV2: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_createNodesV2, "f"),
-        createNodes: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_createNodes, "f"),
-        name: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginPath, "f"),
-    }, plugin);
-    const originalResults = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_createNodesResultsForTargets, "f").get(targetName);
-    let resultsWithIncludes;
-    try {
-        resultsWithIncludes = await (0, devkit_internals_1.retrieveProjectConfigurations)([loadedPlugin], this.tree.root, tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f"));
-    }
-    catch (e) {
-        if (e instanceof devkit_internals_1.ProjectConfigurationsError) {
-            resultsWithIncludes = e.partialProjectConfigurationsResult;
-        }
-        else {
-            throw e;
-        }
-    }
-    return !deepEqual(originalResults, resultsWithIncludes);
-}, _ExecutorToPluginMigrator_addPlugins = async function _ExecutorToPluginMigrator_addPlugins() {
-    for (const [targetName, plugin] of tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginToAddForTarget, "f").entries()) {
-        const pluginOptions = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginOptionsBuilder, "f").call(this, targetName);
-        const existingPlugin = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f").plugins.find((plugin) => {
-            if (typeof plugin === 'string' ||
-                plugin.plugin !== tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginPath, "f")) {
-                return;
-            }
-            for (const key in plugin.options) {
-                if (plugin.options[key] !== pluginOptions[key]) {
-                    return false;
-                }
-            }
-            return true;
-        });
-        if (existingPlugin?.include) {
-            // Add to the existing plugin includes
-            existingPlugin.include = existingPlugin.include.concat(
-            // Any include that is in the new plugin's include list
-            plugin.include.filter((projectPath) => 
-            // And is not already covered by the existing plugin's include list
-            !existingPlugin.include.some((pluginIncludes) => (0, minimatch_1.minimatch)(projectPath, pluginIncludes, { dot: true }))));
-            if (!(await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_pluginRequiresIncludes).call(this, targetName, existingPlugin))) {
-                delete existingPlugin.include;
-            }
-        }
-        if (!existingPlugin) {
-            if (!(await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_pluginRequiresIncludes).call(this, targetName, plugin))) {
-                plugin.include = undefined;
-            }
-            tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f").plugins.push(plugin);
-        }
-    }
-    (0, devkit_exports_1.updateNxJson)(this.tree, tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f"));
 }, _ExecutorToPluginMigrator_getTargetAndProjectsToMigrate = function _ExecutorToPluginMigrator_getTargetAndProjectsToMigrate() {
     (0, executor_options_utils_1.forEachExecutorOptions)(this.tree, tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_executor, "f"), (targetConfiguration, projectName, targetName, configurationName) => {
-        if (configurationName) {
+        if (tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_skippedProjects, "f").has(projectName) || configurationName) {
             return;
         }
         if (tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_specificProjectToMigrate, "f") &&
             projectName !== tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_specificProjectToMigrate, "f")) {
             return;
         }
-        const [skipTarget, reasonTargetWasSkipped] = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_skipTargetFilter, "f").call(this, targetConfiguration);
-        if (skipTarget) {
-            const errorMsg = `${targetName} target on project "${projectName}" cannot be migrated. ${reasonTargetWasSkipped}`;
+        const skipProjectReason = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_skipProjectFilter, "f").call(this, tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_projectGraph, "f").nodes[projectName].data);
+        if (skipProjectReason) {
+            tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_skippedProjects, "f").add(projectName);
+            const errorMsg = `The "${projectName}" project cannot be migrated. ${skipProjectReason}`;
+            if (tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_specificProjectToMigrate, "f")) {
+                throw new Error(errorMsg);
+            }
+            console.warn(errorMsg);
+            return;
+        }
+        const skipTargetReason = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_skipTargetFilter, "f").call(this, targetConfiguration);
+        if (skipTargetReason) {
+            const errorMsg = `${targetName} target on project "${projectName}" cannot be migrated. ${skipTargetReason}`;
             if (tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_specificProjectToMigrate, "f")) {
                 throw new Error(errorMsg);
             }
@@ -227,40 +186,135 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
     if (tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, "f").size === 0) {
         return;
     }
-    for (const targetName of tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, "f").keys()) {
-        const loadedPlugin = new devkit_internals_1.LoadedNxPlugin({
-            createNodesV2: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_createNodesV2, "f"),
-            createNodes: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_createNodes, "f"),
-            name: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginPath, "f"),
-        }, {
-            plugin: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginPath, "f"),
-            options: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginOptionsBuilder, "f").call(this, targetName),
+    global.NX_GRAPH_CREATION = true;
+    try {
+        for (const targetName of tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, "f").keys()) {
+            const result = await getCreateNodesResultsForPlugin(this.tree, {
+                plugin: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginPath, "f"),
+                options: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginOptionsBuilder, "f").call(this, targetName),
+            }, tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginPath, "f"), tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_createNodes, "f"), tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_createNodesV2, "f"), tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f"));
+            tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_createNodesResultsForTargets, "f").set(targetName, result);
+        }
+    }
+    finally {
+        global.NX_GRAPH_CREATION = false;
+    }
+};
+async function migrateProjectExecutorsToPlugin(tree, projectGraph, pluginPath, createNodesV2, defaultPluginOptions, migrations, specificProjectToMigrate) {
+    const projects = await migrateProjects(tree, projectGraph, pluginPath, undefined, createNodesV2, defaultPluginOptions, migrations, specificProjectToMigrate);
+    return projects;
+}
+exports.migrateProjectExecutorsToPlugin = migrateProjectExecutorsToPlugin;
+async function migrateProjectExecutorsToPluginV1(tree, projectGraph, pluginPath, createNodes, defaultPluginOptions, migrations, specificProjectToMigrate) {
+    const projects = await migrateProjects(tree, projectGraph, pluginPath, createNodes, undefined, defaultPluginOptions, migrations, specificProjectToMigrate);
+    return projects;
+}
+exports.migrateProjectExecutorsToPluginV1 = migrateProjectExecutorsToPluginV1;
+async function migrateProjects(tree, projectGraph, pluginPath, createNodes, createNodesV2, defaultPluginOptions, migrations, specificProjectToMigrate) {
+    const projects = new Map();
+    for (const migration of migrations) {
+        for (const executor of migration.executors) {
+            const migrator = new ExecutorToPluginMigrator(tree, projectGraph, executor, pluginPath, migration.targetPluginOptionMapper, migration.postTargetTransformer, createNodes, createNodesV2, specificProjectToMigrate, {
+                skipProjectFilter: migration.skipProjectFilter,
+                skipTargetFilter: migration.skipTargetFilter,
+            });
+            const result = await migrator.run();
+            // invert the result to have a map of projects to their targets
+            for (const [target, projectList] of result.entries()) {
+                for (const project of projectList) {
+                    if (!projects.has(project)) {
+                        projects.set(project, {});
+                    }
+                    projects.set(project, {
+                        ...projects.get(project),
+                        ...migration.targetPluginOptionMapper(target),
+                    });
+                }
+            }
+        }
+    }
+    // apply default options
+    for (const [project, pluginOptions] of projects.entries()) {
+        projects.set(project, {
+            ...defaultPluginOptions,
+            ...pluginOptions,
         });
-        let projectConfigs;
+    }
+    await addPluginRegistrations(tree, projects, pluginPath, createNodes, createNodesV2, defaultPluginOptions, projectGraph);
+    return projects;
+}
+async function addPluginRegistrations(tree, projects, pluginPath, createNodes, createNodesV2, defaultPluginOptions, projectGraph) {
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
+    // collect createNodes results for each project before adding the plugins
+    const createNodesResults = new Map();
+    global.NX_GRAPH_CREATION = true;
+    try {
+        for (const [project, options] of projects.entries()) {
+            const projectConfigs = await getCreateNodesResultsForPlugin(tree, { plugin: pluginPath, options }, pluginPath, createNodes, createNodesV2, nxJson);
+            createNodesResults.set(project, projectConfigs);
+        }
+    }
+    finally {
+        global.NX_GRAPH_CREATION = false;
+    }
+    const arePluginIncludesRequired = async (project, pluginConfiguration) => {
+        global.NX_GRAPH_CREATION = true;
+        let result;
         try {
-            projectConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([loadedPlugin], this.tree.root, tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f"));
+            result = await getCreateNodesResultsForPlugin(tree, pluginConfiguration, pluginPath, createNodes, createNodesV2, nxJson);
+        }
+        finally {
+            global.NX_GRAPH_CREATION = false;
         }
-        catch (e) {
-            if (e instanceof devkit_internals_1.ProjectConfigurationsError) {
-                projectConfigs = e.partialProjectConfigurationsResult;
+        const originalResults = createNodesResults.get(project);
+        return !deepEqual(originalResults, result);
+    };
+    for (const [project, options] of projects.entries()) {
+        const existingPlugin = nxJson.plugins?.find((plugin) => typeof plugin !== 'string' &&
+            plugin.plugin === pluginPath &&
+            Object.keys(options).every((key) => plugin.options[key] === options[key] ||
+                (plugin.options[key] === undefined &&
+                    options[key] === defaultPluginOptions[key])));
+        const projectIncludeGlob = `${projectGraph.nodes[project].data.root}/**/*`;
+        if (!existingPlugin) {
+            nxJson.plugins ??= [];
+            const plugin = {
+                plugin: pluginPath,
+                options,
+                include: [projectIncludeGlob],
+            };
+            if (!(await arePluginIncludesRequired(project, plugin))) {
+                delete plugin.include;
             }
-            else {
-                throw e;
+            nxJson.plugins.push(plugin);
+        }
+        else if (existingPlugin.include) {
+            if (!existingPlugin.include.some((include) => (0, minimatch_1.minimatch)(projectIncludeGlob, include, { dot: true }))) {
+                existingPlugin.include.push(projectIncludeGlob);
+                if (!(await arePluginIncludesRequired(project, existingPlugin))) {
+                    delete existingPlugin.include;
+                }
             }
         }
-        tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_createNodesResultsForTargets, "f").set(targetName, projectConfigs);
     }
-};
-async function migrateExecutorToPlugin(tree, projectGraph, executor, pluginPath, pluginOptionsBuilder, postTargetTransformer, createNodes, specificProjectToMigrate, skipTargetFilter) {
-    const migrator = new ExecutorToPluginMigrator(tree, projectGraph, executor, pluginPath, pluginOptionsBuilder, postTargetTransformer, undefined, createNodes, specificProjectToMigrate, skipTargetFilter);
-    return await migrator.run();
+    (0, devkit_exports_1.updateNxJson)(tree, nxJson);
 }
-exports.migrateExecutorToPlugin = migrateExecutorToPlugin;
-async function migrateExecutorToPluginV1(tree, projectGraph, executor, pluginPath, pluginOptionsBuilder, postTargetTransformer, createNodes, specificProjectToMigrate, skipTargetFilter) {
-    const migrator = new ExecutorToPluginMigrator(tree, projectGraph, executor, pluginPath, pluginOptionsBuilder, postTargetTransformer, createNodes, undefined, specificProjectToMigrate, skipTargetFilter);
-    return await migrator.run();
+async function getCreateNodesResultsForPlugin(tree, pluginConfiguration, pluginPath, createNodes, createNodesV2, nxJson) {
+    let projectConfigs;
+    try {
+        const plugin = new devkit_internals_1.LoadedNxPlugin({ createNodes, createNodesV2, name: pluginPath }, pluginConfiguration);
+        projectConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([plugin], tree.root, nxJson);
+    }
+    catch (e) {
+        if (e instanceof devkit_internals_1.ProjectConfigurationsError) {
+            projectConfigs = e.partialProjectConfigurationsResult;
+        }
+        else {
+            throw e;
+        }
+    }
+    return projectConfigs;
 }
-exports.migrateExecutorToPluginV1 = migrateExecutorToPluginV1;
 // Checks if two objects are structurely equal, without caring
 // about the order of the keys.
 function deepEqual(a, b, logKey = '') {

package/src/generators/plugin-migrations/plugin-migration-utils.d.ts

@@ -1,4 +1,4 @@
-import type { TargetConfiguration } from 'nx/src/devkit-exports';
+import { type TargetConfiguration } from 'nx/src/devkit-exports';
 /**
  * Iterate through the current target in the project.json and its options comparing it to the target created by the Plugin itself
  * Delete matching properties from current target.
@@ -60,3 +60,4 @@ export declare function processTargetOutputs(target: TargetConfiguration, rename
     projectName: string;
     projectRoot: string;
 }): void;
+export declare function toProjectRelativePath(path: string, projectRoot: string): string;

package/src/generators/plugin-migrations/plugin-migration-utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processTargetOutputs = exports.deleteMatchingProperties = void 0;
+exports.toProjectRelativePath = exports.processTargetOutputs = exports.deleteMatchingProperties = void 0;
+const posix_1 = require("node:path/posix");
+const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 /**
  * Iterate through the current target in the project.json and its options comparing it to the target created by the Plugin itself
@@ -105,6 +107,16 @@ function processTargetOutputs(target, renamedOutputOptions, inferredTarget, proj
     target.outputs = targetOutputs;
 }
 exports.processTargetOutputs = processTargetOutputs;
+function toProjectRelativePath(path, projectRoot) {
+    if (projectRoot === '.') {
+        // workspace and project root are the same, we add a leading './' which is
+        // required by some tools (e.g. Jest)
+        return path.startsWith('.') ? path : `./${path}`;
+    }
+    const relativePath = (0, posix_1.relative)((0, posix_1.resolve)(devkit_exports_1.workspaceRoot, projectRoot), (0, posix_1.resolve)(devkit_exports_1.workspaceRoot, path));
+    return relativePath.startsWith('.') ? relativePath : `./${relativePath}`;
+}
+exports.toProjectRelativePath = toProjectRelativePath;
 function updateOutputRenamingOption(output, option, previousName) {
     const newOptionToken = `{options.${option}}`;
     const oldOptionToken = `{options.${previousName}}`;