@nx/devkit 19.0.0-canary.20240430-458f2cc → 19.0.0-canary.20240502-5ded713

package/src/generators/run-tasks-in-serial.d.ts

@@ -1,4 +1,4 @@
-import type { GeneratorCallback } from 'nx/src/config/misc-interfaces';
+import type { GeneratorCallback } from 'nx/src/devkit-exports';
 /**
  * Run tasks in serial
  *

package/src/generators/to-js.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
+import type { Tree } from 'nx/src/devkit-exports';
 import type { ScriptTarget, ModuleKind } from 'typescript';
 export type ToJSOptions = {
     target?: ScriptTarget;

package/src/generators/update-ts-configs-to-js.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
+import { Tree } from 'nx/src/devkit-exports';
 export declare function updateTsConfigsToJs(tree: Tree, options: {
     projectRoot: string;
 }): void;

package/src/generators/update-ts-configs-to-js.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfigsToJs = void 0;
-const nx_1 = require("../../nx");
-const { updateJson } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 function updateTsConfigsToJs(tree, options) {
     let updateConfigPath;
     const paths = {
@@ -19,7 +18,7 @@ function updateTsConfigsToJs(tree, options) {
         }
         throw new Error(`project is missing tsconfig.lib.json or tsconfig.app.json`);
     };
-    updateJson(tree, paths.tsConfig, (json) => {
+    (0, devkit_exports_1.updateJson)(tree, paths.tsConfig, (json) => {
         if (json.compilerOptions) {
             json.compilerOptions.allowJs = true;
         }
@@ -35,7 +34,7 @@ function updateTsConfigsToJs(tree, options) {
     if (projectType === 'application') {
         updateConfigPath = paths.tsConfigApp;
     }
-    updateJson(tree, updateConfigPath, (json) => {
+    (0, devkit_exports_1.updateJson)(tree, updateConfigPath, (json) => {
         json.include = uniq([...json.include, 'src/**/*.js']);
         json.exclude = uniq([
             ...json.exclude,

package/src/generators/visit-not-ignored-files.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
+import type { Tree } from 'nx/src/devkit-exports';
 /**
  * Utility to act on all files in a tree that are not ignored by git.
  */

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +1,2 @@
-import type { Tree } from 'nx/src/generators/tree';
+import type { Tree } from 'nx/src/devkit-exports';
 export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-9-0/migrate-mf-util-usage.d.ts

@@ -1,4 +1,3 @@
-import type { Tree } from 'nx/src/generators/tree';
-import type { GeneratorCallback } from 'nx/src/config/misc-interfaces';
+import { GeneratorCallback, Tree } from 'nx/src/devkit-exports';
 declare const _default: (tree: Tree) => Promise<GeneratorCallback | void>;
 export default _default;

package/src/migrations/update-16-9-0/migrate-mf-util-usage.js

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const visit_not_ignored_files_1 = require("../../generators/visit-not-ignored-files");
 const format_files_1 = require("../../generators/format-files");
-const nx_1 = require("../../../nx");
 const package_json_1 = require("../../utils/package-json");
 const versions_1 = require("../../utils/versions");
-const { readJson } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 let tsModule;
 const MODULE_FEDERATION_PUBLIC_TOKENS = [
     'AdditionalSharedConfig',
@@ -45,7 +44,7 @@ exports.default = async (tree) => {
     });
     if (hasFileToMigrate) {
         await (0, format_files_1.formatFiles)(tree);
-        const pkgJson = readJson(tree, 'package.json');
+        const pkgJson = (0, devkit_exports_1.readJson)(tree, 'package.json');
         const nxVersion = pkgJson.devDependencies?.['nx'] ??
             pkgJson.dependencies?.['nx'] ??
             '17.0.0';

package/src/tasks/install-packages-task.d.ts

@@ -1,5 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
-import type { PackageManager } from 'nx/src/utils/package-manager';
+import { PackageManager, Tree } from 'nx/src/devkit-exports';
 /**
  * Runs `npm install` or `yarn install`. It will skip running the install if
  * `package.json` hasn't changed at all or it hasn't changed since the last invocation.

package/src/tasks/install-packages-task.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.installPackagesTask = void 0;
 const child_process_1 = require("child_process");
 const path_1 = require("path");
-const nx_1 = require("../../nx");
-const { detectPackageManager, getPackageManagerCommand, joinPathFragments } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 /**
  * Runs `npm install` or `yarn install`. It will skip running the install if
  * `package.json` hasn't changed at all or it hasn't changed since the last invocation.
@@ -12,19 +11,19 @@ const { detectPackageManager, getPackageManagerCommand, joinPathFragments } = (0
  * @param tree - the file system tree
  * @param alwaysRun - always run the command even if `package.json` hasn't changed.
  */
-function installPackagesTask(tree, alwaysRun = false, cwd = '', packageManager = detectPackageManager(cwd)) {
+function installPackagesTask(tree, alwaysRun = false, cwd = '', packageManager = (0, devkit_exports_1.detectPackageManager)(cwd)) {
     if (!tree
         .listChanges()
-        .find((f) => f.path === joinPathFragments(cwd, 'package.json')) &&
+        .find((f) => f.path === (0, devkit_exports_1.joinPathFragments)(cwd, 'package.json')) &&
         !alwaysRun) {
         return;
     }
-    const packageJsonValue = tree.read(joinPathFragments(cwd, 'package.json'), 'utf-8');
+    const packageJsonValue = tree.read((0, devkit_exports_1.joinPathFragments)(cwd, 'package.json'), 'utf-8');
     let storedPackageJsonValue = global['__packageJsonInstallCache__'];
     // Don't install again if install was already executed with package.json
     if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
         global['__packageJsonInstallCache__'] = packageJsonValue;
-        const pmc = getPackageManagerCommand(packageManager);
+        const pmc = (0, devkit_exports_1.getPackageManagerCommand)(packageManager);
         const execSyncOptions = {
             cwd: (0, path_1.join)(tree.root, cwd),
             stdio: process.env.NX_GENERATE_QUIET === 'true' ? 'ignore' : 'inherit',

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

@@ -1,4 +1,4 @@
-import { type CreateNodes, type ProjectGraph, type 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
 

package/src/utils/add-plugin.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCombinations = exports.addPlugin = void 0;
 const yargs = require("yargs-parser");
-const nx_1 = require("../../nx");
-const { readJson, writeJson, readNxJson, updateNxJson, 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");
 /**
  * Iterates through various forms of plugin options to find the one which does not conflict with the current graph
 
  */
 async function addPlugin(tree, graph, pluginName, createNodesTuple, options, shouldUpdatePackageJsonScripts) {
     const graphNodes = Object.values(graph.nodes);
-    const nxJson = readNxJson(tree);
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     let pluginOptions;
     let projConfigs;
     const combinations = generateCombinations(options);
@@ -25,8 +25,8 @@ async function addPlugin(tree, graph, pluginName, createNodesTuple, options, sho
         }
         global.NX_GRAPH_CREATION = true;
         try {
-            projConfigs = await retrieveProjectConfigurations([
-                new LoadedNxPlugin({
+            projConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([
+                new devkit_internals_1.LoadedNxPlugin({
                     name: pluginName,
                     createNodes: createNodesTuple,
                 }, {
@@ -37,7 +37,7 @@ async function addPlugin(tree, graph, pluginName, createNodesTuple, options, sho
         }
         catch (e) {
             // Errors are okay for this because we're only running 1 plugin
-            if (e instanceof ProjectConfigurationsError) {
+            if (e instanceof devkit_internals_1.ProjectConfigurationsError) {
                 projConfigs = e.partialProjectConfigurationsResult;
             }
             else {
@@ -67,7 +67,7 @@ async function addPlugin(tree, graph, pluginName, createNodesTuple, options, sho
         plugin: pluginName,
         options: pluginOptions,
     });
-    updateNxJson(tree, nxJson);
+    (0, devkit_exports_1.updateNxJson)(tree, nxJson);
     if (shouldUpdatePackageJsonScripts) {
         updatePackageScripts(tree, projConfigs);
     }
@@ -84,7 +84,7 @@ function processProject(tree, projectRoot, projectConfiguration) {
     if (!tree.exists(packageJsonPath)) {
         return;
     }
-    const packageJson = readJson(tree, packageJsonPath);
+    const packageJson = (0, devkit_exports_1.readJson)(tree, packageJsonPath);
     if (!packageJson.scripts || !Object.keys(packageJson.scripts).length) {
         return;
     }
@@ -175,7 +175,7 @@ function processProject(tree, projectRoot, projectConfiguration) {
             }
         }
     }
-    writeJson(tree, packageJsonPath, packageJson);
+    (0, devkit_exports_1.writeJson)(tree, packageJsonPath, packageJson);
 }
 function getInferredTargetCommands(project) {
     const targetCommands = [];

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

@@ -1,2 +1,2 @@
-import type { CreateNodesContext } from 'nx/src/devkit-exports';
+import { CreateNodesContext } from 'nx/src/devkit-exports';
 export declare function calculateHashForCreateNodes(projectRoot: string, options: object, context: CreateNodesContext, additionalGlobs?: string[]): string;

package/src/utils/calculate-hash-for-create-nodes.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateHashForCreateNodes = void 0;
-const nx_1 = require("../../nx");
 const path_1 = require("path");
-const { hashWithWorkspaceContext, hashArray, hashObject } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const devkit_internals_1 = require("nx/src/devkit-internals");
 function calculateHashForCreateNodes(projectRoot, options, context, additionalGlobs = []) {
-    return hashArray([
-        hashWithWorkspaceContext(context.workspaceRoot, [
+    return (0, devkit_exports_1.hashArray)([
+        (0, devkit_internals_1.hashWithWorkspaceContext)(context.workspaceRoot, [
             (0, path_1.join)(projectRoot, '**/*'),
             ...additionalGlobs,
         ]),
-        hashObject(options),
+        (0, devkit_internals_1.hashObject)(options),
     ]);
 }
 exports.calculateHashForCreateNodes = calculateHashForCreateNodes;

package/src/utils/config-utils.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearRequireCache = exports.getRootTsConfigFileName = exports.getRootTsConfigPath = exports.loadConfigFile = exports.dynamicImport = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
-const nx_1 = require("../../nx");
 const node_url_1 = require("node:url");
-const { workspaceRoot, registerTsProject } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const devkit_internals_1 = require("nx/src/devkit-internals");
 exports.dynamicImport = new Function('modulePath', 'return import(modulePath);');
 async function loadConfigFile(configFilePath) {
     {
@@ -16,7 +16,7 @@ async function loadConfigFile(configFilePath) {
                 ? (0, path_1.join)((0, path_1.dirname)(configFilePath), 'tsconfig.json')
                 : getRootTsConfigPath();
             if (tsConfigPath) {
-                const unregisterTsProject = registerTsProject(tsConfigPath);
+                const unregisterTsProject = (0, devkit_internals_1.registerTsProject)(tsConfigPath);
                 try {
                     module = await load(configFilePath);
                 }
@@ -37,12 +37,12 @@ async function loadConfigFile(configFilePath) {
 exports.loadConfigFile = loadConfigFile;
 function getRootTsConfigPath() {
     const tsConfigFileName = getRootTsConfigFileName();
-    return tsConfigFileName ? (0, path_1.join)(workspaceRoot, tsConfigFileName) : null;
+    return tsConfigFileName ? (0, path_1.join)(devkit_exports_1.workspaceRoot, tsConfigFileName) : null;
 }
 exports.getRootTsConfigPath = getRootTsConfigPath;
 function getRootTsConfigFileName() {
     for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
-        const pathExists = (0, fs_1.existsSync)((0, path_1.join)(workspaceRoot, tsConfigName));
+        const pathExists = (0, fs_1.existsSync)((0, path_1.join)(devkit_exports_1.workspaceRoot, tsConfigName));
         if (pathExists) {
             return tsConfigName;
         }

package/src/utils/convert-nx-executor.d.ts

@@ -1,4 +1,4 @@
-import type { Executor } from 'nx/src/config/misc-interfaces';
+import type { Executor } from 'nx/src/devkit-exports';
 /**
  * Convert an Nx Executor into an Angular Devkit Builder
  *

package/src/utils/convert-nx-executor.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxExecutor = void 0;
-const nx_1 = require("../../nx");
 const package_json_1 = require("./package-json");
 const semver_1 = require("semver");
-const { Workspaces, readNxJsonFromDisk, retrieveProjectConfigurationsWithAngularProjects, readProjectConfigurationsFromRootMap, } = (0, nx_1.requireNx)();
+const devkit_internals_1 = require("nx/src/devkit-internals");
 /**
  * Convert an Nx Executor into an Angular Devkit Builder
  *
@@ -13,34 +12,25 @@ const { Workspaces, readNxJsonFromDisk, retrieveProjectConfigurationsWithAngular
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 function convertNxExecutor(executor) {
     const builderFunction = (options, builderContext) => {
-        const workspaces = new Workspaces(builderContext.workspaceRoot);
-        const nxJsonConfiguration = readNxJsonFromDisk
-            ? readNxJsonFromDisk(builderContext.workspaceRoot)
-            : // TODO(v19): remove readNxJson. This is to be backwards compatible with Nx 16.5 and below.
-                workspaces.readNxJson();
+        const nxJsonConfiguration = (0, devkit_internals_1.readNxJsonFromDisk)(builderContext.workspaceRoot);
         const promise = async () => {
-            const projectsConfigurations = retrieveProjectConfigurationsWithAngularProjects
-                ? {
-                    version: 2,
-                    projects: await retrieveProjectConfigurationsWithAngularProjects(builderContext.workspaceRoot, nxJsonConfiguration).then((p) => {
-                        if (p.projectNodes) {
-                            return p.projectNodes;
-                        }
-                        // v18.3.4 changed projects to be keyed by root
-                        // rather than project name
-                        if ((0, semver_1.lt)(package_json_1.NX_VERSION, '18.3.4')) {
-                            return p.projects;
-                        }
-                        if (readProjectConfigurationsFromRootMap) {
-                            return readProjectConfigurationsFromRootMap(p.projects);
-                        }
-                        throw new Error('Unable to successfully map Nx executor -> Angular Builder');
-                    }),
-                }
-                : // TODO(v19): remove retrieveProjectConfigurations. This is to be backwards compatible with Nx 16.5 and below.
-                    workspaces.readProjectsConfigurations({
-                        _includeProjectsFromAngularJson: true,
-                    });
+            const projectsConfigurations = {
+                version: 2,
+                projects: await (0, devkit_internals_1.retrieveProjectConfigurationsWithAngularProjects)(builderContext.workspaceRoot, nxJsonConfiguration).then((p) => {
+                    if (p.projectNodes) {
+                        return p.projectNodes;
+                    }
+                    // v18.3.4 changed projects to be keyed by root
+                    // rather than project name
+                    if ((0, semver_1.lt)(package_json_1.NX_VERSION, '18.3.4')) {
+                        return p.projects;
+                    }
+                    if (devkit_internals_1.readProjectConfigurationsFromRootMap) {
+                        return (0, devkit_internals_1.readProjectConfigurationsFromRootMap)(p.projects);
+                    }
+                    throw new Error('Unable to successfully map Nx executor -> Angular Builder');
+                }),
+            };
             const context = {
                 root: builderContext.workspaceRoot,
                 projectName: builderContext.target.project,

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

@@ -1,5 +1,5 @@
-import type { CreateNodesContext } from 'nx/src/devkit-exports';
 import type { InputDefinition } from 'nx/src/config/workspace-json-project-json';
+import { CreateNodesContext } from 'nx/src/devkit-exports';
 /**
  * Get the named inputs available for a directory
  */

package/src/utils/get-named-inputs.js

@@ -3,19 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNamedInputs = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
-const nx_1 = require("../../nx");
-const { readJsonFile } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 /**
  * Get the named inputs available for a directory
  */
 function getNamedInputs(directory, context) {
     const projectJsonPath = (0, path_1.join)(directory, 'project.json');
     const projectJson = (0, fs_1.existsSync)(projectJsonPath)
-        ? readJsonFile(projectJsonPath)
+        ? (0, devkit_exports_1.readJsonFile)(projectJsonPath)
         : null;
     const packageJsonPath = (0, path_1.join)(directory, 'package.json');
     const packageJson = (0, fs_1.existsSync)(packageJsonPath)
-        ? readJsonFile(packageJsonPath)
+        ? (0, devkit_exports_1.readJsonFile)(packageJsonPath)
         : null;
     return {
         ...context.nxJsonConfiguration.namedInputs,

package/src/utils/get-workspace-layout.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
+import { Tree } from 'nx/src/devkit-exports';
 /**
  * Returns workspace defaults. It includes defaults folders for apps and libs,
  * and the default scope.

package/src/utils/get-workspace-layout.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractLayoutDirectory = exports.getWorkspaceLayout = void 0;
-const nx_1 = require("../../nx");
-const { readNxJson } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 /**
  * Returns workspace defaults. It includes defaults folders for apps and libs,
  * and the default scope.
@@ -15,7 +14,7 @@ const { readNxJson } = (0, nx_1.requireNx)();
  * @param tree - file system tree
  */
 function getWorkspaceLayout(tree) {
-    const nxJson = readNxJson(tree);
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     return {
         appsDir: nxJson?.workspaceLayout?.appsDir ??
             inOrderOfPreference(tree, ['apps', 'packages'], '.'),

package/src/utils/invoke-nx-generator.d.ts

@@ -1,4 +1,4 @@
-import type { Generator } from 'nx/src/config/misc-interfaces';
+import { Generator } from 'nx/src/devkit-exports';
 /**
  * Convert an Nx Generator into an Angular Devkit Schematic.
  * @param generator The Nx generator to convert to an Angular Devkit Schematic.

package/src/utils/invoke-nx-generator.js

@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxGenerator = void 0;
 const path_1 = require("path");
-const nx_1 = require("../../nx");
-let { logger, stripIndent } = (0, nx_1.requireNx)();
-// TODO: Remove this in Nx 19 when Nx 16.7.0 is no longer supported
-stripIndent = stripIndent ?? require('nx/src/utils/logger').stripIndent;
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const devkit_internals_1 = require("nx/src/devkit-internals");
 class RunCallbackTask {
     constructor(callback) {
         this.callback = callback;
@@ -166,7 +164,7 @@ class DevkitTreeFromAngularDevkitTree {
         this.warnUnsupportedFilePermissionsChange(filePath, mode);
     }
     warnUnsupportedFilePermissionsChange(filePath, mode) {
-        logger.warn(stripIndent(`The Angular DevKit tree does not support changing a file permissions.
+        devkit_exports_1.logger.warn((0, devkit_internals_1.stripIndent)(`The Angular DevKit tree does not support changing a file permissions.
                   Ignoring changing ${filePath} permissions to ${mode}.`));
     }
 }

package/src/utils/log-show-project-command.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logShowProjectCommand = void 0;
-const nx_1 = require("../../nx");
+const devkit_exports_1 = require("nx/src/devkit-exports");
 function logShowProjectCommand(projectName) {
-    const { output } = (0, nx_1.requireNx)();
-    output.log({
+    devkit_exports_1.output.log({
         title: `👀 View Details of ${projectName}`,
         bodyLines: [
             `Run "nx show project ${projectName} --web" to view details about this project.`,

package/src/utils/move-dir.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
+import { Tree } from 'nx/src/devkit-exports';
 /**
  * Analogous to cp -r oldDir newDir
  */

package/src/utils/move-dir.js

@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.moveFilesToNewDirectory = void 0;
 const path_1 = require("path");
 const visit_not_ignored_files_1 = require("../generators/visit-not-ignored-files");
-const nx_1 = require("../../nx");
-const { normalizePath } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 /**
  * Analogous to cp -r oldDir newDir
  */
 function moveFilesToNewDirectory(tree, oldDir, newDir) {
-    oldDir = normalizePath(oldDir);
-    newDir = normalizePath(newDir);
+    oldDir = (0, devkit_exports_1.normalizePath)(oldDir);
+    newDir = (0, devkit_exports_1.normalizePath)(newDir);
     (0, visit_not_ignored_files_1.visitNotIgnoredFiles)(tree, oldDir, (file) => {
         try {
             tree.rename(file, `${newDir}/${(0, path_1.relative)(oldDir, file)}`);

package/src/utils/package-json.d.ts

@@ -1,5 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
-import type { GeneratorCallback } from 'nx/src/config/misc-interfaces';
+import { GeneratorCallback, Tree } from 'nx/src/devkit-exports';
 /**
  * Add Dependencies and Dev Dependencies to package.json
  *

package/src/utils/package-json.js

@@ -5,11 +5,11 @@ const child_process_1 = require("child_process");
 const module_1 = require("module");
 const semver_1 = require("semver");
 const install_packages_task_1 = require("../tasks/install-packages-task");
-const nx_1 = require("../../nx");
 const tmp_1 = require("tmp");
 const path_1 = require("path");
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const devkit_internals_1 = require("nx/src/devkit-internals");
 const fs_1 = require("fs");
-const { readJson, updateJson, getPackageManagerCommand, workspaceRoot, detectPackageManager, createTempNpmDirectory, getPackageManagerVersion, } = (0, nx_1.requireNx)();
 const UNIDENTIFIED_VERSION = 'UNIDENTIFIED_VERSION';
 const NON_SEMVER_TAGS = {
     '*': 2,
@@ -90,7 +90,7 @@ function updateExistingDependenciesVersion(dependencies, existingDependencies =
  * @returns Callback to install dependencies only if necessary, no-op otherwise
  */
 function addDependenciesToPackageJson(tree, dependencies, devDependencies, packageJsonPath = 'package.json', keepExistingVersions) {
-    const currentPackageJson = readJson(tree, packageJsonPath);
+    const currentPackageJson = (0, devkit_exports_1.readJson)(tree, packageJsonPath);
     /** Dependencies to install that are not met in dev dependencies */
     let filteredDependencies = filterExistingDependencies(dependencies, currentPackageJson.devDependencies);
     /** Dev dependencies to install that are not met in dependencies */
@@ -117,7 +117,7 @@ function addDependenciesToPackageJson(tree, dependencies, devDependencies, packa
         filteredDevDependencies = removeLowerVersions(filteredDevDependencies, currentPackageJson.devDependencies);
     }
     if (requiresAddingOfPackages(currentPackageJson, filteredDependencies, filteredDevDependencies)) {
-        updateJson(tree, packageJsonPath, (json) => {
+        (0, devkit_exports_1.updateJson)(tree, packageJsonPath, (json) => {
             json.dependencies = {
                 ...(json.dependencies || {}),
                 ...filteredDependencies,
@@ -171,9 +171,9 @@ function removeExistingDependencies(incomingDeps, existingDeps) {
  * @returns Callback to uninstall dependencies only if necessary. undefined is returned if changes are not necessary.
  */
 function removeDependenciesFromPackageJson(tree, dependencies, devDependencies, packageJsonPath = 'package.json') {
-    const currentPackageJson = readJson(tree, packageJsonPath);
+    const currentPackageJson = (0, devkit_exports_1.readJson)(tree, packageJsonPath);
     if (requiresRemovingOfPackages(currentPackageJson, dependencies, devDependencies)) {
-        updateJson(tree, packageJsonPath, (json) => {
+        (0, devkit_exports_1.updateJson)(tree, packageJsonPath, (json) => {
             for (const dep of dependencies) {
                 delete json.dependencies[dep];
             }
@@ -291,14 +291,14 @@ 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 { dir: tempDir } = createTempNpmDirectory?.() ?? {
+    const { dir: tempDir } = (0, devkit_internals_1.createTempNpmDirectory)?.() ?? {
         dir: (0, tmp_1.dirSync)().name,
     };
     console.log(`Fetching ${pkg}...`);
-    const packageManager = detectPackageManager();
+    const packageManager = (0, devkit_exports_1.detectPackageManager)();
     const isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
     generatePackageManagerFiles(tempDir, packageManager);
-    const preInstallCommand = getPackageManagerCommand(packageManager).preInstall;
+    const preInstallCommand = (0, devkit_exports_1.getPackageManagerCommand)(packageManager).preInstall;
     if (preInstallCommand) {
         // ensure package.json and repo in tmp folder is set to a proper package manager state
         (0, child_process_1.execSync)(preInstallCommand, {
@@ -306,7 +306,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
             stdio: isVerbose ? 'inherit' : 'ignore',
         });
     }
-    let addCommand = getPackageManagerCommand(packageManager).addDev;
+    let addCommand = (0, devkit_exports_1.getPackageManagerCommand)(packageManager).addDev;
     if (packageManager === 'pnpm') {
         addCommand = 'pnpm add -D'; // we need to ensure that we are not using workspace command
     }
@@ -314,7 +314,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
         cwd: tempDir,
         stdio: isVerbose ? 'inherit' : 'ignore',
     });
-    addToNodePath((0, path_1.join)(workspaceRoot, 'node_modules'));
+    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
     module_1.Module._initPaths();
@@ -340,8 +340,8 @@ exports.ensurePackage = ensurePackage;
  * Generates necessary files needed for the package manager to work
  * and for the node_modules to be accessible.
  */
-function generatePackageManagerFiles(root, packageManager = detectPackageManager()) {
-    const [pmMajor] = getPackageManagerVersion(packageManager).split('.');
+function generatePackageManagerFiles(root, packageManager = (0, devkit_exports_1.detectPackageManager)()) {
+    const [pmMajor] = (0, devkit_exports_1.getPackageManagerVersion)(packageManager).split('.');
     switch (packageManager) {
         case 'yarn':
             if (+pmMajor >= 2) {

package/src/utils/replace-package.d.ts

@@ -1,2 +1,2 @@
-import type { Tree } from 'nx/src/generators/tree';
+import { Tree } from 'nx/src/devkit-exports';
 export declare function replaceNrwlPackageWithNxPackage(tree: Tree, oldPackageName: string, newPackageName: string): void;