@nx/angular 23.0.0-beta.2 → 23.0.0-beta.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.0.0-beta.2",
+  "version": "23.0.0-beta.20",
   "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": {
@@ -24,7 +24,6 @@
     "./executors": "./executors.js",
     "./plugin": "./plugin.js",
     "./tailwind": "./tailwind.js",
-    "./module-federation": "./module-federation/index.js",
     "./src/utils": "./src/utils/index.js",
     "./plugins/component-testing": "./plugins/component-testing.js",
     "./src/generators/utils": "./src/generators/utils/index.js",
@@ -62,15 +61,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.2",
-    "@nx/eslint": "23.0.0-beta.2",
-    "@nx/js": "23.0.0-beta.2",
-    "@nx/module-federation": "23.0.0-beta.2",
-    "@nx/rspack": "23.0.0-beta.2",
-    "@nx/web": "23.0.0-beta.2",
-    "@nx/webpack": "23.0.0-beta.2",
-    "@nx/workspace": "23.0.0-beta.2",
-    "@phenomnomnominal/tsquery": "~6.1.4",
+    "@nx/devkit": "23.0.0-beta.20",
+    "@nx/eslint": "23.0.0-beta.20",
+    "@nx/js": "23.0.0-beta.20",
+    "@nx/module-federation": "23.0.0-beta.20",
+    "@nx/rspack": "23.0.0-beta.20",
+    "@nx/web": "23.0.0-beta.20",
+    "@nx/webpack": "23.0.0-beta.20",
+    "@phenomnomnominal/tsquery": "~6.2.0",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",
     "magic-string": "~0.30.2",

package/plugins/component-testing.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxComponentTestingPreset = nxComponentTestingPreset;
 const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
-const ct_helpers_1 = require("@nx/cypress/src/utils/ct-helpers");
+const internal_1 = require("@nx/cypress/internal");
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const semver_1 = require("semver");
@@ -46,9 +46,9 @@ This is likely due to not running via nx. i.e. 'nx component-test my-project'.
 Please open an issue if this error persists.
 ${e.stack ? e.stack : e}`);
     }
-    const ctProjectConfig = (0, ct_helpers_1.getProjectConfigByPath)(graph, pathToConfig);
+    const ctProjectConfig = (0, internal_1.getProjectConfigByPath)(graph, pathToConfig);
     const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
-    const ctContext = (0, ct_helpers_1.createExecutorContext)(graph, ctProjectConfig.targets, ctProjectConfig.name, options?.ctTargetName || 'component-test', ctConfigurationName);
+    const ctContext = (0, internal_1.createExecutorContext)(graph, ctProjectConfig.targets, ctProjectConfig.name, options?.ctTargetName || 'component-test', ctConfigurationName);
     const buildTarget = options?.buildTarget
         ? (0, devkit_1.parseTargetString)(options.buildTarget, graph)
         : // for backwards compat, if no buildTargetin the preset options, get it from the target options
@@ -65,7 +65,7 @@ ${e.stack ? e.stack : e}`);
     const offset = isOffsetNeeded(ctContext, ctProjectConfig)
         ? (0, devkit_1.offsetFromRoot)(normalizedFromWorkspaceRootPath)
         : undefined;
-    const buildContext = (0, ct_helpers_1.createExecutorContext)(graph, graph.nodes[buildTarget.project]?.data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
+    const buildContext = (0, internal_1.createExecutorContext)(graph, graph.nodes[buildTarget.project]?.data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
     const buildableProjectConfig = normalizeBuildTargetOptions(buildContext, ctContext, offset);
     return {
         ...(0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig, { testingType: 'component' }),
@@ -116,7 +116,7 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
         configuration: buildContext.configurationName,
     }, buildContext);
     const project = buildContext.projectsConfigurations.projects[buildContext.projectName];
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project);
+    const sourceRoot = (0, internal_2.getProjectSourceRoot)(project);
     const buildOptions = withSchemaDefaults(options, sourceRoot, buildContext.root);
     // cypress creates a tsconfig if one isn't preset
     // that contains all the support required for angular and component tests
@@ -158,7 +158,7 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
     // then we don't want to have the assets/scripts/styles be included to
     // prevent inclusion of unintended stuff like tailwind
     if (buildContext.projectName === ctContext.projectName ||
-        (0, ct_helpers_1.isCtProjectUsingBuildProject)(ctContext.projectGraph, buildContext.projectName, ctContext.projectName)) {
+        (0, internal_1.isCtProjectUsingBuildProject)(ctContext.projectGraph, buildContext.projectName, ctContext.projectName)) {
         if (offset) {
             buildOptions.assets = buildOptions.assets.map((asset) => {
                 return typeof asset === 'string'
@@ -248,7 +248,7 @@ function getTempStylesForTailwind(ctExecutorContext) {
     const rootTailwindPath = (0, path_1.join)(ctExecutorContext.root, 'tailwind.config');
     const isTailWindInRoot = exts.some((ext) => (0, fs_1.existsSync)(`${rootTailwindPath}.${ext}`));
     if (isTailWindInRoot || isTailWindInCtProject) {
-        const pathToStyle = (0, ct_helpers_1.getTempTailwindPath)(ctExecutorContext);
+        const pathToStyle = (0, internal_1.getTempTailwindPath)(ctExecutorContext);
         try {
             (0, fs_1.mkdirSync)((0, path_1.dirname)(pathToStyle), { recursive: true });
             (0, fs_1.writeFileSync)(pathToStyle, `

package/src/builders/utilities/buildable-libs.d.ts

@@ -1,4 +1,4 @@
-import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+import { DependentBuildableProjectNode } from '@nx/js/internal';
 import { ProjectGraph } from '@nx/devkit';
 export declare function createTmpTsConfigForBuildableLibs(tsConfigPath: string, context: import('@angular-devkit/architect').BuilderContext, options?: {
     projectGraph?: ProjectGraph;

package/src/builders/utilities/buildable-libs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildable-libs.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/buildable-libs.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,6BAA6B,EAC9B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,YAAY,EAA0B,MAAM,YAAY,CAAC;AAGlE,wBAAgB,iCAAiC,CAC/C,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,OAAO,2BAA2B,EAAE,cAAc,EAC3D,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,YAAY,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;EAqB3D"}
+{"version":3,"file":"buildable-libs.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/buildable-libs.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,6BAA6B,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAA0B,MAAM,YAAY,CAAC;AAGlE,wBAAgB,iCAAiC,CAC/C,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,OAAO,2BAA2B,EAAE,cAAc,EAC3D,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,YAAY,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;EAqB3D"}

package/src/builders/utilities/buildable-libs.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTmpTsConfigForBuildableLibs = createTmpTsConfigForBuildableLibs;
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_1 = require("@nx/js/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 function createTmpTsConfigForBuildableLibs(tsConfigPath, context, options) {
     let dependencies;
-    const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(options?.projectGraph ?? (0, devkit_1.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, options?.target ?? context.target.target, context.target.configuration);
+    const result = (0, internal_1.calculateProjectDependencies)(options?.projectGraph ?? (0, devkit_1.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, options?.target ?? context.target.target, context.target.configuration);
     dependencies = result.dependencies;
-    const tmpTsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.workspaceRoot, tsConfigPath), context.workspaceRoot, result.target.data.root, dependencies);
+    const tmpTsConfigPath = (0, internal_1.createTmpTsConfig)((0, path_1.join)(context.workspaceRoot, tsConfigPath), context.workspaceRoot, result.target.data.root, dependencies);
     process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;
     return { tsConfigPath: tmpTsConfigPath, dependencies };
 }

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

@@ -5,8 +5,7 @@ exports.getStaticRemotes = getStaticRemotes;
 exports.validateDevRemotes = validateDevRemotes;
 exports.getDynamicMfManifestFile = getDynamicMfManifestFile;
 const devkit_1 = require("@nx/devkit");
-const internal_1 = require("@nx/js/src/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
 function getDynamicRemotes(project, context, workspaceProjects, remotesToSkip, pathToManifestFile) {
@@ -48,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,
@@ -106,6 +104,6 @@ function getDynamicMfManifestFile(project, workspaceRoot) {
     // at the old path.
     return [
         (0, path_1.join)(workspaceRoot, project.root, 'public/module-federation.manifest.json'),
-        (0, path_1.join)(workspaceRoot, (0, ts_solution_setup_1.getProjectSourceRoot)(project), 'assets/module-federation.manifest.json'),
+        (0, path_1.join)(workspaceRoot, (0, internal_1.getProjectSourceRoot)(project), 'assets/module-federation.manifest.json'),
     ].find((path) => (0, fs_1.existsSync)(path));
 }

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

@@ -4,7 +4,7 @@ exports.mergeCustomWebpackConfig = mergeCustomWebpackConfig;
 exports.resolveCustomWebpackConfig = resolveCustomWebpackConfig;
 exports.resolveIndexHtmlTransformer = resolveIndexHtmlTransformer;
 const webpack_merge_1 = require("webpack-merge");
-const internal_1 = require("@nx/js/src/internal");
+const internal_1 = require("@nx/js/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const fs_1 = require("fs");
@@ -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/delegate-build/delegate-build.impl.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.delegateBuildExecutor = delegateBuildExecutor;
 const devkit_1 = require("@nx/devkit");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_1 = require("@nx/js/internal");
 async function* delegateBuildExecutor(options, context) {
-    const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
-    options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, devkit_1.joinPathFragments)(context.root, options.tsConfig), context.root, target.data.root, dependencies);
+    const { target, dependencies } = (0, internal_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
+    options.tsConfig = (0, internal_1.createTmpTsConfig)((0, devkit_1.joinPathFragments)(context.root, options.tsConfig), context.root, target.data.root, dependencies);
     const { buildTarget, ...targetOptions } = options;
     const delegateTarget = (0, devkit_1.parseTargetString)(buildTarget, context);
     yield* await (0, devkit_1.runExecutor)(delegateTarget, targetOptions, context);

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-federation-dev-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAwCvC,wBAAuB,iCAAiC,CACtD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,iCAgIzB;AAED,eAAe,iCAAiC,CAAC"}
+{"version":3,"file":"module-federation-dev-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAkCvC,wBAAuB,iCAAiC,CACtD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,iCAgIzB;AAED,eAAe,iCAAiC,CAAC"}

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

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.moduleFederationDevServerExecutor = moduleFederationDevServerExecutor;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
-const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const utils_1 = require("@nx/module-federation/src/executors/utils");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
@@ -46,7 +45,7 @@ async function* moduleFederationDevServerExecutor(schema, context) {
             cors: true,
             cacheSeconds: -1,
         }, context)
-        : (0, rxjs_for_await_1.eachValueFrom)((0, dev_server_impl_1.executeDevServerBuilder)(options, await (0, ngcli_adapter_1.createBuilderContext)({
+        : (0, internal_1.eachValueFrom)((0, dev_server_impl_1.executeDevServerBuilder)(options, await (0, ngcli_adapter_1.createBuilderContext)({
             builderName: '@nx/angular:webpack-browser',
             description: 'Build a browser application',
             optionSchema: require('../../builders/webpack-browser/schema.json'),
@@ -70,11 +69,11 @@ async function* moduleFederationDevServerExecutor(schema, context) {
     }
     (0, module_federation_1.validateDevRemotes)(options, workspaceProjects);
     const { remotes, staticRemotesIter, devRemoteIters } = await (0, utils_1.startRemoteIterators)(options, context, lib_1.startRemotes, pathToManifestFile, 'angular');
-    const removeBaseUrlEmission = (iter) => (0, async_iterable_1.mapAsyncIterable)(iter, (v) => ({
+    const removeBaseUrlEmission = (iter) => (0, internal_1.mapAsyncIterable)(iter, (v) => ({
         ...v,
         baseUrl: undefined,
     }));
-    return yield* (0, async_iterable_1.combineAsyncIterables)(removeBaseUrlEmission(currIter), ...devRemoteIters.map(removeBaseUrlEmission), ...(staticRemotesIter ? [removeBaseUrlEmission(staticRemotesIter)] : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    return yield* (0, internal_1.combineAsyncIterables)(removeBaseUrlEmission(currIter), ...devRemoteIters.map(removeBaseUrlEmission), ...(staticRemotesIter ? [removeBaseUrlEmission(staticRemotesIter)] : []), (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
         if (!options.isInitialHost) {
             done();
             return;

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

@@ -35,8 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.moduleFederationSsrDevServerExecutor = moduleFederationSsrDevServerExecutor;
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
+const internal_1 = require("@nx/devkit/internal");
 const utils_1 = require("@nx/module-federation/src/executors/utils");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const fs_1 = require("fs");
@@ -67,7 +66,7 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
     const options = (0, normalize_options_1.normalizeOptions)(schema);
     (0, builder_package_1.assertBuilderPackageIsInstalled)('@angular-devkit/build-angular');
     const { executeSSRDevServerBuilder } = await Promise.resolve().then(() => __importStar(require('@angular-devkit/build-angular')));
-    const currIter = (0, rxjs_for_await_1.eachValueFrom)(executeSSRDevServerBuilder(options, await (0, ngcli_adapter_1.createBuilderContext)({
+    const currIter = (0, internal_1.eachValueFrom)(executeSSRDevServerBuilder(options, await (0, ngcli_adapter_1.createBuilderContext)({
         builderName: '@nx/angular:webpack-server',
         description: 'Build a ssr application',
         optionSchema: require('../../builders/webpack-server/schema.json'),
@@ -93,11 +92,11 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
     }
     (0, module_federation_1.validateDevRemotes)({ devRemotes: options.devRemotes }, workspaceProjects);
     const { remotes, staticRemotesIter, devRemoteIters } = await (0, utils_1.startRemoteIterators)(options, context, start_dev_remotes_1.startRemotes, pathToManifestFile, 'angular', true);
-    const removeBaseUrlEmission = (iter) => (0, async_iterable_1.mapAsyncIterable)(iter, (v) => ({
+    const removeBaseUrlEmission = (iter) => (0, internal_1.mapAsyncIterable)(iter, (v) => ({
         ...v,
         baseUrl: undefined,
     }));
-    const combined = (0, async_iterable_1.combineAsyncIterables)(removeBaseUrlEmission(staticRemotesIter), ...(devRemoteIters ? devRemoteIters.map(removeBaseUrlEmission) : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    const combined = (0, internal_1.combineAsyncIterables)(removeBaseUrlEmission(staticRemotesIter), ...(devRemoteIters ? devRemoteIters.map(removeBaseUrlEmission) : []), (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
         if (!options.isInitialHost) {
             done();
             return;

package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngPackagrLiteExecutor = void 0;
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const package_impl_1 = require("../package/package.impl");
 const typescript_1 = require("../utilities/typescript");
@@ -10,7 +10,7 @@ async function initializeNgPackgrLite(options, context, projectDependencies) {
     const ngPackagr = await (0, ng_packagr_1.getNgPackagrInstance)();
     ngPackagr.forProject((0, path_1.resolve)(context.root, options.project));
     if (options.tsConfig) {
-        const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
+        const remappedTsConfigFilePath = (0, internal_1.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
         const tsConfig = await (0, typescript_1.parseRemappedTsConfigAndMergeDefaults)(context.root, options.tsConfig, remappedTsConfigFilePath);
         ngPackagr.withTsConfig(tsConfig);
     }

package/src/executors/package/package.impl.d.ts

@@ -1,5 +1,5 @@
 import type { ExecutorContext } from '@nx/devkit';
-import { type DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+import { type DependentBuildableProjectNode } from '@nx/js/internal';
 import type { NgPackagr } from 'ng-packagr';
 import type { BuildAngularLibraryExecutorOptions } from './schema';
 /**

package/src/executors/package/package.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAM5C,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AA4BnE;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,mBAAmB,EAAE,CACnB,OAAO,EAAE,kCAAkC,EAC3C,OAAO,EAAE,eAAe,EACxB,mBAAmB,EAAE,6BAA6B,EAAE,KACjD,OAAO,CAAC,SAAS,CAAC,IAGrB,SAAS,kCAAkC,EAC3C,SAAS,eAAe;;aAgC3B;AAED,eAAO,MAAM,eAAe,YAnCf,kCAAkC,WAClC,eAAe;;YAkC6C,CAAC;AAE1E,eAAe,eAAe,CAAC"}
+{"version":3,"file":"package.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAM5C,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AA4BnE;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,mBAAmB,EAAE,CACnB,OAAO,EAAE,kCAAkC,EAC3C,OAAO,EAAE,eAAe,EACxB,mBAAmB,EAAE,6BAA6B,EAAE,KACjD,OAAO,CAAC,SAAS,CAAC,IAGrB,SAAS,kCAAkC,EAC3C,SAAS,eAAe;;aAgC3B;AAED,eAAO,MAAM,eAAe,YAnCf,kCAAkC,WAClC,eAAe;;YAkC6C,CAAC;AAE1E,eAAe,eAAe,CAAC"}

package/src/executors/package/package.impl.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageExecutor = void 0;
 exports.createLibraryExecutor = createLibraryExecutor;
-const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/js/internal");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
@@ -13,7 +13,7 @@ async function initializeNgPackagr(options, context, projectDependencies) {
     const ngPackagr = await (0, ng_packagr_1.getNgPackagrInstance)();
     ngPackagr.forProject((0, path_1.resolve)(context.root, options.project));
     if (options.tsConfig) {
-        const remappedTsConfigFilePath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
+        const remappedTsConfigFilePath = (0, internal_2.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, context.projectsConfigurations.projects[context.projectName].root, projectDependencies);
         const tsConfig = await (0, typescript_1.parseRemappedTsConfigAndMergeDefaults)(context.root, options.tsConfig, remappedTsConfigFilePath);
         ngPackagr.withTsConfig(tsConfig);
     }
@@ -27,9 +27,9 @@ async function initializeNgPackagr(options, context, projectDependencies) {
 function createLibraryExecutor(initializeNgPackagr) {
     return async function* (options, context) {
         options.project ??= (0, path_1.join)(context.projectsConfigurations.projects[context.projectName].root, 'ng-package.json');
-        const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
+        const { dependencies } = (0, internal_2.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
         if (options.watch) {
-            return yield* (0, rxjs_for_await_1.eachValueFrom)((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies)).pipe((0, operators_1.switchMap)((packagr) => packagr.watch()), (0, operators_1.mapTo)({ success: true })));
+            return yield* (0, internal_1.eachValueFrom)((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies)).pipe((0, operators_1.switchMap)((packagr) => packagr.watch()), (0, operators_1.mapTo)({ success: true })));
         }
         return (0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies))
             .pipe((0, operators_1.switchMap)((packagr) => packagr.build()), (0, operators_1.mapTo)({ success: true }))

package/src/executors/utilities/angular-version-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"angular-version-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/angular-version-utils.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,WAAW,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7D,wBAAgB,8BAA8B,IAAI,WAAW,GAAG,IAAI,CAEnE;AAED,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,MAAM,GACd,WAAW,GAAG,IAAI,CAUpB"}
+{"version":3,"file":"angular-version-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/angular-version-utils.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,WAAW,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7D,wBAAgB,8BAA8B,IAAI,WAAW,GAAG,IAAI,CAEnE;AAED,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,MAAM,GACd,WAAW,GAAG,IAAI,CAGpB"}

package/src/executors/utilities/angular-version-utils.js

@@ -2,17 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInstalledAngularVersionInfo = getInstalledAngularVersionInfo;
 exports.getInstalledPackageVersionInfo = getInstalledPackageVersionInfo;
-const package_json_1 = require("nx/src/utils/package-json");
+const internal_1 = require("@nx/devkit/internal");
 const semver_1 = require("semver");
 function getInstalledAngularVersionInfo() {
     return getInstalledPackageVersionInfo('@angular/core');
 }
 function getInstalledPackageVersionInfo(pkgName) {
-    try {
-        const { packageJson: { version }, } = (0, package_json_1.readModulePackageJson)(pkgName);
-        return { major: (0, semver_1.major)(version), version };
-    }
-    catch {
-        return null;
-    }
+    const version = (0, internal_1.getInstalledPackageVersion)(pkgName);
+    return version ? { major: (0, semver_1.major)(version), version } : null;
 }

package/src/executors/utilities/buildable-libs.d.ts

@@ -1,5 +1,5 @@
 import { type ExecutorContext } from '@nx/devkit';
-import { type DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+import { type DependentBuildableProjectNode } from '@nx/js/internal';
 export declare function createTmpTsConfigForBuildableLibs(tsConfigPath: string, context: ExecutorContext): {
     tsConfigPath: string;
     dependencies: DependentBuildableProjectNode[];

package/src/executors/utilities/buildable-libs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildable-libs.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/buildable-libs.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,uCAAuC,CAAC;AAG/C,wBAAgB,iCAAiC,CAC/C,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,eAAe;;;EA0BzB"}
+{"version":3,"file":"buildable-libs.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/buildable-libs.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EAGL,KAAK,6BAA6B,EACnC,MAAM,iBAAiB,CAAC;AAGzB,wBAAgB,iCAAiC,CAC/C,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,eAAe;;;EA0BzB"}

package/src/executors/utilities/buildable-libs.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTmpTsConfigForBuildableLibs = createTmpTsConfigForBuildableLibs;
 const devkit_1 = require("@nx/devkit");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 function createTmpTsConfigForBuildableLibs(tsConfigPath, context) {
     let dependencies;
-    const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph ?? (0, devkit_1.readCachedProjectGraph)(), context.root, context.projectName, context.targetName, context.configurationName);
+    const result = (0, internal_1.calculateProjectDependencies)(context.projectGraph ?? (0, devkit_1.readCachedProjectGraph)(), context.root, context.projectName, context.targetName, context.configurationName);
     dependencies = result.dependencies;
-    const tmpTsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, tsConfigPath), context.root, result.target.data.root, dependencies);
+    const tmpTsConfigPath = (0, internal_1.createTmpTsConfig)((0, path_1.join)(context.root, tsConfigPath), context.root, result.target.data.root, dependencies);
     process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;
     const tmpTsConfigPathWithoutWorkspaceRoot = tmpTsConfigPath.replace(context.root, '');
     return { tsConfigPath: tmpTsConfigPathWithoutWorkspaceRoot, dependencies };

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/src/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":"AAAA,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,CA6I5B;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"}