@nx/devkit 19.0.0-canary.20240427-f74aeab → 19.0.0-canary.20240502-5ded713

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "19.0.0-canary.20240427-f74aeab",
+  "version": "19.0.0-canary.20240502-5ded713",
   "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,10 +36,10 @@
     "semver": "^7.5.3",
     "yargs-parser": "21.1.1",
     "minimatch": "9.0.3",
-    "@nrwl/devkit": "19.0.0-canary.20240427-f74aeab"
+    "@nrwl/devkit": "19.0.0-canary.20240502-5ded713"
   },
   "peerDependencies": {
-    "nx": ">= 16 <= 19"
+    "nx": ">= 17 <= 20"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/parse-target-string.d.ts

@@ -1,6 +1,4 @@
-import type { Target } from 'nx/src/command-line/run/run';
-import type { ProjectGraph } from 'nx/src/config/project-graph';
-import type { ExecutorContext } from 'nx/src/devkit-exports';
+import { ExecutorContext, ProjectGraph, Target } from 'nx/src/devkit-exports';
 /**
  * @deprecated(v17) A project graph should be passed to parseTargetString for best accuracy.
  */

package/src/executors/parse-target-string.js

@@ -1,32 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.targetToTargetString = exports.parseTargetString = void 0;
-const nx_1 = require("../../nx");
-let { readCachedProjectGraph, splitTarget, splitByColons } = (0, nx_1.requireNx)();
-// TODO: Remove this in Nx 19 when Nx 16.7.0 is no longer supported
-splitTarget = splitTarget ?? require('nx/src/utils/split-target').splitTarget;
-splitByColons =
-    splitByColons ?? ((s) => s.split(':'));
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const devkit_internals_1 = require("nx/src/devkit-internals");
 function parseTargetString(targetString, projectGraphOrCtx) {
     let projectGraph = projectGraphOrCtx && 'projectGraph' in projectGraphOrCtx
         ? projectGraphOrCtx.projectGraph
         : projectGraphOrCtx;
     if (!projectGraph) {
         try {
-            projectGraph = readCachedProjectGraph();
+            projectGraph = (0, devkit_exports_1.readCachedProjectGraph)();
         }
         catch (e) {
             projectGraph = { nodes: {} };
         }
     }
-    const [maybeProject] = splitByColons(targetString);
+    const [maybeProject] = (0, devkit_internals_1.splitByColons)(targetString);
     if (!projectGraph.nodes[maybeProject] &&
         projectGraphOrCtx &&
         'projectName' in projectGraphOrCtx &&
         maybeProject !== projectGraphOrCtx.projectName) {
         targetString = `${projectGraphOrCtx.projectName}:${targetString}`;
     }
-    const [project, target, configuration] = splitTarget(targetString, projectGraph);
+    const [project, target, configuration] = (0, devkit_internals_1.splitTarget)(targetString, projectGraph);
     if (!project || !target) {
         throw new Error(`Invalid Target String: ${targetString}`);
     }

package/src/executors/read-target-options.d.ts

@@ -1,5 +1,4 @@
-import type { Target } from 'nx/src/command-line/run/run';
-import type { ExecutorContext } from 'nx/src/config/misc-interfaces';
+import type { ExecutorContext, Target } from 'nx/src/devkit-exports';
 /**
  * Reads and combines options for a given target.
  *

package/src/executors/read-target-options.js

@@ -1,13 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readTargetOptions = void 0;
-const nx_1 = require("../../nx");
 const path_1 = require("path");
-let { Workspaces, getExecutorInformation, calculateDefaultProjectName, combineOptionsForExecutor, } = (0, nx_1.requireNx)();
-// TODO: Remove this in Nx 19 when Nx 16.7.0 is no longer supported
-combineOptionsForExecutor =
-    combineOptionsForExecutor ??
-        require('nx/src/utils/params').combineOptionsForExecutor;
+const devkit_internals_1 = require("nx/src/devkit-internals");
 /**
  * Reads and combines options for a given target.
  *
@@ -22,17 +17,9 @@ function readTargetOptions({ project, target, configuration }, context) {
     if (!targetConfiguration) {
         throw new Error(`Unable to find target ${target} for project ${project}`);
     }
-    // TODO(v19): remove Workspaces.
-    const ws = new Workspaces(context.root);
     const [nodeModule, executorName] = targetConfiguration.executor.split(':');
-    const { schema } = getExecutorInformation
-        ? getExecutorInformation(nodeModule, executorName, context.root, context.projectsConfigurations?.projects ?? context.workspace.projects)
-        : // TODO(v19): remove readExecutor. This is to be backwards compatible with Nx 16.5 and below.
-            ws.readExecutor(nodeModule, executorName);
-    const defaultProject = calculateDefaultProjectName
-        ? calculateDefaultProjectName(context.cwd, context.root, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration)
-        : // TODO(v19): remove calculateDefaultProjectName. This is to be backwards compatible with Nx 16.5 and below.
-            ws.calculateDefaultProjectName(context.cwd, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration);
-    return combineOptionsForExecutor({}, configuration ?? targetConfiguration.defaultConfiguration ?? '', targetConfiguration, schema, defaultProject, (0, path_1.relative)(context.root, context.cwd));
+    const { schema } = (0, devkit_internals_1.getExecutorInformation)(nodeModule, executorName, context.root, context.projectsConfigurations?.projects ?? context.workspace.projects);
+    const defaultProject = (0, devkit_internals_1.calculateDefaultProjectName)(context.cwd, context.root, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration);
+    return (0, devkit_internals_1.combineOptionsForExecutor)({}, configuration ?? targetConfiguration.defaultConfiguration ?? '', targetConfiguration, schema, defaultProject, (0, path_1.relative)(context.root, context.cwd));
 }
 exports.readTargetOptions = readTargetOptions;

package/src/generators/add-build-target-defaults.d.ts

@@ -1,2 +1,2 @@
-import type { Tree } from 'nx/src/devkit-exports';
+import { Tree } from 'nx/src/devkit-exports';
 export declare function addBuildTargetDefaults(tree: Tree, executorName: string, buildTargetName?: string): void;

package/src/generators/add-build-target-defaults.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addBuildTargetDefaults = void 0;
-const nx_1 = require("../../nx");
-const { readNxJson, updateNxJson } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 function addBuildTargetDefaults(tree, executorName, buildTargetName = 'build') {
-    const nxJson = readNxJson(tree);
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     nxJson.targetDefaults ??= {};
     nxJson.targetDefaults[executorName] ??= {
         cache: true,
@@ -13,6 +12,6 @@ function addBuildTargetDefaults(tree, executorName, buildTargetName = 'build') {
             ? ['production', '^production']
             : ['default', '^default'],
     };
-    updateNxJson(tree, nxJson);
+    (0, devkit_exports_1.updateNxJson)(tree, nxJson);
 }
 exports.addBuildTargetDefaults = addBuildTargetDefaults;

package/src/generators/artifact-name-and-directory-utils.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
+import { Tree } from 'nx/src/devkit-exports';
 export type NameAndDirectoryFormat = 'as-provided' | 'derived';
 export type ArtifactGenerationOptions = {
     artifactType: string;

package/src/generators/artifact-name-and-directory-utils.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setCwd = exports.getRelativeCwd = exports.determineArtifactNameAndDirectoryOptions = void 0;
 const enquirer_1 = require("enquirer");
 const path_1 = require("path");
-const nx_1 = require("../../nx");
 const names_1 = require("../utils/names");
-const { createProjectRootMappingsFromProjectConfigurations, findProjectForPath, getProjects, joinPathFragments, logger, normalizePath, output, workspaceRoot, } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const devkit_internals_1 = require("nx/src/devkit-internals");
 async function determineArtifactNameAndDirectoryOptions(tree, options) {
     if (!options.nameAndDirectoryFormat &&
         (process.env.NX_INTERACTIVE !== 'true' || !isTTY())) {
@@ -53,8 +53,8 @@ async function determineFormat(formats, options) {
     return result;
 }
 function logDeprecationMessage(options, formats) {
-    logger.warn(`
-In Nx 19, generating a ${options.artifactType} will no longer support providing a project and deriving the directory.
+    devkit_exports_1.logger.warn(`
+In Nx 20, generating a ${options.artifactType} will no longer support providing a project and deriving the directory.
 Please provide the exact directory in the future.
 Example: nx g ${options.callingGenerator} ${formats['derived'].artifactName} --directory ${formats['derived'].directory}
 NOTE: The example above assumes the command is being run from the workspace root. If the command is being run from a subdirectory, the directory option should be adjusted accordingly.
@@ -62,7 +62,7 @@ NOTE: The example above assumes the command is being run from the workspace root
 }
 function getNameAndDirectoryOptionFormats(tree, options) {
     const directory = options.directory
-        ? normalizePath(options.directory.replace(/^\.?\//, ''))
+        ? (0, devkit_exports_1.normalizePath)(options.directory.replace(/^\.?\//, ''))
         : undefined;
     const fileExtension = options.fileExtension ?? 'ts';
     const { name: extractedName, directory: extractedDirectory } = extractNameAndDirectoryFromName(options.name);
@@ -87,7 +87,7 @@ function getNameAndDirectoryOptionFormats(tree, options) {
     }
     if (options.disallowPathInNameForDerived && options.name.includes('/')) {
         if (!options.nameAndDirectoryFormat) {
-            output.warn({
+            devkit_exports_1.output.warn({
                 title: `The provided name "${options.name}" contains a path and this is not supported by the "${options.callingGenerator}" when using the "derived" format.`,
                 bodyLines: [
                     `The generator will try to generate the ${options.artifactType} using the "as-provided" format at "${asProvidedOptions.filePath}".`,
@@ -124,7 +124,7 @@ function getAsProvidedOptions(tree, options) {
             asProvidedDirectory = options.directory;
         }
         else {
-            asProvidedDirectory = joinPathFragments(relativeCwd, options.directory);
+            asProvidedDirectory = (0, devkit_exports_1.joinPathFragments)(relativeCwd, options.directory);
         }
     }
     else {
@@ -133,7 +133,7 @@ function getAsProvidedOptions(tree, options) {
     const asProvidedProject = findProjectFromPath(tree, asProvidedDirectory);
     const asProvidedFileName = options.fileName ??
         (options.suffix ? `${options.name}.${options.suffix}` : options.name);
-    const asProvidedFilePath = joinPathFragments(asProvidedDirectory, `${asProvidedFileName}.${options.fileExtension}`);
+    const asProvidedFilePath = (0, devkit_exports_1.joinPathFragments)(asProvidedDirectory, `${asProvidedFileName}.${options.fileExtension}`);
     return {
         artifactName: options.name,
         directory: asProvidedDirectory,
@@ -143,7 +143,7 @@ function getAsProvidedOptions(tree, options) {
     };
 }
 function getDerivedOptions(tree, options, asProvidedOptions, extractedDirectory) {
-    const projects = getProjects(tree);
+    const projects = (0, devkit_exports_1.getProjects)(tree);
     if (options.project && !projects.has(options.project)) {
         throw new Error(`The provided project "${options.project}" does not exist! Please provide an existing project name.`);
     }
@@ -152,22 +152,22 @@ function getDerivedOptions(tree, options, asProvidedOptions, extractedDirectory)
     const derivedName = options.name;
     const baseDirectory = options.directory
         ? (0, names_1.names)(options.directory).fileName
-        : joinPathFragments(project.sourceRoot ?? joinPathFragments(project.root, 'src'), project.projectType === 'application' ? 'app' : 'lib', extractedDirectory ?? '');
+        : (0, devkit_exports_1.joinPathFragments)(project.sourceRoot ?? (0, devkit_exports_1.joinPathFragments)(project.root, 'src'), project.projectType === 'application' ? 'app' : 'lib', extractedDirectory ?? '');
     const derivedDirectory = typeof options.derivedDirectory === 'string'
-        ? joinPathFragments(project.sourceRoot ?? project.root, options.derivedDirectory, options.flat
+        ? (0, devkit_exports_1.joinPathFragments)(project.sourceRoot ?? project.root, options.derivedDirectory, options.flat
             ? ''
             : options.pascalCaseDirectory
                 ? (0, names_1.names)(derivedName).className
                 : (0, names_1.names)(derivedName).fileName)
         : options.flat
-            ? normalizePath(baseDirectory)
-            : joinPathFragments(baseDirectory, options.pascalCaseDirectory
+            ? (0, devkit_exports_1.normalizePath)(baseDirectory)
+            : (0, devkit_exports_1.joinPathFragments)(baseDirectory, options.pascalCaseDirectory
                 ? (0, names_1.names)(derivedName).className
                 : (0, names_1.names)(derivedName).fileName);
     if (options.directory &&
         !isDirectoryUnderProjectRoot(derivedDirectory, project.root)) {
         if (!options.nameAndDirectoryFormat) {
-            output.warn({
+            devkit_exports_1.output.warn({
                 title: `The provided directory "${options.directory}" is not under the provided project root "${project.root}".`,
                 bodyLines: [
                     `The generator will try to generate the ${options.artifactType} using the "as-provided" format.`,
@@ -188,7 +188,7 @@ function getDerivedOptions(tree, options, asProvidedOptions, extractedDirectory)
             ? (0, names_1.names)(derivedFileName).className
             : (0, names_1.names)(derivedFileName).fileName;
     }
-    const derivedFilePath = joinPathFragments(derivedDirectory, `${derivedFileName}.${options.fileExtension}`);
+    const derivedFilePath = (0, devkit_exports_1.joinPathFragments)(derivedDirectory, `${derivedFileName}.${options.fileExtension}`);
     return {
         artifactName: derivedName,
         directory: derivedDirectory,
@@ -210,16 +210,16 @@ function validateResolvedProject(tree, project, options, normalizedDirectory) {
 }
 function findProjectFromPath(tree, path) {
     const projectConfigurations = {};
-    const projects = getProjects(tree);
+    const projects = (0, devkit_exports_1.getProjects)(tree);
     for (const [projectName, project] of projects) {
         projectConfigurations[projectName] = project;
     }
-    const projectRootMappings = createProjectRootMappingsFromProjectConfigurations(projectConfigurations);
-    return findProjectForPath(path, projectRootMappings);
+    const projectRootMappings = (0, devkit_internals_1.createProjectRootMappingsFromProjectConfigurations)(projectConfigurations);
+    return (0, devkit_internals_1.findProjectForPath)(path, projectRootMappings);
 }
 function isDirectoryUnderProjectRoot(directory, projectRoot) {
-    const normalizedDirectory = joinPathFragments(workspaceRoot, directory);
-    const normalizedProjectRoot = joinPathFragments(workspaceRoot, projectRoot).replace(/\/$/, '');
+    const normalizedDirectory = (0, devkit_exports_1.joinPathFragments)(devkit_exports_1.workspaceRoot, directory);
+    const normalizedProjectRoot = (0, devkit_exports_1.joinPathFragments)(devkit_exports_1.workspaceRoot, projectRoot).replace(/\/$/, '');
     return (normalizedDirectory === normalizedProjectRoot ||
         normalizedDirectory.startsWith(`${normalizedProjectRoot}/`));
 }
@@ -227,23 +227,23 @@ function isTTY() {
     return !!process.stdout.isTTY && process.env['CI'] !== 'true';
 }
 function getRelativeCwd() {
-    return normalizePath((0, path_1.relative)(workspaceRoot, getCwd()));
+    return (0, devkit_exports_1.normalizePath)((0, path_1.relative)(devkit_exports_1.workspaceRoot, getCwd()));
 }
 exports.getRelativeCwd = getRelativeCwd;
 /**
  * Function for setting cwd during testing
  */
 function setCwd(path) {
-    process.env.INIT_CWD = (0, path_1.join)(workspaceRoot, path);
+    process.env.INIT_CWD = (0, path_1.join)(devkit_exports_1.workspaceRoot, path);
 }
 exports.setCwd = setCwd;
 function getCwd() {
-    return process.env.INIT_CWD?.startsWith(workspaceRoot)
+    return process.env.INIT_CWD?.startsWith(devkit_exports_1.workspaceRoot)
         ? process.env.INIT_CWD
         : process.cwd();
 }
 function extractNameAndDirectoryFromName(rawName) {
-    const parsedName = normalizePath(rawName).split('/');
+    const parsedName = (0, devkit_exports_1.normalizePath)(rawName).split('/');
     const name = parsedName.pop();
     const directory = parsedName.length ? parsedName.join('/') : undefined;
     return { name, directory };

package/src/generators/executor-options-utils.d.ts

@@ -1,5 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
-import type { ProjectGraph } from 'nx/src/config/project-graph';
+import { ProjectGraph, Tree } from 'nx/src/devkit-exports';
 type CallBack<T> = (currentValue: T, project: string, target: string, configuration?: string) => void;
 /**
  * Calls a function for each different options that an executor is configured with

package/src/generators/executor-options-utils.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.forEachExecutorOptionsInGraph = exports.forEachExecutorOptions = void 0;
-const nx_1 = require("../../nx");
-const { getProjects } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 /**
  * Calls a function for each different options that an executor is configured with
  */
@@ -15,7 +14,7 @@ executorName,
  * Callback that is called for each options configured for a builder
  */
 callback) {
-    forEachProjectConfig(getProjects(tree), executorName, callback);
+    forEachProjectConfig((0, devkit_exports_1.getProjects)(tree), executorName, callback);
 }
 exports.forEachExecutorOptions = forEachExecutorOptions;
 /**

package/src/generators/format-files.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
+import { Tree } from 'nx/src/devkit-exports';
 /**
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree

package/src/generators/format-files.js

@@ -2,11 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatFiles = void 0;
 const path = require("path");
-const nx_1 = require("../../nx");
-let { updateJson, readJson, sortObjectByKeys } = (0, nx_1.requireNx)();
-// TODO: Remove this in Nx 19 when Nx 16.7.0 is no longer supported
-sortObjectByKeys =
-    sortObjectByKeys ?? require('nx/src/utils/object-sort').sortObjectByKeys;
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const devkit_internals_1 = require("nx/src/devkit-internals");
 /**
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
@@ -56,11 +53,11 @@ function sortTsConfig(tree) {
         if (!tsConfigPath) {
             return;
         }
-        updateJson(tree, tsConfigPath, (tsconfig) => ({
+        (0, devkit_exports_1.updateJson)(tree, tsConfigPath, (tsconfig) => ({
             ...tsconfig,
             compilerOptions: {
                 ...tsconfig.compilerOptions,
-                paths: sortObjectByKeys(tsconfig.compilerOptions.paths),
+                paths: (0, devkit_internals_1.sortObjectByKeys)(tsconfig.compilerOptions.paths),
             },
         }));
     }
@@ -79,7 +76,7 @@ function getRootTsConfigPath(tree) {
 function getChangedPrettierConfigInTree(tree) {
     if (tree.listChanges().find((file) => file.path === '.prettierrc')) {
         try {
-            return readJson(tree, '.prettierrc');
+            return (0, devkit_exports_1.readJson)(tree, '.prettierrc');
         }
         catch {
             return null;

package/src/generators/generate-files.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
+import { Tree } from 'nx/src/devkit-exports';
 /**
  * Generates a folder of files based on provided templates.
  *

package/src/generators/generate-files.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateFiles = void 0;
 const fs_1 = require("fs");
 const path = require("path");
-const nx_1 = require("../../nx");
 const binary_extensions_1 = require("../utils/binary-extensions");
-const { logger } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 /**
  * Generates a folder of files based on provided templates.
  *
@@ -49,7 +48,7 @@ function generateFiles(tree, srcFolder, target, substitutions) {
                     });
                 }
                 catch (e) {
-                    logger.error(`Error in ${filePath.replace(`${tree.root}/`, '')}:`);
+                    devkit_exports_1.logger.error(`Error in ${filePath.replace(`${tree.root}/`, '')}:`);
                     throw e;
                 }
             }

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

@@ -1,9 +1,6 @@
-import type { TargetConfiguration } from 'nx/src/config/workspace-json-project-json';
-import type { Tree } from 'nx/src/generators/tree';
-import type { CreateNodes } from 'nx/src/project-graph/plugins';
-import type { ProjectGraph } from 'nx/src/config/project-graph';
+import { ProjectGraph, TargetConfiguration, Tree, CreateNodes } from 'nx/src/devkit-exports';
 type PluginOptionsBuilder<T> = (targetName: string) => T;
-type PostTargetTransformer = (targetConfiguration: TargetConfiguration) => TargetConfiguration;
+type PostTargetTransformer = (targetConfiguration: TargetConfiguration, tree?: Tree) => 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<void>;
 export {};

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

@@ -6,8 +6,8 @@ const tslib_1 = require("tslib");
 const minimatch_1 = require("minimatch");
 const executor_options_utils_1 = require("../executor-options-utils");
 const plugin_migration_utils_1 = require("./plugin-migration-utils");
-const nx_1 = require("../../../nx");
-const { glob, readNxJson, updateNxJson, mergeTargetConfigurations, updateProjectConfiguration, readProjectConfiguration, retrieveProjectConfigurations, LoadedNxPlugin, ProjectConfigurationsError, } = (0, nx_1.requireNx)();
+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) {
         _ExecutorToPluginMigrator_instances.add(this);
@@ -44,7 +44,7 @@ class ExecutorToPluginMigrator {
     }
 }
 _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() {
-    const nxJson = readNxJson(this.tree);
+    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");
@@ -65,13 +65,13 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
     });
 }, _ExecutorToPluginMigrator_migrateProject = function _ExecutorToPluginMigrator_migrateProject(projectName, targetName) {
     const projectFromGraph = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_projectGraph, "f").nodes[projectName];
-    const projectConfig = readProjectConfiguration(this.tree, 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);
     let projectTarget = projectConfig.targets[targetName];
-    projectTarget = mergeTargetConfigurations(projectTarget, tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetDefaultsForExecutor, "f"));
+    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);
+    projectTarget = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_postTargetTransformer, "f").call(this, projectTarget, this.tree);
     if (projectTarget.options &&
         Object.keys(projectTarget.options).length === 0) {
         delete projectTarget.options;
@@ -82,7 +82,7 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
     else {
         delete projectConfig.targets[targetName];
     }
-    updateProjectConfiguration(this.tree, projectName, projectConfig);
+    (0, devkit_exports_1.updateProjectConfiguration)(this.tree, projectName, projectConfig);
     return `${projectFromGraph.data.root}/**/*`;
 }, _ExecutorToPluginMigrator_addPlugins = function _ExecutorToPluginMigrator_addPlugins() {
     for (const [targetName, plugin] of tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginToAddForTarget, "f").entries()) {
@@ -123,7 +123,7 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
             tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f").plugins.push(plugin);
         }
     }
-    updateNxJson(this.tree, tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f"));
+    (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) {
@@ -167,7 +167,7 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
     return createdTarget;
 }, _ExecutorToPluginMigrator_getCreateNodesResults = async function _ExecutorToPluginMigrator_getCreateNodesResults() {
     for (const targetName of tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, "f").keys()) {
-        const loadedPlugin = new LoadedNxPlugin({
+        const loadedPlugin = new devkit_internals_1.LoadedNxPlugin({
             createNodes: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_createNodes, "f"),
             name: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginPath, "f"),
         }, {
@@ -176,10 +176,10 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
         });
         let projectConfigs;
         try {
-            projectConfigs = await retrieveProjectConfigurations([loadedPlugin], this.tree.root, tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f"));
+            projectConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([loadedPlugin], this.tree.root, tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_nxJson, "f"));
         }
         catch (e) {
-            if (e instanceof ProjectConfigurationsError) {
+            if (e instanceof devkit_internals_1.ProjectConfigurationsError) {
                 projectConfigs = e.partialProjectConfigurationsResult;
             }
             else {

package/src/generators/project-name-and-root-utils.d.ts

@@ -1,5 +1,4 @@
-import type { ProjectType } from 'nx/src/config/workspace-json-project-json';
-import type { Tree } from 'nx/src/generators/tree';
+import { ProjectType, Tree } from 'nx/src/devkit-exports';
 export type ProjectNameAndRootFormat = 'as-provided' | 'derived';
 export type ProjectGenerationOptions = {
     name: string;

package/src/generators/project-name-and-root-utils.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setCwd = exports.determineProjectNameAndRootOptions = void 0;
 const enquirer_1 = require("enquirer");
 const path_1 = require("path");
-const nx_1 = require("../../nx");
 const get_workspace_layout_1 = require("../utils/get-workspace-layout");
 const names_1 = require("../utils/names");
-const { joinPathFragments, logger, normalizePath, output, readJson, stripIndents, workspaceRoot, } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 async function determineProjectNameAndRootOptions(tree, options) {
     if (!options.projectNameAndRootFormat &&
         (process.env.NX_INTERACTIVE !== 'true' || !isTTY())) {
@@ -45,8 +44,8 @@ function validateName(name, projectNameAndRootFormat) {
     }
 }
 function logDeprecationMessage(callingGenerator, formats) {
-    logger.warn(stripIndents `
-    In Nx 19, generating projects will no longer derive the name and root.
+    devkit_exports_1.logger.warn((0, devkit_exports_1.stripIndents) `
+    In Nx 20, generating projects will no longer derive the name and root.
     Please provide the exact project name and root in the future.
     Example: nx g ${callingGenerator} ${formats['derived'].projectName} --directory ${formats['derived'].projectRoot}
   `);
@@ -86,7 +85,7 @@ async function determineFormat(formats) {
 }
 function getProjectNameAndRootFormats(tree, options) {
     const directory = options.directory
-        ? normalizePath(options.directory.replace(/^\.?\//, ''))
+        ? (0, devkit_exports_1.normalizePath)(options.directory.replace(/^\.?\//, ''))
         : undefined;
     const { name: asProvidedParsedName, directory: asProvidedParsedDirectory } = parseNameForAsProvided(options.name);
     if (asProvidedParsedDirectory && directory) {
@@ -106,7 +105,7 @@ function getProjectNameAndRootFormats(tree, options) {
     }
     if (asProvidedOptions.projectName.startsWith('@')) {
         if (!options.projectNameAndRootFormat) {
-            output.warn({
+            devkit_exports_1.output.warn({
                 title: `The provided name "${options.name}" contains a scoped project name and this is not supported by the "${options.callingGenerator}" when using the "derived" format.`,
                 bodyLines: [
                     `The generator will try to generate the project "${asProvidedOptions.projectName}" using the "as-provided" format at "${asProvidedOptions.projectRoot}".`,
@@ -152,7 +151,7 @@ function getAsProvidedOptions(tree, options) {
             projectRoot = options.directory;
         }
         else {
-            projectRoot = joinPathFragments(relativeCwd, options.directory);
+            projectRoot = (0, devkit_exports_1.joinPathFragments)(relativeCwd, options.directory);
         }
     }
     else if (options.rootProject) {
@@ -162,7 +161,7 @@ function getAsProvidedOptions(tree, options) {
         projectRoot = relativeCwd;
         // append the project name to the current working directory if it doesn't end with it
         if (!relativeCwd.endsWith(options.name)) {
-            projectRoot = joinPathFragments(relativeCwd, options.name);
+            projectRoot = (0, devkit_exports_1.joinPathFragments)(relativeCwd, options.name);
         }
     }
     let importPath = undefined;
@@ -176,7 +175,7 @@ function getAsProvidedOptions(tree, options) {
                 const npmScope = getNpmScope(tree);
                 importPath =
                     projectRoot === '.'
-                        ? readJson(tree, 'package.json').name ??
+                        ? (0, devkit_exports_1.readJson)(tree, 'package.json').name ??
                             getImportPath(npmScope, options.name)
                         : getImportPath(npmScope, options.name);
             }
@@ -208,7 +207,7 @@ function getDerivedOptions(tree, options) {
     let projectRoot = projectDirectoryWithoutLayout;
     if (projectDirectoryWithoutLayout !== '.') {
         // prepend the layout directory
-        projectRoot = joinPathFragments(layoutDirectory, projectRoot);
+        projectRoot = (0, devkit_exports_1.joinPathFragments)(layoutDirectory, projectRoot);
     }
     let importPath;
     if (options.projectType === 'library') {
@@ -217,7 +216,7 @@ function getDerivedOptions(tree, options) {
             const npmScope = getNpmScope(tree);
             importPath =
                 projectRoot === '.'
-                    ? readJson(tree, 'package.json').name ??
+                    ? (0, devkit_exports_1.readJson)(tree, 'package.json').name ??
                         getImportPath(npmScope, projectName)
                     : getImportPath(npmScope, projectDirectoryWithoutLayout);
         }
@@ -245,7 +244,7 @@ function getImportPath(npmScope, name) {
 }
 function getNpmScope(tree) {
     const { name } = tree.exists('package.json')
-        ? readJson(tree, 'package.json')
+        ? (0, devkit_exports_1.readJson)(tree, 'package.json')
         : { name: null };
     return name?.startsWith('@') ? name.split('/')[0].substring(1) : undefined;
 }
@@ -259,22 +258,22 @@ function isTTY() {
  * environment variable (see here: https://docs.npmjs.com/cli/v9/commands/npm-run-script#description).
  */
 function getCwd() {
-    return process.env.INIT_CWD?.startsWith(workspaceRoot)
+    return process.env.INIT_CWD?.startsWith(devkit_exports_1.workspaceRoot)
         ? process.env.INIT_CWD
         : process.cwd();
 }
 function getRelativeCwd() {
-    return normalizePath((0, path_1.relative)(workspaceRoot, getCwd())).replace(/\/$/, '');
+    return (0, devkit_exports_1.normalizePath)((0, path_1.relative)(devkit_exports_1.workspaceRoot, getCwd())).replace(/\/$/, '');
 }
 /**
  * Function for setting cwd during testing
  */
 function setCwd(path) {
-    process.env.INIT_CWD = (0, path_1.join)(workspaceRoot, path);
+    process.env.INIT_CWD = (0, path_1.join)(devkit_exports_1.workspaceRoot, path);
 }
 exports.setCwd = setCwd;
 function parseNameForAsProvided(rawName) {
-    const directory = normalizePath(rawName);
+    const directory = (0, devkit_exports_1.normalizePath)(rawName);
     if (rawName.includes('@')) {
         const index = directory.lastIndexOf('@');
         if (index === 0) {
@@ -291,7 +290,7 @@ function parseNameForAsProvided(rawName) {
     return { name: rawName, directory: undefined };
 }
 function parseNameForDerived(rawName) {
-    const parsedName = normalizePath(rawName).split('/');
+    const parsedName = (0, devkit_exports_1.normalizePath)(rawName).split('/');
     const name = parsedName.pop();
     const directory = parsedName.length ? parsedName.join('/') : undefined;
     return { name, directory };