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

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

@@ -19,7 +19,7 @@ async function addLintingGenerator(tree, options) {
             (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
         ],
         unitTestRunner: options.unitTestRunner,
-        setParserOptionsProject: options.setParserOptionsProject,
+        enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
         skipFormat: true,
         rootProject: rootProject,
         addPlugin: options.addPlugin ?? false,
@@ -28,11 +28,6 @@ async function addLintingGenerator(tree, options) {
     });
     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 });
@@ -63,11 +58,27 @@ async function addLintingGenerator(tree, options) {
             });
         }
         else {
+            // 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_2.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)
+                : 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] : []),
                 {
                     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

@@ -2,6 +2,10 @@ export interface AddLintingGeneratorSchema {
   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

@@ -28,11 +28,17 @@
       "description": "The path to the root of the selected project.",
       "x-priority": "important"
     },
-    "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."
+    },
     "skipFormat": {
       "type": "boolean",
       "description": "Skip formatting files.",

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
 const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/eslint/internal");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 async function addE2e(tree, options) {
@@ -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,6 +2,7 @@
 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') {
@@ -11,7 +12,7 @@ async function addLinting(host, options) {
         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/schema.d.ts

@@ -20,6 +20,10 @@ export interface Schema {
   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;

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

@@ -133,11 +133,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",

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.host = host;
 const tslib_1 = require("tslib");
 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 assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
@@ -81,7 +82,7 @@ async function host(tree, schema) {
         prefix: options.prefix,
         typescriptConfiguration,
         standalone: options.standalone,
-        setParserOptionsProject: options.setParserOptionsProject,
+        enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
     });
     let installTasks = [appInstallTask];
     if (options.ssr) {

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

@@ -9,6 +9,10 @@ export interface Schema {
   port?: number;
   remotes?: string[];
   dynamic?: boolean;
+  enableTypedLinting?: boolean;
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
   skipPostInstall?: boolean;

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

@@ -153,11 +153,17 @@
       "description": "Create an application with stricter type checking and build optimization options.",
       "default": true
     },
-    "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."
+    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

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

@@ -18,6 +18,10 @@ export interface NormalizedSchema {
         tags?: string;
         strict?: boolean;
         compilationMode?: 'full' | 'partial';
+        enableTypedLinting?: boolean;
+        /**
+         * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+         */
         setParserOptionsProject?: boolean;
         skipModule?: boolean;
         skipPackageJson?: boolean;

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

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 const tslib_1 = require("tslib");
 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_2 = require("@nx/js/internal");
+const internal_3 = require("@nx/js/internal");
 const init_1 = tslib_1.__importDefault(require("../../generators/init/init"));
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const test_runners_1 = require("../../utils/test-runners");
@@ -71,7 +72,7 @@ async function libraryGenerator(tree, schema) {
         () => (0, devkit_1.installPackagesTask)(tree),
     ];
     if (libraryOptions.publishable) {
-        tasks.push(await (0, internal_2.releaseTasks)(tree));
+        tasks.push(await (0, internal_3.releaseTasks)(tree));
     }
     tasks.push(() => (0, internal_1.logShowProjectCommand)(libraryOptions.name));
     return (0, devkit_1.runTasksInSerial)(...tasks);
@@ -123,7 +124,7 @@ async function addLinting(host, options) {
         projectRoot: options.projectRoot,
         prefix: options.prefix,
         unitTestRunner: options.unitTestRunner,
-        setParserOptionsProject: options.setParserOptionsProject,
+        enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
         skipFormat: true,
         skipPackageJson: options.skipPackageJson,
     });

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

@@ -22,6 +22,10 @@ export interface Schema {
   linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;
   compilationMode?: 'full' | 'partial';
+  enableTypedLinting?: boolean;
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean;
   skipModule?: boolean;
   skipPackageJson?: boolean;

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

@@ -107,11 +107,17 @@
       "type": "string",
       "enum": ["full", "partial"]
     },
-    "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."
+    },
     "skipModule": {
       "type": "boolean",
       "description": "Whether to skip the creation of a default module when generating the library.",

package/dist/src/generators/remote/remote.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.remote = remote;
 const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/eslint/internal");
 const devkit_1 = require("@nx/devkit");
-const internal_2 = require("@nx/js/internal");
+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 = require("../application/application");
@@ -68,12 +69,12 @@ async function remote(tree, schema) {
         standalone: options.standalone,
         prefix: options.prefix,
         typescriptConfiguration,
-        setParserOptionsProject: options.setParserOptionsProject,
+        enableTypedLinting: (0, internal_2.isTypedLintingEnabled)(options),
     });
     const installTasks = [appInstallTask];
     if (!options.skipPackageJson) {
         const installSwcHelpersTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@swc/helpers': internal_2.swcHelpersVersion,
+            '@swc/helpers': internal_3.swcHelpersVersion,
         });
         installTasks.push(installSwcHelpersTask);
     }

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

@@ -8,6 +8,10 @@ export interface Schema {
   bundler?: 'webpack' | 'rspack';
   host?: string;
   port?: number;
+  enableTypedLinting?: boolean;
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
   prefix?: string;

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

@@ -143,11 +143,17 @@
       "description": "Create an application with stricter type checking and build optimization options.",
       "default": true
     },
-    "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."
+    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/dist/src/generators/setup-mf/lib/generate-config.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateWebpackConfig = generateWebpackConfig;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/eslint/internal");
 function generateWebpackConfig(tree, options, appRoot, remotesWithPorts) {
     if (tree.exists(`${appRoot}/module-federation.config.js`) ||
         tree.exists(`${appRoot}/webpack.config.js`) ||
@@ -25,7 +26,7 @@ function generateWebpackConfig(tree, options, appRoot, remotesWithPorts) {
         standalone: options.standalone,
         entryModuleFileName: options.entryModuleFileName,
     });
-    if (!options.setParserOptionsProject) {
+    if (!(0, internal_1.isTypedLintingEnabled)(options)) {
         tree.delete((0, devkit_1.joinPathFragments)(appRoot, 'tsconfig.lint.json'));
     }
 }

package/dist/src/generators/setup-mf/schema.d.ts

@@ -17,6 +17,10 @@ export interface Schema {
   standalone?: boolean;
   skipE2E?: boolean;
   typescriptConfiguration?: boolean;
+  enableTypedLinting?: boolean;
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean;
 }
 

package/dist/src/generators/setup-mf/schema.json

@@ -81,10 +81,16 @@
       "description": "Whether the module federation configuration and webpack configuration files should use TS.",
       "default": true
     },
-    "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."
     }
   },
   "required": ["appName", "mfType"],

package/dist/src/generators/utils/tsconfig-utils.js

@@ -18,12 +18,7 @@ function getDefinedCompilerOption(tree, tsConfigPath, optionName) {
 }
 function readCompilerOptionsFromTsConfig(tree, tsConfigPath) {
     const ts = (0, internal_1.ensureTypescript)();
-    const tsSysFromTree = {
-        ...ts.sys,
-        readDirectory: () => [],
-        readFile: (path) => tree.read(path, 'utf-8'),
-        fileExists: (path) => tree.exists(path),
-    };
-    const parsed = ts.parseJsonConfigFileContent(ts.readConfigFile(tsConfigPath, tsSysFromTree.readFile).config, tsSysFromTree, (0, node_path_1.dirname)(tsConfigPath));
+    const host = (0, internal_1.createTreeParseConfigHost)(tree);
+    const parsed = ts.parseJsonConfigFileContent(ts.readConfigFile(tsConfigPath, host.readFile).config, host, (0, node_path_1.dirname)(tsConfigPath));
     return parsed.options;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.2.0-beta.1",
+  "version": "23.2.0-beta.3",
   "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,15 +80,14 @@
     "picomatch": "4.0.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-beta.1",
-    "@nx/eslint": "23.2.0-beta.1",
-    "@nx/js": "23.2.0-beta.1",
-    "@nx/web": "23.2.0-beta.1"
+    "@nx/devkit": "23.2.0-beta.3",
+    "@nx/js": "23.2.0-beta.3",
+    "@nx/web": "23.2.0-beta.3",
+    "@nx/eslint": "23.2.0-beta.3"
   },
   "devDependencies": {
-    "@nx/cypress": "23.2.0-beta.1",
-    "nx": "23.2.0-beta.1",
-    "@nx/vitest": "23.2.0-beta.1"
+    "@nx/vitest": "23.2.0-beta.3",
+    "nx": "23.2.0-beta.3"
   },
   "peerDependencies": {
     "@angular/build": ">= 20.0.0 < 23.0.0",
@@ -99,9 +98,11 @@
     "ng-packagr": ">= 20.0.0 < 23.0.0",
     "rxjs": "^6.5.3 || ^7.5.0",
     "webpack-merge": "^5.8.0",
-    "@nx/module-federation": "23.2.0-beta.1",
-    "@nx/rspack": "23.2.0-beta.1",
-    "@nx/webpack": "23.2.0-beta.1"
+    "@nx/cypress": "23.2.0-beta.3",
+    "@nx/playwright": "23.2.0-beta.3",
+    "@nx/module-federation": "23.2.0-beta.3",
+    "@nx/rspack": "23.2.0-beta.3",
+    "@nx/webpack": "23.2.0-beta.3"
   },
   "peerDependenciesMeta": {
     "@angular/build": {
@@ -110,6 +111,12 @@
     "@angular-devkit/build-angular": {
       "optional": true
     },
+    "@nx/cypress": {
+      "optional": true
+    },
+    "@nx/playwright": {
+      "optional": true
+    },
     "@nx/module-federation": {
       "optional": true
     },