@nx/angular 23.1.0 → 23.1.2

package/dist/src/builders/dev-server/dev-server.impl.js

@@ -3,20 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeDevServerBuilder = executeDevServerBuilder;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const internal_1 = require("@nx/webpack/internal");
 const fs_1 = require("fs");
-const configuration_1 = require("nx/src/config/configuration");
-const operators_1 = require("nx/src/project-graph/operators");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
-const operators_2 = require("rxjs/operators");
+const operators_1 = require("rxjs/operators");
 const builder_package_1 = require("../../executors/utilities/builder-package");
 const esbuild_extensions_1 = require("../../executors/utilities/esbuild-extensions");
 const patch_builder_context_1 = require("../../executors/utilities/patch-builder-context");
 const buildable_libs_1 = require("../utilities/buildable-libs");
-const webpack_1 = require("../utilities/webpack");
 const lib_1 = require("./lib");
+const internal_1 = require("@nx/devkit/internal");
 function executeDevServerBuilder(rawOptions, context) {
     (0, lib_1.validateOptions)(rawOptions);
     process.env.NX_TSCONFIG_PATH = (0, js_1.getRootTsConfigPath)();
@@ -28,10 +24,10 @@ function executeDevServerBuilder(rawOptions, context) {
         projectName: context.target.project,
         projectsConfigurations: (0, devkit_1.readProjectsConfigurationFromProjectGraph)(projectGraph),
         root: context.workspaceRoot,
-        nxJsonConfiguration: (0, configuration_1.readNxJson)(devkit_1.workspaceRoot),
+        nxJsonConfiguration: (0, internal_1.readNxJsonFromDisk)(devkit_1.workspaceRoot),
         isVerbose: false,
     });
-    const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBuildTarget.project);
+    const browserTargetProjectConfiguration = (0, internal_1.readCachedProjectConfiguration)(parsedBuildTarget.project);
     const buildTarget = browserTargetProjectConfiguration.targets[parsedBuildTarget.target];
     const buildTargetOptions = {
         ...buildTarget.options,
@@ -102,32 +98,37 @@ function executeDevServerBuilder(rawOptions, context) {
      * handle `@nx/angular:*` executors.
      */
     (0, patch_builder_context_1.patchBuilderContext)(context, !isUsingWebpackBuilder, parsedBuildTarget);
-    (0, builder_package_1.assertBuilderPackageIsInstalled)('@angular-devkit/build-angular');
+    (0, builder_package_1.assertPackageIsInstalled)('@angular-devkit/build-angular', '@nx/angular:dev-server');
     return (0, rxjs_1.combineLatest)([
         (0, rxjs_1.from)(import('@angular-devkit/build-angular')),
         (0, rxjs_1.from)((0, esbuild_extensions_1.loadPlugins)(buildTargetOptions.plugins, buildTargetOptions.tsConfig)),
         (0, rxjs_1.from)((0, esbuild_extensions_1.loadMiddleware)(options.esbuildMiddleware, buildTargetOptions.tsConfig)),
         (0, rxjs_1.from)(loadIndexHtmlFileTransformer(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context, isUsingWebpackBuilder)),
-    ]).pipe((0, operators_2.switchMap)(([{ executeDevServerBuilder }, plugins, middleware, indexHtmlTransformer,]) => executeDevServerBuilder(delegateBuilderOptions, context, {
+    ]).pipe((0, operators_1.switchMap)(([{ executeDevServerBuilder }, plugins, middleware, indexHtmlTransformer,]) => executeDevServerBuilder(delegateBuilderOptions, context, {
         webpackConfiguration: isUsingWebpackBuilder
             ? async (baseWebpackConfig) => {
                 if (!buildLibsFromSource) {
                     const workspaceDependencies = dependencies
-                        .filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
+                        .filter((dep) => !(0, internal_1.isNpmProject)(dep.node))
                         .map((dep) => dep.node.name);
                     // default for `nx run-many` is --all projects
                     // by passing an empty string for --projects, run-many will default to
                     // run the target for all projects.
                     // This will occur when workspaceDependencies = []
                     if (workspaceDependencies.length > 0) {
-                        baseWebpackConfig.plugins.push(new internal_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${parsedBuildTarget.target} --projects=${workspaceDependencies.join(',')}`, { skipWatchingDeps: !options.watchDependencies }) // TODO(Colum): this can be removed when angular 20.2 is merged
+                        (0, builder_package_1.assertPackageIsInstalled)('@nx/webpack', '@nx/angular:dev-server');
+                        const { WebpackNxBuildCoordinationPlugin } = await import('@nx/webpack/internal');
+                        baseWebpackConfig.plugins.push(new WebpackNxBuildCoordinationPlugin(`nx run-many --target=${parsedBuildTarget.target} --projects=${workspaceDependencies.join(',')}`, { skipWatchingDeps: !options.watchDependencies }) // TODO(Colum): this can be removed when angular 20.2 is merged
                         );
                     }
                 }
                 if (!pathToWebpackConfig) {
                     return baseWebpackConfig;
                 }
-                return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetOptions, context.target);
+                (0, builder_package_1.assertPackageIsInstalled)('@nx/webpack', '@nx/angular:dev-server');
+                (0, builder_package_1.assertPackageIsInstalled)('webpack-merge', '@nx/angular:dev-server');
+                const { mergeCustomWebpackConfig } = await import('../utilities/webpack.js');
+                return mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig, buildTargetOptions, context.target);
             }
             : undefined,
         ...(indexHtmlTransformer
@@ -154,7 +155,11 @@ async function loadIndexHtmlFileTransformer(pathToIndexFileTransformer, tsConfig
     if (!pathToIndexFileTransformer) {
         return undefined;
     }
-    return isUsingWebpackBuilder
-        ? (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, tsConfig, context.target)
-        : await (0, esbuild_extensions_1.loadIndexHtmlTransformer)(pathToIndexFileTransformer, tsConfig);
+    if (isUsingWebpackBuilder) {
+        (0, builder_package_1.assertPackageIsInstalled)('@nx/webpack', '@nx/angular:dev-server');
+        (0, builder_package_1.assertPackageIsInstalled)('webpack-merge', '@nx/angular:dev-server');
+        const { resolveIndexHtmlTransformer } = await import('../utilities/webpack.js');
+        return resolveIndexHtmlTransformer(pathToIndexFileTransformer, tsConfig, context.target);
+    }
+    return (0, esbuild_extensions_1.loadIndexHtmlTransformer)(pathToIndexFileTransformer, tsConfig);
 }

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

@@ -2,16 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeWebpackBrowserBuilder = executeWebpackBrowserBuilder;
 const devkit_1 = require("@nx/devkit");
-const internal_1 = require("@nx/webpack/internal");
 const fs_1 = require("fs");
-const operators_1 = require("nx/src/project-graph/operators");
-const utils_1 = require("nx/src/tasks-runner/utils");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
-const operators_2 = require("rxjs/operators");
+const operators_1 = require("rxjs/operators");
 const builder_package_1 = require("../../executors/utilities/builder-package");
 const buildable_libs_1 = require("../utilities/buildable-libs");
-const webpack_1 = require("../utilities/webpack");
+const internal_1 = require("@nx/devkit/internal");
 // This is required to ensure that the webpack version used by the Module Federation is the same as the one used by the builders.
 const Module = require('module');
 const originalResolveFilename = Module._resolveFilename;
@@ -36,11 +33,12 @@ function shouldSkipInitialTargetRun(projectGraph, project, target) {
             allTargetNames.add(targetName);
         }
     }
-    const projectDependencyConfigs = (0, utils_1.getDependencyConfigs)({ project, target }, {}, projectGraph, Array.from(allTargetNames));
+    const projectDependencyConfigs = (0, internal_1.getDependencyConfigs)({ project, target }, {}, projectGraph, Array.from(allTargetNames));
     // if the task runner already ran the target, skip the initial run
     return projectDependencyConfigs.some((d) => d.target === target && d.projects === 'dependencies');
 }
 function executeWebpackBrowserBuilder(options, context) {
+    (0, builder_package_1.assertPackageIsInstalled)('@nx/webpack', '@nx/angular:webpack-browser');
     options.buildLibsFromSource ??= true;
     options.watchDependencies ??= true;
     const { buildLibsFromSource, customWebpackConfig, indexHtmlTransformer, watchDependencies, ...delegateBuilderOptions } = options;
@@ -64,12 +62,17 @@ function executeWebpackBrowserBuilder(options, context) {
         dependencies = foundDependencies;
         delegateBuilderOptions.tsConfig = (0, devkit_1.normalizePath)((0, path_1.relative)(context.workspaceRoot, tsConfigPath));
     }
-    (0, builder_package_1.assertBuilderPackageIsInstalled)('@angular-devkit/build-angular');
-    return (0, rxjs_1.from)(import('@angular-devkit/build-angular')).pipe((0, operators_2.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(delegateBuilderOptions, context, {
+    (0, builder_package_1.assertPackageIsInstalled)('@angular-devkit/build-angular', '@nx/angular:webpack-browser');
+    (0, builder_package_1.assertPackageIsInstalled)('webpack-merge', '@nx/angular:webpack-browser');
+    return (0, rxjs_1.from)(Promise.all([
+        import('@angular-devkit/build-angular'),
+        import('@nx/webpack/internal'),
+        import('../utilities/webpack.js'),
+    ])).pipe((0, operators_1.switchMap)(([{ executeBrowserBuilder }, { WebpackNxBuildCoordinationPlugin }, { mergeCustomWebpackConfig, resolveIndexHtmlTransformer },]) => executeBrowserBuilder(delegateBuilderOptions, context, {
         webpackConfiguration: (baseWebpackConfig) => {
             if (!buildLibsFromSource && delegateBuilderOptions.watch) {
                 const workspaceDependencies = dependencies
-                    .filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
+                    .filter((dep) => !(0, internal_1.isNpmProject)(dep.node))
                     .map((dep) => dep.node.name);
                 // default for `nx run-many` is --all projects
                 // by passing an empty string for --projects, run-many will default to
@@ -79,17 +82,17 @@ function executeWebpackBrowserBuilder(options, context) {
                     const skipInitialRun = shouldSkipInitialTargetRun(projectGraph, context.target.project, context.target.target);
                     baseWebpackConfig.plugins.push(
                     // Cast away the angular/webpack plugin type difference (webpack versions).
-                    new internal_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${context.target.target} --projects=${workspaceDependencies.join(',')}`, { skipInitialRun, skipWatchingDeps: !watchDependencies }));
+                    new WebpackNxBuildCoordinationPlugin(`nx run-many --target=${context.target.target} --projects=${workspaceDependencies.join(',')}`, { skipInitialRun, skipWatchingDeps: !watchDependencies }));
                 }
             }
             if (!pathToWebpackConfig) {
                 return baseWebpackConfig;
             }
-            return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, delegateBuilderOptions, context.target);
+            return mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig, delegateBuilderOptions, context.target);
         },
         ...(pathToIndexFileTransformer
             ? {
-                indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, delegateBuilderOptions.tsConfig, context.target),
+                indexHtml: resolveIndexHtmlTransformer(pathToIndexFileTransformer, delegateBuilderOptions.tsConfig, context.target),
             }
             : {}),
     })));

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

@@ -8,7 +8,6 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const builder_package_1 = require("../../executors/utilities/builder-package");
 const buildable_libs_1 = require("../utilities/buildable-libs");
-const webpack_1 = require("../utilities/webpack");
 // This is required to ensure that the webpack version used by the Module Federation is the same as the one used by the builders.
 const Module = require('module');
 const originalResolveFilename = Module._resolveFilename;
@@ -26,7 +25,7 @@ Module._resolveFilename = function (request, parent, isMain, options) {
     return originalResolveFilename.call(this, request, parent, isMain, options);
 };
 function buildServerApp(options, context) {
-    (0, builder_package_1.assertBuilderPackageIsInstalled)('@angular-devkit/build-angular');
+    (0, builder_package_1.assertPackageIsInstalled)('@angular-devkit/build-angular', '@nx/angular:webpack-server');
     const { buildLibsFromSource, customWebpackConfig, ...delegateOptions } = options;
     // If there is a path to custom webpack config
     // Invoke our own support for custom webpack config
@@ -42,7 +41,11 @@ function buildServerApp(options, context) {
     return (0, rxjs_1.from)(import('@angular-devkit/build-angular')).pipe((0, operators_1.switchMap)(({ executeServerBuilder }) => executeServerBuilder(delegateOptions, context)));
 }
 function buildServerAppWithCustomWebpackConfiguration(options, context, pathToWebpackConfig) {
-    return (0, rxjs_1.from)(import('@angular-devkit/build-angular')).pipe((0, operators_1.switchMap)(({ executeServerBuilder }) => executeServerBuilder(options, context, {
+    (0, builder_package_1.assertPackageIsInstalled)('webpack-merge', '@nx/angular:webpack-server');
+    return (0, rxjs_1.from)(Promise.all([
+        import('@angular-devkit/build-angular'),
+        import('../utilities/webpack.js'),
+    ])).pipe((0, operators_1.switchMap)(([{ executeServerBuilder }, { mergeCustomWebpackConfig }]) => executeServerBuilder(options, context, {
         webpackConfiguration: async (baseWebpackConfig) => {
             // Angular auto includes code from @angular/platform-server
             // This includes the code outside the shared scope created by ModuleFederation
@@ -50,7 +53,7 @@ function buildServerAppWithCustomWebpackConfiguration(options, context, pathToWe
             // maintaining it within the shared scope.
             // Therefore, if the build is an MF Server build, remove the auto-includes from
             // the base webpack config from Angular
-            let mergedConfig = await (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, options, context.target);
+            let mergedConfig = await mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig, options, context.target);
             if (mergedConfig.target === 'async-node') {
                 mergedConfig.entry.main = mergedConfig.entry.main.filter((m) => !m.startsWith('@angular/platform-server/init'));
                 mergedConfig.module.rules = mergedConfig.module.rules.filter((m) => !m.loader
@@ -62,6 +65,7 @@ function buildServerAppWithCustomWebpackConfiguration(options, context, pathToWe
     })));
 }
 function executeWebpackServerBuilder(options, context) {
+    (0, builder_package_1.assertPackageIsInstalled)('@nx/webpack', '@nx/angular:webpack-server');
     options.buildLibsFromSource ??= true;
     process.env.NX_BUILD_LIBS_FROM_SOURCE = `${options.buildLibsFromSource}`;
     process.env.NX_BUILD_TARGET = (0, devkit_1.targetToTargetString)({ ...context.target });

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

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = applicationExecutor;
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const buildable_libs_1 = require("../utilities/buildable-libs");
 const builder_package_1 = require("../utilities/builder-package");
 const esbuild_extensions_1 = require("../utilities/esbuild-extensions");
 const normalize_options_1 = require("./utils/normalize-options");
 const validate_options_1 = require("./utils/validate-options");
+const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
 async function* applicationExecutor(options, context) {
     (0, validate_options_1.validateOptions)(options);
     const { buildLibsFromSource = true, plugins: pluginPaths, indexHtmlTransformer: indexHtmlTransformerPath, ...delegateExecutorOptions } = (0, normalize_options_1.normalizeOptions)(options);
@@ -25,7 +25,7 @@ async function* applicationExecutor(options, context) {
         description: 'Build an application.',
         optionSchema: require('./schema.json'),
     }, context);
-    (0, builder_package_1.assertBuilderPackageIsInstalled)('@angular/build');
+    (0, builder_package_1.assertPackageIsInstalled)('@angular/build', '@nx/angular:application');
     const { buildApplication } = await import('@angular/build');
     return yield* buildApplication(delegateExecutorOptions, builderContext, {
         codePlugins: plugins,

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

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

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

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

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

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.moduleFederationDevServerExecutor = moduleFederationDevServerExecutor;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
+const builder_package_1 = require("../utilities/builder-package");
 const lib_1 = require("./lib");
-const internal_2 = require("@nx/module-federation/internal");
-const internal_3 = require("@nx/web/internal");
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
+const internal_2 = require("@nx/web/internal");
 const dev_server_impl_1 = require("../../builders/dev-server/dev-server.impl");
 const module_federation_1 = require("../../builders/utilities/module-federation");
 const path_1 = require("path");
 const fs_1 = require("fs");
 const module_federation_deprecation_1 = require("../../utils/module-federation-deprecation");
+const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
 // This is required to ensure that the webpack version used by the Module Federation is the same as the one used by the builders.
 const Module = require('module');
 const originalResolveFilename = Module._resolveFilename;
@@ -29,12 +29,14 @@ Module._resolveFilename = function (request, parent, isMain, options) {
     return originalResolveFilename.call(this, request, parent, isMain, options);
 };
 async function* moduleFederationDevServerExecutor(schema, context) {
+    (0, builder_package_1.assertPackageIsInstalled)('@nx/module-federation', '@nx/angular:module-federation-dev-server');
+    const { startRemoteIterators } = await import('@nx/module-federation/internal');
     (0, module_federation_deprecation_1.warnAngularMfDevServerExecutorDeprecation)();
     const options = (0, lib_1.normalizeOptions)(schema);
     const { projects: workspaceProjects } = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(context.projectGraph);
     const project = workspaceProjects[context.projectName];
     const currIter = options.static
-        ? (0, internal_3.fileServerExecutor)({
+        ? (0, internal_2.fileServerExecutor)({
             port: options.port,
             host: options.host,
             ssl: options.ssl,
@@ -68,7 +70,7 @@ async function* moduleFederationDevServerExecutor(schema, context) {
         pathToManifestFile = userPathToManifestFile;
     }
     (0, module_federation_1.validateDevRemotes)(options, workspaceProjects);
-    const { remotes, staticRemotesIter, devRemoteIters } = await (0, internal_2.startRemoteIterators)(options, context, lib_1.startRemotes, pathToManifestFile, 'angular');
+    const { remotes, staticRemotesIter, devRemoteIters } = await startRemoteIterators(options, context, lib_1.startRemotes, pathToManifestFile, 'angular');
     const removeBaseUrlEmission = (iter) => (0, internal_1.mapAsyncIterable)(iter, (v) => ({
         ...v,
         baseUrl: undefined,
@@ -88,7 +90,7 @@ async function* moduleFederationDevServerExecutor(schema, context) {
             const portsToWaitFor = staticRemotesIter
                 ? [options.staticRemotesPort, ...remotes.remotePorts]
                 : [...remotes.remotePorts];
-            await Promise.all(portsToWaitFor.map((port) => (0, internal_3.waitForPortOpen)(port, {
+            await Promise.all(portsToWaitFor.map((port) => (0, internal_2.waitForPortOpen)(port, {
                 retries: 480,
                 retryDelay: 2500,
                 host: 'localhost',

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

@@ -3,17 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.moduleFederationSsrDevServerExecutor = moduleFederationSsrDevServerExecutor;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const internal_2 = require("@nx/module-federation/internal");
-const internal_3 = require("@nx/web/internal");
+const internal_2 = require("@nx/web/internal");
 const fs_1 = require("fs");
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
 const path_1 = require("path");
 const module_federation_1 = require("../../builders/utilities/module-federation");
 const builder_package_1 = require("../utilities/builder-package");
 const normalize_options_1 = require("./lib/normalize-options");
 const start_dev_remotes_1 = require("./lib/start-dev-remotes");
 const module_federation_deprecation_1 = require("../../utils/module-federation-deprecation");
+const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
 // This is required to ensure that the webpack version used by the Module Federation is the same as the one used by the builders.
 const Module = require('module');
 const originalResolveFilename = Module._resolveFilename;
@@ -31,9 +29,11 @@ Module._resolveFilename = function (request, parent, isMain, options) {
     return originalResolveFilename.call(this, request, parent, isMain, options);
 };
 async function* moduleFederationSsrDevServerExecutor(schema, context) {
+    (0, builder_package_1.assertPackageIsInstalled)('@nx/module-federation', '@nx/angular:module-federation-dev-ssr');
+    const { startRemoteIterators } = await import('@nx/module-federation/internal');
     (0, module_federation_deprecation_1.warnAngularMfDevSsrExecutorDeprecation)();
     const options = (0, normalize_options_1.normalizeOptions)(schema);
-    (0, builder_package_1.assertBuilderPackageIsInstalled)('@angular-devkit/build-angular');
+    (0, builder_package_1.assertPackageIsInstalled)('@angular-devkit/build-angular', '@nx/angular:module-federation-dev-ssr');
     const { executeSSRDevServerBuilder } = await import('@angular-devkit/build-angular');
     const currIter = (0, internal_1.eachValueFrom)(executeSSRDevServerBuilder(options, await (0, ngcli_adapter_1.createBuilderContext)({
         builderName: '@nx/angular:webpack-server',
@@ -43,7 +43,7 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
     if (options.isInitialHost === false) {
         return yield* currIter;
     }
-    const { projects: workspaceProjects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(context.projectGraph);
+    const { projects: workspaceProjects } = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(context.projectGraph);
     const project = workspaceProjects[context.projectName];
     let pathToManifestFile;
     if (options.pathToManifestFile) {
@@ -60,7 +60,7 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
         pathToManifestFile = (0, module_federation_1.getDynamicMfManifestFile)(project, context.root);
     }
     (0, module_federation_1.validateDevRemotes)({ devRemotes: options.devRemotes }, workspaceProjects);
-    const { remotes, staticRemotesIter, devRemoteIters } = await (0, internal_2.startRemoteIterators)(options, context, start_dev_remotes_1.startRemotes, pathToManifestFile, 'angular', true);
+    const { remotes, staticRemotesIter, devRemoteIters } = await startRemoteIterators(options, context, start_dev_remotes_1.startRemotes, pathToManifestFile, 'angular', true);
     const removeBaseUrlEmission = (iter) => (0, internal_1.mapAsyncIterable)(iter, (v) => ({
         ...v,
         baseUrl: undefined,
@@ -80,7 +80,7 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
             const portsToWaitFor = staticRemotesIter && options.staticRemotesPort
                 ? [options.staticRemotesPort, ...remotes.remotePorts]
                 : [...remotes.remotePorts];
-            await Promise.all(portsToWaitFor.map((port) => (0, internal_3.waitForPortOpen)(port, {
+            await Promise.all(portsToWaitFor.map((port) => (0, internal_2.waitForPortOpen)(port, {
                 retries: 480,
                 retryDelay: 2500,
                 host: 'localhost',

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = unitTestExecutor;
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
+const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
 const targets_1 = require("../../utils/targets");
 const semver_1 = require("semver");
 const angular_version_utils_1 = require("../utilities/angular-version-utils");
@@ -22,7 +22,7 @@ async function* unitTestExecutor(options, context) {
     const buildTargetSpecifier = options.buildTarget ?? `::development`;
     const buildTarget = (0, targets_1.targetFromTargetString)(buildTargetSpecifier, context.projectName, 'build');
     patchBuilderContext(builderContext, buildTarget);
-    (0, builder_package_1.assertBuilderPackageIsInstalled)('@angular/build');
+    (0, builder_package_1.assertPackageIsInstalled)('@angular/build', '@nx/angular:unit-test');
     const { executeUnitTestBuilder } = await import('@angular/build');
     return yield* executeUnitTestBuilder(delegateExecutorOptions, builderContext, {
         codePlugins: plugins,

package/dist/src/executors/utilities/builder-package.d.ts

@@ -1 +1 @@
-export declare function assertBuilderPackageIsInstalled(packageName: string): void;
+export declare function assertPackageIsInstalled(packageName: string, requiredBy: string): void;

package/dist/src/executors/utilities/builder-package.js

@@ -1,11 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertBuilderPackageIsInstalled = assertBuilderPackageIsInstalled;
-function assertBuilderPackageIsInstalled(packageName) {
+exports.assertPackageIsInstalled = assertPackageIsInstalled;
+function assertPackageIsInstalled(packageName, requiredBy) {
     try {
         require.resolve(packageName);
     }
-    catch {
-        throw new Error(`This executor requires the package ${packageName} to be installed. Please make sure it is installed and try again.`);
+    catch (e) {
+        // Only a missing module means "not installed"; surface other resolution
+        // errors (e.g. a malformed package's exports) as-is instead of mislabeling.
+        const code = e.code;
+        if (code !== 'MODULE_NOT_FOUND' && code !== 'ERR_MODULE_NOT_FOUND') {
+            throw e;
+        }
+        throw new Error(`The "${packageName}" package is required by "${requiredBy}" but is not installed. Please install it and try again.`);
     }
 }

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

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

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

@@ -2,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/lib/create-files.js

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

package/dist/src/generators/application/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",