@nx/angular 23.2.0-beta.1 → 23.2.0-beta.11

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/src/builders/dev-server/dev-server.impl.js

@@ -4,17 +4,15 @@ exports.executeDevServerBuilder = executeDevServerBuilder;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const fs_1 = require("fs");
-const configuration_1 = require("nx/src/config/configuration");
-const operators_1 = require("nx/src/project-graph/operators");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
-const operators_2 = require("rxjs/operators");
+const operators_1 = require("rxjs/operators");
 const builder_package_1 = require("../../executors/utilities/builder-package");
 const esbuild_extensions_1 = require("../../executors/utilities/esbuild-extensions");
 const patch_builder_context_1 = require("../../executors/utilities/patch-builder-context");
 const buildable_libs_1 = require("../utilities/buildable-libs");
 const lib_1 = require("./lib");
+const internal_1 = require("@nx/devkit/internal");
 function executeDevServerBuilder(rawOptions, context) {
     (0, lib_1.validateOptions)(rawOptions);
     process.env.NX_TSCONFIG_PATH = (0, js_1.getRootTsConfigPath)();
@@ -26,10 +24,10 @@ function executeDevServerBuilder(rawOptions, context) {
         projectName: context.target.project,
         projectsConfigurations: (0, devkit_1.readProjectsConfigurationFromProjectGraph)(projectGraph),
         root: context.workspaceRoot,
-        nxJsonConfiguration: (0, configuration_1.readNxJson)(devkit_1.workspaceRoot),
+        nxJsonConfiguration: (0, internal_1.readNxJsonFromDisk)(devkit_1.workspaceRoot),
         isVerbose: false,
     });
-    const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBuildTarget.project);
+    const browserTargetProjectConfiguration = (0, internal_1.readCachedProjectConfiguration)(parsedBuildTarget.project);
     const buildTarget = browserTargetProjectConfiguration.targets[parsedBuildTarget.target];
     const buildTargetOptions = {
         ...buildTarget.options,
@@ -106,12 +104,12 @@ function executeDevServerBuilder(rawOptions, context) {
         (0, rxjs_1.from)((0, esbuild_extensions_1.loadPlugins)(buildTargetOptions.plugins, buildTargetOptions.tsConfig)),
         (0, rxjs_1.from)((0, esbuild_extensions_1.loadMiddleware)(options.esbuildMiddleware, buildTargetOptions.tsConfig)),
         (0, rxjs_1.from)(loadIndexHtmlFileTransformer(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context, isUsingWebpackBuilder)),
-    ]).pipe((0, operators_2.switchMap)(([{ executeDevServerBuilder }, plugins, middleware, indexHtmlTransformer,]) => executeDevServerBuilder(delegateBuilderOptions, context, {
+    ]).pipe((0, operators_1.switchMap)(([{ executeDevServerBuilder }, plugins, middleware, indexHtmlTransformer,]) => executeDevServerBuilder(delegateBuilderOptions, context, {
         webpackConfiguration: isUsingWebpackBuilder
             ? async (baseWebpackConfig) => {
                 if (!buildLibsFromSource) {
                     const workspaceDependencies = dependencies
-                        .filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
+                        .filter((dep) => !(0, internal_1.isNpmProject)(dep.node))
                         .map((dep) => dep.node.name);
                     // default for `nx run-many` is --all projects
                     // by passing an empty string for --projects, run-many will default to

package/dist/src/builders/webpack-browser/webpack-browser.impl.js

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeWebpackBrowserBuilder = executeWebpackBrowserBuilder;
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
-const operators_1 = require("nx/src/project-graph/operators");
-const utils_1 = require("nx/src/tasks-runner/utils");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
-const operators_2 = require("rxjs/operators");
+const operators_1 = require("rxjs/operators");
 const builder_package_1 = require("../../executors/utilities/builder-package");
 const buildable_libs_1 = require("../utilities/buildable-libs");
+const internal_1 = require("@nx/devkit/internal");
 // This is required to ensure that the webpack version used by the Module Federation is the same as the one used by the builders.
 const Module = require('module');
 const originalResolveFilename = Module._resolveFilename;
@@ -34,7 +33,7 @@ function shouldSkipInitialTargetRun(projectGraph, project, target) {
             allTargetNames.add(targetName);
         }
     }
-    const projectDependencyConfigs = (0, utils_1.getDependencyConfigs)({ project, target }, {}, projectGraph, Array.from(allTargetNames));
+    const projectDependencyConfigs = (0, internal_1.getDependencyConfigs)({ project, target }, {}, projectGraph, Array.from(allTargetNames));
     // if the task runner already ran the target, skip the initial run
     return projectDependencyConfigs.some((d) => d.target === target && d.projects === 'dependencies');
 }
@@ -69,11 +68,11 @@ function executeWebpackBrowserBuilder(options, context) {
         import('@angular-devkit/build-angular'),
         import('@nx/webpack/internal'),
         import('../utilities/webpack.js'),
-    ])).pipe((0, operators_2.switchMap)(([{ executeBrowserBuilder }, { WebpackNxBuildCoordinationPlugin }, { mergeCustomWebpackConfig, resolveIndexHtmlTransformer },]) => executeBrowserBuilder(delegateBuilderOptions, context, {
+    ])).pipe((0, operators_1.switchMap)(([{ executeBrowserBuilder }, { WebpackNxBuildCoordinationPlugin }, { mergeCustomWebpackConfig, resolveIndexHtmlTransformer },]) => executeBrowserBuilder(delegateBuilderOptions, context, {
         webpackConfiguration: (baseWebpackConfig) => {
             if (!buildLibsFromSource && delegateBuilderOptions.watch) {
                 const workspaceDependencies = dependencies
-                    .filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
+                    .filter((dep) => !(0, internal_1.isNpmProject)(dep.node))
                     .map((dep) => dep.node.name);
                 // default for `nx run-many` is --all projects
                 // by passing an empty string for --projects, run-many will default to

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

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = applicationExecutor;
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const buildable_libs_1 = require("../utilities/buildable-libs");
 const builder_package_1 = require("../utilities/builder-package");
 const esbuild_extensions_1 = require("../utilities/esbuild-extensions");
 const normalize_options_1 = require("./utils/normalize-options");
 const validate_options_1 = require("./utils/validate-options");
+const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
 async function* applicationExecutor(options, context) {
     (0, validate_options_1.validateOptions)(options);
     const { buildLibsFromSource = true, plugins: pluginPaths, indexHtmlTransformer: indexHtmlTransformerPath, ...delegateExecutorOptions } = (0, normalize_options_1.normalizeOptions)(options);

package/dist/src/executors/browser-esbuild/browser-esbuild.impl.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = esbuildExecutor;
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const buildable_libs_1 = require("../utilities/buildable-libs");
 const esbuild_extensions_1 = require("../utilities/esbuild-extensions");
+const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
 async function* esbuildExecutor(options, context) {
     options.buildLibsFromSource ??= true;
     const { buildLibsFromSource, plugins: pluginPaths, ...delegateExecutorOptions } = options;

package/dist/src/executors/extract-i18n/extract-i18n.impl.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = extractI18nExecutor;
 const devkit_1 = require("@nx/devkit");
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
 const builder_package_1 = require("../utilities/builder-package");
 const patch_builder_context_1 = require("../utilities/patch-builder-context");
+const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
+const internal_1 = require("@nx/devkit/internal");
 async function* extractI18nExecutor(options, context) {
     const parsedBuildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context);
-    const buildTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBuildTarget.project);
+    const buildTargetProjectConfiguration = (0, internal_1.readCachedProjectConfiguration)(parsedBuildTarget.project);
     const buildTarget = buildTargetProjectConfiguration.targets[parsedBuildTarget.target];
     const isUsingEsbuildBuilder = [
         '@angular/build:application',

package/dist/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -6,12 +6,12 @@ const devkit_1 = require("@nx/devkit");
 const builder_package_1 = require("../utilities/builder-package");
 const lib_1 = require("./lib");
 const internal_2 = require("@nx/web/internal");
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const dev_server_impl_1 = require("../../builders/dev-server/dev-server.impl");
 const module_federation_1 = require("../../builders/utilities/module-federation");
 const path_1 = require("path");
 const fs_1 = require("fs");
 const module_federation_deprecation_1 = require("../../utils/module-federation-deprecation");
+const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
 // This is required to ensure that the webpack version used by the Module Federation is the same as the one used by the builders.
 const Module = require('module');
 const originalResolveFilename = Module._resolveFilename;

package/dist/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js

@@ -5,14 +5,13 @@ const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const internal_2 = require("@nx/web/internal");
 const fs_1 = require("fs");
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
 const path_1 = require("path");
 const module_federation_1 = require("../../builders/utilities/module-federation");
 const builder_package_1 = require("../utilities/builder-package");
 const normalize_options_1 = require("./lib/normalize-options");
 const start_dev_remotes_1 = require("./lib/start-dev-remotes");
 const module_federation_deprecation_1 = require("../../utils/module-federation-deprecation");
+const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
 // This is required to ensure that the webpack version used by the Module Federation is the same as the one used by the builders.
 const Module = require('module');
 const originalResolveFilename = Module._resolveFilename;
@@ -44,7 +43,7 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
     if (options.isInitialHost === false) {
         return yield* currIter;
     }
-    const { projects: workspaceProjects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(context.projectGraph);
+    const { projects: workspaceProjects } = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(context.projectGraph);
     const project = workspaceProjects[context.projectName];
     let pathToManifestFile;
     if (options.pathToManifestFile) {

package/dist/src/executors/package/schema.d.ts

@@ -1,6 +1,5 @@
 import type { NgPackagrBuilderOptions } from '@angular-devkit/build-angular';
 
-export interface BuildAngularLibraryExecutorOptions
-  extends NgPackagrBuilderOptions {
+export interface BuildAngularLibraryExecutorOptions extends NgPackagrBuilderOptions {
   project?: string;
 }

package/dist/src/executors/unit-test/unit-test.impl.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = unitTestExecutor;
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
+const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
 const targets_1 = require("../../utils/targets");
 const semver_1 = require("semver");
 const angular_version_utils_1 = require("../utilities/angular-version-utils");

package/dist/src/generators/add-linting/add-linting.js

@@ -3,40 +3,46 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLintingGenerator = addLintingGenerator;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const eslint_1 = require("@nx/eslint");
+const internal_2 = require("@nx/js/internal");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
-const internal_2 = require("@nx/eslint/internal");
+const internal_3 = require("@nx/eslint/internal");
 const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
 const buildable_project_1 = require("./lib/buildable-project");
 async function addLintingGenerator(tree, options) {
     (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const tasks = [];
     const rootProject = options.projectRoot === '.' || options.projectRoot === '';
-    const lintTask = await (0, eslint_1.lintProjectGenerator)(tree, {
-        linter: 'eslint',
+    // Resolved once, up front: `undefined !== 'eslint'` is true, so an unresolved
+    // linter would take the early return below and skip the angular-eslint arm.
+    // Callers that already resolved it pass it in, so this only prompts when the
+    // generator is run directly.
+    const linter = await (0, internal_2.normalizeLinterOption)(tree, options.linter);
+    tasks.push(await (0, internal_2.addLintingToProject)(tree, {
+        linter,
         project: options.projectName,
         tsConfigPaths: [
             (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
         ],
         unitTestRunner: options.unitTestRunner,
-        setParserOptionsProject: options.setParserOptionsProject,
-        skipFormat: true,
+        enableTypedLinting: (0, internal_3.isTypedLintingEnabled)(options),
         rootProject: rootProject,
         addPlugin: options.addPlugin ?? false,
         addExplicitTargets: true,
         skipPackageJson: options.skipPackageJson,
-    });
-    tasks.push(lintTask);
-    if ((0, internal_2.isEslintConfigSupported)(tree)) {
-        const eslintFile = (0, internal_2.findEslintFile)(tree, options.projectRoot);
-        // keep parser options if they exist
-        const hasParserOptions = tree
-            .read((0, devkit_1.joinPathFragments)(options.projectRoot, eslintFile), 'utf8')
-            .includes(`${options.projectRoot}/tsconfig.*?.json`);
-        if ((0, internal_2.useFlatConfig)(tree)) {
-            (0, internal_2.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular', { checkBaseConfig: true });
-            (0, internal_2.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular-template', { checkBaseConfig: true });
-            (0, internal_2.addOverrideToLintConfig)(tree, options.projectRoot, {
+    }));
+    // The angular-eslint presets, selector rules and dependency install below have
+    // no equivalent in other linters. Only the formatting tail is shared.
+    if (linter !== 'eslint') {
+        if (!options.skipFormat) {
+            await (0, devkit_1.formatFiles)(tree);
+        }
+        return (0, devkit_1.runTasksInSerial)(...tasks);
+    }
+    if ((0, internal_3.isEslintConfigSupported)(tree)) {
+        if ((0, internal_3.useFlatConfig)(tree)) {
+            (0, internal_3.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular', { checkBaseConfig: true });
+            (0, internal_3.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular-template', { checkBaseConfig: true });
+            (0, internal_3.addOverrideToLintConfig)(tree, options.projectRoot, {
                 files: ['*.ts'],
                 rules: {
                     '@angular-eslint/directive-selector': [
@@ -57,17 +63,33 @@ async function addLintingGenerator(tree, options) {
                     ],
                 },
             });
-            (0, internal_2.addOverrideToLintConfig)(tree, options.projectRoot, {
+            (0, internal_3.addOverrideToLintConfig)(tree, options.projectRoot, {
                 files: ['*.html'],
                 rules: {},
             });
         }
         else {
-            (0, internal_2.replaceOverridesInLintConfig)(tree, options.projectRoot, [
-                ...(rootProject ? [internal_2.typeScriptOverride, internal_2.javaScriptOverride] : []),
+            // Legacy `.eslintrc` overrides are fully replaced below, which would drop
+            // an existing `parserOptions.project`. Detect it first so we can carry it
+            // over. (Flat configs keep typed linting via `lintProjectGenerator`, so
+            // this is only needed on the legacy stack.)
+            const eslintFile = (0, internal_3.findEslintFile)(tree, options.projectRoot);
+            const eslintFileContent = eslintFile
+                ? tree.read((0, devkit_1.joinPathFragments)(options.projectRoot, eslintFile), 'utf8')
+                : null;
+            const typedLinting = eslintFileContent
+                ? (0, internal_3.inspectTypedLinting)(eslintFileContent)
+                : null;
+            // Only a `project` needs carrying over. A config running the project
+            // service needs no glob and typescript-eslint rejects one next to it.
+            const carryOverProject = !!typedLinting?.project && !typedLinting.projectService;
+            (0, internal_3.replaceOverridesInLintConfig)(tree, options.projectRoot, [
+                ...(rootProject ? [internal_3.typeScriptOverride, internal_3.javaScriptOverride] : []),
                 {
                     files: ['*.ts'],
-                    ...(hasParserOptions
+                    // Legacy `.eslintrc` is JSON, which can't express the `__dirname`
+                    // that `tsconfigRootDir` needs, so it keeps `parserOptions.project`.
+                    ...(carryOverProject
                         ? {
                             parserOptions: {
                                 project: [`${options.projectRoot}/tsconfig.*?.json`],

package/dist/src/generators/add-linting/schema.d.ts

@@ -1,7 +1,14 @@
+import type { LinterType } from '@nx/js';
+
 export interface AddLintingGeneratorSchema {
+  linter?: LinterType;
   projectName: string;
   projectRoot: string;
   prefix: string;
+  enableTypedLinting?: boolean;
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean;
   skipFormat?: boolean;
   skipPackageJson?: boolean;

package/dist/src/generators/add-linting/schema.json

@@ -2,13 +2,13 @@
   "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularAddLintingGenerator",
   "title": "Add linting to an Angular project.",
-  "description": "Adds linting configuration to an Angular project.",
+  "description": "Adds linting configuration to an Angular project, using the linter the workspace already uses. Adds nothing when the workspace has no linter and none is selected.",
   "cli": "nx",
   "type": "object",
   "examples": [
     {
       "command": "nx g @nx/angular:add-linting --prefix=cool --projectName=cool-lib --projectRoot=libs/cool-lib",
-      "description": "Adds ESLint with Angular-specific rules for an existing project named `cool-lib` with the [prefix](https://angular.dev/style-guide#style-02-07) `cool`"
+      "description": "Sets up linting for an existing project named `cool-lib` using the linter the workspace already uses. The Angular-specific rules and the [prefix](https://angular.dev/style-guide#style-02-07) `cool` apply to ESLint only"
     }
   ],
   "properties": {
@@ -28,11 +28,22 @@
       "description": "The path to the root of the selected project.",
       "x-priority": "important"
     },
-    "setParserOptionsProject": {
+    "linter": {
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
+      "type": "string",
+      "enum": ["eslint", "oxlint", "none"]
+    },
+    "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."
+    },
     "skipFormat": {
       "type": "boolean",
       "description": "Skip formatting files.",

package/dist/src/generators/application/lib/add-e2e.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
-const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/eslint/internal");
 const versions_1 = require("../../../utils/versions");
 async function addE2e(tree, options) {
     // since e2e are separate projects, default to adding plugins
@@ -54,7 +55,7 @@ async function addE2e(tree, options) {
             directory: 'src',
             js: false,
             linter: options.linter,
-            setParserOptionsProject: options.setParserOptionsProject,
+            enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
             webServerCommand: e2eWebServerInfo.e2eWebServerCommand,
             webServerAddress: e2eWebServerInfo.e2eWebServerAddress,
             rootProject: options.rootProject,

package/dist/src/generators/application/lib/add-linting.js

@@ -2,16 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = addLinting;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/eslint/internal");
 const add_linting_1 = tslib_1.__importDefault(require("../../add-linting/add-linting"));
 async function addLinting(host, options) {
     if (options.linter === 'none') {
         return;
     }
     await (0, add_linting_1.default)(host, {
+        linter: options.linter,
         projectName: options.name,
         projectRoot: options.appProjectRoot,
         prefix: options.prefix,
-        setParserOptionsProject: options.setParserOptionsProject,
+        enableTypedLinting: (0, internal_1.isTypedLintingEnabled)(options),
         skipPackageJson: options.skipPackageJson,
         unitTestRunner: options.unitTestRunner,
         skipFormat: true,

package/dist/src/generators/application/lib/create-files.js

@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = createFiles;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
 const test_runners_1 = require("../../../utils/test-runners");
 const artifact_types_1 = require("../../utils/artifact-types");
 const selector_1 = require("../../utils/selector");
 const update_project_root_tsconfig_1 = require("../../utils/update-project-root-tsconfig");
+const internal_1 = require("@nx/devkit/internal");
 async function createFiles(tree, options, rootOffset) {
     const rootSelector = `${options.prefix}-root`;
     (0, selector_1.validateHtmlSelector)(rootSelector);
     const nxWelcomeSelector = `${options.prefix}-nx-welcome`;
     (0, selector_1.validateHtmlSelector)(nxWelcomeSelector);
-    const onBoardingStatus = await (0, onboarding_1.createNxCloudOnboardingURLForWelcomeApp)(tree, options.nxCloudToken);
+    const onBoardingStatus = await (0, internal_1.createNxCloudOnboardingURLForWelcomeApp)(tree, options.nxCloudToken);
     const connectCloudUrl = onBoardingStatus === 'unclaimed' &&
-        (await (0, onboarding_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
+        (await (0, internal_1.getNxCloudAppOnBoardingUrl)(options.nxCloudToken));
     const componentType = (0, artifact_types_1.getComponentType)(tree);
     const componentFileSuffix = componentType ? `.${componentType}` : '';
     const moduleTypeSeparator = (0, artifact_types_1.getModuleTypeSeparator)(tree);

package/dist/src/generators/application/lib/normalize-options.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/js/internal");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
 function arePluginsExplicitlyDisabled(host) {
@@ -50,11 +51,14 @@ async function normalizeOptions(host, options, isRspack) {
         skipTests: unitTestRunner === test_runners_1.UnitTestRunner.None,
         skipFormat: false,
         e2eTestRunner: test_runners_1.E2eTestRunner.Playwright,
-        linter: 'eslint',
         strict: true,
         standalone: true,
         directory: appProjectRoot,
         ...options,
+        // Resolved after the spread, so the `=== 'none'` and `!== 'eslint'` guards
+        // downstream see a concrete linter. Both read `undefined` as "some linter,
+        // but not ESLint", which sets up linting and then skips its config.
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
         prefix: options.prefix || 'app',
         name: appProjectName,
         appProjectRoot,

package/dist/src/generators/application/lib/normalized-schema.d.ts

@@ -1,8 +1,8 @@
 import { E2eTestRunner, UnitTestRunner } from '../../../utils/test-runners';
 import type { Schema } from '../schema';
-import { Linter, LinterType } from '@nx/eslint';
+import { LinterType } from '@nx/js';
 export interface NormalizedSchema extends Schema {
-    linter: Linter | LinterType;
+    linter: LinterType;
     unitTestRunner: UnitTestRunner;
     e2eTestRunner: E2eTestRunner;
     prefix: string;

package/dist/src/generators/application/lib/set-generator-defaults.js

@@ -7,7 +7,9 @@ function setGeneratorDefaults(tree, options) {
     nxJson.generators = nxJson.generators ?? {};
     nxJson.generators['@nx/angular:application'] = {
         e2eTestRunner: options.e2eTestRunner,
-        linter: options.linter,
+        // Pinning `none` would freeze the answer detection exists to give, so a
+        // workspace that adopts a linter later would keep getting none.
+        linter: options.linter === 'none' ? undefined : options.linter,
         style: options.style,
         unitTestRunner: options.unitTestRunner,
         strict: !options.strict ? false : undefined,

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

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
@@ -14,12 +14,16 @@ export interface Schema {
   style?: Styles;
   skipTests?: boolean;
   tags?: string;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;
   strict?: boolean;
   port?: number;
+  enableTypedLinting?: boolean;
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
   standalone?: boolean;
@@ -30,4 +34,5 @@ export interface Schema {
   nxCloudToken?: string;
   addPlugin?: boolean;
   zoneless?: boolean;
+  formatter?: 'prettier' | 'oxfmt' | 'none';
 }

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

@@ -115,10 +115,9 @@
       "description": "Add tags to the application (used for linting)."
     },
     "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": ["eslint", "none"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "backendProject": {
       "type": "string",
@@ -133,11 +132,17 @@
       "type": "number",
       "description": "The port at which the remote application should be served."
     },
-    "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."
+    },
     "standalone": {
       "description": "Generate an application that is setup to use standalone components.",
       "type": "boolean",
@@ -173,6 +178,11 @@
     "zoneless": {
       "description": "Generate an application that does not use `zone.js`. It defaults to `true`. _Note: this is only supported in Angular versions >= 21.0.0_",
       "type": "boolean"
+    },
+    "formatter": {
+      "description": "The tool to use for code formatting.",
+      "type": "string",
+      "enum": ["none", "prettier", "oxfmt"]
     }
   },
   "additionalProperties": false,

package/dist/src/generators/component-test/component-test.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentTestGenerator = componentTestGenerator;
 const devkit_1 = require("@nx/devkit");
+const assert_cypress_component_testing_support_1 = require("../../utils/assert-cypress-component-testing-support");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const versions_1 = require("../../utils/versions");
 const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
@@ -9,6 +10,7 @@ const version_utils_1 = require("../utils/version-utils");
 async function componentTestGenerator(tree, options) {
     (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+    (0, assert_cypress_component_testing_support_1.assertCypressComponentTestingSupport)(tree);
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const componentDirPath = (0, devkit_1.joinPathFragments)(root, options.componentDir);
     const componentFilePath = (0, devkit_1.joinPathFragments)(componentDirPath, `${options.componentFileName}.ts`);

package/dist/src/generators/convert-to-rspack/convert-to-rspack.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToRspack = convertToRspack;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const enquirer_1 = require("enquirer");
 const path_1 = require("path");
 const posix_1 = require("path/posix");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
@@ -226,13 +225,10 @@ async function getProjectToConvert(tree) {
             projects.add(project);
         });
     }
-    const { project } = await (0, enquirer_1.prompt)({
-        type: 'select',
-        name: 'project',
+    return (0, internal_1.selectPrompt)({
         message: 'Which project would you like to convert to rspack?',
         choices: Array.from(projects),
     });
-    return project;
 }
 async function convertToRspack(tree, schema) {
     (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);

package/dist/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfiguration = cypressComponentConfiguration;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const assert_cypress_component_testing_support_1 = require("../../utils/assert-cypress-component-testing-support");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const zoneless_1 = require("../../utils/zoneless");
 const versions_1 = require("../../utils/versions");
@@ -31,6 +32,7 @@ const esbuildExecutors = new Set([
 async function cypressComponentConfiguration(tree, options) {
     (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const { componentConfigurationGenerator: baseCyCTConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+    (0, assert_cypress_component_testing_support_1.assertCypressComponentTestingSupport)(tree);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     let isZoneless;
     if (projectConfig.projectType === 'application') {