@nx/devkit 19.2.0-beta.3 → 19.2.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "19.2.0-beta.3",
+  "version": "19.2.0-beta.5",
   "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.2.0-beta.3"
+    "@nrwl/devkit": "19.2.0-beta.5"
   },
   "peerDependencies": {
     "nx": ">= 17 <= 20"

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

@@ -1,9 +1,10 @@
-import { ProjectGraph, TargetConfiguration, Tree, CreateNodes } from 'nx/src/devkit-exports';
+import { ProjectGraph, TargetConfiguration, Tree, CreateNodes, CreateNodesV2 } from 'nx/src/devkit-exports';
 type PluginOptionsBuilder<T> = (targetName: string) => T;
 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: CreateNodes<T>, specificProjectToMigrate?: string, skipTargetFilter?: SkipTargetFilter): Promise<Map<string, Set<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>>>;
 export {};

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

@@ -1,15 +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_configFiles, _ExecutorToPluginMigrator_createNodesResultsForTargets, _ExecutorToPluginMigrator_init, _ExecutorToPluginMigrator_migrateTarget, _ExecutorToPluginMigrator_migrateProject, _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_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;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrateExecutorToPlugin = void 0;
+exports.migrateExecutorToPluginV1 = exports.migrateExecutorToPlugin = 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");
 class ExecutorToPluginMigrator {
-    constructor(tree, projectGraph, executor, pluginPath, pluginOptionsBuilder, postTargetTransformer, createNodes, specificProjectToMigrate, skipTargetFilter) {
+    constructor(tree, projectGraph, executor, pluginPath, pluginOptionsBuilder, postTargetTransformer, createNodes, createNodesV2, specificProjectToMigrate, skipTargetFilter) {
         _ExecutorToPluginMigrator_instances.add(this);
         _ExecutorToPluginMigrator_projectGraph.set(this, void 0);
         _ExecutorToPluginMigrator_executor.set(this, void 0);
@@ -23,7 +24,7 @@ class ExecutorToPluginMigrator {
         _ExecutorToPluginMigrator_targetAndProjectsToMigrate.set(this, void 0);
         _ExecutorToPluginMigrator_pluginToAddForTarget.set(this, void 0);
         _ExecutorToPluginMigrator_createNodes.set(this, void 0);
-        _ExecutorToPluginMigrator_configFiles.set(this, void 0);
+        _ExecutorToPluginMigrator_createNodesV2.set(this, void 0);
         _ExecutorToPluginMigrator_createNodesResultsForTargets.set(this, void 0);
         this.tree = tree;
         tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_projectGraph, projectGraph, "f");
@@ -32,6 +33,7 @@ class ExecutorToPluginMigrator {
         tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_pluginOptionsBuilder, pluginOptionsBuilder, "f");
         tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_postTargetTransformer, postTargetTransformer, "f");
         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");
     }
@@ -46,7 +48,7 @@ class ExecutorToPluginMigrator {
         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_configFiles = 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_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() {
     const nxJson = (0, devkit_exports_1.readNxJson)(this.tree);
     nxJson.plugins ??= [];
     tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_nxJson, nxJson, "f");
@@ -74,6 +76,9 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
     projectTarget = (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetDefaultsForExecutor, "f"));
     delete projectTarget.executor;
     (0, plugin_migration_utils_1.deleteMatchingProperties)(projectTarget, createdTarget);
+    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);
     if (projectTarget.options &&
         Object.keys(projectTarget.options).length === 0) {
@@ -90,8 +95,44 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
     }
     (0, devkit_exports_1.updateProjectConfiguration)(this.tree, projectName, projectConfig);
     return `${projectFromGraph.data.root}/**/*`;
+}, _ExecutorToPluginMigrator_mergeInputs = function _ExecutorToPluginMigrator_mergeInputs(target, inferredTarget) {
+    const isInputInferred = (input) => {
+        return inferredTarget.inputs.some((inferredInput) => {
+            try {
+                (0, node_assert_1.deepStrictEqual)(input, inferredInput);
+                return true;
+            }
+            catch {
+                return false;
+            }
+        });
+    };
+    if (target.inputs.every(isInputInferred)) {
+        delete target.inputs;
+        return;
+    }
+    const inferredTargetExternalDependencyInput = inferredTarget.inputs.find((i) => typeof i !== 'string' && 'externalDependencies' in i);
+    if (!inferredTargetExternalDependencyInput) {
+        // plugins should normally have an externalDependencies input, but if it
+        // doesn't, there's nothing to merge
+        return;
+    }
+    const targetExternalDependencyInput = target.inputs.find((i) => typeof i !== 'string' && 'externalDependencies' in i);
+    if (!targetExternalDependencyInput) {
+        // the target doesn't have an externalDependencies input, so we can just
+        // add the inferred one
+        target.inputs.push(inferredTargetExternalDependencyInput);
+    }
+    else {
+        // the target has an externalDependencies input, so we need to merge them
+        targetExternalDependencyInput.externalDependencies = Array.from(new Set([
+            ...targetExternalDependencyInput.externalDependencies,
+            ...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);
@@ -188,6 +229,7 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
     }
     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"),
         }, {
@@ -206,15 +248,19 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
                 throw e;
             }
         }
-        tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_configFiles, Array.from(projectConfigs.matchingProjectFiles), "f");
         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, createNodes, specificProjectToMigrate, skipTargetFilter);
+    const migrator = new ExecutorToPluginMigrator(tree, projectGraph, executor, pluginPath, pluginOptionsBuilder, postTargetTransformer, undefined, createNodes, specificProjectToMigrate, skipTargetFilter);
     return await migrator.run();
 }
 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();
+}
+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/utils/add-plugin.d.ts

@@ -1,7 +1,13 @@
-import { CreateNodes, ProjectGraph, Tree } from 'nx/src/devkit-exports';
+import { CreateNodes, CreateNodesV2, ProjectGraph, Tree } from 'nx/src/devkit-exports';
 /**
  * Iterates through various forms of plugin options to find the one which does not conflict with the current graph
 
  */
-export declare function addPlugin<PluginOptions>(tree: Tree, graph: ProjectGraph, pluginName: string, createNodesTuple: CreateNodes<PluginOptions>, options: Partial<Record<keyof PluginOptions, PluginOptions[keyof PluginOptions][]>>, shouldUpdatePackageJsonScripts: boolean): Promise<void>;
+export declare function addPlugin<PluginOptions>(tree: Tree, graph: ProjectGraph, pluginName: string, createNodesTuple: CreateNodesV2<PluginOptions>, options: Partial<Record<keyof PluginOptions, PluginOptions[keyof PluginOptions][]>>, shouldUpdatePackageJsonScripts: boolean): Promise<void>;
+/**
+ * @deprecated Use `addPlugin` instead
+ * Iterates through various forms of plugin options to find the one which does not conflict with the current graph
+
+ */
+export declare function addPluginV1<PluginOptions>(tree: Tree, graph: ProjectGraph, pluginName: string, createNodesTuple: CreateNodes<PluginOptions>, options: Partial<Record<keyof PluginOptions, PluginOptions[keyof PluginOptions][]>>, shouldUpdatePackageJsonScripts: boolean): Promise<void>;
 export declare function generateCombinations<T>(input: Record<string, T[]>): Record<string, T>[];

package/src/utils/add-plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateCombinations = exports.addPlugin = void 0;
+exports.generateCombinations = exports.addPluginV1 = exports.addPlugin = void 0;
 const yargs = require("yargs-parser");
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
@@ -9,6 +9,31 @@ const devkit_internals_1 = require("nx/src/devkit-internals");
 
  */
 async function addPlugin(tree, graph, pluginName, createNodesTuple, options, shouldUpdatePackageJsonScripts) {
+    return _addPluginInternal(tree, graph, pluginName, (pluginOptions) => new devkit_internals_1.LoadedNxPlugin({
+        name: pluginName,
+        createNodesV2: createNodesTuple,
+    }, {
+        plugin: pluginName,
+        options: pluginOptions,
+    }), options, shouldUpdatePackageJsonScripts);
+}
+exports.addPlugin = addPlugin;
+/**
+ * @deprecated Use `addPlugin` instead
+ * Iterates through various forms of plugin options to find the one which does not conflict with the current graph
+
+ */
+async function addPluginV1(tree, graph, pluginName, createNodesTuple, options, shouldUpdatePackageJsonScripts) {
+    return _addPluginInternal(tree, graph, pluginName, (pluginOptions) => new devkit_internals_1.LoadedNxPlugin({
+        name: pluginName,
+        createNodes: createNodesTuple,
+    }, {
+        plugin: pluginName,
+        options: pluginOptions,
+    }), options, shouldUpdatePackageJsonScripts);
+}
+exports.addPluginV1 = addPluginV1;
+async function _addPluginInternal(tree, graph, pluginName, pluginFactory, options, shouldUpdatePackageJsonScripts) {
     const graphNodes = Object.values(graph.nodes);
     const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     let pluginOptions;
@@ -25,15 +50,7 @@ async function addPlugin(tree, graph, pluginName, createNodesTuple, options, sho
         }
         global.NX_GRAPH_CREATION = true;
         try {
-            projConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([
-                new devkit_internals_1.LoadedNxPlugin({
-                    name: pluginName,
-                    createNodes: createNodesTuple,
-                }, {
-                    plugin: pluginName,
-                    options: pluginOptions,
-                }),
-            ], tree.root, nxJson);
+            projConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([pluginFactory(pluginOptions)], tree.root, nxJson);
         }
         catch (e) {
             // Errors are okay for this because we're only running 1 plugin
@@ -72,7 +89,6 @@ async function addPlugin(tree, graph, pluginName, createNodesTuple, options, sho
         updatePackageScripts(tree, projConfigs);
     }
 }
-exports.addPlugin = addPlugin;
 function updatePackageScripts(tree, projectConfigurations) {
     for (const projectConfig of Object.values(projectConfigurations.projects)) {
         const projectRoot = projectConfig.root;