@nx/devkit 23.0.0-beta.22 → 23.0.0-beta.23

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

@@ -1,5 +1,5 @@
 import type { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json';
-import { type CreateNodesV2, type NxJsonConfiguration, type ProjectGraph, type TargetConfiguration, type Tree } from 'nx/src/devkit-exports';
+import { type CreateNodes, type NxJsonConfiguration, type ProjectGraph, type TargetConfiguration, type Tree } from 'nx/src/devkit-exports';
 import { logger as devkitLogger } from 'nx/src/devkit-exports';
 export type InferredTargetConfiguration = TargetConfiguration & {
     name: string;
@@ -14,14 +14,14 @@ export declare class NoTargetsToMigrateError extends Error {
     constructor();
 }
 export declare function readTargetDefaultsForExecutor(executor: string, targetDefaults: NxJsonConfiguration['targetDefaults'] | undefined): Partial<TargetConfiguration> | undefined;
-export declare function migrateProjectExecutorsToPlugin<T>(tree: Tree, projectGraph: ProjectGraph, pluginPath: string, createNodesV2: CreateNodesV2<T>, defaultPluginOptions: T, migrations: Array<{
+export declare function migrateProjectExecutorsToPlugin<T>(tree: Tree, projectGraph: ProjectGraph, pluginPath: string, createNodesV2: CreateNodes<T>, defaultPluginOptions: T, migrations: Array<{
     executors: string[];
     targetPluginOptionMapper: (targetName: string) => Partial<T>;
     postTargetTransformer: PostTargetTransformer;
     skipProjectFilter?: SkipProjectFilter;
     skipTargetFilter?: SkipTargetFilter;
 }>, specificProjectToMigrate?: string, logger?: typeof devkitLogger): Promise<Map<string, Record<string, string>>>;
-export declare function migrateProjectExecutorsToPluginV1<T>(tree: Tree, projectGraph: ProjectGraph, pluginPath: string, createNodes: CreateNodesV2<T>, defaultPluginOptions: T, migrations: Array<{
+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;

package/dist/src/generators/target-defaults-utils.js

@@ -7,6 +7,7 @@ exports.addBuildTargetDefaults = addBuildTargetDefaults;
 exports.addE2eCiTargetDefaults = addE2eCiTargetDefaults;
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
+const minimatch_1 = require("minimatch");
 const semver_1 = require("semver");
 const package_json_1 = require("../utils/package-json");
 const normalize_target_defaults_1 = require("../utils/normalize-target-defaults");
@@ -183,7 +184,12 @@ async function addE2eCiTargetDefaults(tree, e2ePlugin, buildTarget, pathToE2ECon
         return;
     }
     const resolvedE2ePlugin = await import(e2ePlugin);
-    const e2ePluginGlob = resolvedE2ePlugin.createNodesV2?.[0] ?? resolvedE2ePlugin.createNodes?.[0];
+    const e2ePluginGlob = resolvedE2ePlugin.createNodes?.[0] ?? resolvedE2ePlugin.createNodesV2?.[0];
+    // The e2e config file must be one this plugin actually processes (its path
+    // matches the plugin's createNodes glob) before the registration's
+    // include/exclude filters are applied.
+    const e2eConfigMatchesPluginGlob = !e2ePluginGlob ||
+        (0, minimatch_1.minimatch)(pathToE2EConfigFile, e2ePluginGlob, { dot: true });
     let foundPluginForApplication;
     for (let i = 0; i < e2ePluginRegistrations.length; i++) {
         let candidatePluginForApplication = e2ePluginRegistrations[i];
@@ -191,7 +197,9 @@ async function addE2eCiTargetDefaults(tree, e2ePlugin, buildTarget, pathToE2ECon
             foundPluginForApplication = candidatePluginForApplication;
             break;
         }
-        const matchingConfigFiles = (0, devkit_internals_1.findMatchingConfigFiles)([pathToE2EConfigFile], e2ePluginGlob, candidatePluginForApplication.include, candidatePluginForApplication.exclude);
+        const matchingConfigFiles = e2eConfigMatchesPluginGlob
+            ? (0, devkit_internals_1.findMatchingConfigFiles)([pathToE2EConfigFile], candidatePluginForApplication.include, candidatePluginForApplication.exclude)
+            : [];
         if (matchingConfigFiles.length) {
             foundPluginForApplication = candidatePluginForApplication;
             break;

package/dist/src/utils/add-plugin.d.ts

@@ -1,13 +1,13 @@
-import { CreateNodesV2, ProjectGraph, Tree } from 'nx/src/devkit-exports';
+import { CreateNodes, 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: CreateNodesV2<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: CreateNodes<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: CreateNodesV2<PluginOptions>, options: Partial<Record<keyof PluginOptions, PluginOptions[keyof PluginOptions][]>>, shouldUpdatePackageJsonScripts: boolean): Promise<void>;
+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/dist/src/utils/add-plugin.js

@@ -14,7 +14,7 @@ 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,
+        createNodes: createNodesTuple,
     }, {
         plugin: pluginName,
         options: pluginOptions,

package/dist/src/utils/calculate-hash-for-create-nodes.d.ts

@@ -1,8 +1,8 @@
-import { CreateNodesContextV2 } from 'nx/src/devkit-exports';
+import { CreateNodesContext } from 'nx/src/devkit-exports';
 /**
  * @deprecated Use {@link calculateHashesForCreateNodes} instead, which batches
  * workspace-context hashing across multiple project roots in a single call.
  * This will be removed in Nx 24.
  */
-export declare function calculateHashForCreateNodes(projectRoot: string, options: object, context: CreateNodesContextV2, additionalGlobs?: string[]): Promise<string>;
-export declare function calculateHashesForCreateNodes(projectRoots: string[], options: object, context: CreateNodesContextV2, additionalGlobs?: string[][]): Promise<string[]>;
+export declare function calculateHashForCreateNodes(projectRoot: string, options: object, context: CreateNodesContext, additionalGlobs?: string[]): Promise<string>;
+export declare function calculateHashesForCreateNodes(projectRoots: string[], options: object, context: CreateNodesContext, additionalGlobs?: string[][]): Promise<string[]>;

package/dist/src/utils/find-plugin-for-config-file.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findPluginForConfigFile = findPluginForConfigFile;
 const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
+const minimatch_1 = require("minimatch");
 async function findPluginForConfigFile(tree, pluginName, pathToConfigFile) {
     const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     if (!nxJson.plugins) {
@@ -18,8 +19,13 @@ async function findPluginForConfigFile(tree, pluginName, pathToConfigFile) {
         }
         if (plugin.include || plugin.exclude) {
             const resolvedPlugin = await import(pluginName);
-            const pluginGlob = resolvedPlugin.createNodesV2?.[0] ?? resolvedPlugin.createNodes?.[0];
-            const matchingConfigFile = (0, devkit_internals_1.findMatchingConfigFiles)([pathToConfigFile], pluginGlob, plugin.include, plugin.exclude);
+            const pluginGlob = resolvedPlugin.createNodes?.[0] ?? resolvedPlugin.createNodesV2?.[0];
+            // The file must be one this plugin actually processes (its path matches
+            // the plugin's createNodes glob) before the registration's include/exclude
+            // filters are applied.
+            const matchingConfigFile = !pluginGlob || (0, minimatch_1.minimatch)(pathToConfigFile, pluginGlob, { dot: true })
+                ? (0, devkit_internals_1.findMatchingConfigFiles)([pathToConfigFile], plugin.include, plugin.exclude)
+                : [];
             if (matchingConfigFile.length) {
                 return plugin;
             }

package/dist/src/utils/get-named-inputs.d.ts

@@ -1,8 +1,8 @@
 import type { InputDefinition } from 'nx/src/config/workspace-json-project-json';
-import { CreateNodesContextV2 } from 'nx/src/devkit-exports';
+import { CreateNodesContext } from 'nx/src/devkit-exports';
 /**
  * Get the named inputs available for a directory
  */
-export declare function getNamedInputs(directory: string, context: CreateNodesContextV2): {
+export declare function getNamedInputs(directory: string, context: CreateNodesContext): {
     [inputName: string]: (string | InputDefinition)[];
 };

package/dist/src/utils/package-json.js

@@ -456,7 +456,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
     if (process.env.NX_DRY_RUN && process.env.NX_DRY_RUN !== 'false') {
         throw new Error('NOTE: This generator does not support --dry-run. If you are running this in Nx Console, it should execute fine once you hit the "Generate" button.\n');
     }
-    const { tempDir } = (0, devkit_internals_1.installPackageToTmp)(pkg, requiredVersion);
+    const { tempDir } = (0, devkit_internals_1.installPackageToTmp)(pkg, requiredVersion, (0, devkit_exports_1.detectPackageManager)(devkit_exports_1.workspaceRoot));
     addToNodePath((0, path_1.join)(devkit_exports_1.workspaceRoot, 'node_modules'));
     addToNodePath((0, path_1.join)(tempDir, 'node_modules'));
     // Re-initialize the added paths into require

package/dist/src/utils/replace-project-configuration-with-plugin.d.ts

@@ -1,2 +1,2 @@
-import { CreateNodesV2, Tree } from 'nx/src/devkit-exports';
-export declare function replaceProjectConfigurationsWithPlugin<T = unknown>(tree: Tree, rootMappings: Map<string, string>, pluginPath: string, createNodes: CreateNodesV2<T>, pluginOptions: T): Promise<void>;
+import { CreateNodes, Tree } from 'nx/src/devkit-exports';
+export declare function replaceProjectConfigurationsWithPlugin<T = unknown>(tree: Tree, rootMappings: Map<string, string>, pluginPath: string, createNodes: CreateNodes<T>, pluginOptions: T): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "23.0.0-beta.22",
+  "version": "23.0.0-beta.23",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -60,7 +60,7 @@
   },
   "devDependencies": {
     "jest": "30.3.0",
-    "nx": "23.0.0-beta.22"
+    "nx": "23.0.0-beta.23"
   },
   "peerDependencies": {
     "nx": ">= 22 <= 24 || ^23.0.0-0"