@nx/js 23.2.0-pr.36527.2252709 → 23.2.0-pr.36838.ef8e258

package/README.md

@@ -7,9 +7,9 @@
 
 <div style="text-align: center;">
 
-[![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
+[![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)](<>)
 [![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
-[![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
+[![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)](<>)
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join us on the Official Nx Discord Server](https://img.shields.io/discord/1143497901675401286?label=discord)](https://go.nx.dev/community)
 [![Nx Sandboxing](https://staging.nx.app/workspaces/62d013ea0852fe0a2df74438/sandbox-badge.svg)](https://nx.dev/docs/features/ci-features/sandboxing)

package/dist/internal.d.ts

@@ -3,6 +3,9 @@ export { TargetProjectLocator, isBuiltinModuleImport, } from '@nx/devkit/interna
 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';

package/dist/internal.js

@@ -5,8 +5,8 @@
 // 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.getImportPath = exports.createGlobPatternsForDependencies = exports.addLintingToProject = exports.detectLinters = 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 = exports.addLocalRegistryScripts = exports.stripGlobToBaseDir = void 0;
+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; } });
@@ -26,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; } });

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

@@ -7,6 +7,49 @@ const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const fs_1 = require("fs");
 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);
@@ -17,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, 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) {
@@ -41,11 +88,18 @@ function handleWorkspaceModules(outputDirectory, packageJson, projectGraph) {
         processedModules.add(pkgName);
         devkit_1.logger.verbose(`Copying ${pkgName}.`);
         const workspaceModuleProject = workspaceModules.get(pkgName);
-        const workspaceModuleRoot = (0, path_1.join)(devkit_1.workspaceRoot, workspaceModuleProject.data.root);
+        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,
         });
@@ -60,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) {

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

@@ -3,48 +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 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, internal_1.getLockFileName)(packageManager);
-    const lockFile = (0, internal_1.createLockFile)(packageJson, graph, packageManager);
+// 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 [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}`;
+    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

package/dist/src/executors/tsc/lib/typescript-compilation.js

@@ -154,7 +154,7 @@ function compileTSWithWatch(context, logger, hooks, reporters) {
                 project.kind !== ts.InvalidatedProjectKind.UpdateOutputFileStamps) {
                 logger.warn(`The project ${projectName} ` +
                     `is using the deprecated "prepend" Typescript compiler option. ` +
-                    `This option is not supported by the batch executor and it's ignored.`);
+                    `This option is not supported by the batch executor and it's ignored.`, project.project);
                 continue;
             }
             hooks?.beforeProjectCompilationCallback(project.project);

package/dist/src/generators/library/schema.d.ts

@@ -41,8 +41,7 @@ export interface LibraryGeneratorSchema {
   passWithNoTests?: boolean;
 }
 
-export interface NormalizedLibraryGeneratorOptions
-  extends LibraryGeneratorSchema {
+export interface NormalizedLibraryGeneratorOptions extends LibraryGeneratorSchema {
   name: string;
   /** `normalizeOptions` always resolves this, so it is no longer optional. */
   linter: LinterType;

package/dist/src/index.d.ts

@@ -18,5 +18,4 @@ export { setupPrettierGenerator } from './generators/setup-prettier/generator';
 export { setupVerdaccio } from './generators/setup-verdaccio/generator';
 export { isValidVariable } from './utils/is-valid-variable';
 export { type LinterType } from './utils/linter';
-export { createLockFile, getLockFileName } from '@nx/devkit/internal';
-export { createPackageJson } from '@nx/devkit/internal';
+export { createLockFile, createPackageJson, generatePrunedDeployOutput, getLockFileName, } from '@nx/devkit/internal';

package/dist/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPackageJson = exports.getLockFileName = exports.createLockFile = exports.isValidVariable = exports.setupVerdaccio = exports.setupPrettierGenerator = exports.setUpFormatter = exports.initGenerator = exports.libraryGenerator = void 0;
+exports.getLockFileName = exports.generatePrunedDeployOutput = exports.createPackageJson = exports.createLockFile = exports.isValidVariable = exports.setupVerdaccio = exports.setupPrettierGenerator = exports.setUpFormatter = exports.initGenerator = exports.libraryGenerator = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./utils/typescript/add-tslib-dependencies"), exports);
 tslib_1.__exportStar(require("./utils/typescript/load-ts-transformers"), exports);
@@ -29,6 +29,6 @@ var is_valid_variable_1 = require("./utils/is-valid-variable");
 Object.defineProperty(exports, "isValidVariable", { enumerable: true, get: function () { return is_valid_variable_1.isValidVariable; } });
 var internal_1 = require("@nx/devkit/internal");
 Object.defineProperty(exports, "createLockFile", { enumerable: true, get: function () { return internal_1.createLockFile; } });
+Object.defineProperty(exports, "createPackageJson", { enumerable: true, get: function () { return internal_1.createPackageJson; } });
+Object.defineProperty(exports, "generatePrunedDeployOutput", { enumerable: true, get: function () { return internal_1.generatePrunedDeployOutput; } });
 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/migrations/update-23-2-0/add-pnpm-deploy-output-cache-inputs.d.ts

@@ -0,0 +1,14 @@
+import { type Tree } from '@nx/devkit';
+/**
+ * Adds the workspace-root pnpm install settings sources to the `inputs` of
+ * build targets that emit the pruned pnpm deploy output. The build approvals
+ * and `supportedArchitectures` those outputs carry reach no lockfile, so
+ * without these a revoked approval leaves the task hash unchanged and a cached
+ * run replays an output that still grants it. Inferred targets are covered by
+ * the `@nx/webpack` and `@nx/rspack` plugins themselves; this migration covers
+ * the explicitly configured executor targets, plus overlays of inferred
+ * targets (a project-level entry, under the exact name or a glob-pattern key
+ * matching it, or a matching `targetDefaults` entry) whose replacing `inputs`
+ * array discards the plugin-generated one.
+ */
+export default function update(tree: Tree): Promise<void>;

package/dist/src/migrations/update-23-2-0/add-pnpm-deploy-output-cache-inputs.js

@@ -0,0 +1,242 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
+const path_1 = require("path");
+const pnpm_deploy_output_cache_inputs_1 = require("../../utils/pnpm-deploy-output-cache-inputs");
+const target_defaults_matching_1 = require("../../utils/target-defaults-matching");
+// The executors that emit the pruned pnpm deploy output (lockfile,
+// settings-only pnpm-workspace.yaml, patches, vendored local paths), each with
+// the option that turns the emission on. webpack, rspack, vite and esbuild
+// gate it on `generatePackageJson`; next, remix, tsc and swc emit the manifest
+// regardless and gate only the deploy output on `generateLockfile`.
+const DEPLOY_OUTPUT_EXECUTORS = {
+    '@nx/webpack:webpack': 'generatePackageJson',
+    '@nx/rspack:rspack': 'generatePackageJson',
+    '@nx/vite:build': 'generatePackageJson',
+    '@nx/esbuild:esbuild': 'generatePackageJson',
+    '@nx/next:build': 'generateLockfile',
+    '@nx/remix:build': 'generateLockfile',
+    '@nx/js:tsc': 'generateLockfile',
+    '@nx/js:swc': 'generateLockfile',
+};
+// The config-file plugins whose inferred build target can emit the deploy
+// output (NxAppWebpackPlugin/NxAppRspackPlugin with generatePackageJson).
+// The globs mirror each plugin's own createNodes pattern; the commands are
+// what each plugin sets on the build target it creates.
+const INFERRED_DEPLOY_PLUGINS = {
+    '@nx/webpack/plugin': {
+        configGlob: '**/webpack.config.{js,ts,mjs,cjs}',
+        command: 'webpack-cli build',
+    },
+    '@nx/rspack/plugin': {
+        configGlob: '**/rspack.config.{js,ts,mjs,mts,cjs,cts}',
+        command: 'rspack build',
+    },
+};
+/**
+ * Adds the workspace-root pnpm install settings sources to the `inputs` of
+ * build targets that emit the pruned pnpm deploy output. The build approvals
+ * and `supportedArchitectures` those outputs carry reach no lockfile, so
+ * without these a revoked approval leaves the task hash unchanged and a cached
+ * run replays an output that still grants it. Inferred targets are covered by
+ * the `@nx/webpack` and `@nx/rspack` plugins themselves; this migration covers
+ * the explicitly configured executor targets, plus overlays of inferred
+ * targets (a project-level entry, under the exact name or a glob-pattern key
+ * matching it, or a matching `targetDefaults` entry) whose replacing `inputs`
+ * array discards the plugin-generated one.
+ */
+async function update(tree) {
+    // The deploy output's install settings are pnpm-specific; other package
+    // managers' outputs hash everything they are built from already.
+    if (!tree.exists('pnpm-lock.yaml')) {
+        return;
+    }
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const targetDefaults = nxJson?.targetDefaults;
+    const projects = new Map();
+    const changedProjects = new Set();
+    let defaultsChanged = false;
+    for (const [projectName, project] of (0, devkit_1.getProjects)(tree)) {
+        projects.set(projectName, project);
+        const projectNode = {
+            name: projectName,
+            type: 'lib',
+            data: { root: project.root, tags: project.tags },
+        };
+        for (const [targetName, target] of Object.entries(project.targets ?? {})) {
+            // The executor may come from a matching targetDefaults entry rather
+            // than the target itself. A `command` target resolves to nx:run-commands
+            // before defaults apply, so a default can never re-identify it.
+            const executor = target.executor ??
+                (target.command
+                    ? 'nx:run-commands'
+                    : (0, target_defaults_matching_1.resolveDefaultsExecutor)(targetName, projectName, projectNode, targetDefaults));
+            if (!executor || !DEPLOY_OUTPUT_EXECUTORS[executor]) {
+                continue;
+            }
+            const ref = {
+                targetName,
+                projectName,
+                projectNode,
+                matcherExecutor: target.executor,
+                target,
+            };
+            const selectedKey = targetDefaults
+                ? (0, target_defaults_matching_1.selectDefaultsKey)(ref, targetDefaults, executor)
+                : null;
+            const entries = (0, target_defaults_matching_1.compatibleDefaultsEntries)(ref, selectedKey, targetDefaults);
+            const defaults = entries.length
+                ? (0, internal_1.readTargetDefaultsForTarget)(targetName, { [selectedKey]: entries }, ref.matcherExecutor, { projectName, projectNode })
+                : null;
+            // The effective view, not the target's own: the gating option may be
+            // supplied by a matching defaults entry or set only in a configuration.
+            const effective = (0, internal_1.mergeTargetConfigurations)(target, defaults ?? {});
+            if (!emitsDeployOutput(effective, DEPLOY_OUTPUT_EXECUTORS[executor])) {
+                continue;
+            }
+            const changed = (0, pnpm_deploy_output_cache_inputs_1.addPnpmDeployOutputCacheInputs)(ref, targetDefaults, executor);
+            if (changed === 'target') {
+                changedProjects.add(projectName);
+            }
+            else if (changed === 'defaults') {
+                defaultsChanged = true;
+            }
+        }
+    }
+    // Overlays of plugin-inferred build targets carry no executor, so the loop
+    // above cannot see them, yet a replacing `inputs` array in one discards the
+    // settings inputs the plugin generates. The plugin adds those inputs without
+    // knowing whether the config enables generatePackageJson (that lives inside
+    // the user's config file), so the overlay repair is equally unconditional.
+    // It appends the runtime probe even where the plugin omits it under a valid
+    // pnpm pin: the repair runs once and the pin can be removed later.
+    for (const ref of await inferredDeployTargetOverlayRefs(tree, nxJson, projects)) {
+        const changed = (0, pnpm_deploy_output_cache_inputs_1.addPnpmDeployOutputCacheInputsToInferredTargetOverlay)(ref, targetDefaults);
+        if (changed === 'target') {
+            changedProjects.add(ref.projectName);
+        }
+        else if (changed === 'defaults') {
+            defaultsChanged = true;
+        }
+    }
+    for (const projectName of changedProjects) {
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projects.get(projectName));
+    }
+    if (defaultsChanged) {
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+/**
+ * One ref per (project, inferred build target) the registered `@nx/webpack` or
+ * `@nx/rspack` config-file plugins would create, resolved the way the plugins
+ * do: their createNodes glob filtered by each registration's include/exclude,
+ * the config file's directory as the project root, and the registration's
+ * `buildTargetName` option. The overlaying project-level entry may sit under
+ * the exact target name or a glob-pattern key matching it; one that replaces
+ * what the target runs disqualifies the target instead.
+ */
+async function inferredDeployTargetOverlayRefs(tree, nxJson, projects) {
+    const rootToProject = new Map();
+    for (const [projectName, project] of projects) {
+        rootToProject.set(project.root, projectName);
+    }
+    const refs = [];
+    for (const registration of nxJson?.plugins ?? []) {
+        const pluginName = typeof registration === 'string' ? registration : registration.plugin;
+        const inferredPlugin = INFERRED_DEPLOY_PLUGINS[pluginName];
+        if (!inferredPlugin) {
+            continue;
+        }
+        const options = typeof registration === 'string'
+            ? undefined
+            : registration.options;
+        const targetName = options?.buildTargetName ?? 'build';
+        const configFiles = (0, internal_1.findMatchingConfigFiles)(await (0, devkit_1.globAsync)(tree, [inferredPlugin.configGlob]), typeof registration === 'string' ? undefined : registration.include, typeof registration === 'string' ? undefined : registration.exclude);
+        for (const configFile of configFiles) {
+            const projectName = rootToProject.get((0, path_1.dirname)(configFile));
+            if (!projectName) {
+                continue;
+            }
+            const project = projects.get(projectName);
+            const target = inferredTargetOverlayEntry(project.targets, targetName);
+            // An entry that changes what the target runs is not an overlay; the
+            // executor loop covers the deploy executors among those.
+            if (target &&
+                replacesInferredRunCommandsIdentity(target, inferredPlugin.command, project.root)) {
+                continue;
+            }
+            refs.push({
+                targetName,
+                projectName,
+                projectNode: {
+                    name: projectName,
+                    type: 'lib',
+                    data: { root: project.root, tags: project.tags },
+                },
+                // the runtime matcher sees the plugin target's effective identity:
+                // its `command` payload resolves to nx:run-commands
+                matcherExecutor: 'nx:run-commands',
+                // the runtime drops the plugin attribution as soon as the project
+                // entry authors an executor or command, restated or not, so a
+                // plugin-filtered defaults entry no longer applies to the target
+                sourcePlugin: target?.executor !== undefined || target?.command !== undefined
+                    ? undefined
+                    : pluginName,
+                target: target ?? {},
+            });
+        }
+    }
+    return refs;
+}
+/**
+ * The project-level entry that overlays the inferred `targetName`. Its key is
+ * the exact name or a glob pattern the name matches; the inferred target
+ * exists before any project-level entry merges, so a matching glob key
+ * overlays it too. When several keys match, each entry merges against the
+ * inferred target independently and the last write wins, so only the last
+ * one applies. A glob key matching an earlier same-file sibling never
+ * surfaces here: the project read already collapsed it onto that sibling and
+ * dropped the key.
+ */
+function inferredTargetOverlayEntry(targets, targetName) {
+    const matching = Object.entries(targets ?? {}).filter(([key]) => key === targetName ||
+        (0, internal_1.findMatchingTargetNames)(key, [targetName]).length > 0);
+    return matching[matching.length - 1]?.[1];
+}
+/**
+ * Whether the entry changes what the inferred run-commands target runs when
+ * merged, resolved with nx's own merge so `"..."` placement and restated
+ * identities land the way the runtime lands them: a merged executor other
+ * than nx:run-commands, an effective command differing from the plugin's, or
+ * a `command`/`commands` clash the run-commands schema rejects. An entry
+ * restating the identity the plugin infers is still an overlay.
+ */
+function replacesInferredRunCommandsIdentity(target, inferredCommand, projectRoot) {
+    // `command` alongside `executor` fails graph construction outright;
+    // there is nothing running to repair.
+    if (target.command && target.executor) {
+        return true;
+    }
+    const merged = (0, internal_1.mergeTargetConfigurations)((0, internal_1.resolveCommandSyntacticSugar)(target, projectRoot), { executor: 'nx:run-commands', options: { command: inferredCommand } });
+    if (merged.executor !== 'nx:run-commands') {
+        return true;
+    }
+    // Both present fails the run-commands schema's oneOf; the target cannot run.
+    if (merged.options?.command && merged.options?.commands) {
+        return true;
+    }
+    const command = merged.options?.command ?? merged.options?.commands?.join(' && ');
+    return command !== inferredCommand;
+}
+/**
+ * Whether the target ships the deploy output in any of its runs: the gating
+ * option can sit in `options` or in any configuration, and `inputs` cannot
+ * vary per configuration, so one enabled configuration is enough.
+ */
+function emitsDeployOutput(effective, gate) {
+    return (Boolean(effective.options?.[gate]) ||
+        Object.values(effective.configurations ?? {}).some((configuration) => Boolean(configuration?.[gate])));
+}