@nx/devkit 19.0.0-canary.20240503-dbad02a → 19.0.0-canary.20240504-fd5ea92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "19.0.0-canary.20240503-dbad02a",
+  "version": "19.0.0-canary.20240504-fd5ea92",
   "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.0.0-canary.20240503-dbad02a"
+    "@nrwl/devkit": "19.0.0-canary.20240504-fd5ea92"
   },
   "peerDependencies": {
     "nx": ">= 17 <= 20"

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

@@ -1,6 +1,9 @@
 import { ProjectGraph, TargetConfiguration, Tree, CreateNodes } from 'nx/src/devkit-exports';
 type PluginOptionsBuilder<T> = (targetName: string) => T;
-type PostTargetTransformer = (targetConfiguration: TargetConfiguration, tree?: Tree) => TargetConfiguration;
+type PostTargetTransformer = (targetConfiguration: TargetConfiguration, tree?: Tree, projectDetails?: {
+    projectName: string;
+    root: string;
+}) => 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<number>;
+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 {};

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

@@ -74,7 +74,10 @@ _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);
-    projectTarget = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_postTargetTransformer, "f").call(this, projectTarget, this.tree);
+    projectTarget = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_postTargetTransformer, "f").call(this, projectTarget, this.tree, {
+        projectName,
+        root: projectFromGraph.data.root,
+    });
     if (projectTarget.options &&
         Object.keys(projectTarget.options).length === 0) {
         delete projectTarget.options;
@@ -85,6 +88,9 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
     else {
         delete projectConfig.targets[targetName];
     }
+    if (!projectConfig['// targets']) {
+        projectConfig['// targets'] = `to see all targets run: nx show project ${projectName} --web`;
+    }
     (0, devkit_exports_1.updateProjectConfiguration)(this.tree, projectName, projectConfig);
     return `${projectFromGraph.data.root}/**/*`;
 }, _ExecutorToPluginMigrator_addPlugins = function _ExecutorToPluginMigrator_addPlugins() {
@@ -123,6 +129,17 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
             }
         }
         if (!existingPlugin) {
+            const allConfigFilesAreIncluded = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_configFiles, "f").every((configFile) => {
+                for (const includePattern of plugin.include) {
+                    if ((0, minimatch_1.minimatch)(configFile, includePattern, { dot: true })) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+            if (allConfigFilesAreIncluded) {
+                plugin.include = undefined;
+            }
             tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f").plugins.push(plugin);
         }
     }
@@ -192,7 +209,6 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
 };
 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 migratedProjectsAndTargets = await migrator.run();
-    return migratedProjectsAndTargets.size;
+    return await migrator.run();
 }
 exports.migrateExecutorToPlugin = migrateExecutorToPlugin;