@nx/js 23.2.0-beta.4 → 23.2.0-beta.6

package/dist/src/release/version-actions.js

@@ -5,6 +5,7 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const node_child_process_1 = require("node:child_process");
 const node_path_1 = require("node:path");
+const jsonc_parser_1 = require("jsonc-parser");
 const release_1 = require("nx/release");
 const npm_config_1 = require("../utils/npm-config");
 const update_lock_file_1 = require("./utils/update-lock-file");
@@ -26,6 +27,7 @@ class JsVersionActions extends release_1.VersionActions {
     constructor() {
         super(...arguments);
         this.validManifestFilenames = ['package.json'];
+        this.excludeManifestsFromFormatting = true;
     }
     async readCurrentVersionFromSourceManifest(tree) {
         const sourcePackageJsonPath = (0, node_path_1.join)(this.projectGraphNode.data.root, 'package.json');
@@ -122,10 +124,9 @@ class JsVersionActions extends release_1.VersionActions {
     async updateProjectVersion(tree, newVersion) {
         const logMessages = [];
         for (const manifestToUpdate of this.manifestsToUpdate) {
-            (0, devkit_1.updateJson)(tree, manifestToUpdate.manifestPath, (json) => {
-                json.version = newVersion;
-                return json;
-            });
+            this.updateManifestValues(tree, manifestToUpdate.manifestPath, [
+                { path: ['version'], value: newVersion },
+            ]);
             logMessages.push(`✍️  New version ${newVersion} written to manifest: ${manifestToUpdate.manifestPath}`);
         }
         return logMessages;
@@ -139,67 +140,70 @@ class JsVersionActions extends release_1.VersionActions {
         const catalogUpdates = [];
         const catalogManager = (0, internal_1.getCatalogManager)(tree.root);
         for (const manifestToUpdate of this.manifestsToUpdate) {
-            (0, devkit_1.updateJson)(tree, manifestToUpdate.manifestPath, (json) => {
-                const dependencyTypes = [
-                    'dependencies',
-                    'devDependencies',
-                    'peerDependencies',
-                    'optionalDependencies',
-                ];
-                const preserveMatchingDependencyRanges = this.finalConfigForProject.preserveMatchingDependencyRanges === true
-                    ? dependencyTypes
-                    : this.finalConfigForProject.preserveMatchingDependencyRanges ===
-                        false
-                        ? []
-                        : this.finalConfigForProject.preserveMatchingDependencyRanges ||
-                            dependencyTypes;
-                for (const depType of dependencyTypes) {
-                    if (json[depType]) {
-                        for (const [dep, version] of Object.entries(dependenciesToUpdate)) {
-                            // Resolve the package name from the project graph metadata, as it may not match the project name
-                            const packageName = projectGraph.nodes[dep].data.metadata?.js?.packageName;
-                            if (!packageName) {
-                                throw new Error(`Unable to determine the package name for project "${dep}" from the project graph metadata, please ensure that the "@nx/js" plugin is installed and the project graph has been built. If the issue persists, please report this issue on https://github.com/nrwl/nx/issues`);
+            const json = (0, devkit_1.readJson)(tree, manifestToUpdate.manifestPath);
+            const manifestUpdates = [];
+            const dependencyTypes = [
+                'dependencies',
+                'devDependencies',
+                'peerDependencies',
+                'optionalDependencies',
+            ];
+            const preserveMatchingDependencyRanges = this.finalConfigForProject.preserveMatchingDependencyRanges === true
+                ? dependencyTypes
+                : this.finalConfigForProject.preserveMatchingDependencyRanges ===
+                    false
+                    ? []
+                    : this.finalConfigForProject.preserveMatchingDependencyRanges ||
+                        dependencyTypes;
+            for (const depType of dependencyTypes) {
+                if (json[depType]) {
+                    for (const [dep, version] of Object.entries(dependenciesToUpdate)) {
+                        // Resolve the package name from the project graph metadata, as it may not match the project name
+                        const packageName = projectGraph.nodes[dep].data.metadata?.js?.packageName;
+                        if (!packageName) {
+                            throw new Error(`Unable to determine the package name for project "${dep}" from the project graph metadata, please ensure that the "@nx/js" plugin is installed and the project graph has been built. If the issue persists, please report this issue on https://github.com/nrwl/nx/issues`);
+                        }
+                        const currentVersion = json[depType][packageName];
+                        if (currentVersion) {
+                            if (catalogManager?.isCatalogReference(currentVersion)) {
+                                // collect the catalog updates so we can update the catalog definitions later
+                                const catalogRef = catalogManager.parseCatalogReference(currentVersion);
+                                catalogUpdates.push({
+                                    packageName,
+                                    version,
+                                    catalogName: catalogRef.catalogName,
+                                });
+                                numDependenciesToUpdate--;
+                                continue;
                             }
-                            const currentVersion = json[depType][packageName];
-                            if (currentVersion) {
-                                if (catalogManager?.isCatalogReference(currentVersion)) {
-                                    // collect the catalog updates so we can update the catalog definitions later
-                                    const catalogRef = catalogManager.parseCatalogReference(currentVersion);
-                                    catalogUpdates.push({
-                                        packageName,
-                                        version,
-                                        catalogName: catalogRef.catalogName,
-                                    });
-                                    numDependenciesToUpdate--;
-                                    continue;
+                            // Check if other local dependency protocols should be preserved
+                            else if (manifestToUpdate.preserveLocalDependencyProtocols &&
+                                this.isLocalDependencyProtocol(currentVersion)) {
+                                // Reduce the count appropriately to avoid confusing user-facing logs
+                                numDependenciesToUpdate--;
+                                continue;
+                            }
+                            else if (preserveMatchingDependencyRanges.includes(depType) &&
+                                !this.isLocalDependencyProtocol(currentVersion)) {
+                                // If the dependency is specified using a range, do some additional processing to determine whether to update the version
+                                if ((0, semver_1.isValidRange)(currentVersion) &&
+                                    !(0, semver_1.isMatchingDependencyRange)(version, currentVersion)) {
+                                    throw new Error(`"preserveMatchingDependencyRanges" is enabled for "${depType}" and the new version "${version}" is outside the current range for "${packageName}" in manifest "${manifestToUpdate.manifestPath}". Please update the range before releasing.`);
                                 }
-                                // Check if other local dependency protocols should be preserved
-                                else if (manifestToUpdate.preserveLocalDependencyProtocols &&
-                                    this.isLocalDependencyProtocol(currentVersion)) {
-                                    // Reduce the count appropriately to avoid confusing user-facing logs
-                                    numDependenciesToUpdate--;
+                                else if ((0, semver_1.isValidRange)(currentVersion)) {
+                                    // it is a range, but it is valid
                                     continue;
                                 }
-                                else if (preserveMatchingDependencyRanges.includes(depType) &&
-                                    !this.isLocalDependencyProtocol(currentVersion)) {
-                                    // If the dependency is specified using a range, do some additional processing to determine whether to update the version
-                                    if ((0, semver_1.isValidRange)(currentVersion) &&
-                                        !(0, semver_1.isMatchingDependencyRange)(version, currentVersion)) {
-                                        throw new Error(`"preserveMatchingDependencyRanges" is enabled for "${depType}" and the new version "${version}" is outside the current range for "${packageName}" in manifest "${manifestToUpdate.manifestPath}". Please update the range before releasing.`);
-                                    }
-                                    else if ((0, semver_1.isValidRange)(currentVersion)) {
-                                        // it is a range, but it is valid
-                                        continue;
-                                    }
-                                }
-                                json[depType][packageName] = version;
                             }
+                            manifestUpdates.push({
+                                path: [depType, packageName],
+                                value: version,
+                            });
                         }
                     }
                 }
-                return json;
-            });
+            }
+            this.updateManifestValues(tree, manifestToUpdate.manifestPath, manifestUpdates);
             // If we ignored local dependecy protocols, then we could have dynamically ended up with zero here and we should not log anything related to dependencies
             if (numDependenciesToUpdate === 0) {
                 return [];
@@ -218,6 +222,56 @@ class JsVersionActions extends release_1.VersionActions {
         }
         return logMessages;
     }
+    updateManifestValues(tree, manifestPath, updates) {
+        if (updates.length === 0) {
+            return;
+        }
+        let content = this.readAndValidateManifest(tree, manifestPath);
+        const formattingOptions = this.detectFormattingOptions(content);
+        for (const update of updates) {
+            content = (0, jsonc_parser_1.applyEdits)(content, (0, jsonc_parser_1.modify)(content, update.path, update.value, { formattingOptions }));
+        }
+        this.validateManifestUpdates(content, manifestPath, updates);
+        tree.write(manifestPath, content);
+    }
+    readAndValidateManifest(tree, manifestPath) {
+        const content = tree.read(manifestPath, 'utf-8');
+        try {
+            // Match readJson's support for comments and trailing commas while
+            // retaining the original text for targeted edits.
+            (0, devkit_1.parseJson)(content);
+        }
+        catch (error) {
+            throw new Error(`Cannot parse ${manifestPath}: ${error.message}`);
+        }
+        return content;
+    }
+    validateManifestUpdates(content, manifestPath, updates) {
+        const manifest = (0, devkit_1.parseJson)(content);
+        for (const update of updates) {
+            let actualValue = manifest;
+            for (const pathSegment of update.path) {
+                if (actualValue === null ||
+                    typeof actualValue !== 'object' ||
+                    !(pathSegment in actualValue)) {
+                    actualValue = undefined;
+                    break;
+                }
+                actualValue = actualValue[pathSegment];
+            }
+            if (actualValue !== update.value) {
+                throw new Error(`Cannot update ${manifestPath}: "${update.path.join('.')}" resolves to ${JSON.stringify(actualValue)} instead of ${JSON.stringify(update.value)} after editing. The manifest may contain duplicate keys.`);
+            }
+        }
+    }
+    detectFormattingOptions(content) {
+        const indentation = content.match(/^[\t ]+(?=")/m)?.[0] ?? '  ';
+        const insertSpaces = !indentation.includes('\t');
+        return {
+            insertSpaces,
+            tabSize: insertSpaces ? indentation.length : 1,
+        };
+    }
     // NOTE: The TODOs were carried over from the original implementation, they are not yet implemented
     isLocalDependencyProtocol(versionSpecifier) {
         const localPackageProtocols = [

package/dist/src/utils/assets/copy-assets-handler.d.ts

@@ -1,6 +1,6 @@
 import { AssetGlob } from './assets';
 import { normalizeAssets, getAssetOutputPath, NormalizedAssetEntry as AssetEntry } from './normalize-assets';
-import { ChangedFile } from 'nx/src/daemon/client/client';
+import { ChangedFile } from '@nx/devkit/internal';
 export type { AssetEntry };
 export { normalizeAssets, getAssetOutputPath };
 export type FileEventType = 'create' | 'update' | 'delete';

package/dist/src/utils/assets/copy-assets-handler.js

@@ -12,7 +12,7 @@ const normalize_assets_1 = require("./normalize-assets");
 Object.defineProperty(exports, "normalizeAssets", { enumerable: true, get: function () { return normalize_assets_1.normalizeAssets; } });
 Object.defineProperty(exports, "getAssetOutputPath", { enumerable: true, get: function () { return normalize_assets_1.getAssetOutputPath; } });
 const devkit_1 = require("@nx/devkit");
-const client_1 = require("nx/src/daemon/client/client");
+const internal_1 = require("@nx/devkit/internal");
 const picocolors_1 = require("picocolors");
 const defaultFileEventHandler = (events) => {
     const dirs = new Set(events.map((event) => path.dirname(event.dest)));
@@ -93,7 +93,7 @@ class CopyAssetsHandler {
         return ['**/node_modules/**', '**/.git/**'];
     }
     async watchAndProcessOnAssetChange() {
-        const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({
+        const unregisterFileWatcher = await internal_1.daemonClient.registerFileWatcher({
             watchProjects: 'all',
             includeGlobalWorkspaceFiles: true,
         }, (err, data) => {

package/dist/src/utils/buildable-libs-utils.js

@@ -9,14 +9,11 @@ exports.updatePaths = updatePaths;
 exports.updateBuildableProjectPackageJsonDependencies = updateBuildableProjectPackageJsonDependencies;
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
-const operators_1 = require("nx/src/project-graph/operators");
-const fileutils_1 = require("nx/src/utils/fileutils");
-const output_1 = require("nx/src/utils/output");
 const path_1 = require("path");
 const ts_config_1 = require("./typescript/ts-config");
 const strip_glob_to_base_dir_1 = require("./strip-glob-to-base-dir");
 const crypto_1 = require("crypto");
-const project_graph_1 = require("nx/src/config/project-graph");
+const internal_1 = require("@nx/devkit/internal");
 function isBuildable(target, node) {
     return (node.data.targets &&
         node.data.targets[target] &&
@@ -49,11 +46,11 @@ function calculateProjectDependencies(projGraph, root, projectName, targetName,
         .map(({ name: dep, isTopLevel }) => {
         let project = null;
         const depNode = projGraph.nodes[dep] || projGraph.externalNodes[dep];
-        if ((0, project_graph_1.isProjectGraphProjectNode)(depNode) && depNode.type === 'lib') {
+        if ((0, internal_1.isProjectGraphProjectNode)(depNode) && depNode.type === 'lib') {
             if (isBuildable(targetName, depNode)) {
                 const libPackageJsonPath = (0, path_1.join)(root, depNode.data.root, 'package.json');
                 project = {
-                    name: (0, fileutils_1.fileExists)(libPackageJsonPath)
+                    name: (0, internal_1.fileExists)(libPackageJsonPath)
                         ? (0, devkit_1.readJsonFile)(libPackageJsonPath).name // i.e. @workspace/mylib
                         : dep,
                     outputs: (0, devkit_1.getOutputsForTargetAndConfiguration)({
@@ -68,7 +65,7 @@ function calculateProjectDependencies(projGraph, root, projectName, targetName,
                 nonBuildableDependencies.push(dep);
             }
         }
-        else if ((0, project_graph_1.isProjectGraphExternalNode)(depNode)) {
+        else if ((0, internal_1.isProjectGraphExternalNode)(depNode)) {
             project = {
                 name: depNode.data.packageName,
                 outputs: [],
@@ -130,7 +127,7 @@ function readTsConfigWithRemappedPaths(originalTsconfigPath, generatedTsconfigPa
     }
     generatedTsConfig.compilerOptions.paths = paths;
     if (process.env.NX_VERBOSE_LOGGING_PATH_MAPPINGS === 'true') {
-        output_1.output.log({
+        devkit_1.output.log({
             title: 'TypeScript path mappings have been rewritten.',
         });
         console.log(JSON.stringify(generatedTsConfig.compilerOptions.paths, null, 2));
@@ -158,7 +155,7 @@ function calculateDependenciesFromTaskGraph(taskGraph, projectGraph, root, proje
         }
         const libPackageJsonPath = (0, path_1.join)(root, depProjectNode.data.root, 'package.json');
         project = {
-            name: (0, fileutils_1.fileExists)(libPackageJsonPath)
+            name: (0, internal_1.fileExists)(libPackageJsonPath)
                 ? (0, devkit_1.readJsonFile)(libPackageJsonPath).name // i.e. @workspace/mylib
                 : depTask.target.project,
             outputs,
@@ -264,7 +261,7 @@ function updatePaths(dependencies, paths) {
     const pathsKeys = Object.keys(paths);
     // For each registered dependency
     dependencies
-        .filter((dep) => (0, project_graph_1.isProjectGraphProjectNode)(dep.node))
+        .filter((dep) => (0, internal_1.isProjectGraphProjectNode)(dep.node))
         .forEach((dep) => {
         // If there are outputs
         if (dep.outputs && dep.outputs.length > 0) {
@@ -335,7 +332,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
     packageJson.peerDependencies = packageJson.peerDependencies || {};
     let updatePackageJson = false;
     dependencies.forEach((entry) => {
-        const packageName = (0, operators_1.isNpmProject)(entry.node)
+        const packageName = (0, internal_1.isNpmProject)(entry.node)
             ? entry.node.data.packageName
             : entry.name;
         if (!hasDependency(packageJson, 'dependencies', packageName) &&
@@ -343,7 +340,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
             !hasDependency(packageJson, 'peerDependencies', packageName)) {
             try {
                 let depVersion;
-                if ((0, project_graph_1.isProjectGraphProjectNode)(entry.node) &&
+                if ((0, internal_1.isProjectGraphProjectNode)(entry.node) &&
                     entry.node.type === 'lib') {
                     const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
                         project: projectName,
@@ -354,7 +351,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
                     depVersion = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
                     packageJson[typeOfDependency][packageName] = depVersion;
                 }
-                else if ((0, operators_1.isNpmProject)(entry.node)) {
+                else if ((0, internal_1.isNpmProject)(entry.node)) {
                     // If an npm dep is part of the workspace devDependencies, do not include it the library
                     if (!!workspacePackageJson.devDependencies?.[entry.node.data.packageName]) {
                         return;

package/dist/src/utils/find-npm-dependencies.js

@@ -2,12 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findNpmDependencies = findNpmDependencies;
 const path_1 = require("path");
-const configuration_1 = require("nx/src/config/configuration");
 const devkit_1 = require("@nx/devkit");
-const fileutils_1 = require("nx/src/utils/fileutils");
-const project_graph_1 = require("nx/src/config/project-graph");
 const ts_config_1 = require("./typescript/ts-config");
-const task_hasher_1 = require("nx/src/hasher/task-hasher");
+const internal_1 = require("@nx/devkit/internal");
 /**
  * Finds all npm dependencies and their expected versions for a given project.
  */
@@ -44,14 +41,14 @@ function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGra
     // If build target does not exist in project, use all files as input.
     // This is needed for transitive dependencies for apps -- where libs may not be buildable.
     const inputs = sourceProject.data.targets[buildTarget]
-        ? (0, task_hasher_1.getTargetInputs)((0, configuration_1.readNxJson)(), sourceProject, buildTarget).selfInputs
+        ? (0, internal_1.getTargetInputs)((0, internal_1.readNxJsonFromDisk)(), sourceProject, buildTarget).selfInputs
         : ['{projectRoot}/**/*'];
     if (ignoredFiles) {
         for (const pattern of ignoredFiles) {
             inputs.push(`!${pattern}`);
         }
     }
-    const files = (0, task_hasher_1.filterUsingGlobPatterns)(sourceProject.data.root, projectFileMap[sourceProject.name] || [], inputs);
+    const files = (0, internal_1.filterUsingGlobPatterns)(sourceProject.data.root, projectFileMap[sourceProject.name] || [], inputs);
     for (const fileData of files) {
         if (!fileData.deps ||
             fileData.file ===
@@ -59,7 +56,7 @@ function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGra
             continue;
         }
         for (const dep of fileData.deps) {
-            const target = (0, project_graph_1.fileDataDepTarget)(dep);
+            const target = (0, internal_1.fileDataDepTarget)(dep);
             // If the node is external, then read package info from `data`.
             const externalDep = projectGraph.externalNodes[target];
             if (externalDep?.type === 'npm') {
@@ -110,7 +107,7 @@ function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGra
 }
 function readPackageJson(project, workspaceRoot) {
     const packageJsonPath = (0, path_1.join)(workspaceRoot, project.data.root, 'package.json');
-    if ((0, fileutils_1.fileExists)(packageJsonPath))
+    if ((0, internal_1.fileExists)(packageJsonPath))
         return (0, devkit_1.readJsonFile)(packageJsonPath);
     return null;
 }
@@ -139,7 +136,7 @@ function collectHelperDependencies(workspaceRoot, sourceProject, projectGraph, b
         const swcConfigPath = target.options.swcrc
             ? (0, path_1.join)(workspaceRoot, target.options.swcrc)
             : (0, path_1.join)(workspaceRoot, sourceProject.data.root, '.swcrc');
-        const swcConfig = (0, fileutils_1.fileExists)(swcConfigPath)
+        const swcConfig = (0, internal_1.fileExists)(swcConfigPath)
             ? (0, devkit_1.readJsonFile)(swcConfigPath)
             : {};
         if (swcConfig?.jsc?.externalHelpers &&
@@ -169,7 +166,7 @@ function resolveTsConfigForRunCommandsTarget(workspaceRoot, sourceProject, targe
         const resolved = (0, path_1.isAbsolute)(commandTsConfig)
             ? commandTsConfig
             : (0, path_1.join)(cwdAbsolute, commandTsConfig);
-        if ((0, fileutils_1.fileExists)(resolved))
+        if ((0, internal_1.fileExists)(resolved))
             return resolved;
     }
     // Preserves prior behavior when the tsconfig can't be determined from the command.

package/dist/src/utils/generate-globs.js

@@ -3,16 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGlobPatternsForDependencies = createGlobPatternsForDependencies;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const workspace_root_1 = require("nx/src/utils/workspace-root");
 const path_1 = require("path");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
-const project_graph_utils_1 = require("nx/src/utils/project-graph-utils");
 const fs_1 = require("fs");
 const ignore_1 = tslib_1.__importDefault(require("ignore"));
-const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
+const internal_1 = require("@nx/devkit/internal");
 function configureIgnore() {
     let ig;
-    const pathToGitIgnore = (0, path_1.join)(workspace_root_1.workspaceRoot, '.gitignore');
+    const pathToGitIgnore = (0, path_1.join)(devkit_1.workspaceRoot, '.gitignore');
     if ((0, fs_1.existsSync)(pathToGitIgnore)) {
         ig = (0, ignore_1.default)();
         ig.add((0, fs_1.readFileSync)(pathToGitIgnore, { encoding: 'utf-8' }));
@@ -26,13 +23,13 @@ function configureIgnore() {
  */
 function createGlobPatternsForDependencies(dirPath, fileGlobPattern) {
     let ig = configureIgnore();
-    const filenameRelativeToWorkspaceRoot = (0, devkit_1.normalizePath)((0, path_1.relative)(workspace_root_1.workspaceRoot, dirPath));
-    const projectGraph = (0, project_graph_1.readCachedProjectGraph)();
-    const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(projectGraph.nodes);
+    const filenameRelativeToWorkspaceRoot = (0, devkit_1.normalizePath)((0, path_1.relative)(devkit_1.workspaceRoot, dirPath));
+    const projectGraph = (0, devkit_1.readCachedProjectGraph)();
+    const projectRootMappings = (0, internal_1.createProjectRootMappings)(projectGraph.nodes);
     // find the project
     let projectName;
     try {
-        projectName = (0, find_project_for_path_1.findProjectForPath)(filenameRelativeToWorkspaceRoot, projectRootMappings);
+        projectName = (0, internal_1.findProjectForPath)(filenameRelativeToWorkspaceRoot, projectRootMappings);
         if (!projectName) {
             throw new Error(`createGlobPatternsForDependencies: Could not find any project containing the file "${filenameRelativeToWorkspaceRoot}" among it's project files`);
         }
@@ -42,17 +39,17 @@ function createGlobPatternsForDependencies(dirPath, fileGlobPattern) {
     }
     // generate the glob
     try {
-        const [projectDirs, warnings] = (0, project_graph_utils_1.getSourceDirOfDependentProjects)(projectName, projectGraph);
+        const [projectDirs, warnings] = (0, internal_1.getSourceDirOfDependentProjects)(projectName, projectGraph);
         const dirsToUse = [];
         const recursiveScanDirs = (dirPath) => {
-            const children = (0, fs_1.readdirSync)((0, path_1.resolve)(workspace_root_1.workspaceRoot, dirPath));
+            const children = (0, fs_1.readdirSync)((0, path_1.resolve)(devkit_1.workspaceRoot, dirPath));
             for (const child of children) {
                 const childPath = (0, path_1.join)(dirPath, child);
                 if (ig?.ignores(childPath) ||
-                    !(0, fs_1.lstatSync)((0, path_1.resolve)(workspace_root_1.workspaceRoot, childPath)).isDirectory()) {
+                    !(0, fs_1.lstatSync)((0, path_1.resolve)(devkit_1.workspaceRoot, childPath)).isDirectory()) {
                     continue;
                 }
-                if ((0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, childPath, 'ng-package.json'))) {
+                if ((0, fs_1.existsSync)((0, path_1.join)(devkit_1.workspaceRoot, childPath, 'ng-package.json'))) {
                     dirsToUse.push(childPath);
                 }
                 else {
@@ -72,7 +69,7 @@ ${warnings.join('\n- ')}\n
 due to missing "sourceRoot" in the dependencies' project configuration
       `);
         }
-        return dirsToUse.map((sourceDir) => (0, path_1.resolve)(workspace_root_1.workspaceRoot, (0, devkit_1.joinPathFragments)(sourceDir, fileGlobPattern)));
+        return dirsToUse.map((sourceDir) => (0, path_1.resolve)(devkit_1.workspaceRoot, (0, devkit_1.joinPathFragments)(sourceDir, fileGlobPattern)));
     }
     catch (e) {
         throw new Error(`createGlobPatternsForDependencies: Error when generating globs.\n${e?.message}`);

package/dist/src/utils/get-main-file-dir.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRelativeDirectoryToProjectRoot = getRelativeDirectoryToProjectRoot;
 const path_1 = require("path");
-const path_2 = require("nx/src/utils/path");
+const devkit_1 = require("@nx/devkit");
 function getRelativeDirectoryToProjectRoot(file, projectRoot) {
     const dir = (0, path_1.dirname)(file);
-    const relativeDir = (0, path_2.normalizePath)((0, path_1.relative)(projectRoot, dir));
+    const relativeDir = (0, devkit_1.normalizePath)((0, path_1.relative)(projectRoot, dir));
     return relativeDir === '' ? `./` : `./${relativeDir}/`;
 }

package/dist/src/utils/npm-config.d.ts

@@ -1,4 +1,4 @@
-import { PackageJson } from 'nx/src/utils/package-json';
+import { PackageJson } from '@nx/devkit/internal';
 export declare function parseRegistryOptions(cwd: string, pkg: {
     packageRoot: string;
     packageJson: PackageJson;

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

@@ -1,6 +1,6 @@
 import { ExecutorContext, ProjectFileMap, ProjectGraphProjectNode } from '@nx/devkit';
 import { DependentBuildableProjectNode } from '../buildable-libs-utils';
-import type { PackageJson } from 'nx/src/utils/package-json';
+import type { PackageJson } from '@nx/devkit/internal';
 export type SupportedFormat = 'cjs' | 'esm';
 export interface UpdatePackageJsonOption {
     rootDir?: string;

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

@@ -4,24 +4,22 @@ exports.updatePackageJson = updatePackageJson;
 exports.getExports = getExports;
 exports.getUpdatedPackageJsonContent = getUpdatedPackageJsonContent;
 exports.getOutputDir = getOutputDir;
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-const create_package_json_1 = require("nx/src/plugins/js/package-json/create-package-json");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
-const fileutils_1 = require("nx/src/utils/fileutils");
-const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
+const internal_3 = require("@nx/devkit/internal");
+const internal_4 = require("@nx/devkit/internal");
 const get_main_file_dir_1 = require("../get-main-file-dir");
 const strip_glob_to_base_dir_1 = require("../strip-glob-to-base-dir");
 function updatePackageJson(options, context, target, dependencies, fileMap = null) {
     let packageJson;
     if (fileMap == null) {
-        fileMap = (0, nx_deps_cache_1.readFileMapCache)()?.fileMap?.projectFileMap || {};
+        fileMap = (0, internal_4.readFileMapCache)()?.fileMap?.projectFileMap || {};
     }
     if (options.updateBuildableProjectDepsInPackageJson) {
-        packageJson = (0, create_package_json_1.createPackageJson)(context.projectName, context.projectGraph, {
+        packageJson = (0, internal_2.createPackageJson)(context.projectName, context.projectGraph, {
             target: context.targetName,
             root: context.root,
             // By default we remove devDependencies since this is a production build.
@@ -34,7 +32,7 @@ function updatePackageJson(options, context, target, dependencies, fileMap = nul
     }
     else {
         const pathToPackageJson = (0, path_1.join)(context.root, options.projectRoot, 'package.json');
-        packageJson = (0, fileutils_1.fileExists)(pathToPackageJson)
+        packageJson = (0, internal_3.fileExists)(pathToPackageJson)
             ? (0, devkit_1.readJsonFile)(pathToPackageJson)
             : { name: context.projectName, version: '0.0.1' };
     }
@@ -60,8 +58,8 @@ function updatePackageJson(options, context, target, dependencies, fileMap = nul
             devkit_1.logger.warn(`Bun lockfile generation is unsupported. Remove "generateLockfile" option or set it to false.`);
         }
         else {
-            const lockFile = (0, lock_file_1.createLockFile)(packageJson, context.projectGraph, packageManager);
-            (0, node_fs_1.writeFileSync)(`${options.outputPath}/${(0, lock_file_1.getLockFileName)(packageManager)}`, lockFile, {
+            const lockFile = (0, internal_1.createLockFile)(packageJson, context.projectGraph, packageManager);
+            (0, node_fs_1.writeFileSync)(`${options.outputPath}/${(0, internal_1.getLockFileName)(packageManager)}`, lockFile, {
                 encoding: 'utf-8',
             });
         }

package/dist/src/utils/package-manager-workspaces.js

@@ -8,8 +8,8 @@ exports.getProjectPackageManagerWorkspaceStateWarningTask = getProjectPackageMan
 const devkit_1 = require("@nx/devkit");
 const picomatch = require("picomatch");
 const posix_1 = require("node:path/posix");
-const package_json_1 = require("nx/src/plugins/package-json");
 const semver_1 = require("semver");
+const internal_1 = require("@nx/devkit/internal");
 function getProjectPackageManagerWorkspaceState(tree, projectRoot) {
     if (!isUsingPackageManagerWorkspaces(tree)) {
         return 'no-workspaces';
@@ -19,7 +19,7 @@ function getProjectPackageManagerWorkspaceState(tree, projectRoot) {
     return isIncluded ? 'included' : 'excluded';
 }
 function getPackageManagerWorkspacesPatterns(tree) {
-    return (0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (path) => (0, devkit_1.readJson)(tree, path, { expectComments: true }), (path) => {
+    return (0, internal_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (path) => (0, devkit_1.readJson)(tree, path, { expectComments: true }), (path) => {
         const content = tree.read(path, 'utf-8');
         const { load } = require('@zkochan/js-yaml');
         return load(content, { filename: path });

package/dist/src/utils/typescript/create-ts-config.d.ts

@@ -1,4 +1,4 @@
-import { Tree } from 'nx/src/generators/tree';
+import { Tree } from '@nx/devkit';
 export declare const tsConfigBaseOptions: {
     rootDir: string;
     sourceMap: boolean;

package/dist/src/utils/typescript/create-ts-config.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsConfigBaseOptions = void 0;
 exports.getTsConfigBaseOptions = getTsConfigBaseOptions;
 exports.extractTsConfigBase = extractTsConfigBase;
-const json_1 = require("nx/src/generators/utils/json");
 const is_typescript_version_at_least_1 = require("../is-typescript-version-at-least");
+const devkit_1 = require("@nx/devkit");
 exports.tsConfigBaseOptions = {
     rootDir: '.',
     sourceMap: true,
@@ -32,7 +32,7 @@ function getTsConfigBaseOptions(tree) {
 function extractTsConfigBase(host) {
     if (host.exists('tsconfig.base.json'))
         return;
-    const tsconfig = (0, json_1.readJson)(host, 'tsconfig.json');
+    const tsconfig = (0, devkit_1.readJson)(host, 'tsconfig.json');
     const baseCompilerOptions = {};
     if (tsconfig.compilerOptions) {
         for (let compilerOption of Object.keys(exports.tsConfigBaseOptions)) {
@@ -41,7 +41,7 @@ function extractTsConfigBase(host) {
             delete tsconfig.compilerOptions[compilerOption];
         }
     }
-    (0, json_1.writeJson)(host, 'tsconfig.base.json', {
+    (0, devkit_1.writeJson)(host, 'tsconfig.base.json', {
         compileOnSave: false,
         compilerOptions: baseCompilerOptions,
         exclude: tsconfig.exclude,
@@ -49,10 +49,10 @@ function extractTsConfigBase(host) {
     tsconfig.extends = './tsconfig.base.json';
     delete tsconfig.compileOnSave;
     delete tsconfig.exclude;
-    (0, json_1.writeJson)(host, 'tsconfig.json', tsconfig);
+    (0, devkit_1.writeJson)(host, 'tsconfig.json', tsconfig);
     // special case for updating e2e tests.
     if (host.exists('e2e/tsconfig.json')) {
-        (0, json_1.updateJson)(host, 'e2e/tsconfig.json', (json) => {
+        (0, devkit_1.updateJson)(host, 'e2e/tsconfig.json', (json) => {
             json.extends = '../tsconfig.base.json';
             return json;
         });

package/dist/src/utils/typescript/plugin.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureProjectIsIncludedInPluginRegistrations = ensureProjectIsIncludedInPluginRegistrations;
-const devkit_internals_1 = require("nx/src/devkit-internals");
 const picomatch = require("picomatch");
+const internal_1 = require("@nx/devkit/internal");
 function ensureProjectIsIncludedInPluginRegistrations(nxJson, projectRoot, buildTargetName) {
     nxJson.plugins ??= [];
     let isIncluded = false;
@@ -32,7 +32,7 @@ function ensureProjectIsIncludedInPluginRegistrations(nxJson, projectRoot, build
             // before the registration's include/exclude filters are applied.
             const tsconfigPath = `${projectRoot}/tsconfig.json`;
             const matchingConfigFiles = picomatch('**/tsconfig.json', { dot: true })(tsconfigPath)
-                ? (0, devkit_internals_1.findMatchingConfigFiles)([tsconfigPath], registration.include, registration.exclude)
+                ? (0, internal_1.findMatchingConfigFiles)([tsconfigPath], registration.include, registration.exclude)
                 : [];
             if (matchingConfigFiles.length) {
                 // it's included by the plugin registration, check if the user-specified options would result