@nx/js 23.2.0-beta.0 → 23.2.0-beta.10

package/dist/internal.d.ts

@@ -1,10 +1,14 @@
-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 { PNPM_INSTALL_SETTINGS_INPUTS, PNPM_MAJOR_RUNTIME_INPUT, pnpmInstallSettingsInputsForInferredTarget, shouldIncludePnpmMajorRuntimeInput, } from './src/utils/pnpm-install-settings-inputs';
+export { addPnpmDeployOutputCacheInputs } from './src/utils/pnpm-deploy-output-cache-inputs';
+export type { MatchedTargetRef } from './src/utils/target-defaults-matching';
 export { TS_SOLUTION_SETUP_TSCONFIG_INPUT, addProjectToTsSolutionWorkspace, assertNotUsingTsSolutionSetup, findRuntimeTsConfigName, getDefinedCustomConditionName, getProjectSourceRoot, getProjectType, isUsingTsSolutionSetup, shouldConfigureTsSolutionSetup, updateTsconfigFiles, } from './src/utils/typescript/ts-solution-setup';
 export { getTsConfigBaseOptions } from './src/utils/typescript/create-ts-config';
+export { createTreeParseConfigHost, type TreeParseConfigHost, } from './src/utils/typescript/ts-config';
 export { ensureTypescript } from './src/utils/typescript/ensure-typescript';
 export { getRangeMinimum, getTsConfigModuleResolution, isTypescriptVersionAtLeast, } from './src/utils/is-typescript-version-at-least';
 export { getNeededCompilerOptionOverrides } from './src/utils/typescript/configuration';
@@ -20,6 +24,8 @@ export { getProjectPackageManagerWorkspaceState, getProjectPackageManagerWorkspa
 export { findNpmDependencies } from './src/utils/find-npm-dependencies';
 export { addBuildAndWatchDepsTargets, isValidPackageJsonBuildConfig, } from './src/plugins/typescript/util';
 export { normalizeLinterOption, normalizeUnitTestRunnerOption, } from './src/utils/generator-prompts';
+export { detectLinters } from './src/utils/linter';
+export { addLintingToProject, type AddLintingToProjectOptions, } from './src/utils/add-linting-to-project';
 export { createGlobPatternsForDependencies } from './src/utils/generate-globs';
 export { getImportPath } from './src/utils/get-import-path';
 export { stripGlobToBaseDir } from './src/utils/strip-glob-to-base-dir';

package/dist/internal.js

@@ -5,23 +5,20 @@
 // internal consumers and may change without semver protection. Consider it
 // the @nx/js equivalent of `@nx/devkit/internal`.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addReleaseConfigForNonTsSolution = 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.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 = 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; } });
+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.addPnpmDeployOutputCacheInputs = exports.shouldIncludePnpmMajorRuntimeInput = exports.pnpmInstallSettingsInputsForInferredTarget = exports.PNPM_MAJOR_RUNTIME_INPUT = exports.PNPM_INSTALL_SETTINGS_INPUTS = 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 = exports.addLocalRegistryScripts = exports.stripGlobToBaseDir = exports.getImportPath = exports.createGlobPatternsForDependencies = exports.addLintingToProject = exports.detectLinters = exports.normalizeUnitTestRunnerOption = void 0;
+// 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; } });
@@ -29,6 +26,14 @@ Object.defineProperty(exports, "walkTsconfigExtendsChain", { enumerable: true, g
 // TS solution awareness; mirrors Node's nearest-package.json semantics).
 var is_esm_project_1 = require("./src/utils/module-format/is-esm-project");
 Object.defineProperty(exports, "isEsmProject", { enumerable: true, get: function () { return is_esm_project_1.isEsmProject; } });
+// Inputs for build targets that emit a pruned pnpm deploy output
+var pnpm_install_settings_inputs_1 = require("./src/utils/pnpm-install-settings-inputs");
+Object.defineProperty(exports, "PNPM_INSTALL_SETTINGS_INPUTS", { enumerable: true, get: function () { return pnpm_install_settings_inputs_1.PNPM_INSTALL_SETTINGS_INPUTS; } });
+Object.defineProperty(exports, "PNPM_MAJOR_RUNTIME_INPUT", { enumerable: true, get: function () { return pnpm_install_settings_inputs_1.PNPM_MAJOR_RUNTIME_INPUT; } });
+Object.defineProperty(exports, "pnpmInstallSettingsInputsForInferredTarget", { enumerable: true, get: function () { return pnpm_install_settings_inputs_1.pnpmInstallSettingsInputsForInferredTarget; } });
+Object.defineProperty(exports, "shouldIncludePnpmMajorRuntimeInput", { enumerable: true, get: function () { return pnpm_install_settings_inputs_1.shouldIncludePnpmMajorRuntimeInput; } });
+var pnpm_deploy_output_cache_inputs_1 = require("./src/utils/pnpm-deploy-output-cache-inputs");
+Object.defineProperty(exports, "addPnpmDeployOutputCacheInputs", { enumerable: true, get: function () { return pnpm_deploy_output_cache_inputs_1.addPnpmDeployOutputCacheInputs; } });
 // TS solution setup detection
 var ts_solution_setup_1 = require("./src/utils/typescript/ts-solution-setup");
 Object.defineProperty(exports, "TS_SOLUTION_SETUP_TSCONFIG_INPUT", { enumerable: true, get: function () { return ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT; } });
@@ -47,6 +52,8 @@ Object.defineProperty(exports, "updateTsconfigFiles", { enumerable: true, get: f
 // re-exported here so internal consumers can import it from @nx/js/internal.
 var create_ts_config_1 = require("./src/utils/typescript/create-ts-config");
 Object.defineProperty(exports, "getTsConfigBaseOptions", { enumerable: true, get: function () { return create_ts_config_1.getTsConfigBaseOptions; } });
+var ts_config_1 = require("./src/utils/typescript/ts-config");
+Object.defineProperty(exports, "createTreeParseConfigHost", { enumerable: true, get: function () { return ts_config_1.createTreeParseConfigHost; } });
 var ensure_typescript_1 = require("./src/utils/typescript/ensure-typescript");
 Object.defineProperty(exports, "ensureTypescript", { enumerable: true, get: function () { return ensure_typescript_1.ensureTypescript; } });
 var is_typescript_version_at_least_1 = require("./src/utils/is-typescript-version-at-least");
@@ -90,6 +97,10 @@ Object.defineProperty(exports, "isValidPackageJsonBuildConfig", { enumerable: tr
 var generator_prompts_1 = require("./src/utils/generator-prompts");
 Object.defineProperty(exports, "normalizeLinterOption", { enumerable: true, get: function () { return generator_prompts_1.normalizeLinterOption; } });
 Object.defineProperty(exports, "normalizeUnitTestRunnerOption", { enumerable: true, get: function () { return generator_prompts_1.normalizeUnitTestRunnerOption; } });
+var linter_1 = require("./src/utils/linter");
+Object.defineProperty(exports, "detectLinters", { enumerable: true, get: function () { return linter_1.detectLinters; } });
+var add_linting_to_project_1 = require("./src/utils/add-linting-to-project");
+Object.defineProperty(exports, "addLintingToProject", { enumerable: true, get: function () { return add_linting_to_project_1.addLintingToProject; } });
 var generate_globs_1 = require("./src/utils/generate-globs");
 Object.defineProperty(exports, "createGlobPatternsForDependencies", { enumerable: true, get: function () { return generate_globs_1.createGlobPatternsForDependencies; } });
 var get_import_path_1 = require("./src/utils/get-import-path");

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

@@ -2,13 +2,54 @@
 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 strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
+const workspace_module_sections_1 = require("../../utils/workspace-module-sections");
+// Sections of a copied module's own manifest whose workspace-module deps are
+// rewritten to file: and recursed into. pnpm installs a transitive dependency's
+// regular, optional, and auto-installed peer deps (a workspace peer is linked
+// and recorded under the depending importer's dependencies in the lockfile), but
+// never its devDependencies. A workspace-module peer is moved into dependencies,
+// since pnpm rejects a file: spec under peerDependencies (mirrors the app-level
+// move in prune-lockfile).
+const TRANSITIVE_INSTALL_SECTIONS = [
+    'dependencies',
+    'optionalDependencies',
+    'peerDependencies',
+];
+// Resolve `catalog:` references in a copied module manifest to the version the
+// workspace pinned. Only the sections pnpm installs for a `file:` directory
+// dependency are resolved: a copied module's devDependencies are never
+// installed, so a `catalog:` there is inert (pnpm leaves it untouched), and
+// resolving it would abort the whole deploy build if that catalog entry does
+// not exist. Returns whether anything changed.
+function resolveCatalogReferences(packageJson, manager) {
+    if (!manager) {
+        return false;
+    }
+    let modified = false;
+    for (const section of TRANSITIVE_INSTALL_SECTIONS) {
+        const deps = packageJson[section];
+        if (!deps) {
+            continue;
+        }
+        for (const [name, version] of Object.entries(deps)) {
+            if (!manager.isCatalogReference(version)) {
+                continue;
+            }
+            const resolved = manager.resolveCatalogReference(devkit_1.workspaceRoot, name, version);
+            if (!resolved) {
+                throw new Error(`Could not resolve catalog reference for package ${name}@${version}.`);
+            }
+            deps[name] = resolved;
+            modified = true;
+        }
+    }
+    return modified;
+}
 async function copyWorkspaceModules(schema, context) {
     devkit_1.logger.log('Copying Workspace Modules to Build Directory...');
     const outputDirectory = getOutputDir(schema, context);
@@ -19,10 +60,14 @@ async function copyWorkspaceModules(schema, context) {
     return { success: true };
 }
 function handleWorkspaceModules(outputDirectory, packageJson, projectGraph) {
-    if (!packageJson.dependencies) {
+    if (!workspace_module_sections_1.WORKSPACE_MODULE_INSTALL_SECTIONS.some((section) => packageJson[section])) {
         return;
     }
-    const workspaceModules = (0, get_workspace_packages_from_graph_1.getWorkspacePackagesFromGraph)(projectGraph);
+    const workspaceModules = (0, internal_1.getWorkspacePackagesFromGraph)(projectGraph);
+    const catalogManager = (0, internal_1.getCatalogManager)(devkit_1.workspaceRoot);
+    // Only the pnpm prune path ships non-workspace local-path targets, so only
+    // pnpm manifests get their file:/link: specs relocated.
+    const isPnpmWorkspace = (0, devkit_1.detectPackageManager)(devkit_1.workspaceRoot) === 'pnpm';
     const processedModules = new Set();
     const workspaceModulesDir = (0, path_1.join)(outputDirectory, 'workspace_modules');
     function calculateRelativePath(fromPkgName, toPkgName) {
@@ -44,10 +89,17 @@ function handleWorkspaceModules(outputDirectory, packageJson, projectGraph) {
         devkit_1.logger.verbose(`Copying ${pkgName}.`);
         const workspaceModuleProject = workspaceModules.get(pkgName);
         const workspaceModuleRoot = workspaceModuleProject.data.root;
+        // data.root is workspace-root-relative in the graph, but may arrive
+        // absolute; normalize so the local-path relocation math is in
+        // workspace-root space.
+        const moduleWsRelativeRoot = (0, path_1.isAbsolute)(workspaceModuleRoot)
+            ? (0, path_1.relative)(devkit_1.workspaceRoot, workspaceModuleRoot).split(path_1.sep).join('/')
+            : workspaceModuleRoot;
         const newWorkspaceModulePath = (0, path_1.join)(workspaceModulesDir, pkgName);
-        // Copy the module
+        // Copy the module, from the workspace root rather than the process cwd: a
+        // graph root arrives workspace-relative in the common case.
         (0, node_fs_1.mkdirSync)(newWorkspaceModulePath, { recursive: true });
-        (0, node_fs_1.cpSync)(workspaceModuleRoot, newWorkspaceModulePath, {
+        (0, node_fs_1.cpSync)((0, path_1.join)(devkit_1.workspaceRoot, moduleWsRelativeRoot), newWorkspaceModulePath, {
             filter: (src) => !src.includes('node_modules'),
             recursive: true,
         });
@@ -62,26 +114,75 @@ function handleWorkspaceModules(outputDirectory, packageJson, projectGraph) {
             devkit_1.logger.warn(`Could not read package.json for ${pkgName}: ${e.message}`);
             return;
         }
-        // Process and update dependencies
-        if (copiedPackageJson.dependencies) {
-            let packageJsonModified = false;
-            for (const [depName, depVersion] of Object.entries(copiedPackageJson.dependencies)) {
+        // The standalone dist ships no catalog definition, so resolve any
+        // `catalog:` references to the version the workspace pinned.
+        let packageJsonModified = resolveCatalogReferences(copiedPackageJson, catalogManager);
+        // Rewrite sibling workspace-module deps to file: paths and recurse. A peer
+        // is moved into dependencies (pnpm rejects a file: spec under
+        // peerDependencies), dropping its now-orphaned optional/required marker.
+        for (const section of TRANSITIVE_INSTALL_SECTIONS) {
+            const deps = copiedPackageJson[section];
+            if (!deps) {
+                continue;
+            }
+            for (const depName of Object.keys(deps)) {
                 if (workspaceModules.has(depName)) {
-                    const relativePath = calculateRelativePath(pkgName, depName);
-                    copiedPackageJson.dependencies[depName] = `file:${relativePath}`;
+                    const fileSpec = `file:${calculateRelativePath(pkgName, depName)}`;
+                    if (section === 'peerDependencies') {
+                        (0, internal_1.movePeerDependencyToDependencies)(copiedPackageJson, depName, fileSpec);
+                    }
+                    else {
+                        deps[depName] = fileSpec;
+                    }
                     packageJsonModified = true;
                     processModule(depName);
+                    continue;
+                }
+                // A non-workspace file:/link: dep must keep resolving after the module
+                // moves. pnpm reads a non-importer manifest file: spec relative to the
+                // package dir but a link: spec relative to the install root, so each
+                // rebases onto a different base (pnpm-only; see isPnpmWorkspace).
+                if (!isPnpmWorkspace) {
+                    continue;
+                }
+                const spec = deps[depName];
+                const relocation = (0, internal_1.relocatePrunedLocalPathSpec)(spec, moduleWsRelativeRoot, spec.startsWith('link:') ? '' : `workspace_modules/${pkgName}`);
+                if (!relocation) {
+                    continue;
+                }
+                if (relocation.reason) {
+                    (0, internal_1.warnUnshippableLocalPathSpec)(`"${spec}" in ${pkgName}`, relocation.reason);
+                }
+                if (section === 'peerDependencies') {
+                    // Moved even when the target cannot ship: pnpm rejects the spec here
+                    // either way.
+                    (0, internal_1.movePeerDependencyToDependencies)(copiedPackageJson, depName, relocation.spec);
+                    packageJsonModified = true;
+                }
+                else if (!relocation.reason) {
+                    deps[depName] = relocation.spec;
+                    packageJsonModified = true;
                 }
             }
-            if (packageJsonModified) {
-                (0, node_fs_1.writeFileSync)(copiedPackageJsonPath, JSON.stringify(copiedPackageJson, null, 2));
-                devkit_1.logger.verbose(`Updated package.json for ${pkgName} with relative workspace module paths.`);
-            }
+        }
+        (0, internal_1.dropEmptyPeerDependencySections)(copiedPackageJson);
+        if (packageJsonModified) {
+            (0, node_fs_1.writeFileSync)(copiedPackageJsonPath, JSON.stringify(copiedPackageJson, null, 2));
+            devkit_1.logger.verbose(`Updated package.json for ${pkgName}.`);
         }
     }
-    // Process all top-level dependencies
-    for (const [pkgName] of Object.entries(packageJson.dependencies)) {
-        processModule(pkgName);
+    // Seed from every section the app declares a workspace module in. Copied
+    // modules recurse over production sections only (see processModule).
+    // processModule dedups via processedModules, so a module listed in several
+    // sections is copied once.
+    for (const section of workspace_module_sections_1.WORKSPACE_MODULE_INSTALL_SECTIONS) {
+        const deps = packageJson[section];
+        if (!deps) {
+            continue;
+        }
+        for (const pkgName of Object.keys(deps)) {
+            processModule(pkgName);
+        }
     }
 }
 function createWorkspaceModules(outputDirectory) {
@@ -114,7 +215,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,12 @@ 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 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 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 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 +171,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_1.killProcessTreeGraceful)(task.childProcess.pid, signal, process.platform === 'win32' ? 0 : undefined);
                     }
                     if (task.id === globalLineAwareWriter.currentProcessId) {
                         globalLineAwareWriter.setActiveProcess(null);
@@ -237,7 +233,7 @@ async function* nodeExecutor(options, context) {
                 await debouncedProcessQueue.trigger();
             };
             if ((0, devkit_1.isDaemonEnabled)()) {
-                additionalExitHandler = await client_1.daemonClient.registerFileWatcher({
+                additionalExitHandler = await internal_1.daemonClient.registerFileWatcher({
                     watchProjects: [context.projectName],
                     includeDependencies: true,
                 }, async (err, data) => {
@@ -279,9 +275,12 @@ async function* nodeExecutor(options, context) {
             }, context);
             while (true) {
                 const event = await output.next();
+                if (event.done) {
+                    break;
+                }
                 await addToQueue(null, Promise.resolve(event.value));
                 await debouncedProcessQueue.trigger();
-                if (event.done && !options.watch) {
+                if (!options.watch) {
                     break;
                 }
             }
@@ -337,7 +336,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_1.interpolate)(outputPath, {
                 projectName: project.name,
                 projectRoot: project.data.root,
                 workspaceRoot: context.root,
@@ -366,12 +365,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_1.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_1.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

@@ -3,53 +3,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = pruneLockfileExecutor;
 exports.resolveCatalogReferences = resolveCatalogReferences;
 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_1 = require("@nx/devkit/internal");
 const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
+const workspace_module_sections_1 = require("../../utils/workspace-module-sections");
 async function pruneLockfileExecutor(schema, context) {
     devkit_1.logger.log('Pruning lockfile...');
     const outputDirectory = getOutputDir(schema, context);
     const packageJson = resolveCatalogReferences(getPackageJson(schema, context));
     mergeAllowScripts(packageJson);
     const packageManager = (0, devkit_1.detectPackageManager)(devkit_1.workspaceRoot);
-    if (packageManager === 'bun') {
-        devkit_1.logger.warn('Bun lockfile generation is not supported. Only package.json will be generated. Run "bun install" in the output directory if needed.');
-        (0, fs_1.writeFileSync)((0, path_1.join)(outputDirectory, 'package.json'), JSON.stringify(packageJson, null, 2));
-    }
-    else {
-        const { lockfileName, lockFile } = createPrunedLockfile(packageJson, context.projectGraph);
-        const lockfileOutputPath = (0, path_1.join)(outputDirectory, lockfileName);
-        (0, fs_1.writeFileSync)(lockfileOutputPath, lockFile);
-        (0, fs_1.writeFileSync)((0, path_1.join)(outputDirectory, 'package.json'), JSON.stringify(packageJson, null, 2));
-        devkit_1.logger.log(`Lockfile pruned: ${lockfileOutputPath}`);
-    }
+    const { project } = (0, devkit_1.parseTargetString)(schema.buildTarget, context);
+    const projectRoot = context.projectGraph.nodes[project].data.root;
+    (0, internal_1.generatePrunedDeployOutput)(packageJson, context.projectGraph, projectRoot, {
+        outputDirectory,
+        packageManager,
+        workspaceRoot: devkit_1.workspaceRoot,
+    });
+    rewriteWorkspaceModuleSpecifiers(packageJson, context.projectGraph);
+    (0, fs_1.writeFileSync)((0, path_1.join)(outputDirectory, 'package.json'), JSON.stringify(packageJson, null, 2));
+    devkit_1.logger.log(`Pruned deploy output written to ${outputDirectory}`);
     return {
         success: true,
     };
 }
-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);
-    for (const [pkgName, pkgVersion] of Object.entries(packageJson.dependencies ?? {})) {
-        if (pkgVersion.startsWith('workspace:') ||
-            pkgVersion.startsWith('file:') ||
-            pkgVersion.startsWith('link:') ||
-            workspacePackages.has(pkgName)) {
-            packageJson.dependencies[pkgName] = `file:./workspace_modules/${pkgName}`;
+// Point every workspace-module dependency at its copied directory so the
+// standalone output installs them as pnpm `file:` directory dependencies.
+// pnpm rejects a `file:` spec under peerDependencies, so a peer-declared
+// workspace module is moved into dependencies instead (an optional peer
+// becomes required, which is moot since the module is always copied in). Gate
+// strictly on graph membership: a `file:`/`link:` spec to a non-workspace
+// local path (e.g. a vendored tarball) is left alone, since
+// copy-workspace-modules only ever copies actual workspace projects.
+function rewriteWorkspaceModuleSpecifiers(packageJson, graph) {
+    const workspacePackages = (0, internal_1.getWorkspacePackagesFromGraph)(graph);
+    for (const section of workspace_module_sections_1.WORKSPACE_MODULE_INSTALL_SECTIONS) {
+        const deps = packageJson[section];
+        if (!deps) {
+            continue;
+        }
+        for (const pkgName of Object.keys(deps)) {
+            if (!workspacePackages.has(pkgName)) {
+                continue;
+            }
+            const fileSpec = `file:./workspace_modules/${pkgName}`;
+            if (section === 'peerDependencies') {
+                (0, internal_1.movePeerDependencyToDependencies)(packageJson, pkgName, fileSpec);
+            }
+            else {
+                deps[pkgName] = fileSpec;
+            }
         }
     }
-    return {
-        lockfileName,
-        lockFile,
-    };
+    (0, internal_1.dropEmptyPeerDependencySections)(packageJson);
 }
 /**
  * npm reads the `allowScripts` install-script allowlist only from the install
@@ -127,7 +134,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/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

@@ -66,12 +66,19 @@ async function verdaccioExecutor(options, context) {
         port: options.port,
     };
 }
+function getVerdaccioBinPath() {
+    const { packageJson, path: packageJsonPath } = (0, internal_1.readModulePackageJson)('verdaccio');
+    const bin = typeof packageJson.bin === 'string'
+        ? packageJson.bin
+        : packageJson.bin['verdaccio'];
+    return (0, path_1.join)((0, path_1.dirname)(packageJsonPath), bin);
+}
 /**
  * Fork the verdaccio process: https://verdaccio.org/docs/verdaccio-programmatically/#using-fork-from-child_process-module
  */
 function startVerdaccio(options, workspaceRoot) {
     return new Promise((resolve, reject) => {
-        childProcess = (0, child_process_1.fork)(require.resolve('verdaccio/bin/verdaccio'), createVerdaccioOptions(options, workspaceRoot), {
+        childProcess = (0, child_process_1.fork)(getVerdaccioBinPath(), createVerdaccioOptions(options, workspaceRoot), {
             env: {
                 ...process.env,
                 VERDACCIO_HANDLE_KILL_SIGNALS: 'true',