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

package/dist/internal.d.ts

@@ -1,6 +1,6 @@
-export { forceRegisterEsmLoader, loadTsFile, registerTsProject, registerTsConfigPaths, requireWithTsconfigFallback, } from 'nx/src/plugins/js/utils/register';
-export { TargetProjectLocator, isBuiltinModuleImport, } from 'nx/src/plugins/js/project-graph/build-dependencies/target-project-locator';
-export { findProjectsNpmDependencies } from 'nx/src/plugins/js/package-json/create-package-json';
+export { forceRegisterEsmLoader, loadTsFile, registerTsProject, registerTsConfigPaths, requireWithTsconfigFallback, } from '@nx/devkit/internal';
+export { TargetProjectLocator, isBuiltinModuleImport, } from '@nx/devkit/internal';
+export { findProjectsNpmDependencies } from '@nx/devkit/internal';
 export { walkTsconfigExtendsChain, type RawTsconfigJsonCache, } from './src/utils/typescript/raw-tsconfig';
 export { isEsmProject } from './src/utils/module-format/is-esm-project';
 export { TS_SOLUTION_SETUP_TSCONFIG_INPUT, addProjectToTsSolutionWorkspace, assertNotUsingTsSolutionSetup, findRuntimeTsConfigName, getDefinedCustomConditionName, getProjectSourceRoot, getProjectType, isUsingTsSolutionSetup, shouldConfigureTsSolutionSetup, updateTsconfigFiles, } from './src/utils/typescript/ts-solution-setup';

package/dist/internal.js

@@ -7,21 +7,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLocalRegistryScripts = exports.stripGlobToBaseDir = exports.getImportPath = exports.createGlobPatternsForDependencies = exports.normalizeUnitTestRunnerOption = exports.normalizeLinterOption = exports.isValidPackageJsonBuildConfig = exports.addBuildAndWatchDepsTargets = exports.findNpmDependencies = exports.getProjectPackageManagerWorkspaceStateWarningTask = exports.getProjectPackageManagerWorkspaceState = exports.getNpmScope = exports.sortPackageJsonFields = exports.CopyAssetsHandler = exports.addSwcRegisterDependencies = exports.addSwcDependencies = exports.addSwcTestConfig = exports.addSwcConfig = exports.createTmpTsConfig = exports.computeCompilerOptionsPaths = exports.calculateProjectDependencies = exports.calculateProjectBuildableDependencies = exports.compileTypeScript = exports.getNeededCompilerOptionOverrides = exports.isTypescriptVersionAtLeast = exports.getTsConfigModuleResolution = exports.getRangeMinimum = exports.ensureTypescript = exports.createTreeParseConfigHost = exports.getTsConfigBaseOptions = exports.updateTsconfigFiles = exports.shouldConfigureTsSolutionSetup = exports.isUsingTsSolutionSetup = exports.getProjectType = exports.getProjectSourceRoot = exports.getDefinedCustomConditionName = exports.findRuntimeTsConfigName = exports.assertNotUsingTsSolutionSetup = exports.addProjectToTsSolutionWorkspace = exports.TS_SOLUTION_SETUP_TSCONFIG_INPUT = exports.isEsmProject = exports.walkTsconfigExtendsChain = exports.findProjectsNpmDependencies = exports.isBuiltinModuleImport = exports.TargetProjectLocator = exports.requireWithTsconfigFallback = exports.registerTsConfigPaths = exports.registerTsProject = exports.loadTsFile = exports.forceRegisterEsmLoader = void 0;
 exports.typesNodeVersion = exports.tsLibVersion = exports.swcNodeVersion = exports.swcHelpersVersion = exports.swcCoreVersion = exports.swcCliVersion = exports.prettierVersion = exports.esbuildVersion = exports.nxVersion = exports.releaseTasks = exports.addReleaseConfigForTsSolution = exports.addReleaseConfigForNonTsSolution = void 0;
-// Re-exports of nx-source internals (need `no-restricted-imports` overrides).
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-var register_1 = require("nx/src/plugins/js/utils/register");
-Object.defineProperty(exports, "forceRegisterEsmLoader", { enumerable: true, get: function () { return register_1.forceRegisterEsmLoader; } });
-Object.defineProperty(exports, "loadTsFile", { enumerable: true, get: function () { return register_1.loadTsFile; } });
-Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });
-Object.defineProperty(exports, "registerTsConfigPaths", { enumerable: true, get: function () { return register_1.registerTsConfigPaths; } });
-Object.defineProperty(exports, "requireWithTsconfigFallback", { enumerable: true, get: function () { return register_1.requireWithTsconfigFallback; } });
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-var target_project_locator_1 = require("nx/src/plugins/js/project-graph/build-dependencies/target-project-locator");
-Object.defineProperty(exports, "TargetProjectLocator", { enumerable: true, get: function () { return target_project_locator_1.TargetProjectLocator; } });
-Object.defineProperty(exports, "isBuiltinModuleImport", { enumerable: true, get: function () { return target_project_locator_1.isBuiltinModuleImport; } });
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-var create_package_json_1 = require("nx/src/plugins/js/package-json/create-package-json");
-Object.defineProperty(exports, "findProjectsNpmDependencies", { enumerable: true, get: function () { return create_package_json_1.findProjectsNpmDependencies; } });
+// Re-exports of nx-source internals.
+var internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "forceRegisterEsmLoader", { enumerable: true, get: function () { return internal_1.forceRegisterEsmLoader; } });
+Object.defineProperty(exports, "loadTsFile", { enumerable: true, get: function () { return internal_1.loadTsFile; } });
+Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return internal_1.registerTsProject; } });
+Object.defineProperty(exports, "registerTsConfigPaths", { enumerable: true, get: function () { return internal_1.registerTsConfigPaths; } });
+Object.defineProperty(exports, "requireWithTsconfigFallback", { enumerable: true, get: function () { return internal_1.requireWithTsconfigFallback; } });
+var internal_2 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "TargetProjectLocator", { enumerable: true, get: function () { return internal_2.TargetProjectLocator; } });
+Object.defineProperty(exports, "isBuiltinModuleImport", { enumerable: true, get: function () { return internal_2.isBuiltinModuleImport; } });
+var internal_3 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "findProjectsNpmDependencies", { enumerable: true, get: function () { return internal_3.findProjectsNpmDependencies; } });
 // Raw tsconfig walkers (the other AST utils ship via the public @nx/js entry)
 var raw_tsconfig_1 = require("./src/utils/typescript/raw-tsconfig");
 Object.defineProperty(exports, "walkTsconfigExtendsChain", { enumerable: true, get: function () { return raw_tsconfig_1.walkTsconfigExtendsChain; } });

package/dist/src/executors/copy-workspace-modules/copy-workspace-modules.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = copyWorkspaceModules;
 const devkit_1 = require("@nx/devkit");
-const utils_1 = require("nx/src/tasks-runner/utils");
+const internal_1 = require("@nx/devkit/internal");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const fs_1 = require("fs");
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-const get_workspace_packages_from_graph_1 = require("nx/src/plugins/js/utils/get-workspace-packages-from-graph");
+const internal_2 = require("@nx/devkit/internal");
 const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
 async function copyWorkspaceModules(schema, context) {
     devkit_1.logger.log('Copying Workspace Modules to Build Directory...');
@@ -22,7 +21,7 @@ function handleWorkspaceModules(outputDirectory, packageJson, projectGraph) {
     if (!packageJson.dependencies) {
         return;
     }
-    const workspaceModules = (0, get_workspace_packages_from_graph_1.getWorkspacePackagesFromGraph)(projectGraph);
+    const workspaceModules = (0, internal_2.getWorkspacePackagesFromGraph)(projectGraph);
     const processedModules = new Set();
     const workspaceModulesDir = (0, path_1.join)(outputDirectory, 'workspace_modules');
     function calculateRelativePath(fromPkgName, toPkgName) {
@@ -43,7 +42,7 @@ function handleWorkspaceModules(outputDirectory, packageJson, projectGraph) {
         processedModules.add(pkgName);
         devkit_1.logger.verbose(`Copying ${pkgName}.`);
         const workspaceModuleProject = workspaceModules.get(pkgName);
-        const workspaceModuleRoot = workspaceModuleProject.data.root;
+        const workspaceModuleRoot = (0, path_1.join)(devkit_1.workspaceRoot, workspaceModuleProject.data.root);
         const newWorkspaceModulePath = (0, path_1.join)(workspaceModulesDir, pkgName);
         // Copy the module
         (0, node_fs_1.mkdirSync)(newWorkspaceModulePath, { recursive: true });
@@ -114,7 +113,7 @@ function getOutputDir(schema, context) {
     if (!maybeOutputPath) {
         throw new Error(`Could not infer an output directory from the '${schema.buildTarget}' target. Please provide 'outputPath'.`);
     }
-    maybeOutputPath = (0, utils_1.interpolate)(maybeOutputPath, {
+    maybeOutputPath = (0, internal_1.interpolate)(maybeOutputPath, {
         workspaceRoot: devkit_1.workspaceRoot,
         projectRoot: project.root,
         projectName: project.name,

package/dist/src/executors/node/lib/output-file.js

@@ -2,18 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutputFileName = getOutputFileName;
 const path_1 = require("path");
-const path_2 = require("nx/src/utils/path");
 const get_main_file_dir_1 = require("../../../utils/get-main-file-dir");
+const devkit_1 = require("@nx/devkit");
 function getOutputFileName({ buildTargetExecutor, main, outputPath, rootDir, }) {
     const fileName = `${(0, path_1.parse)(main).name}.js`;
     if (buildTargetExecutor !== '@nx/js:tsc' &&
         buildTargetExecutor !== '@nx/js:swc') {
         return fileName;
     }
-    const mainDirectory = (0, path_2.normalizePath)((0, path_1.dirname)(main));
-    const normalizedOutputPath = (0, path_2.normalizePath)(outputPath);
+    const mainDirectory = (0, devkit_1.normalizePath)((0, path_1.dirname)(main));
+    const normalizedOutputPath = (0, devkit_1.normalizePath)(outputPath);
     const isMainInsideOutputPath = mainDirectory === normalizedOutputPath ||
         mainDirectory.startsWith(`${normalizedOutputPath}/`);
     const base = isMainInsideOutputPath ? normalizedOutputPath : rootDir;
-    return (0, path_2.joinPathFragments)((0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(main, base), fileName);
+    return (0, devkit_1.joinPathFragments)((0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(main, base), fileName);
 }

package/dist/src/executors/node/node.impl.js

@@ -6,16 +6,16 @@ const internal_1 = require("@nx/devkit/internal");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const devkit_1 = require("@nx/devkit");
-const client_1 = require("nx/src/daemon/client/client");
+const internal_2 = require("@nx/devkit/internal");
 const crypto_1 = require("crypto");
 const path = tslib_1.__importStar(require("path"));
 const path_1 = require("path");
 const buildable_libs_utils_1 = require("../../utils/buildable-libs-utils");
-const native_1 = require("nx/src/native");
+const internal_3 = require("@nx/devkit/internal");
 const line_aware_writer_1 = require("./lib/line-aware-writer");
 const coalescing_debounce_1 = require("./lib/coalescing-debounce");
-const fileutils_1 = require("nx/src/utils/fileutils");
-const utils_1 = require("nx/src/tasks-runner/utils");
+const internal_4 = require("@nx/devkit/internal");
+const internal_5 = require("@nx/devkit/internal");
 const detect_module_format_1 = require("./lib/detect-module-format");
 const output_file_1 = require("./lib/output-file");
 const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
@@ -175,7 +175,7 @@ async function* nodeExecutor(options, context) {
                         // Windows cannot deliver graceful signals through this API, so
                         // skip the grace period and force-kill immediately (matching the
                         // previous taskkill /F behavior).
-                        await (0, native_1.killProcessTreeGraceful)(task.childProcess.pid, signal, process.platform === 'win32' ? 0 : undefined);
+                        await (0, internal_3.killProcessTreeGraceful)(task.childProcess.pid, signal, process.platform === 'win32' ? 0 : undefined);
                     }
                     if (task.id === globalLineAwareWriter.currentProcessId) {
                         globalLineAwareWriter.setActiveProcess(null);
@@ -237,7 +237,7 @@ async function* nodeExecutor(options, context) {
                 await debouncedProcessQueue.trigger();
             };
             if ((0, devkit_1.isDaemonEnabled)()) {
-                additionalExitHandler = await client_1.daemonClient.registerFileWatcher({
+                additionalExitHandler = await internal_2.daemonClient.registerFileWatcher({
                     watchProjects: [context.projectName],
                     includeDependencies: true,
                 }, async (err, data) => {
@@ -337,7 +337,7 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
         // {workspaceRoot}/dist/{projectRoot} -> dist/my-app
         const outputPath = project.data.targets[buildOptions.target]?.outputs?.[0];
         if (outputPath) {
-            const outputFilePath = (0, utils_1.interpolate)(outputPath, {
+            const outputFilePath = (0, internal_5.interpolate)(outputPath, {
                 projectName: project.name,
                 projectRoot: project.data.root,
                 workspaceRoot: context.root,
@@ -366,12 +366,12 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
     return (0, path_1.join)(context.root, buildOptions.outputPath, outputFileName);
 }
 function fileToRunCorrectPath(fileToRun) {
-    if ((0, fileutils_1.fileExists)(fileToRun))
+    if ((0, internal_4.fileExists)(fileToRun))
         return fileToRun;
     const extensionsToTry = ['.cjs', '.mjs', '.cjs.js', '.esm.js'];
     for (const ext of extensionsToTry) {
         const file = fileToRun.replace(/\.js$/, ext);
-        if ((0, fileutils_1.fileExists)(file))
+        if ((0, internal_4.fileExists)(file))
             return file;
     }
     throw new Error(`Could not find ${fileToRun}. Make sure your build succeeded.`);

package/dist/src/executors/prune-lockfile/prune-lockfile.d.ts

@@ -1,5 +1,5 @@
 import { type ExecutorContext } from '@nx/devkit';
-import { type PackageJson } from 'nx/src/utils/package-json';
+import { type PackageJson } from '@nx/devkit/internal';
 import { type PruneLockfileOptions } from './schema';
 export default function pruneLockfileExecutor(schema: PruneLockfileOptions, context: ExecutorContext): Promise<{
     success: boolean;

package/dist/src/executors/prune-lockfile/prune-lockfile.js

@@ -6,11 +6,9 @@ const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const utils_1 = require("nx/src/tasks-runner/utils");
-// 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 get_workspace_packages_from_graph_1 = require("nx/src/plugins/js/utils/get-workspace-packages-from-graph");
+const internal_2 = require("@nx/devkit/internal");
+const internal_3 = require("@nx/devkit/internal");
+const internal_4 = require("@nx/devkit/internal");
 const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
 async function pruneLockfileExecutor(schema, context) {
     devkit_1.logger.log('Pruning lockfile...');
@@ -35,9 +33,9 @@ async function pruneLockfileExecutor(schema, context) {
 }
 function createPrunedLockfile(packageJson, graph) {
     const packageManager = (0, devkit_1.detectPackageManager)(devkit_1.workspaceRoot);
-    const lockfileName = (0, lock_file_1.getLockFileName)(packageManager);
-    const lockFile = (0, lock_file_1.createLockFile)(packageJson, graph, packageManager);
-    const workspacePackages = (0, get_workspace_packages_from_graph_1.getWorkspacePackagesFromGraph)(graph);
+    const lockfileName = (0, internal_3.getLockFileName)(packageManager);
+    const lockFile = (0, internal_3.createLockFile)(packageJson, graph, packageManager);
+    const workspacePackages = (0, internal_4.getWorkspacePackagesFromGraph)(graph);
     for (const [pkgName, pkgVersion] of Object.entries(packageJson.dependencies ?? {})) {
         if (pkgVersion.startsWith('workspace:') ||
             pkgVersion.startsWith('file:') ||
@@ -127,7 +125,7 @@ function getOutputDir(schema, context) {
     if (!maybeOutputPath) {
         throw new Error(`Could not infer an output directory from the '${schema.buildTarget}' target. Please provide 'outputPath'.`);
     }
-    maybeOutputPath = (0, utils_1.interpolate)(maybeOutputPath, {
+    maybeOutputPath = (0, internal_2.interpolate)(maybeOutputPath, {
         workspaceRoot: devkit_1.workspaceRoot,
         projectRoot: project.root,
         projectName: project.name,

package/dist/src/executors/tsc/lib/batch/watch.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.watchTaskProjectsPackageJsonFileChanges = watchTaskProjectsPackageJsonFileChanges;
 exports.watchTaskProjectsFileChangesForAssets = watchTaskProjectsFileChangesForAssets;
 const devkit_1 = require("@nx/devkit");
-const client_1 = require("nx/src/daemon/client/client");
 const path_1 = require("path");
+const internal_1 = require("@nx/devkit/internal");
 async function watchTaskProjectsPackageJsonFileChanges(taskInfos, callback) {
     const projects = [];
     const packageJsonTaskInfoMap = new Map();
@@ -12,7 +12,7 @@ async function watchTaskProjectsPackageJsonFileChanges(taskInfos, callback) {
         projects.push(t.context.projectName);
         packageJsonTaskInfoMap.set((0, path_1.join)(t.options.projectRoot, 'package.json'), t);
     });
-    const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({ watchProjects: projects }, (err, data) => {
+    const unregisterFileWatcher = await internal_1.daemonClient.registerFileWatcher({ watchProjects: projects }, (err, data) => {
         if (err === 'reconnecting') {
             // Silent - daemon restarts automatically on lockfile changes
             return;
@@ -43,7 +43,7 @@ async function watchTaskProjectsPackageJsonFileChanges(taskInfos, callback) {
     return () => unregisterFileWatcher();
 }
 async function watchTaskProjectsFileChangesForAssets(taskInfos) {
-    const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({
+    const unregisterFileWatcher = await internal_1.daemonClient.registerFileWatcher({
         watchProjects: taskInfos.map((t) => t.context.projectName),
         includeDependencies: true,
         includeGlobalWorkspaceFiles: true,

package/dist/src/executors/tsc/tsc.batch-impl.d.ts

@@ -1,5 +1,5 @@
 import { ExecutorContext, TaskGraph } from '@nx/devkit';
-import type { BatchExecutorTaskResult } from 'nx/src/config/misc-interfaces';
 import type { ExecutorOptions } from '../../utils/schema';
+import { type BatchExecutorTaskResult } from '@nx/devkit/internal';
 export declare function tscBatchExecutor(taskGraph: TaskGraph, inputs: Record<string, ExecutorOptions>, overrides: ExecutorOptions, context: ExecutorContext): AsyncGenerator<BatchExecutorTaskResult, any, unknown>;
 export default tscBatchExecutor;

package/dist/src/executors/tsc/tsc.batch-impl.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tscBatchExecutor = tscBatchExecutor;
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
-const async_iterator_1 = require("nx/src/utils/async-iterator");
 const update_package_json_1 = require("../../utils/package-json/update-package-json");
 const tsc_impl_1 = require("./tsc.impl");
 const lib_1 = require("./lib");
 const batch_1 = require("./lib/batch");
 const create_entry_points_1 = require("../../utils/package-json/create-entry-points");
+const internal_1 = require("@nx/devkit/internal");
 async function* tscBatchExecutor(taskGraph, inputs, overrides, context) {
     const tasksOptions = (0, batch_1.normalizeTasksOptions)(inputs, context);
     let shouldWatch = false;
@@ -89,7 +89,7 @@ async function* tscBatchExecutor(taskGraph, inputs, overrides, context) {
         process.on('SIGTERM', () => handleTermination(128 + 15));
         return yield* mapAsyncIterable(typescriptCompilation, async (iterator) => {
             // drain the iterator, we don't use the results
-            await (0, async_iterator_1.getLastValueFromAsyncIterableIterator)(iterator);
+            await (0, internal_1.getLastValueFromAsyncIterableIterator)(iterator);
             return { value: undefined, done: true };
         });
     }

package/dist/src/executors/verdaccio/verdaccio.impl.js

@@ -7,7 +7,7 @@ const internal_1 = require("@nx/devkit/internal");
 const child_process_1 = require("child_process");
 const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 const node_fs_1 = require("node:fs");
-const devkit_internals_1 = require("nx/src/devkit-internals");
+const internal_2 = require("@nx/devkit/internal");
 const path_1 = require("path");
 const semver_1 = require("semver");
 let childProcess;
@@ -68,7 +68,7 @@ async function verdaccioExecutor(options, context) {
     };
 }
 function getVerdaccioBinPath() {
-    const { packageJson, path: packageJsonPath } = (0, devkit_internals_1.readModulePackageJson)('verdaccio');
+    const { packageJson, path: packageJsonPath } = (0, internal_2.readModulePackageJson)('verdaccio');
     const bin = typeof packageJson.bin === 'string'
         ? packageJson.bin
         : packageJson.bin['verdaccio'];

package/dist/src/generators/library/utils/add-release-config.js

@@ -5,8 +5,8 @@ exports.addReleaseConfigForNonTsSolution = addReleaseConfigForNonTsSolution;
 exports.releaseTasks = releaseTasks;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const find_matching_projects_1 = require("nx/src/utils/find-matching-projects");
 const generator_1 = tslib_1.__importDefault(require("../../setup-verdaccio/generator"));
+const internal_1 = require("@nx/devkit/internal");
 /**
  * Adds release option in nx.json to build the project before versioning
  */
@@ -122,7 +122,7 @@ function projectsConfigMatchesProject(projectsConfig, project) {
     const graph = {
         [project.name]: project,
     };
-    const matchingProjects = (0, find_matching_projects_1.findMatchingProjects)(projectsConfig, graph);
+    const matchingProjects = (0, internal_1.findMatchingProjects)(projectsConfig, graph);
     return matchingProjects.includes(project.name);
 }
 async function releaseTasks(tree) {

package/dist/src/generators/setup-build/generator.js

@@ -4,7 +4,6 @@ exports.setupBuildGenerator = setupBuildGenerator;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const posix_1 = require("node:path/posix");
-const devkit_internals_1 = require("nx/src/devkit-internals");
 const assert_supported_typescript_version_1 = require("../../utils/assert-supported-typescript-version");
 const get_import_path_1 = require("../../utils/get-import-path");
 const update_package_json_1 = require("../../utils/package-json/update-package-json");
@@ -245,5 +244,5 @@ function updatePackageJson(tree, projectName, projectRoot, main, outputPath, roo
 function mergeTargetDefaults(tree, project, buildTarget) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const projectTarget = project.targets[buildTarget];
-    return (0, devkit_internals_1.mergeTargetConfigurations)(projectTarget, (0, internal_1.readTargetDefaultsForTarget)(buildTarget, nxJson.targetDefaults, projectTarget.executor));
+    return (0, internal_1.mergeTargetConfigurations)(projectTarget, (0, internal_1.readTargetDefaultsForTarget)(buildTarget, nxJson.targetDefaults, projectTarget.executor));
 }

package/dist/src/generators/typescript-sync/typescript-sync.d.ts

@@ -1,4 +1,4 @@
 import { type Tree } from '@nx/devkit';
-import { type SyncGeneratorResult } from 'nx/src/utils/sync-generators';
+import { type SyncGeneratorResult } from '@nx/devkit/internal';
 export declare function syncGenerator(tree: Tree): Promise<SyncGeneratorResult>;
 export default syncGenerator;

package/dist/src/generators/typescript-sync/typescript-sync.js

@@ -6,9 +6,9 @@ const devkit_1 = require("@nx/devkit");
 const ignore_1 = tslib_1.__importDefault(require("ignore"));
 const jsonc_parser_1 = require("jsonc-parser");
 const posix_1 = require("node:path/posix");
-const sync_generators_1 = require("nx/src/utils/sync-generators");
 const ts = tslib_1.__importStar(require("typescript"));
 const assert_supported_typescript_version_1 = require("../../utils/assert-supported-typescript-version");
+const internal_1 = require("@nx/devkit/internal");
 const COMMON_RUNTIME_TS_CONFIG_FILE_NAMES = [
     'tsconfig.app.json',
     'tsconfig.lib.json',
@@ -29,7 +29,7 @@ async function syncGenerator(tree) {
     // Root tsconfig containing project references for the whole workspace
     const rootTsconfigPath = 'tsconfig.json';
     if (!tsconfigExists(tree, tsconfigInfoCaches, rootTsconfigPath)) {
-        throw new sync_generators_1.SyncError('Missing root "tsconfig.json"', [
+        throw new internal_1.SyncError('Missing root "tsconfig.json"', [
             `A "tsconfig.json" file must exist in the workspace root in order to sync the project graph information to the TypeScript configuration files.`,
         ]);
     }

package/dist/src/index.d.ts

@@ -16,5 +16,5 @@ export { initGenerator } from './generators/init/init';
 export { setupPrettierGenerator } from './generators/setup-prettier/generator';
 export { setupVerdaccio } from './generators/setup-verdaccio/generator';
 export { isValidVariable } from './utils/is-valid-variable';
-export { createLockFile, getLockFileName, } from 'nx/src/plugins/js/lock-file/lock-file';
-export { createPackageJson } from 'nx/src/plugins/js/package-json/create-package-json';
+export { createLockFile, getLockFileName } from '@nx/devkit/internal';
+export { createPackageJson } from '@nx/devkit/internal';

package/dist/src/index.js

@@ -25,10 +25,8 @@ var generator_2 = require("./generators/setup-verdaccio/generator");
 Object.defineProperty(exports, "setupVerdaccio", { enumerable: true, get: function () { return generator_2.setupVerdaccio; } });
 var is_valid_variable_1 = require("./utils/is-valid-variable");
 Object.defineProperty(exports, "isValidVariable", { enumerable: true, get: function () { return is_valid_variable_1.isValidVariable; } });
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-var lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
-Object.defineProperty(exports, "createLockFile", { enumerable: true, get: function () { return lock_file_1.createLockFile; } });
-Object.defineProperty(exports, "getLockFileName", { enumerable: true, get: function () { return lock_file_1.getLockFileName; } });
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-var create_package_json_1 = require("nx/src/plugins/js/package-json/create-package-json");
-Object.defineProperty(exports, "createPackageJson", { enumerable: true, get: function () { return create_package_json_1.createPackageJson; } });
+var internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "createLockFile", { enumerable: true, get: function () { return internal_1.createLockFile; } });
+Object.defineProperty(exports, "getLockFileName", { enumerable: true, get: function () { return internal_1.getLockFileName; } });
+var internal_2 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "createPackageJson", { enumerable: true, get: function () { return internal_2.createPackageJson; } });

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

@@ -5,12 +5,12 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const file_hasher_1 = require("nx/src/hasher/file-hasher");
+const devkit_2 = require("@nx/devkit");
+const internal_2 = require("@nx/devkit/internal");
 const picomatch = require("picomatch");
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
-const installation_directory_1 = require("nx/src/utils/installation-directory");
+const internal_3 = require("@nx/devkit/internal");
+const internal_4 = require("@nx/devkit/internal");
+const internal_5 = require("@nx/devkit/internal");
 const util_1 = require("./util");
 let ts;
 const resolvedTypescriptPaths = {};
@@ -20,12 +20,12 @@ function resolveTypescriptPath(projectRoot, workspaceRoot) {
     // path is outside the workspace tree (e.g. pnpm's enableGlobalVirtualStore),
     // since typescript is not a declared dep.
     resolvedTypescriptPaths[projectRoot] ??= require.resolve('typescript', {
-        paths: [projectRoot, ...(0, installation_directory_1.getNxRequirePaths)(workspaceRoot), __dirname],
+        paths: [projectRoot, ...(0, internal_5.getNxRequirePaths)(workspaceRoot), __dirname],
     });
     return resolvedTypescriptPaths[projectRoot];
 }
 const TSCONFIG_CACHE_VERSION = 2;
-const TS_CONFIG_CACHE_PATH = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, 'tsconfig-files.hash');
+const TS_CONFIG_CACHE_PATH = (0, node_path_1.join)(internal_4.workspaceDataDirectory, 'tsconfig-files.hash');
 // Module-level cache store — each invocation gets a unique Symbol key
 const cacheStore = new Map();
 // Shared tsconfig cache — initialized once per batch, persisted to disk
@@ -117,8 +117,8 @@ const tsConfigGlob = '**/tsconfig*.json';
 exports.createNodesV2 = [
     tsConfigGlob,
     async (configFilePaths, options, context) => {
-        const optionsHash = (0, file_hasher_1.hashObject)(options);
-        const targetsCachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `tsc-${optionsHash}.hash`);
+        const optionsHash = (0, internal_2.hashObject)(options);
+        const targetsCachePath = (0, node_path_1.join)(internal_4.workspaceDataDirectory, `tsc-${optionsHash}.hash`);
         const targetsCache = readFromCache(targetsCachePath);
         // Each invocation gets a unique Symbol key — guaranteed no collisions
         const cacheKey = Symbol('tsc-invocation');
@@ -136,7 +136,7 @@ exports.createNodesV2 = [
         const normalizedOptions = normalizePluginOptions(options);
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
-        const lockFileName = (0, lock_file_1.getLockFileName)(packageManager);
+        const lockFileName = (0, internal_3.getLockFileName)(packageManager);
         const { configFilePaths: validConfigFilePaths, hashes, projectRoots, } = await resolveValidConfigFilesAndHashes(configFilePaths, normalizedOptions, optionsHash, context, cache, lockFileName);
         try {
             return await (0, devkit_1.createNodesFromFiles)((configFilePath, options, context, idx) => {
@@ -171,7 +171,7 @@ exports.createNodesV2 = [
 ];
 exports.createNodes = exports.createNodesV2;
 async function resolveValidConfigFilesAndHashes(configFilePaths, options, optionsHash, context, cache, lockFileName) {
-    const lockFileHash = (0, file_hasher_1.hashFile)((0, node_path_1.join)(context.workspaceRoot, lockFileName)) ?? '';
+    const lockFileHash = (0, internal_2.hashFile)((0, node_path_1.join)(context.workspaceRoot, lockFileName)) ?? '';
     const validConfigFilePaths = [];
     const hashes = [];
     const projectRoots = [];
@@ -218,7 +218,7 @@ async function getConfigFileHash(configFilePath, workspaceRoot, project, options
         packageJson = (0, devkit_1.readJsonFile)((0, node_path_1.join)(workspaceRoot, project.root, 'package.json'));
     }
     catch { }
-    return (0, file_hasher_1.hashArray)([
+    return (0, devkit_2.hashArray)([
         ...[
             fullConfigPath,
             ...extendedConfigFiles.files.sort(),
@@ -228,7 +228,7 @@ async function getConfigFileHash(configFilePath, workspaceRoot, project, options
         ...extendedConfigFiles.packages.sort(),
         lockFileHash,
         optionsHash,
-        ...(packageJson ? [(0, file_hasher_1.hashObject)(packageJson)] : []),
+        ...(packageJson ? [(0, internal_2.hashObject)(packageJson)] : []),
     ]);
 }
 function checkIfConfigFileShouldBeProject(config, cache) {
@@ -956,7 +956,7 @@ function getFileHash(filePath, workspaceRoot, cache) {
     const relativePath = posixRelative(workspaceRoot, filePath);
     if (!cache.fileHashes[relativePath]) {
         const content = readFile(filePath, workspaceRoot, cache);
-        cache.fileHashes[relativePath] = (0, file_hasher_1.hashArray)([content]);
+        cache.fileHashes[relativePath] = (0, devkit_2.hashArray)([content]);
     }
     return cache.fileHashes[relativePath];
 }

package/dist/src/plugins/typescript/util.d.ts

@@ -1,6 +1,6 @@
 import { type TargetConfiguration } from '@nx/devkit';
-import { type PackageManagerCommands } from 'nx/src/utils/package-manager';
 import { type ParsedCommandLine } from 'typescript';
+import { type PackageManagerCommands } from '@nx/devkit/internal';
 export type ExtendedConfigFile = {
     filePath: string;
     externalPackage?: string;

package/dist/src/release/utils/update-lock-file.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateLockFile = updateLockFile;
 const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
-const client_1 = require("nx/src/daemon/client/client");
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/devkit/internal");
 const semver_1 = require("semver");
 async function updateLockFile(cwd, { dryRun, verbose, options, }) {
     if (options?.skipLockFileUpdate) {
@@ -30,10 +29,10 @@ async function updateLockFile(cwd, { dryRun, verbose, options, }) {
         }
         return [];
     }
-    const isDaemonEnabled = client_1.daemonClient.enabled();
+    const isDaemonEnabled = internal_1.daemonClient.enabled();
     if (!dryRun && isDaemonEnabled) {
         // if not in dry-run temporarily stop the daemon, as it will error if the lock file is updated
-        await client_1.daemonClient.stop();
+        await internal_1.daemonClient.stop();
     }
     const packageManagerCommands = (0, devkit_1.getPackageManagerCommand)(packageManager);
     let installArgs = options?.installArgs || '';
@@ -48,7 +47,7 @@ async function updateLockFile(cwd, { dryRun, verbose, options, }) {
             installArgs = `${installArgs} --ignore-scripts`.trim();
         }
     }
-    const lockFile = (0, lock_file_1.getLockFileName)(packageManager);
+    const lockFile = (0, internal_2.getLockFileName)(packageManager);
     const command = `${packageManagerCommands.updateLockFile} ${installArgs}`.trim();
     if (verbose) {
         if (dryRun) {
@@ -65,7 +64,7 @@ async function updateLockFile(cwd, { dryRun, verbose, options, }) {
     execLockFileUpdate(command, cwd, env);
     if (isDaemonEnabled) {
         try {
-            await client_1.daemonClient.startInBackground();
+            await internal_1.daemonClient.startInBackground();
         }
         catch (e) {
             // If the daemon fails to start, we don't want to prevent the user from continuing, so we just log the error and move on

package/dist/src/release/version-actions.d.ts

@@ -1,9 +1,10 @@
 import { ProjectGraph, Tree } from '@nx/devkit';
-import { AfterAllProjectsVersioned, VersionActions } from 'nx/release';
-import type { NxReleaseVersionConfiguration } from 'nx/src/config/nx-json';
+import { VersionActions } from 'nx/release';
+import type { AfterAllProjectsVersioned, NxReleaseVersionConfiguration } from '@nx/devkit/internal';
 export declare const afterAllProjectsVersioned: AfterAllProjectsVersioned;
 export default class JsVersionActions extends VersionActions {
     validManifestFilenames: string[];
+    excludeManifestsFromFormatting: boolean;
     readCurrentVersionFromSourceManifest(tree: Tree): Promise<{
         currentVersion: string;
         manifestPath: string;
@@ -18,5 +19,9 @@ export default class JsVersionActions extends VersionActions {
     }>;
     updateProjectVersion(tree: Tree, newVersion: string): Promise<string[]>;
     updateProjectDependencies(tree: Tree, projectGraph: ProjectGraph, dependenciesToUpdate: Record<string, string>): Promise<string[]>;
+    private updateManifestValues;
+    private readAndValidateManifest;
+    private validateManifestUpdates;
+    private detectFormattingOptions;
     private isLocalDependencyProtocol;
 }