@nx/devkit 23.0.0-pr.35413.460eeef → 23.0.0-rc.0

package/{index.d.ts → dist/index.d.ts}

@@ -12,4 +12,3 @@
  */
 export * from 'nx/src/devkit-exports';
 export * from './public-api';
-//# sourceMappingURL=index.d.ts.map

package/dist/internal.d.ts

@@ -0,0 +1,24 @@
+export { signalToCode, createProjectRootMappingsFromProjectConfigurations, PluginCache, safeWriteFileCache, emitPluginWorkerLog, resolveImplementation, resolveSchema, ImplementationResolutionError, SchemaResolutionError, resolvePrompt, PromptResolutionError, } from 'nx/src/devkit-internals';
+export { determineArtifactNameAndDirectoryOptions, getRelativeCwd, type FileExtensionType, } from './src/generators/artifact-name-and-directory-utils';
+export { getE2EWebServerInfo, type E2EWebServerDetails, } from './src/generators/e2e-web-server-info-utils';
+export { forEachExecutorOptions } from './src/generators/executor-options-utils';
+export { AggregatedLog } from './src/generators/plugin-migrations/aggregate-log-util';
+export { migrateProjectExecutorsToPlugin, migrateProjectExecutorsToPluginV1, NoTargetsToMigrateError, type InferredTargetConfiguration, } from './src/generators/plugin-migrations/executor-to-plugin-migrator';
+export { processTargetOutputs, deleteMatchingProperties, toProjectRelativePath, } from './src/generators/plugin-migrations/plugin-migration-utils';
+export { determineProjectNameAndRootOptions, ensureRootProjectName, resolveImportPath, } from './src/generators/project-name-and-root-utils';
+export { promptWhenInteractive } from './src/generators/prompt';
+export { addBuildTargetDefaults, addE2eCiTargetDefaults, findTargetDefault, readTargetDefaultsForTarget, upsertTargetDefault, } from './src/generators/target-defaults-utils';
+export { downgradeTargetDefaults, normalizeTargetDefaults, } from './src/utils/normalize-target-defaults';
+export { addPlugin } from './src/utils/add-plugin';
+export { getDeclaredPackageVersion, getInstalledPackageVersion, } from './src/utils/installed-version';
+export { assertSupportedInstalledPackageVersion, assertSupportedPackageVersion, } from './src/utils/version-floor';
+export { createAsyncIterable, combineAsyncIterables, mapAsyncIterable, } from './src/utils/async-iterable';
+export { calculateHashForCreateNodes, calculateHashesForCreateNodes, } from './src/utils/calculate-hash-for-create-nodes';
+export { getCatalogManager } from './src/utils/catalog';
+export { loadConfigFile, clearRequireCache } from './src/utils/config-utils';
+export { findPluginForConfigFile } from './src/utils/find-plugin-for-config-file';
+export { getNamedInputs } from './src/utils/get-named-inputs';
+export { logShowProjectCommand } from './src/utils/log-show-project-command';
+export { eachValueFrom } from './src/utils/rxjs-for-await';
+export { checkAndCleanWithSemver } from './src/utils/semver';
+export { camelize, capitalize, classify, dasherize, } from './src/utils/string-utils';

package/dist/internal.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.eachValueFrom = exports.logShowProjectCommand = exports.getNamedInputs = exports.findPluginForConfigFile = exports.clearRequireCache = exports.loadConfigFile = exports.getCatalogManager = exports.calculateHashesForCreateNodes = exports.calculateHashForCreateNodes = exports.mapAsyncIterable = exports.combineAsyncIterables = exports.createAsyncIterable = exports.assertSupportedPackageVersion = exports.assertSupportedInstalledPackageVersion = exports.getInstalledPackageVersion = exports.getDeclaredPackageVersion = exports.addPlugin = exports.normalizeTargetDefaults = exports.downgradeTargetDefaults = exports.upsertTargetDefault = exports.readTargetDefaultsForTarget = exports.findTargetDefault = exports.addE2eCiTargetDefaults = exports.addBuildTargetDefaults = exports.promptWhenInteractive = exports.resolveImportPath = exports.ensureRootProjectName = exports.determineProjectNameAndRootOptions = exports.toProjectRelativePath = exports.deleteMatchingProperties = exports.processTargetOutputs = exports.NoTargetsToMigrateError = exports.migrateProjectExecutorsToPluginV1 = exports.migrateProjectExecutorsToPlugin = exports.AggregatedLog = exports.forEachExecutorOptions = exports.getE2EWebServerInfo = exports.getRelativeCwd = exports.determineArtifactNameAndDirectoryOptions = exports.PromptResolutionError = exports.resolvePrompt = exports.SchemaResolutionError = exports.ImplementationResolutionError = exports.resolveSchema = exports.resolveImplementation = exports.emitPluginWorkerLog = exports.safeWriteFileCache = exports.PluginCache = exports.createProjectRootMappingsFromProjectConfigurations = exports.signalToCode = void 0;
+exports.dasherize = exports.classify = exports.capitalize = exports.camelize = exports.checkAndCleanWithSemver = void 0;
+var devkit_internals_1 = require("nx/src/devkit-internals");
+Object.defineProperty(exports, "signalToCode", { enumerable: true, get: function () { return devkit_internals_1.signalToCode; } });
+Object.defineProperty(exports, "createProjectRootMappingsFromProjectConfigurations", { enumerable: true, get: function () { return devkit_internals_1.createProjectRootMappingsFromProjectConfigurations; } });
+Object.defineProperty(exports, "PluginCache", { enumerable: true, get: function () { return devkit_internals_1.PluginCache; } });
+Object.defineProperty(exports, "safeWriteFileCache", { enumerable: true, get: function () { return devkit_internals_1.safeWriteFileCache; } });
+Object.defineProperty(exports, "emitPluginWorkerLog", { enumerable: true, get: function () { return devkit_internals_1.emitPluginWorkerLog; } });
+Object.defineProperty(exports, "resolveImplementation", { enumerable: true, get: function () { return devkit_internals_1.resolveImplementation; } });
+Object.defineProperty(exports, "resolveSchema", { enumerable: true, get: function () { return devkit_internals_1.resolveSchema; } });
+Object.defineProperty(exports, "ImplementationResolutionError", { enumerable: true, get: function () { return devkit_internals_1.ImplementationResolutionError; } });
+Object.defineProperty(exports, "SchemaResolutionError", { enumerable: true, get: function () { return devkit_internals_1.SchemaResolutionError; } });
+Object.defineProperty(exports, "resolvePrompt", { enumerable: true, get: function () { return devkit_internals_1.resolvePrompt; } });
+Object.defineProperty(exports, "PromptResolutionError", { enumerable: true, get: function () { return devkit_internals_1.PromptResolutionError; } });
+// Generators
+var artifact_name_and_directory_utils_1 = require("./src/generators/artifact-name-and-directory-utils");
+Object.defineProperty(exports, "determineArtifactNameAndDirectoryOptions", { enumerable: true, get: function () { return artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions; } });
+Object.defineProperty(exports, "getRelativeCwd", { enumerable: true, get: function () { return artifact_name_and_directory_utils_1.getRelativeCwd; } });
+var e2e_web_server_info_utils_1 = require("./src/generators/e2e-web-server-info-utils");
+Object.defineProperty(exports, "getE2EWebServerInfo", { enumerable: true, get: function () { return e2e_web_server_info_utils_1.getE2EWebServerInfo; } });
+var executor_options_utils_1 = require("./src/generators/executor-options-utils");
+Object.defineProperty(exports, "forEachExecutorOptions", { enumerable: true, get: function () { return executor_options_utils_1.forEachExecutorOptions; } });
+var aggregate_log_util_1 = require("./src/generators/plugin-migrations/aggregate-log-util");
+Object.defineProperty(exports, "AggregatedLog", { enumerable: true, get: function () { return aggregate_log_util_1.AggregatedLog; } });
+var executor_to_plugin_migrator_1 = require("./src/generators/plugin-migrations/executor-to-plugin-migrator");
+Object.defineProperty(exports, "migrateProjectExecutorsToPlugin", { enumerable: true, get: function () { return executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin; } });
+Object.defineProperty(exports, "migrateProjectExecutorsToPluginV1", { enumerable: true, get: function () { return executor_to_plugin_migrator_1.migrateProjectExecutorsToPluginV1; } });
+Object.defineProperty(exports, "NoTargetsToMigrateError", { enumerable: true, get: function () { return executor_to_plugin_migrator_1.NoTargetsToMigrateError; } });
+var plugin_migration_utils_1 = require("./src/generators/plugin-migrations/plugin-migration-utils");
+Object.defineProperty(exports, "processTargetOutputs", { enumerable: true, get: function () { return plugin_migration_utils_1.processTargetOutputs; } });
+Object.defineProperty(exports, "deleteMatchingProperties", { enumerable: true, get: function () { return plugin_migration_utils_1.deleteMatchingProperties; } });
+Object.defineProperty(exports, "toProjectRelativePath", { enumerable: true, get: function () { return plugin_migration_utils_1.toProjectRelativePath; } });
+var project_name_and_root_utils_1 = require("./src/generators/project-name-and-root-utils");
+Object.defineProperty(exports, "determineProjectNameAndRootOptions", { enumerable: true, get: function () { return project_name_and_root_utils_1.determineProjectNameAndRootOptions; } });
+Object.defineProperty(exports, "ensureRootProjectName", { enumerable: true, get: function () { return project_name_and_root_utils_1.ensureRootProjectName; } });
+Object.defineProperty(exports, "resolveImportPath", { enumerable: true, get: function () { return project_name_and_root_utils_1.resolveImportPath; } });
+var prompt_1 = require("./src/generators/prompt");
+Object.defineProperty(exports, "promptWhenInteractive", { enumerable: true, get: function () { return prompt_1.promptWhenInteractive; } });
+var target_defaults_utils_1 = require("./src/generators/target-defaults-utils");
+Object.defineProperty(exports, "addBuildTargetDefaults", { enumerable: true, get: function () { return target_defaults_utils_1.addBuildTargetDefaults; } });
+Object.defineProperty(exports, "addE2eCiTargetDefaults", { enumerable: true, get: function () { return target_defaults_utils_1.addE2eCiTargetDefaults; } });
+Object.defineProperty(exports, "findTargetDefault", { enumerable: true, get: function () { return target_defaults_utils_1.findTargetDefault; } });
+Object.defineProperty(exports, "readTargetDefaultsForTarget", { enumerable: true, get: function () { return target_defaults_utils_1.readTargetDefaultsForTarget; } });
+Object.defineProperty(exports, "upsertTargetDefault", { enumerable: true, get: function () { return target_defaults_utils_1.upsertTargetDefault; } });
+var normalize_target_defaults_1 = require("./src/utils/normalize-target-defaults");
+Object.defineProperty(exports, "downgradeTargetDefaults", { enumerable: true, get: function () { return normalize_target_defaults_1.downgradeTargetDefaults; } });
+Object.defineProperty(exports, "normalizeTargetDefaults", { enumerable: true, get: function () { return normalize_target_defaults_1.normalizeTargetDefaults; } });
+// Utils
+var add_plugin_1 = require("./src/utils/add-plugin");
+Object.defineProperty(exports, "addPlugin", { enumerable: true, get: function () { return add_plugin_1.addPlugin; } });
+var installed_version_1 = require("./src/utils/installed-version");
+Object.defineProperty(exports, "getDeclaredPackageVersion", { enumerable: true, get: function () { return installed_version_1.getDeclaredPackageVersion; } });
+Object.defineProperty(exports, "getInstalledPackageVersion", { enumerable: true, get: function () { return installed_version_1.getInstalledPackageVersion; } });
+var version_floor_1 = require("./src/utils/version-floor");
+Object.defineProperty(exports, "assertSupportedInstalledPackageVersion", { enumerable: true, get: function () { return version_floor_1.assertSupportedInstalledPackageVersion; } });
+Object.defineProperty(exports, "assertSupportedPackageVersion", { enumerable: true, get: function () { return version_floor_1.assertSupportedPackageVersion; } });
+var async_iterable_1 = require("./src/utils/async-iterable");
+Object.defineProperty(exports, "createAsyncIterable", { enumerable: true, get: function () { return async_iterable_1.createAsyncIterable; } });
+Object.defineProperty(exports, "combineAsyncIterables", { enumerable: true, get: function () { return async_iterable_1.combineAsyncIterables; } });
+Object.defineProperty(exports, "mapAsyncIterable", { enumerable: true, get: function () { return async_iterable_1.mapAsyncIterable; } });
+var calculate_hash_for_create_nodes_1 = require("./src/utils/calculate-hash-for-create-nodes");
+Object.defineProperty(exports, "calculateHashForCreateNodes", { enumerable: true, get: function () { return calculate_hash_for_create_nodes_1.calculateHashForCreateNodes; } });
+Object.defineProperty(exports, "calculateHashesForCreateNodes", { enumerable: true, get: function () { return calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes; } });
+var catalog_1 = require("./src/utils/catalog");
+Object.defineProperty(exports, "getCatalogManager", { enumerable: true, get: function () { return catalog_1.getCatalogManager; } });
+var config_utils_1 = require("./src/utils/config-utils");
+Object.defineProperty(exports, "loadConfigFile", { enumerable: true, get: function () { return config_utils_1.loadConfigFile; } });
+Object.defineProperty(exports, "clearRequireCache", { enumerable: true, get: function () { return config_utils_1.clearRequireCache; } });
+var find_plugin_for_config_file_1 = require("./src/utils/find-plugin-for-config-file");
+Object.defineProperty(exports, "findPluginForConfigFile", { enumerable: true, get: function () { return find_plugin_for_config_file_1.findPluginForConfigFile; } });
+var get_named_inputs_1 = require("./src/utils/get-named-inputs");
+Object.defineProperty(exports, "getNamedInputs", { enumerable: true, get: function () { return get_named_inputs_1.getNamedInputs; } });
+var log_show_project_command_1 = require("./src/utils/log-show-project-command");
+Object.defineProperty(exports, "logShowProjectCommand", { enumerable: true, get: function () { return log_show_project_command_1.logShowProjectCommand; } });
+var rxjs_for_await_1 = require("./src/utils/rxjs-for-await");
+Object.defineProperty(exports, "eachValueFrom", { enumerable: true, get: function () { return rxjs_for_await_1.eachValueFrom; } });
+var semver_1 = require("./src/utils/semver");
+Object.defineProperty(exports, "checkAndCleanWithSemver", { enumerable: true, get: function () { return semver_1.checkAndCleanWithSemver; } });
+var string_utils_1 = require("./src/utils/string-utils");
+Object.defineProperty(exports, "camelize", { enumerable: true, get: function () { return string_utils_1.camelize; } });
+Object.defineProperty(exports, "capitalize", { enumerable: true, get: function () { return string_utils_1.capitalize; } });
+Object.defineProperty(exports, "classify", { enumerable: true, get: function () { return string_utils_1.classify; } });
+Object.defineProperty(exports, "dasherize", { enumerable: true, get: function () { return string_utils_1.dasherize; } });

package/{ngcli-adapter.d.ts → dist/ngcli-adapter.d.ts}

@@ -2,4 +2,3 @@
  * @category Ng CLI Adapter
  */
 export { wrapAngularDevkitSchematic, mockSchematicsForTesting, NxScopedHost, } from 'nx/src/adapter/ngcli-adapter';
-//# sourceMappingURL=ngcli-adapter.d.ts.map

package/{public-api.d.ts → dist/public-api.d.ts}

@@ -76,4 +76,3 @@ export { convertNxExecutor } from './src/utils/convert-nx-executor';
  * @category Utils
  */
 export { moveFilesToNewDirectory } from './src/utils/move-dir';
-//# sourceMappingURL=public-api.d.ts.map

package/{src → dist/src}/executors/parse-target-string.d.ts

@@ -36,4 +36,3 @@ export declare function parseTargetString(targetString: string, ctx: ExecutorCon
  * ```
  */
 export declare function targetToTargetString({ project, target, configuration, }: Target): string;
-//# sourceMappingURL=parse-target-string.d.ts.map

package/{src → dist/src}/executors/read-target-options.d.ts

@@ -5,4 +5,3 @@ import type { ExecutorContext, Target } from 'nx/src/devkit-exports';
  * Works as if you invoked the target yourself without passing any command lint overrides.
  */
 export declare function readTargetOptions<T = any>({ project, target, configuration }: Target, context: ExecutorContext): T;
-//# sourceMappingURL=read-target-options.d.ts.map

package/{src → dist/src}/generators/artifact-name-and-directory-utils.d.ts

@@ -52,4 +52,3 @@ export declare function getRelativeCwd(): string;
  * Function for setting cwd during testing
  */
 export declare function setCwd(path: string): void;
-//# sourceMappingURL=artifact-name-and-directory-utils.d.ts.map

package/{src → dist/src}/generators/e2e-web-server-info-utils.d.ts

@@ -21,4 +21,3 @@ export interface E2EWebServerDetails {
 }
 export declare function getE2EWebServerInfo(tree: Tree, projectName: string, pluginOptions: E2EWebServerPluginOptions, defaultValues: E2EWebServerDefaultValues, isPluginBeingAdded: boolean): Promise<E2EWebServerDetails>;
 export {};
-//# sourceMappingURL=e2e-web-server-info-utils.d.ts.map

package/{src → dist/src}/generators/e2e-web-server-info-utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getE2EWebServerInfo = getE2EWebServerInfo;
 const devkit_exports_1 = require("nx/src/devkit-exports");
+const target_defaults_utils_1 = require("./target-defaults-utils");
 const find_plugin_for_config_file_1 = require("../utils/find-plugin-for-config-file");
 async function getE2EWebServerInfo(tree, projectName, pluginOptions, defaultValues, isPluginBeingAdded) {
     const pm = (0, devkit_exports_1.getPackageManagerCommand)((0, devkit_exports_1.detectPackageManager)(tree.root));
@@ -33,23 +34,18 @@ async function getE2EWebServerInfoForPlugin(tree, projectName, pluginOptions, de
     }
     const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     let e2ePort = defaultValues.defaultE2EPort ?? 4200;
-    if (nxJson.targetDefaults?.[foundPlugin.options[pluginOptions.serveTargetName] ??
-        defaultValues.defaultServeTargetName] &&
-        nxJson.targetDefaults?.[foundPlugin.options[pluginOptions.serveTargetName] ??
-            defaultValues.defaultServeTargetName].options?.port) {
-        e2ePort =
-            nxJson.targetDefaults?.[foundPlugin.options[pluginOptions.serveTargetName] ??
-                defaultValues.defaultServeTargetName].options?.port;
-    }
+    const serveTargetName = foundPlugin.options[pluginOptions.serveTargetName] ??
+        defaultValues.defaultServeTargetName;
+    e2ePort =
+        (0, target_defaults_utils_1.readTargetDefaultsForTarget)(serveTargetName, nxJson.targetDefaults)?.options
+            ?.port ?? e2ePort;
     const e2eWebServerAddress = defaultValues.defaultE2EWebServerAddress.replace(/:\d+/, `:${e2ePort}`);
     return {
         e2eWebServerAddress,
-        e2eWebServerCommand: `${pm.exec} nx run ${projectName}:${foundPlugin.options[pluginOptions.serveTargetName] ??
-            defaultValues.defaultServeTargetName}`,
+        e2eWebServerCommand: `${pm.exec} nx run ${projectName}:${serveTargetName}`,
         e2eCiWebServerCommand: `${pm.exec} nx run ${projectName}:${foundPlugin.options[pluginOptions.serveStaticTargetName] ??
             defaultValues.defaultServeStaticTargetName}`,
         e2eCiBaseUrl: defaultValues.defaultE2ECiBaseUrl,
-        e2eDevServerTarget: `${projectName}:${foundPlugin.options[pluginOptions.serveTargetName] ??
-            defaultValues.defaultServeTargetName}`,
+        e2eDevServerTarget: `${projectName}:${serveTargetName}`,
     };
 }

package/{src → dist/src}/generators/executor-options-utils.d.ts

@@ -18,4 +18,3 @@ callback: CallBack<Options>): void;
  **/
 export declare function forEachExecutorOptionsInGraph<Options>(graph: ProjectGraph, executorName: string, callback: CallBack<Options>): void;
 export {};
-//# sourceMappingURL=executor-options-utils.d.ts.map

package/{src → dist/src}/generators/format-files.d.ts

@@ -16,4 +16,3 @@ import { Tree } from 'nx/src/devkit-exports';
 export declare function formatFiles(tree: Tree, options?: {
     sortRootTsconfigPaths?: boolean;
 }): Promise<void>;
-//# sourceMappingURL=format-files.d.ts.map

package/{src → dist/src}/generators/format-files.js

@@ -32,7 +32,7 @@ async function formatFiles(tree, options = {}) {
     }
     let prettier;
     try {
-        prettier = await Promise.resolve().then(() => tslib_1.__importStar(require('prettier')));
+        prettier = await import('prettier');
         /**
          * Even after we discovered prettier in node_modules, we need to be sure that the user is intentionally using prettier
          * before proceeding to format with it.

package/{src → dist/src}/generators/generate-files.d.ts

@@ -42,4 +42,3 @@ export interface GenerateFilesOptions {
 export declare function generateFiles(tree: Tree, srcFolder: string, target: string, substitutions: {
     [k: string]: any;
 }, options?: GenerateFilesOptions): void;
-//# sourceMappingURL=generate-files.d.ts.map

package/{src → dist/src}/generators/plugin-migrations/aggregate-log-util.d.ts

@@ -25,4 +25,3 @@ export declare class AggregatedLog {
     flushLogs(): void;
 }
 export {};
-//# sourceMappingURL=aggregate-log-util.d.ts.map

package/{src → 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 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;
@@ -13,14 +13,15 @@ type SkipProjectFilter = (projectConfiguration: ProjectConfiguration) => false |
 export declare class NoTargetsToMigrateError extends Error {
     constructor();
 }
-export declare function migrateProjectExecutorsToPlugin<T>(tree: Tree, projectGraph: ProjectGraph, pluginPath: string, createNodesV2: CreateNodesV2<T>, defaultPluginOptions: T, migrations: Array<{
+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: 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;
@@ -28,4 +29,3 @@ export declare function migrateProjectExecutorsToPluginV1<T>(tree: Tree, project
     skipTargetFilter?: SkipTargetFilter;
 }>, specificProjectToMigrate?: string): Promise<Map<string, Record<string, string>>>;
 export {};
-//# sourceMappingURL=executor-to-plugin-migrator.d.ts.map

package/{src → dist/src}/generators/plugin-migrations/executor-to-plugin-migrator.js

@@ -2,6 +2,7 @@
 var _ExecutorToPluginMigrator_instances, _ExecutorToPluginMigrator_projectGraph, _ExecutorToPluginMigrator_executor, _ExecutorToPluginMigrator_pluginPath, _ExecutorToPluginMigrator_pluginOptionsBuilder, _ExecutorToPluginMigrator_postTargetTransformer, _ExecutorToPluginMigrator_skipTargetFilter, _ExecutorToPluginMigrator_skipProjectFilter, _ExecutorToPluginMigrator_specificProjectToMigrate, _ExecutorToPluginMigrator_logger, _ExecutorToPluginMigrator_nxJson, _ExecutorToPluginMigrator_targetDefaultsForExecutor, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, _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.NoTargetsToMigrateError = void 0;
+exports.readTargetDefaultsForExecutor = readTargetDefaultsForExecutor;
 exports.migrateProjectExecutorsToPlugin = migrateProjectExecutorsToPlugin;
 exports.migrateProjectExecutorsToPluginV1 = migrateProjectExecutorsToPluginV1;
 const tslib_1 = require("tslib");
@@ -11,6 +12,7 @@ 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");
 const executor_options_utils_1 = require("../executor-options-utils");
+const target_defaults_utils_1 = require("../target-defaults-utils");
 const plugin_migration_utils_1 = require("./plugin-migration-utils");
 const devkit_exports_2 = require("nx/src/devkit-exports");
 class ExecutorToPluginMigrator {
@@ -169,7 +171,7 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
         }
     });
 }, _ExecutorToPluginMigrator_getTargetDefaultsForExecutor = function _ExecutorToPluginMigrator_getTargetDefaultsForExecutor() {
-    tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_targetDefaultsForExecutor, structuredClone(tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f").targetDefaults?.[tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_executor, "f")]), "f");
+    tslib_1.__classPrivateFieldSet(this, _ExecutorToPluginMigrator_targetDefaultsForExecutor, structuredClone(readTargetDefaultsForExecutor(tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_executor, "f"), tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f").targetDefaults) ?? {}), "f");
 }, _ExecutorToPluginMigrator_getCreatedTargetForProjectRoot = function _ExecutorToPluginMigrator_getCreatedTargetForProjectRoot(targetName, projectRoot) {
     const entry = Object.entries(tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_createNodesResultsForTargets, "f").get(targetName)?.projects ?? {}).find(([root]) => root === projectRoot);
     if (!entry) {
@@ -204,6 +206,22 @@ class NoTargetsToMigrateError extends Error {
     }
 }
 exports.NoTargetsToMigrateError = NoTargetsToMigrateError;
+function readTargetDefaultsForExecutor(executor, targetDefaults) {
+    // Preserve the legacy record-shape semantics this migrator used before
+    // array support: only an unfiltered default keyed directly by executor
+    // applies here. Target-scoped or filtered array entries remain opt-in
+    // behaviors for callers that can evaluate them in project context.
+    const entry = (0, target_defaults_utils_1.findTargetDefault)(targetDefaults, { executor });
+    if (!entry) {
+        return undefined;
+    }
+    const config = { ...entry };
+    delete config.target;
+    delete config.executor;
+    delete config.projects;
+    delete config.plugin;
+    return config;
+}
 async function migrateProjectExecutorsToPlugin(tree, projectGraph, pluginPath, createNodesV2, defaultPluginOptions, migrations, specificProjectToMigrate, logger) {
     const projects = await migrateProjects(tree, projectGraph, pluginPath, undefined, createNodesV2, defaultPluginOptions, migrations, specificProjectToMigrate, logger);
     return projects;
@@ -316,7 +334,7 @@ async function getCreateNodesResultsForPlugin(tree, pluginConfiguration, pluginP
     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);
+        projectConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)({ specifiedPlugins: [plugin], defaultPlugins: [] }, tree.root, nxJson);
     }
     catch (e) {
         if (e instanceof devkit_internals_1.ProjectConfigurationsError) {

package/{src → dist/src}/generators/plugin-migrations/plugin-migration-utils.d.ts

@@ -61,4 +61,3 @@ export declare function processTargetOutputs(target: TargetConfiguration, rename
     projectRoot: string;
 }): void;
 export declare function toProjectRelativePath(path: string, projectRoot: string): string;
-//# sourceMappingURL=plugin-migration-utils.d.ts.map

package/{src → dist/src}/generators/project-name-and-root-utils.d.ts

@@ -39,4 +39,3 @@ export declare function ensureRootProjectName(options: {
     directory: string;
     name?: string;
 }, projectType: 'application' | 'library'): Promise<void>;
-//# sourceMappingURL=project-name-and-root-utils.d.ts.map

package/{src → dist/src}/generators/prompt.d.ts

@@ -1,3 +1,2 @@
 import { prompt } from 'enquirer';
 export declare function promptWhenInteractive<T>(questions: Parameters<typeof prompt>[0], defaultValue: T): Promise<T>;
-//# sourceMappingURL=prompt.d.ts.map

package/{src → dist/src}/generators/run-tasks-in-serial.d.ts

@@ -5,4 +5,3 @@ import type { GeneratorCallback } from 'nx/src/devkit-exports';
  * @param tasks The tasks to run in serial.
  */
 export declare function runTasksInSerial(...tasks: GeneratorCallback[]): GeneratorCallback;
-//# sourceMappingURL=run-tasks-in-serial.d.ts.map

package/dist/src/generators/target-defaults-utils.d.ts

@@ -0,0 +1,31 @@
+import { type NxJsonConfiguration, type TargetConfiguration, type TargetDefaultEntry, type TargetDefaults, type Tree } from 'nx/src/devkit-exports';
+import { readTargetDefaultsForTarget as readTargetDefaultsForTargetFromNx } from 'nx/src/devkit-internals';
+/**
+ * Upsert a `targetDefaults` entry on the provided `nxJson`. Mutates
+ * `nxJson` in place and returns it so the caller can chain or batch
+ * other edits before persisting via `updateNxJson` exactly once.
+ *
+ * Always writes the array shape — if the underlying value still uses
+ * the legacy record shape, it is upgraded in place. Finds a matching
+ * entry by the `(target, executor, projects, plugin)` tuple and merges
+ * the given config into it, or appends a new entry. The entry must set
+ * at least one of `target` / `executor`.
+ */
+export declare function upsertTargetDefault(tree: Tree, nxJson: NxJsonConfiguration, options: TargetDefaultEntry): NxJsonConfiguration;
+/**
+ * Find a `targetDefaults` entry by its locator tuple
+ * `(target, executor, projects, plugin)`. Locator keys default to
+ * `undefined`, matching only entries that also leave them unset — same
+ * semantics as `upsertTargetDefault`. Accepts either array or legacy
+ * record shape.
+ *
+ * Throws when called with an empty locator (no `target`, `executor`,
+ * `projects`, or `plugin`). An empty locator is almost always a bug —
+ * the caller intended to find a specific entry but forgot to populate
+ * the lookup. Returning the first matching entry (or `undefined`) would
+ * silently mask the mistake.
+ */
+export declare function findTargetDefault(targetDefaults: TargetDefaults | undefined, locator: Pick<TargetDefaultEntry, 'target' | 'executor' | 'projects' | 'plugin'>): TargetDefaultEntry | undefined;
+export declare function readTargetDefaultsForTarget(targetName: string, targetDefaults: TargetDefaults | undefined, executor?: string, opts?: Parameters<typeof readTargetDefaultsForTargetFromNx>[3]): Partial<TargetConfiguration> | null;
+export declare function addBuildTargetDefaults(tree: Tree, executorName: string, buildTargetName?: string, extraInputs?: TargetConfiguration['inputs']): void;
+export declare function addE2eCiTargetDefaults(tree: Tree, e2ePlugin: string, buildTarget: string, pathToE2EConfigFile: string): Promise<void>;

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

@@ -0,0 +1,224 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.upsertTargetDefault = upsertTargetDefault;
+exports.findTargetDefault = findTargetDefault;
+exports.readTargetDefaultsForTarget = readTargetDefaultsForTarget;
+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");
+// Only write the array shape on nx >= 23 (workspace placeholder "0.0.1"
+// counts as modern); older nx can't validate it. Major-only compare so
+// pre-release tags like `23.0.0-beta.8` count as nx 23.
+const SUPPORTS_ARRAY_TARGET_DEFAULTS = !(0, semver_1.valid)(package_json_1.NX_VERSION) || package_json_1.NX_VERSION === '0.0.1' || (0, semver_1.major)(package_json_1.NX_VERSION) >= 23;
+/**
+ * Upsert a `targetDefaults` entry on the provided `nxJson`. Mutates
+ * `nxJson` in place and returns it so the caller can chain or batch
+ * other edits before persisting via `updateNxJson` exactly once.
+ *
+ * Always writes the array shape — if the underlying value still uses
+ * the legacy record shape, it is upgraded in place. Finds a matching
+ * entry by the `(target, executor, projects, plugin)` tuple and merges
+ * the given config into it, or appends a new entry. The entry must set
+ * at least one of `target` / `executor`.
+ */
+function upsertTargetDefault(tree, nxJson, options) {
+    if (options.target === undefined && options.executor === undefined) {
+        throw new Error('upsertTargetDefault requires at least one of `target` or `executor` to be set.');
+    }
+    const { target, executor, projects, plugin, ...config } = options;
+    const originalShape = nxJson.targetDefaults;
+    // Copy — `normalizeTargetDefaults` returns the input array as-is when
+    // it's already array shape. Without the spread, `entries[matchIndex] = ...`
+    // and `entries.push(...)` would mutate the user's array reference (and
+    // any other holders of the same `nxJson.targetDefaults` reference).
+    const entries = [...normalizeTargetDefaultsForUpsert(tree, originalShape)];
+    const matchIndex = entries.findIndex((e) => e.target === target &&
+        e.executor === executor &&
+        projectsEqual(e.projects, projects) &&
+        e.plugin === plugin);
+    if (matchIndex >= 0) {
+        const existing = entries[matchIndex];
+        const { target: et, executor: ee, projects: ep, plugin: ep2, ...existingRest } = existing;
+        entries[matchIndex] = buildTargetDefaultEntry(target ?? et, projects ?? ep, plugin ?? ep2, executor ?? ee, { ...existingRest, ...config });
+    }
+    else {
+        entries.push(buildTargetDefaultEntry(target, projects, plugin, executor, config));
+    }
+    // Preserve the record shape on pre-v23 nx when possible; promote to
+    // array if any entry can't be represented in record form.
+    if (SUPPORTS_ARRAY_TARGET_DEFAULTS || Array.isArray(originalShape)) {
+        nxJson.targetDefaults = entries;
+    }
+    else {
+        try {
+            nxJson.targetDefaults = (0, normalize_target_defaults_1.downgradeTargetDefaults)(entries);
+        }
+        catch {
+            nxJson.targetDefaults = entries;
+        }
+    }
+    return nxJson;
+}
+/**
+ * Find a `targetDefaults` entry by its locator tuple
+ * `(target, executor, projects, plugin)`. Locator keys default to
+ * `undefined`, matching only entries that also leave them unset — same
+ * semantics as `upsertTargetDefault`. Accepts either array or legacy
+ * record shape.
+ *
+ * Throws when called with an empty locator (no `target`, `executor`,
+ * `projects`, or `plugin`). An empty locator is almost always a bug —
+ * the caller intended to find a specific entry but forgot to populate
+ * the lookup. Returning the first matching entry (or `undefined`) would
+ * silently mask the mistake.
+ */
+function findTargetDefault(targetDefaults, locator) {
+    if (locator.target === undefined &&
+        locator.executor === undefined &&
+        locator.projects === undefined &&
+        locator.plugin === undefined) {
+        throw new Error('findTargetDefault requires at least one of `target`, `executor`, `projects`, or `plugin` on the locator.');
+    }
+    return (0, normalize_target_defaults_1.normalizeTargetDefaults)(targetDefaults).find((e) => e.target === locator.target &&
+        e.executor === locator.executor &&
+        projectsEqual(e.projects, locator.projects) &&
+        e.plugin === locator.plugin);
+}
+function readTargetDefaultsForTarget(targetName, targetDefaults, executor, opts) {
+    if (targetDefaults &&
+        !Array.isArray(targetDefaults) &&
+        Object.prototype.hasOwnProperty.call(targetDefaults, targetName)) {
+        return targetDefaults[targetName] ?? null;
+    }
+    return (0, devkit_internals_1.readTargetDefaultsForTarget)(targetName, targetDefaults, executor, opts);
+}
+function normalizeTargetDefaultsForUpsert(tree, targetDefaults) {
+    if (!targetDefaults) {
+        return [];
+    }
+    if (Array.isArray(targetDefaults)) {
+        return targetDefaults;
+    }
+    return (0, devkit_internals_1.normalizeTargetDefaultsAgainstRootMaps)(targetDefaults, buildProjectRootMap((0, devkit_exports_1.getProjects)(tree)));
+}
+function buildProjectRootMap(projects) {
+    return Object.fromEntries([...projects.values()].map((project) => [project.root, project]));
+}
+/**
+ * Construct a `TargetDefaultEntry` with the canonical key order
+ * `target → projects → plugin → executor → ...rest`. Locators land first
+ * so an entry's filter shape is obvious at a glance; `executor` follows
+ * because it doubles as a payload field.
+ */
+function buildTargetDefaultEntry(target, projects, plugin, executor, rest) {
+    return {
+        ...(target !== undefined ? { target } : {}),
+        ...(projects !== undefined ? { projects } : {}),
+        ...(plugin !== undefined ? { plugin } : {}),
+        ...(executor !== undefined ? { executor } : {}),
+        ...rest,
+    };
+}
+// Order-insensitive equality so re-upserts with reordered patterns
+// merge into the same entry rather than appending a duplicate.
+function projectsEqual(a, b) {
+    if (a === b)
+        return true;
+    const aArr = a === undefined ? undefined : Array.isArray(a) ? a : [a];
+    const bArr = b === undefined ? undefined : Array.isArray(b) ? b : [b];
+    if (!aArr || !bArr)
+        return false;
+    if (aArr.length !== bArr.length)
+        return false;
+    const aSet = new Set(aArr);
+    if (aSet.size !== aArr.length) {
+        // Duplicates inside one array — fall back to positional comparison so
+        // we don't silently merge `['a','a']` with `['a']`.
+        for (let i = 0; i < aArr.length; i++)
+            if (aArr[i] !== bArr[i])
+                return false;
+        return true;
+    }
+    for (const item of bArr)
+        if (!aSet.has(item))
+            return false;
+    return true;
+}
+function addBuildTargetDefaults(tree, executorName, buildTargetName = 'build', extraInputs = []) {
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree) ?? {};
+    const entries = (0, normalize_target_defaults_1.normalizeTargetDefaults)(nxJson.targetDefaults);
+    // Only skip when an *unfiltered* entry already covers this executor.
+    // A filtered entry (`projects:` or `plugin:`) only applies to a subset
+    // of targets, so it doesn't satisfy the workspace-wide default this
+    // helper writes — we still need to add the unfiltered baseline.
+    if (entries.some((e) => e.executor === executorName &&
+        e.projects === undefined &&
+        e.plugin === undefined)) {
+        return;
+    }
+    upsertTargetDefault(tree, nxJson, {
+        executor: executorName,
+        cache: true,
+        dependsOn: [`^${buildTargetName}`],
+        inputs: [
+            ...(nxJson.namedInputs && 'production' in nxJson.namedInputs
+                ? ['production', '^production']
+                : ['default', '^default']),
+            ...extraInputs,
+        ],
+    });
+    (0, devkit_exports_1.updateNxJson)(tree, nxJson);
+}
+async function addE2eCiTargetDefaults(tree, e2ePlugin, buildTarget, pathToE2EConfigFile) {
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
+    if (!nxJson?.plugins) {
+        return;
+    }
+    const e2ePluginRegistrations = nxJson.plugins.filter((p) => typeof p === 'string' ? p === e2ePlugin : p.plugin === e2ePlugin);
+    if (!e2ePluginRegistrations.length) {
+        return;
+    }
+    const resolvedE2ePlugin = await import(e2ePlugin);
+    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];
+        if (typeof candidatePluginForApplication === 'string') {
+            foundPluginForApplication = candidatePluginForApplication;
+            break;
+        }
+        const matchingConfigFiles = e2eConfigMatchesPluginGlob
+            ? (0, devkit_internals_1.findMatchingConfigFiles)([pathToE2EConfigFile], candidatePluginForApplication.include, candidatePluginForApplication.exclude)
+            : [];
+        if (matchingConfigFiles.length) {
+            foundPluginForApplication = candidatePluginForApplication;
+            break;
+        }
+    }
+    if (!foundPluginForApplication) {
+        return;
+    }
+    const ciTargetName = typeof foundPluginForApplication === 'string'
+        ? 'e2e-ci'
+        : (foundPluginForApplication.options?.ciTargetName ?? 'e2e-ci');
+    const ciTargetNameGlob = `${ciTargetName}--**/**`;
+    const existing = findTargetDefault(nxJson.targetDefaults, {
+        target: ciTargetNameGlob,
+    });
+    const dependsOn = [...(existing?.dependsOn ?? [])];
+    if (!dependsOn.includes(buildTarget)) {
+        dependsOn.push(buildTarget);
+    }
+    upsertTargetDefault(tree, nxJson, { target: ciTargetNameGlob, dependsOn });
+    (0, devkit_exports_1.updateNxJson)(tree, nxJson);
+}

package/{src → dist/src}/generators/to-js.d.ts

@@ -10,4 +10,3 @@ export type ToJSOptions = {
  * Rename and transpile any new typescript files created to javascript files
  */
 export declare function toJS(tree: Tree, options?: ToJSOptions): void;
-//# sourceMappingURL=to-js.d.ts.map