@nx/angular 23.2.0-beta.6 → 23.2.0-beta.7

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

@@ -3,35 +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,
-        enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
-        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)) {
-        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': [
@@ -52,7 +63,7 @@ async function addLintingGenerator(tree, options) {
                     ],
                 },
             });
-            (0, internal_2.addOverrideToLintConfig)(tree, options.projectRoot, {
+            (0, internal_3.addOverrideToLintConfig)(tree, options.projectRoot, {
                 files: ['*.html'],
                 rules: {},
             });
@@ -62,18 +73,18 @@ async function addLintingGenerator(tree, options) {
             // 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_2.findEslintFile)(tree, options.projectRoot);
+            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_2.inspectTypedLinting)(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_2.replaceOverridesInLintConfig)(tree, options.projectRoot, [
-                ...(rootProject ? [internal_2.typeScriptOverride, internal_2.javaScriptOverride] : []),
+            (0, internal_3.replaceOverridesInLintConfig)(tree, options.projectRoot, [
+                ...(rootProject ? [internal_3.typeScriptOverride, internal_3.javaScriptOverride] : []),
                 {
                     files: ['*.ts'],
                     // Legacy `.eslintrc` is JSON, which can't express the `__dirname`

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

@@ -1,4 +1,7 @@
+import type { LinterType } from '@nx/js';
+
 export interface AddLintingGeneratorSchema {
+  linter?: LinterType;
   projectName: string;
   projectRoot: string;
   prefix: string;

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,6 +28,11 @@
       "description": "The path to the root of the selected project.",
       "x-priority": "important"
     },
+    "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 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.",

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

@@ -9,6 +9,7 @@ async function addLinting(host, options) {
         return;
     }
     await (0, add_linting_1.default)(host, {
+        linter: options.linter,
         projectName: options.name,
         projectRoot: options.appProjectRoot,
         prefix: options.prefix,

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,7 +14,7 @@ export interface Schema {
   style?: Styles;
   skipTests?: boolean;
   tags?: string;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;

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",

package/dist/src/generators/host/host.js

@@ -6,6 +6,7 @@ const internal_1 = require("@nx/devkit/internal");
 const internal_2 = require("@nx/eslint/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
+const internal_3 = require("@nx/js/internal");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = tslib_1.__importDefault(require("../application/application"));
@@ -29,6 +30,10 @@ async function host(tree, schema) {
     schema.zoneless ??= angularMajorVersion >= 21 ? true : false;
     const { typescriptConfiguration = true, ...options } = schema;
     options.standalone = options.standalone ?? true;
+    // Resolved before delegating so the host and every generated remote share one
+    // answer. `applicationGenerator` returns a new object rather than mutating
+    // this one, so resolving there would ask again for each remote.
+    options.linter = await (0, internal_3.normalizeLinterOption)(tree, options.linter);
     const projects = (0, devkit_1.getProjects)(tree);
     const remotesToGenerate = [];
     const remotesToIntegrate = [];

package/dist/src/generators/host/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';
 
@@ -20,7 +20,7 @@ export interface Schema {
   style?: Styles;
   skipTests?: boolean;
   tags?: string;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   unitTestRunner?: Exclude<UnitTestRunner, UnitTestRunner.VitestAngular>;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;

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

@@ -139,10 +139,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",

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

@@ -6,12 +6,14 @@ const internal_1 = require("@nx/devkit/internal");
 const test_runners_1 = require("../../../utils/test-runners");
 const artifact_types_1 = require("../../utils/artifact-types");
 const version_utils_1 = require("../../utils/version-utils");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(host, schema) {
     schema.standalone = schema.standalone ?? true;
     // Create a schema with populated default values
+    // No `linter` default here: it would mask the resolution below, which is what
+    // detects the workspace's linter and prompts when there is nothing to detect.
     const options = {
         buildable: false,
-        linter: 'eslint',
         publishable: false,
         skipFormat: false,
         // Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
@@ -45,7 +47,7 @@ async function normalizeOptions(host, schema) {
     const ngCliSchematicLibRoot = projectName;
     const allNormalizedOptions = {
         ...options,
-        linter: options.linter ?? 'eslint',
+        linter: await (0, internal_2.normalizeLinterOption)(host, options.linter),
         unitTestRunner,
         prefix: options.prefix ?? 'lib',
         name: projectName,

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

@@ -1,5 +1,5 @@
 import { UnitTestRunner } from '../../../utils/test-runners';
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 export interface NormalizedSchema {
     libraryOptions: {
         directory: string;
@@ -28,7 +28,7 @@ export interface NormalizedSchema {
         skipPostInstall?: boolean;
         skipTsConfig?: boolean;
         standalone?: boolean;
-        linter: Linter | LinterType;
+        linter: LinterType;
         unitTestRunner: UnitTestRunner;
         prefix: string;
         fileName: string;

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

@@ -6,7 +6,11 @@ function setGeneratorDefaults(tree, options) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     nxJson.generators = nxJson.generators ?? {};
     nxJson.generators['@nx/angular:library'] = {
-        linter: options.libraryOptions.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.libraryOptions.linter === 'none'
+            ? undefined
+            : options.libraryOptions.linter,
         unitTestRunner: options.libraryOptions.unitTestRunner,
         strict: !options.libraryOptions.strict ? false : undefined,
         ...(nxJson.generators['@nx/angular:library'] || {}),

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

@@ -120,6 +120,7 @@ async function addLinting(host, options) {
         return;
     }
     await (0, add_linting_1.default)(host, {
+        linter: options.linter,
         projectName: options.name,
         projectRoot: options.projectRoot,
         prefix: options.prefix,

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

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 import type { UnitTestRunner } from '../../utils/test-runners';
 
 export interface Schema {
@@ -19,7 +19,7 @@ export interface Schema {
   parent?: string;
   tags?: string;
   strict?: boolean;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   unitTestRunner?: UnitTestRunner;
   compilationMode?: 'full' | 'partial';
   enableTypedLinting?: boolean;

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

@@ -97,10 +97,9 @@
       "default": true
     },
     "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"]
     },
     "compilationMode": {
       "description": "Specifies the compilation mode to use. If not specified, it will default to `partial` for publishable libraries and to `full` for buildable libraries. The `full` value can not be used for publishable libraries.",

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

@@ -1,4 +1,4 @@
-import { Linter, LinterType } from '@nx/eslint';
+import { LinterType } from '@nx/js';
 import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
@@ -11,6 +11,6 @@ export interface GeneratorOptions {
   skipInstall?: boolean;
   skipPostInstall?: boolean;
   style?: Styles;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   skipPackageJson?: boolean;
 }

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

@@ -17,7 +17,6 @@
       "default": false,
       "x-priority": "internal"
     },
-
     "unitTestRunner": {
       "type": "string",
       "enum": ["karma", "jest", "none"],
@@ -39,8 +38,7 @@
     "linter": {
       "description": "The tool to use for running lint checks. NOTE: only used if running the generator in an Nx workspace.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "style": {
       "description": "The file extension to be used for style files. NOTE: only used if running the generator in an Nx workspace.",

package/dist/src/generators/remote/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';
 
@@ -18,7 +18,7 @@ export interface Schema {
   style?: Styles;
   skipTests?: boolean;
   tags?: string;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
   unitTestRunner?: Exclude<UnitTestRunner, UnitTestRunner.VitestAngular>;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;

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

@@ -129,10 +129,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",

package/dist/src/generators/storybook-configuration/schema.d.ts

@@ -1,9 +1,9 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 
 export interface StorybookConfigurationOptions {
   configureStaticServe?: boolean;
   generateStories: boolean;
-  linter: Linter | LinterType;
+  linter: LinterType;
   project: string;
   tsConfiguration?: boolean;
   skipFormat?: boolean;

package/dist/src/generators/storybook-configuration/schema.json

@@ -43,8 +43,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint", "none"],
-      "default": "eslint"
+      "enum": ["eslint", "oxlint", "none"]
     },
     "tsConfiguration": {
       "type": "boolean",

package/generators.json

@@ -6,7 +6,7 @@
     "add-linting": {
       "factory": "./dist/src/generators/add-linting/add-linting",
       "schema": "./dist/src/generators/add-linting/schema.json",
-      "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.",
       "hidden": true
     },
     "application": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.7",
   "private": false,
   "type": "commonjs",
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
@@ -80,14 +80,15 @@
     "picomatch": "4.0.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/eslint": "23.2.0-beta.6",
-    "@nx/web": "23.2.0-beta.6",
-    "@nx/devkit": "23.2.0-beta.6",
-    "@nx/js": "23.2.0-beta.6"
+    "@nx/js": "23.2.0-beta.7",
+    "@nx/web": "23.2.0-beta.7",
+    "@nx/eslint": "23.2.0-beta.7",
+    "@nx/devkit": "23.2.0-beta.7"
   },
   "devDependencies": {
-    "@nx/vitest": "23.2.0-beta.6",
-    "nx": "23.2.0-beta.6"
+    "@nx/storybook": "23.2.0-beta.7",
+    "@nx/vitest": "23.2.0-beta.7",
+    "nx": "23.2.0-beta.7"
   },
   "peerDependencies": {
     "@angular/build": ">= 20.0.0 < 23.0.0",
@@ -98,11 +99,11 @@
     "ng-packagr": ">= 20.0.0 < 23.0.0",
     "rxjs": "^6.5.3 || ^7.5.0",
     "webpack-merge": "^5.8.0",
-    "@nx/playwright": "23.2.0-beta.6",
-    "@nx/cypress": "23.2.0-beta.6",
-    "@nx/rspack": "23.2.0-beta.6",
-    "@nx/webpack": "23.2.0-beta.6",
-    "@nx/module-federation": "23.2.0-beta.6"
+    "@nx/cypress": "23.2.0-beta.7",
+    "@nx/playwright": "23.2.0-beta.7",
+    "@nx/module-federation": "23.2.0-beta.7",
+    "@nx/webpack": "23.2.0-beta.7",
+    "@nx/rspack": "23.2.0-beta.7"
   },
   "peerDependenciesMeta": {
     "@angular/build": {