@nx/angular 23.0.0-beta.15 → 23.0.0-beta.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.0.0-beta.15",
+  "version": "23.0.0-beta.17",
   "private": false,
   "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.",
   "repository": {
@@ -61,13 +61,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.15",
-    "@nx/eslint": "23.0.0-beta.15",
-    "@nx/js": "23.0.0-beta.15",
-    "@nx/module-federation": "23.0.0-beta.15",
-    "@nx/rspack": "23.0.0-beta.15",
-    "@nx/web": "23.0.0-beta.15",
-    "@nx/webpack": "23.0.0-beta.15",
+    "@nx/devkit": "23.0.0-beta.17",
+    "@nx/eslint": "23.0.0-beta.17",
+    "@nx/js": "23.0.0-beta.17",
+    "@nx/module-federation": "23.0.0-beta.17",
+    "@nx/rspack": "23.0.0-beta.17",
+    "@nx/web": "23.0.0-beta.17",
+    "@nx/webpack": "23.0.0-beta.17",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

package/src/builders/utilities/module-federation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-federation.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/module-federation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAK1D,MAAM,MAAM,mBAAmB,GAC3B,MAAM,GACN;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC;AAElD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,OAAO,2BAA2B,EAAE,cAAc,EAC3D,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EACvD,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,EAC1B,kBAAkB,EAAE,MAAM,GAAG,SAAS,GACrC,MAAM,EAAE,CA6DV;AA0CD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,OAAO,2BAA2B,EAAE,cAAc,EAC3D,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EACvD,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GACzB,MAAM,EAAE,CAoCV;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE;IACP,UAAU,EAAE,mBAAmB,EAAE,CAAC;CACnC,EACD,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,GACtD,IAAI,CAgBN;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,oBAAoB,EAC7B,aAAa,EAAE,MAAM,GACpB,MAAM,GAAG,SAAS,CAepB"}
+{"version":3,"file":"module-federation.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/module-federation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAK1D,MAAM,MAAM,mBAAmB,GAC3B,MAAM,GACN;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC;AAElD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,OAAO,2BAA2B,EAAE,cAAc,EAC3D,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EACvD,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,EAC1B,kBAAkB,EAAE,MAAM,GAAG,SAAS,GACrC,MAAM,EAAE,CA6DV;AA2CD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,OAAO,2BAA2B,EAAE,cAAc,EAC3D,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,EACvD,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GACzB,MAAM,EAAE,CAoCV;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE;IACP,UAAU,EAAE,mBAAmB,EAAE,CAAC;CACnC,EACD,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,GACtD,IAAI,CAgBN;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,oBAAoB,EAC7B,aAAa,EAAE,MAAM,GACpB,MAAM,GAAG,SAAS,CAepB"}

package/src/builders/utilities/module-federation.js

@@ -47,15 +47,14 @@ function getDynamicRemotes(project, context, workspaceProjects, remotesToSkip, p
 function getModuleFederationConfig(tsconfigPath, workspaceRoot, projectRoot) {
     const moduleFederationConfigPathJS = (0, path_1.join)(workspaceRoot, projectRoot, 'module-federation.config.js');
     const moduleFederationConfigPathTS = (0, path_1.join)(workspaceRoot, projectRoot, 'module-federation.config.ts');
-    let moduleFederationConfigPath = moduleFederationConfigPathJS;
-    let cleanupTranspiler = () => { };
-    if ((0, fs_1.existsSync)(moduleFederationConfigPathTS)) {
-        cleanupTranspiler = (0, internal_1.registerTsProject)((0, path_1.join)(workspaceRoot, tsconfigPath));
-        moduleFederationConfigPath = moduleFederationConfigPathTS;
-    }
+    const isTsConfig = (0, fs_1.existsSync)(moduleFederationConfigPathTS);
+    const moduleFederationConfigPath = isTsConfig
+        ? moduleFederationConfigPathTS
+        : moduleFederationConfigPathJS;
     try {
-        const config = require(moduleFederationConfigPath);
-        cleanupTranspiler();
+        const config = isTsConfig
+            ? (0, internal_1.loadTsFile)(moduleFederationConfigPath, (0, path_1.join)(workspaceRoot, tsconfigPath))
+            : require(moduleFederationConfigPath);
         return {
             mfeConfig: config.default || config,
             mfConfigPath: moduleFederationConfigPath,

package/src/builders/utilities/webpack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/webpack.ts"],"names":[],"mappings":"AAMA,wBAAsB,wBAAwB,CAC5C,iBAAiB,EAAE,GAAG,EACtB,mBAAmB,EAAE,MAAM,EAC3B,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC/C,MAAM,EAAE,OAAO,2BAA2B,EAAE,MAAM,gBAqDnD;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAUxE;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,2BAA2B,EAAE,MAAM,IAQ1C,cAAS,SAClB"}
+{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/webpack.ts"],"names":[],"mappings":"AAMA,wBAAsB,wBAAwB,CAC5C,iBAAiB,EAAE,GAAG,EACtB,mBAAmB,EAAE,MAAM,EAC3B,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC/C,MAAM,EAAE,OAAO,2BAA2B,EAAE,MAAM,gBAqDnD;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAQxE;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,2BAA2B,EAAE,MAAM,IAK1C,cAAS,SAClB"}

package/src/builders/utilities/webpack.js

@@ -51,9 +51,7 @@ async function mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig,
     return newConfig;
 }
 function resolveCustomWebpackConfig(path, tsConfig) {
-    const cleanupTranspiler = (0, internal_1.registerTsProject)(tsConfig);
-    const customWebpackConfig = require(path);
-    cleanupTranspiler();
+    const customWebpackConfig = (0, internal_1.loadTsFile)(path, tsConfig);
     // If the user provides a configuration in TS file
     // then there are 2 cases for exporting an object. The first one is:
     // `module.exports = { ... }`. And the second one is:
@@ -62,9 +60,7 @@ function resolveCustomWebpackConfig(path, tsConfig) {
     return customWebpackConfig.default ?? customWebpackConfig;
 }
 function resolveIndexHtmlTransformer(path, tsConfig, target) {
-    const cleanupTranspiler = (0, internal_1.registerTsProject)(tsConfig);
-    const indexTransformer = require(path);
-    cleanupTranspiler();
+    const indexTransformer = (0, internal_1.loadTsFile)(path, tsConfig);
     const transform = indexTransformer.default ?? indexTransformer;
     return (indexHtml) => transform(target, indexHtml);
 }

package/src/executors/utilities/esbuild-extensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-extensions.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/esbuild-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAOvD,KAAK,MAAM,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5E,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,GAAG,CAAC;CACd,CAAC;AAEF,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,SAAS,EAC5C,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CAcnB;AAgBD,wBAAsB,cAAc,CAClC,aAAa,EAAE,MAAM,EAAE,GAAG,SAAS,EACnC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,EAAE,CAAC,CAWhB;AAED,wBAAsB,wBAAwB,CAC5C,wBAAwB,EAAE,MAAM,EAChC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,CAQd"}
+{"version":3,"file":"esbuild-extensions.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/esbuild-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAMvD,KAAK,MAAM,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5E,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,GAAG,CAAC;CACd,CAAC;AAEF,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,GAAG,SAAS,EAC5C,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CAQnB;AAmBD,wBAAsB,cAAc,CAClC,aAAa,EAAE,MAAM,EAAE,GAAG,SAAS,EACnC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,EAAE,CAAC,CAOhB;AAED,wBAAsB,wBAAwB,CAC5C,wBAAwB,EAAE,MAAM,EAChC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,CAEd"}

package/src/executors/utilities/esbuild-extensions.js

@@ -3,23 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadPlugins = loadPlugins;
 exports.loadMiddleware = loadMiddleware;
 exports.loadIndexHtmlTransformer = loadIndexHtmlTransformer;
-const internal_1 = require("@nx/js/internal");
 const module_loader_1 = require("./module-loader");
 async function loadPlugins(plugins, tsConfig) {
     if (!plugins?.length) {
         return [];
     }
-    const cleanupTranspiler = (0, internal_1.registerTsProject)(tsConfig);
-    try {
-        return await Promise.all(plugins.map((plugin) => loadPlugin(plugin)));
-    }
-    finally {
-        cleanupTranspiler();
-    }
+    return Promise.all(plugins.map((plugin) => loadPlugin(plugin, tsConfig)));
 }
-async function loadPlugin(pluginSpec) {
+async function loadPlugin(pluginSpec, tsConfig) {
     const pluginPath = typeof pluginSpec === 'string' ? pluginSpec : pluginSpec.path;
-    let plugin = await (0, module_loader_1.loadModule)(pluginPath);
+    let plugin = await (0, module_loader_1.loadModule)(pluginPath, tsConfig);
     if (typeof plugin === 'function') {
         plugin =
             typeof pluginSpec === 'object' ? plugin(pluginSpec.options) : plugin();
@@ -30,20 +23,8 @@ async function loadMiddleware(middlewareFns, tsConfig) {
     if (!middlewareFns?.length) {
         return [];
     }
-    const cleanupTranspiler = (0, internal_1.registerTsProject)(tsConfig);
-    try {
-        return await Promise.all(middlewareFns.map((fnPath) => (0, module_loader_1.loadModule)(fnPath)));
-    }
-    finally {
-        cleanupTranspiler();
-    }
+    return Promise.all(middlewareFns.map((fnPath) => (0, module_loader_1.loadModule)(fnPath, tsConfig)));
 }
 async function loadIndexHtmlTransformer(indexHtmlTransformerPath, tsConfig) {
-    const cleanupTranspiler = (0, internal_1.registerTsProject)(tsConfig);
-    try {
-        return await (0, module_loader_1.loadModule)(indexHtmlTransformerPath);
-    }
-    finally {
-        cleanupTranspiler();
-    }
+    return (0, module_loader_1.loadModule)(indexHtmlTransformerPath, tsConfig);
 }

package/src/executors/utilities/module-loader.d.ts

@@ -1,4 +1,4 @@
-export declare function loadModule<T = any>(path: string): Promise<T>;
+export declare function loadModule<T = any>(path: string, tsConfig?: string): Promise<T>;
 /**
  * This uses a dynamic import to load a module which may be ESM.
  * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript

package/src/executors/utilities/module-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-loader.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/module-loader.ts"],"names":[],"mappings":"AAGA,wBAAsB,UAAU,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAyBlE;AAOD;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,CAAC,GAAG,GAAG,EAAE,UAAU,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAO3E"}
+{"version":3,"file":"module-loader.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/module-loader.ts"],"names":[],"mappings":"AAIA,wBAAsB,UAAU,CAAC,CAAC,GAAG,GAAG,EACtC,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,CAAC,CAAC,CA+BZ;AAOD;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,CAAC,GAAG,GAAG,EAAE,UAAU,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAO3E"}

package/src/executors/utilities/module-loader.js

@@ -4,29 +4,33 @@ exports.loadModule = loadModule;
 exports.loadEsmModule = loadEsmModule;
 const path_1 = require("path");
 const node_url_1 = require("node:url");
-async function loadModule(path) {
-    switch ((0, path_1.extname)(path)) {
-        case '.mjs': {
+const internal_1 = require("@nx/js/internal");
+async function loadModule(path, tsConfig) {
+    const ext = (0, path_1.extname)(path);
+    if (ext === '.mjs') {
+        const result = await loadEsmModule((0, node_url_1.pathToFileURL)(path));
+        return result.default ?? result;
+    }
+    if (ext === '.cjs') {
+        const result = (0, internal_1.requireWithTsconfigFallback)(path, tsConfig);
+        return result.default ?? result;
+    }
+    const isTs = ext === '.ts' || ext === '.cts' || ext === '.mts';
+    try {
+        const result = isTs && tsConfig
+            ? (0, internal_1.loadTsFile)(path, tsConfig)
+            : (0, internal_1.requireWithTsconfigFallback)(path, tsConfig);
+        return result.default ?? result;
+    }
+    catch (e) {
+        // ERR_REQUIRE_ESM (legacy) and ERR_REQUIRE_ASYNC_MODULE (Node 22.12+,
+        // ESM with top-level await) both indicate the module must be loaded via
+        // dynamic import.
+        if (e.code === 'ERR_REQUIRE_ESM' || e.code === 'ERR_REQUIRE_ASYNC_MODULE') {
             const result = await loadEsmModule((0, node_url_1.pathToFileURL)(path));
             return result.default ?? result;
         }
-        case '.cjs': {
-            const result = require(path);
-            return result.default ?? result;
-        }
-        default:
-            // it can be CommonJS or ESM, try both
-            try {
-                const result = require(path);
-                return result.default ?? result;
-            }
-            catch (e) {
-                if (e.code === 'ERR_REQUIRE_ESM') {
-                    const result = await loadEsmModule((0, node_url_1.pathToFileURL)(path));
-                    return result.default ?? result;
-                }
-                throw e;
-            }
+        throw e;
     }
 }
 /**

package/src/generators/add-linting/add-linting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-linting.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAgBpB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAG1D,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,iBAAiB,CAAC,CA8I5B;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"add-linting.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAepB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAE1D,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,iBAAiB,CAAC,CA8I5B;AAED,eAAe,mBAAmB,CAAC"}

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

@@ -5,11 +5,9 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
-const global_eslint_config_1 = require("@nx/eslint/src/generators/init/global-eslint-config");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const internal_2 = require("@nx/eslint/internal");
 const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
 const buildable_project_1 = require("./lib/buildable-project");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 async function addLintingGenerator(tree, options) {
     (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const tasks = [];
@@ -29,16 +27,16 @@ async function addLintingGenerator(tree, options) {
         skipPackageJson: options.skipPackageJson,
     });
     tasks.push(lintTask);
-    if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {
-        const eslintFile = (0, eslint_file_1.findEslintFile)(tree, options.projectRoot);
+    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, flat_config_1.useFlatConfig)(tree)) {
-            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular', { checkBaseConfig: true });
-            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular-template', { checkBaseConfig: true });
-            (0, eslint_file_1.addOverrideToLintConfig)(tree, options.projectRoot, {
+        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, {
                 files: ['*.ts'],
                 rules: {
                     '@angular-eslint/directive-selector': [
@@ -59,14 +57,14 @@ async function addLintingGenerator(tree, options) {
                     ],
                 },
             });
-            (0, eslint_file_1.addOverrideToLintConfig)(tree, options.projectRoot, {
+            (0, internal_2.addOverrideToLintConfig)(tree, options.projectRoot, {
                 files: ['*.html'],
                 rules: {},
             });
         }
         else {
-            (0, eslint_file_1.replaceOverridesInLintConfig)(tree, options.projectRoot, [
-                ...(rootProject ? [global_eslint_config_1.typeScriptOverride, global_eslint_config_1.javaScriptOverride] : []),
+            (0, internal_2.replaceOverridesInLintConfig)(tree, options.projectRoot, [
+                ...(rootProject ? [internal_2.typeScriptOverride, internal_2.javaScriptOverride] : []),
                 {
                     files: ['*.ts'],
                     ...(hasParserOptions

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-angular-eslint-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAMpB,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,GAClB,iBAAiB,CAiCnB"}
+{"version":3,"file":"add-angular-eslint-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,GAClB,iBAAiB,CAiCnB"}

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAngularEsLintDependencies = addAngularEsLintDependencies;
 const devkit_1 = require("@nx/devkit");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
-const versions_1 = require("@nx/eslint/src/utils/versions");
+const internal_1 = require("@nx/eslint/internal");
 const version_utils_1 = require("../../utils/version-utils");
 const buildable_project_1 = require("./buildable-project");
 function addAngularEsLintDependencies(tree, projectName) {
     const compatVersions = (0, version_utils_1.versions)(tree);
     const angularEslintVersionToInstall = compatVersions.angularEslintVersion;
-    const usesEslintFlatConfig = (0, flat_config_1.useFlatConfig)(tree);
+    const usesEslintFlatConfig = (0, internal_1.useFlatConfig)(tree);
     const devDependencies = usesEslintFlatConfig
         ? {
             'angular-eslint': angularEslintVersionToInstall,
@@ -21,7 +20,7 @@ function addAngularEsLintDependencies(tree, projectName) {
         };
     if ('typescriptEslintVersion' in compatVersions) {
         devDependencies['@typescript-eslint/utils'] = usesEslintFlatConfig
-            ? versions_1.eslint9__typescriptESLintVersion
+            ? internal_1.eslint9__typescriptESLintVersion
             : compatVersions.typescriptEslintVersion;
     }
     if ((0, buildable_project_1.isBuildableLibraryProject)(tree, projectName)) {

package/src/generators/convert-to-rspack/lib/create-config.js

@@ -17,7 +17,7 @@ function createConfig(tree, opts, configurationOptions = {}, existingWebpackConf
         })
             .join(',\n')
         : '';
-    const createConfigContents = `createConfig({ 
+    const createConfigContents = `createConfig({
     options: {
       root: __dirname,
       ${JSON.stringify(createConfigOptions, undefined, 2).slice(1, -1)}

package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cypress-component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,iBAAiB,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAiBxD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAuD5B;AAoJD,eAAe,6BAA6B,CAAC"}
+{"version":3,"file":"cypress-component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,iBAAiB,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAiBxD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAuD5B;AAkJD,eAAe,6BAA6B,CAAC"}

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

@@ -183,7 +183,7 @@ async function configureCypressCT(tree, options) {
     }
     const { addDefaultCTConfig, getProjectCypressConfigPath } = require('@nx/cypress/src/utils/config');
     const cypressConfigPath = getProjectCypressConfigPath(tree, projectConfig.root);
-    const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions);
-    tree.write(cypressConfigPath, `import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';\n${updatedCyConfig}`);
+    const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions, '@nx/angular/plugins/component-testing');
+    tree.write(cypressConfigPath, updatedCyConfig);
 }
 exports.default = cypressComponentConfiguration;

package/src/generators/ng-add/utilities/workspace.js

@@ -15,10 +15,10 @@ exports.deleteAngularJson = deleteAngularJson;
 exports.deleteGitKeepFilesIfNotNeeded = deleteGitKeepFilesIfNotNeeded;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
-const setup_root_eslint_1 = require("@nx/eslint/src/generators/lint-project/setup-root-eslint");
+const internal_1 = require("@nx/eslint/internal");
 const js_1 = require("@nx/js");
 const default_base_1 = require("nx/src/utils/default-base");
-const internal_1 = require("@nx/js/internal");
+const internal_2 = require("@nx/js/internal");
 const angular_json_1 = require("nx/src/adapter/angular-json");
 const versions_1 = require("../../../utils/versions");
 const path_1 = require("path");
@@ -151,7 +151,7 @@ function updatePackageJson(tree) {
             packageJson.devDependencies['nx'] = versions_1.nxVersion;
         }
         if (!packageJson.devDependencies['prettier']) {
-            packageJson.devDependencies['prettier'] = internal_1.prettierVersion;
+            packageJson.devDependencies['prettier'] = internal_2.prettierVersion;
         }
         return packageJson;
     });
@@ -162,7 +162,7 @@ async function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner
     });
     if (!existingEsLintConfig) {
         // There was no eslint config in the root, so we set it up and use it as-is
-        (0, setup_root_eslint_1.setupRootEsLint)(tree, { unitTestRunner });
+        (0, internal_1.setupRootEsLint)(tree, { unitTestRunner });
         return;
     }
     existingEsLintConfig.ignorePatterns = ['**/*'];

package/src/generators/setup-mf/files/ts-webpack/module-federation.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig } from '@nx/module-federation';
+import type { ModuleFederationConfig } from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= name %>',<% if(type === 'host') { %>

package/src/generators/setup-mf/setup-mf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-mf.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AA4BpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BA2G3D;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"setup-mf.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AA6BpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BA0H3D;AAED,eAAe,OAAO,CAAC"}

package/src/generators/setup-mf/setup-mf.js

@@ -67,6 +67,12 @@ async function setupMf(tree, rawOptions) {
     if (!options.skipE2E) {
         (0, lib_1.addCypressOnErrorWorkaround)(tree, options);
     }
+    if (!options.skipPackageJson && options.typescriptConfiguration) {
+        // Angular custom-webpack loads webpack.config.ts at build time. Node native
+        // TS strip can't resolve the extensionless `./module-federation.config`
+        // import under strict ESM, so loadTsFile needs ts-node as the fallback.
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { 'ts-node': versions_1.tsNodeVersion }, undefined, true));
+    }
     if (!options.skipPackageJson) {
         const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
         if (angularMajorVersion >= 20) {

package/src/migrations/update-20-2-0/disable-angular-eslint-prefer-standalone.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const internal_1 = require("@nx/eslint/internal");
 const projects_1 = require("../utils/projects");
 const preferStandaloneRule = '@angular-eslint/prefer-standalone';
 async function default_1(tree) {
@@ -11,20 +11,20 @@ async function default_1(tree) {
     ]);
     for (const graphNode of projects) {
         const root = graphNode.data.root;
-        if (!(0, eslint_file_1.isEslintConfigSupported)(tree, root)) {
+        if (!(0, internal_1.isEslintConfigSupported)(tree, root)) {
             // ESLint config is not supported, skip
             continue;
         }
-        if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, (o) => !!o.rules?.[preferStandaloneRule], true)) {
+        if ((0, internal_1.lintConfigHasOverride)(tree, root, (o) => !!o.rules?.[preferStandaloneRule], true)) {
             // the @angular-eslint/prefer-standalone rule is set in an override, skip
             continue;
         }
         const ngEslintOverrideLookup = (o) => o.files?.includes('*.ts') &&
             Object.keys(o.rules ?? {}).some((r) => r.startsWith('@angular-eslint/'));
         const tsFilesOverrideLookup = (o) => o.files?.length === 1 && o.files[0] === '*.ts';
-        if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, ngEslintOverrideLookup, false)) {
+        if ((0, internal_1.lintConfigHasOverride)(tree, root, ngEslintOverrideLookup, false)) {
             // there is an override containing an Angular ESLint rule
-            (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, ngEslintOverrideLookup, (o) => {
+            (0, internal_1.updateOverrideInLintConfig)(tree, root, ngEslintOverrideLookup, (o) => {
                 o.rules = {
                     ...o.rules,
                     [preferStandaloneRule]: 'off',
@@ -32,9 +32,9 @@ async function default_1(tree) {
                 return o;
             });
         }
-        else if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, tsFilesOverrideLookup, false)) {
+        else if ((0, internal_1.lintConfigHasOverride)(tree, root, tsFilesOverrideLookup, false)) {
             // there is an override for just *.ts files
-            (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, tsFilesOverrideLookup, (o) => {
+            (0, internal_1.updateOverrideInLintConfig)(tree, root, tsFilesOverrideLookup, (o) => {
                 o.rules = {
                     ...o.rules,
                     [preferStandaloneRule]: 'off',
@@ -44,7 +44,7 @@ async function default_1(tree) {
         }
         else {
             // there are no overrides for any Angular ESLint rule or just *.ts files, add a new override
-            (0, eslint_file_1.addOverrideToLintConfig)(tree, root, {
+            (0, internal_1.addOverrideToLintConfig)(tree, root, {
                 files: ['*.ts'],
                 rules: {
                     [preferStandaloneRule]: 'off',

package/src/migrations/update-20-2-0/remove-angular-eslint-rules.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rulesToRemove = void 0;
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const internal_1 = require("@nx/eslint/internal");
 const projects_1 = require("../utils/projects");
 exports.rulesToRemove = [
     '@angular-eslint/no-host-metadata-property',
@@ -17,7 +17,7 @@ async function default_1(tree) {
     let hasRootProject = false;
     for (const graphNode of projects) {
         const root = graphNode.data.root;
-        if (!(0, eslint_file_1.isEslintConfigSupported)(tree, root)) {
+        if (!(0, internal_1.isEslintConfigSupported)(tree, root)) {
             // ESLint config is not supported, skip
             continue;
         }
@@ -36,12 +36,12 @@ async function default_1(tree) {
     // check root config, provide a root so it doesn't try to lookup a base config
     if (!hasRootProject) {
         // if there is no root project the root eslint config has not been processed
-        if ((0, eslint_file_1.isEslintConfigSupported)(tree, '')) {
+        if ((0, internal_1.isEslintConfigSupported)(tree, '')) {
             removeRules(tree, '');
         }
     }
     // handle root base config, not providing a root will prioritize a base config
-    const baseEslintConfig = (0, eslint_file_1.findEslintFile)(tree);
+    const baseEslintConfig = (0, internal_1.findEslintFile)(tree);
     if (baseEslintConfig && baseEslintConfig.includes('.base.')) {
         removeRules(tree, baseEslintConfig);
     }
@@ -50,12 +50,12 @@ async function default_1(tree) {
 function removeRules(tree, root) {
     for (const rule of exports.rulesToRemove) {
         const lookup = (o) => !!o.rules?.[rule];
-        if (!(0, eslint_file_1.lintConfigHasOverride)(tree, root, lookup)) {
+        if (!(0, internal_1.lintConfigHasOverride)(tree, root, lookup)) {
             // it's not using the rule, skip
             continue;
         }
         // there is an override containing the rule, remove the rule
-        (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, lookup, (o) => {
+        (0, internal_1.updateOverrideInLintConfig)(tree, root, lookup, (o) => {
             delete o.rules[rule];
             return o;
         });