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

package/dist/src/generators/init/init.js

@@ -7,15 +7,27 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const plugin_1 = require("../../plugins/typescript/plugin");
 const assert_supported_typescript_version_1 = require("../../utils/assert-supported-typescript-version");
-const prettier_1 = require("../../utils/prettier");
+const formatter_setup_1 = require("../../utils/formatter-setup");
+const nx_formatter_internals_1 = require("../../utils/nx-formatter-internals");
 const create_ts_config_1 = require("../../utils/typescript/create-ts-config");
 const ts_config_1 = require("../../utils/typescript/ts-config");
 const ts_solution_setup_1 = require("../../utils/typescript/ts-solution-setup");
 const versions_1 = require("../../utils/versions");
 async function initGenerator(tree, schema) {
     schema.addTsPlugin ??= false;
-    const isUsingNewTsSetup = schema.addTsPlugin || (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
-    schema.formatter ??= isUsingNewTsSetup ? 'none' : 'prettier';
+    // Detection is the only thing here that needs the nx-side helpers, so the
+    // assert belongs with it: `'none'` must still work on an older peer-compatible
+    // nx, and it reaches no formatter code at all. An explicit `'prettier'` or
+    // `'oxfmt'` does not - both setups assert for themselves.
+    if (schema.formatter == null) {
+        (0, nx_formatter_internals_1.assertNxSupportsFormatters)();
+        // Defer to `detectFormatterInTree` rather than re-deriving: it encodes the
+        // oxfmt-over-prettier precedence, which a prettier-first check gets
+        // backwards for a workspace configured with both. Falling back to "none"
+        // rather than a formatter keeps this from installing one the caller never
+        // asked for.
+        schema.formatter = (0, internal_1.detectFormatterInTree)(tree) ?? 'none';
+    }
     return initGeneratorInternal(tree, {
         addTsConfigBase: true,
         ...schema,
@@ -90,11 +102,13 @@ async function initGeneratorInternal(tree, schema) {
     if (!schema.js) {
         devDependencies['typescript'] = versions_1.typescriptVersion;
     }
-    if (schema.formatter === 'prettier') {
-        const prettierTask = (0, prettier_1.generatePrettierSetup)(tree, {
-            skipPackageJson: schema.skipPackageJson,
-        });
-        tasks.push(prettierTask);
+    // One table drives both halves of formatter setup - writing the config and
+    // making the package resolvable further down. They were separate `if` chains
+    // over the same union, forty lines apart, so a third formatter meant finding
+    // both.
+    const formatterSetup = (0, formatter_setup_1.getFormatterSetup)(schema.formatter);
+    if (formatterSetup) {
+        tasks.push(formatterSetup.setUp(tree, { skipPackageJson: schema.skipPackageJson }));
     }
     const rootTsConfigFileName = (0, ts_config_1.getRootTsConfigFileName)(tree);
     // If the root tsconfig file uses `importHelpers` then we must install tslib
@@ -109,15 +123,18 @@ async function initGeneratorInternal(tree, schema) {
         ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, schema.keepExistingVersions ?? true)
         : () => { };
     tasks.push(installTask);
-    if (!schema.skipPackageJson &&
-        // For `create-nx-workspace` or `nx g @nx/js:init`, we want to make sure users didn't set formatter to none.
-        // For programmatic usage, the formatter is normally undefined, and we want prettier to continue to be ensured, even if not ultimately installed.
-        schema.formatter !== 'none') {
-        (0, devkit_1.ensurePackage)('prettier', versions_1.prettierVersion);
+    // `installTask` is queued, not run, so the formatter just added to
+    // package.json is not on disk yet; ensurePackage installs it out of band.
+    // Not gated on `skipFormat` - callers that pass it format later in this same
+    // process.
+    const isDryRun = !!process.env.NX_DRY_RUN && process.env.NX_DRY_RUN !== 'false';
+    if (formatterSetup &&
+        !schema.skipPackageJson &&
+        !isDryRun &&
+        process.env.NX_SKIP_FORMAT !== 'true') {
+        (0, devkit_1.ensurePackage)(schema.formatter, formatterSetup.version);
     }
     if (!schema.skipFormat) {
-        // even if skipPackageJson === true, we can safely run formatFiles, prettier might
-        // have been installed earlier and if not, the formatFiles function still handles it
         await (0, devkit_1.formatFiles)(tree);
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);

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

@@ -1,6 +1,6 @@
 export interface InitSchema {
   addTsConfigBase?: boolean;
-  formatter?: 'none' | 'prettier';
+  formatter?: 'none' | 'prettier' | 'oxfmt';
   js?: boolean;
   keepExistingVersions?: boolean;
   skipFormat?: boolean;

package/dist/src/generators/init/schema.json

@@ -8,7 +8,7 @@
     "formatter": {
       "description": "The tool to use for code formatting.",
       "type": "string",
-      "enum": ["none", "prettier"],
+      "enum": ["none", "prettier", "oxfmt"],
       "default": "none"
     },
     "js": {

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

@@ -2,6 +2,6 @@ import { GeneratorCallback, Tree } from '@nx/devkit';
 import type { LibraryGeneratorSchema, NormalizedLibraryGeneratorOptions } from './schema';
 export declare function libraryGenerator(tree: Tree, schema: LibraryGeneratorSchema): Promise<GeneratorCallback>;
 export declare function libraryGeneratorInternal(tree: Tree, schema: LibraryGeneratorSchema): Promise<GeneratorCallback>;
-export type AddLintOptions = Pick<NormalizedLibraryGeneratorOptions, 'name' | 'linter' | 'projectRoot' | 'unitTestRunner' | 'js' | 'setParserOptionsProject' | 'rootProject' | 'bundler' | 'addPlugin' | 'isUsingTsSolutionConfig'>;
+export type AddLintOptions = Pick<NormalizedLibraryGeneratorOptions, 'name' | 'linter' | 'projectRoot' | 'unitTestRunner' | 'js' | 'enableTypedLinting' | 'setParserOptionsProject' | 'rootProject' | 'bundler' | 'addPlugin' | 'isUsingTsSolutionConfig'>;
 export declare function addLint(tree: Tree, options: AddLintOptions): Promise<GeneratorCallback>;
 export default libraryGenerator;

package/dist/src/generators/library/library.js

@@ -7,6 +7,7 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const add_linting_to_project_1 = require("../../utils/add-linting-to-project");
 const assert_supported_typescript_version_1 = require("../../utils/assert-supported-typescript-version");
 const generator_prompts_1 = require("../../utils/generator-prompts");
 const sort_fields_1 = require("../../utils/package-json/sort-fields");
@@ -40,8 +41,6 @@ async function libraryGeneratorInternal(tree, schema) {
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
         addTsConfigBase: true,
         addTsPlugin,
-        // In the new setup, Prettier is prompted for and installed during `create-nx-workspace`.
-        formatter: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree) ? 'none' : 'prettier',
     }));
     const options = await normalizeOptions(tree, schema);
     createFiles(tree, options);
@@ -110,6 +109,8 @@ async function libraryGeneratorInternal(tree, schema) {
             testEnvironment: options.testEnvironment,
             runtimeTsconfigFileName: 'tsconfig.lib.json',
             compiler: options.compiler === 'swc' ? 'swc' : 'babel',
+            passWithNoTests: options.passWithNoTests,
+            skipPackageJson: options.skipPackageJson,
             addPlugin: options.addPlugin,
         });
         tasks.push(vitestTask);
@@ -248,7 +249,21 @@ async function configureProject(tree, options) {
     }
 }
 async function addLint(tree, options) {
+    // Everything below reaches into `@nx/eslint`'s config utilities, which have
+    // no equivalent for other linters. Dispatch before touching any of it.
+    if (options.linter !== 'eslint') {
+        return (0, add_linting_to_project_1.addLintingToProject)(tree, {
+            linter: options.linter,
+            project: options.name,
+            addPlugin: options.addPlugin,
+            rootProject: options.rootProject,
+            unitTestRunner: options.unitTestRunner,
+        });
+    }
     const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
+    const { addOverrideToLintConfig, lintConfigHasOverride, isEslintConfigSupported, updateOverrideInLintConfig, addIgnoresToLintConfig, isTypedLintingEnabled,
+    // nx-ignore-next-line
+     } = require('@nx/eslint/internal');
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.name);
     const task = await lintProjectGenerator(tree, {
         project: options.name,
@@ -258,15 +273,12 @@ async function addLint(tree, options) {
             (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
         ],
         unitTestRunner: options.unitTestRunner,
-        setParserOptionsProject: options.setParserOptionsProject,
+        enableTypedLinting: isTypedLintingEnabled(options),
         rootProject: options.rootProject,
         addPlugin: options.addPlugin,
         // Since the build target is inferred now, we need to let the generator know to add @nx/dependency-checks regardless.
         addPackageJsonDependencyChecks: options.bundler !== 'none',
     });
-    const { addOverrideToLintConfig, lintConfigHasOverride, isEslintConfigSupported, updateOverrideInLintConfig, addIgnoresToLintConfig,
-    // nx-ignore-next-line
-     } = require('@nx/eslint/internal');
     // if config is not supported, we don't need to do anything
     if (!isEslintConfigSupported(tree)) {
         return task;
@@ -548,22 +560,20 @@ async function normalizeOptions(tree, options) {
     const hasPlugin = (0, ts_solution_setup_1.isUsingTypeScriptPlugin)(tree);
     const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     if (isUsingTsSolutionConfig) {
-        options.unitTestRunner ??= await (0, internal_1.promptWhenInteractive)({
-            type: 'autocomplete',
-            name: 'unitTestRunner',
-            message: `Which unit test runner would you like to use?`,
-            choices: [{ name: 'none' }, { name: 'vitest' }, { name: 'jest' }],
-            initial: 0,
-        }, { unitTestRunner: 'none' }).then(({ unitTestRunner }) => unitTestRunner);
+        options.unitTestRunner ??= (0, internal_1.isInteractive)()
+            ? await (0, internal_1.selectPrompt)({
+                message: `Which unit test runner would you like to use?`,
+                choices: [{ value: 'none' }, { value: 'vitest' }, { value: 'jest' }],
+            })
+            : 'none';
     }
     else {
-        options.unitTestRunner ??= await (0, internal_1.promptWhenInteractive)({
-            type: 'autocomplete',
-            name: 'unitTestRunner',
-            message: `Which unit test runner would you like to use?`,
-            choices: [{ name: 'jest' }, { name: 'vitest' }, { name: 'none' }],
-            initial: 0,
-        }, { unitTestRunner: undefined }).then(({ unitTestRunner }) => unitTestRunner);
+        options.unitTestRunner ??= (0, internal_1.isInteractive)()
+            ? await (0, internal_1.selectPrompt)({
+                message: `Which unit test runner would you like to use?`,
+                choices: [{ value: 'jest' }, { value: 'vitest' }, { value: 'none' }],
+            })
+            : undefined;
         if (!options.unitTestRunner && options.bundler === 'vite') {
             options.unitTestRunner = 'vitest';
         }
@@ -638,6 +648,10 @@ async function normalizeOptions(tree, options) {
         isUsingTsSolutionConfig;
     return {
         ...options,
+        // Read from `options`, not a hoisted local: the `npm-scripts` block resets
+        // it to 'none' after `normalizeLinterOption` runs. Naming the key also
+        // satisfies the normalized type, since the spread carries `linter?`.
+        linter: options.linter,
         fileName,
         name: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
         projectNames,

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

@@ -1,6 +1,5 @@
 import type { ProjectNameAndRootOptions } from '@nx/devkit/internal';
-// nx-ignore-next-line
-const { Linter, LinterType } = require('@nx/eslint'); // use require to import to avoid circular dependency
+import type { LinterType } from '../../utils/linter';
 import type { ProjectPackageManagerWorkspaceState } from '../../utils/package-manager-workspaces';
 
 export type Compiler = 'tsc' | 'swc';
@@ -15,7 +14,8 @@ export interface LibraryGeneratorSchema {
   skipPackageJson?: boolean;
   includeBabelRc?: boolean;
   unitTestRunner?: 'jest' | 'vitest' | 'none';
-  linter?: Linter | LinterType;
+  linter?: LinterType;
+  formatter?: 'none' | 'prettier' | 'oxfmt';
   testEnvironment?: 'jsdom' | 'node';
   importPath?: string;
   js?: boolean;
@@ -23,6 +23,10 @@ export interface LibraryGeneratorSchema {
   strict?: boolean;
   publishable?: boolean;
   buildable?: boolean;
+  enableTypedLinting?: boolean;
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean;
   config?: 'workspace' | 'project' | 'npm-scripts';
   compiler?: Compiler;
@@ -33,11 +37,15 @@ export interface LibraryGeneratorSchema {
   addPlugin?: boolean;
   useProjectJson?: boolean;
   useTscExecutor?: boolean;
+  /** @internal Only honored by the vitest setup. */
+  passWithNoTests?: boolean;
 }
 
 export interface NormalizedLibraryGeneratorOptions
   extends LibraryGeneratorSchema {
   name: string;
+  /** `normalizeOptions` always resolves this, so it is no longer optional. */
+  linter: LinterType;
   projectNames: ProjectNameAndRootOptions['names'];
   fileName: string;
   projectRoot: string;

package/dist/src/generators/library/schema.json

@@ -29,11 +29,16 @@
       "x-priority": "important"
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["none", "eslint"],
+      "enum": ["none", "eslint", "oxlint"],
       "x-priority": "important"
     },
+    "formatter": {
+      "description": "The tool to use for code formatting.",
+      "type": "string",
+      "enum": ["none", "prettier", "oxfmt"]
+    },
     "unitTestRunner": {
       "description": "Test runner to use for unit tests.",
       "type": "string",
@@ -99,11 +104,17 @@
       "description": "Generate a buildable library.",
       "x-deprecated": "Use the `bundler` option for greater control (swc, tsc, rollup, vite, esbuild, none)."
     },
-    "setParserOptionsProject": {
+    "enableTypedLinting": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "description": "Whether to enable typed linting. For flat configs, this configures the recommended `parserOptions.projectService` and `tsconfigRootDir`. For legacy `.eslintrc` configs, this configures `parserOptions.project`. We do not enable this by default for lint performance reasons.",
       "default": false
     },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Deprecated alias for `enableTypedLinting`.",
+      "default": false,
+      "x-deprecated": "Use `enableTypedLinting` instead. This option will be removed in Nx v24."
+    },
     "config": {
       "type": "string",
       "enum": ["workspace", "project", "npm-scripts"],

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");
@@ -181,11 +180,7 @@ function updatePackageJsonForTsc(tree, options, project) {
     if (!ts) {
         ts = (0, ensure_typescript_1.ensureTypescript)();
     }
-    const tsconfig = (0, ts_config_1.readTsConfig)(options.tsConfig, {
-        ...ts.sys,
-        readFile: (p) => tree.read(p, 'utf-8'),
-        fileExists: (p) => tree.exists(p),
-    });
+    const tsconfig = (0, ts_config_1.readTsConfig)(options.tsConfig, (0, ts_config_1.createTreeParseConfigHost)(tree));
     let main;
     let rootDir;
     let outputPath;
@@ -249,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

@@ -13,8 +13,9 @@ export * from './utils/package-json/update-package-json';
 export * from './utils/package-json/create-entry-points';
 export { libraryGenerator } from './generators/library/library';
 export { initGenerator } from './generators/init/init';
+export { setUpFormatter } from './utils/formatter-setup';
 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 { type LinterType } from './utils/linter';
+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.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);
@@ -19,16 +19,16 @@ var library_1 = require("./generators/library/library");
 Object.defineProperty(exports, "libraryGenerator", { enumerable: true, get: function () { return library_1.libraryGenerator; } });
 var init_1 = require("./generators/init/init");
 Object.defineProperty(exports, "initGenerator", { enumerable: true, get: function () { return init_1.initGenerator; } });
+var formatter_setup_1 = require("./utils/formatter-setup");
+Object.defineProperty(exports, "setUpFormatter", { enumerable: true, get: function () { return formatter_setup_1.setUpFormatter; } });
 var generator_1 = require("./generators/setup-prettier/generator");
 Object.defineProperty(exports, "setupPrettierGenerator", { enumerable: true, get: function () { return generator_1.setupPrettierGenerator; } });
 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, "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; } });

package/dist/src/migrations/update-23-1-0/add-ignore-deprecations-for-ts6.d.ts

@@ -21,8 +21,9 @@ import { type Tree } from '@nx/devkit';
  *        the pre-TS6 behavior. It is itself deprecated (removed in TS7), so pass
  *        2 silences it, deferring the interop change to the eventual TS7 work.
  *  - Config-load flag: set `ignoreDeprecations: "6.0"` on every file named
- *    exactly `tsconfig.json`, the name jest/ts-node auto-resolve (walking up
- *    from the file they compile, such as jest.config.ts). ts-node injects a
+ *    exactly `tsconfig.json`, the name ts-node auto-resolves when jest compiles
+ *    a config file like jest.config.ts (walking up from the working directory,
+ *    not the config file's own directory). ts-node injects a
  *    `target: es5` when the config leaves it unset, and es5 is a TS6-deprecated
  *    value (TS5107); the flag (which ts-node passes through) keeps that load
  *    silent. Set unconditionally, since any `tsconfig.json` is a potential

package/dist/src/migrations/update-23-1-0/add-ignore-deprecations-for-ts6.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const node_path_1 = require("node:path");
 const jsonc_parser_1 = require("jsonc-parser");
 const ensure_typescript_1 = require("../../utils/typescript/ensure-typescript");
+const ts_config_1 = require("../../utils/typescript/ts-config");
 const FORMATTING_OPTIONS = {
     formattingOptions: { keepLines: true, insertSpaces: true, tabSize: 2 },
 };
@@ -31,8 +32,9 @@ let tsModule;
  *        the pre-TS6 behavior. It is itself deprecated (removed in TS7), so pass
  *        2 silences it, deferring the interop change to the eventual TS7 work.
  *  - Config-load flag: set `ignoreDeprecations: "6.0"` on every file named
- *    exactly `tsconfig.json`, the name jest/ts-node auto-resolve (walking up
- *    from the file they compile, such as jest.config.ts). ts-node injects a
+ *    exactly `tsconfig.json`, the name ts-node auto-resolves when jest compiles
+ *    a config file like jest.config.ts (walking up from the working directory,
+ *    not the config file's own directory). ts-node injects a
  *    `target: es5` when the config leaves it unset, and es5 is a TS6-deprecated
  *    value (TS5107); the flag (which ts-node passes through) keeps that load
  *    silent. Set unconditionally, since any `tsconfig.json` is a potential
@@ -53,14 +55,11 @@ let tsModule;
 async function default_1(tree) {
     tsModule ??= (0, ensure_typescript_1.ensureTypescript)();
     const ts = tsModule;
-    // Tree-backed host so TypeScript resolves `extends` against pass 1's pending
-    // writes; the `readDirectory` no-op skips the source-file scan, since only the
-    // merged compiler options matter here, not the file list.
-    const parseHost = {
-        ...ts.sys,
-        readFile: (filePath) => tree.read(filePath, 'utf-8') ?? undefined,
-        readDirectory: () => [],
-    };
+    // Tree-faithful host so TypeScript resolves `extends` against pass 1's pending
+    // writes and against package-provided bases (a naive `tree.read` host misses
+    // the latter). The host's `readDirectory` no-op skips the source-file scan,
+    // since only the merged compiler options matter here, not the file list.
+    const parseHost = (0, ts_config_1.createTreeParseConfigHost)(tree);
     const tsconfigPaths = await (0, devkit_1.globAsync)(tree, ['**/tsconfig*.json']);
     // Pass 1: pins and config-load flags, so pass 2's inheritance check sees them.
     let defaultsPinCount = 0;
@@ -178,7 +177,14 @@ function silenceDeprecations(tree, ts, parseHost, tsconfigPath) {
     // The `extends`-merged main options, normalized by TypeScript. Passing the
     // config object (not the path) keeps TypeScript from re-reading this file; it
     // reads only the ancestors.
-    const mainOptions = ts.parseJsonConfigFileContent({ extends: own.extends, compilerOptions: mainIsObject ? mainBlock : {} }, parseHost, (0, node_path_1.dirname)(tsconfigPath)).options;
+    const mainParsed = ts.parseJsonConfigFileContent({ extends: own.extends, compilerOptions: mainIsObject ? mainBlock : {} }, parseHost, (0, node_path_1.dirname)(tsconfigPath));
+    // A base that neither the tree nor `tsc` can read leaves the merged options
+    // incomplete, so a value it deprecates would be missed. The config does not
+    // compile in that state anyway; surface it rather than silently guessing.
+    if ((0, ts_config_1.extendsResolutionFailed)(mainParsed.errors)) {
+        devkit_1.logger.warn(`Could not resolve the "extends" chain of "${tsconfigPath}"; a TypeScript 6 deprecated option inherited from the unresolved base may have been missed. Make sure the config compiles.`);
+    }
+    const mainOptions = mainParsed.options;
     const mainDeprecated = hasDeprecatedOption(ts, mainOptions);
     let contents = original;
     let changed = false;

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>;