@nx/angular 23.1.0 → 23.2.0-beta.1

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

@@ -3,7 +3,6 @@ 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");
@@ -15,7 +14,6 @@ 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");
 function executeDevServerBuilder(rawOptions, context) {
     (0, lib_1.validateOptions)(rawOptions);
@@ -102,7 +100,7 @@ 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)),
@@ -120,14 +118,19 @@ function executeDevServerBuilder(rawOptions, context) {
                     // 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 +157,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,7 +2,6 @@
 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");
@@ -11,7 +10,6 @@ const rxjs_1 = require("rxjs");
 const operators_2 = 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;
@@ -41,6 +39,7 @@ function shouldSkipInitialTargetRun(projectGraph, project, target) {
     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,8 +63,13 @@ 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_2.switchMap)(([{ executeBrowserBuilder }, { WebpackNxBuildCoordinationPlugin }, { mergeCustomWebpackConfig, resolveIndexHtmlTransformer },]) => executeBrowserBuilder(delegateBuilderOptions, context, {
         webpackConfiguration: (baseWebpackConfig) => {
             if (!buildLibsFromSource && delegateBuilderOptions.watch) {
                 const workspaceDependencies = dependencies
@@ -79,17 +83,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

@@ -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/extract-i18n/extract-i18n.impl.js

@@ -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,9 +3,9 @@ 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 internal_2 = require("@nx/web/internal");
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const dev_server_impl_1 = require("../../builders/dev-server/dev-server.impl");
 const module_federation_1 = require("../../builders/utilities/module-federation");
@@ -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,8 +3,7 @@ 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");
@@ -31,9 +30,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',
@@ -60,7 +61,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 +81,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

@@ -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/setup-mf/lib/setup-tspath-for-remote.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupTspathForRemote = setupTspathForRemote;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const module_federation_1 = require("@nx/module-federation");
+const versions_1 = require("../../../utils/versions");
 function setupTspathForRemote(tree, options) {
+    const { normalizeProjectName } = (0, devkit_1.ensurePackage)('@nx/module-federation', versions_1.nxVersion);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
     const exportPath = options.standalone
         ? `./src/app/remote-entry/entry.routes.ts`
         : `./src/app/remote-entry/${options.entryModuleFileName}.ts`;
     const exportName = options.standalone ? 'Routes' : 'Module';
-    (0, js_1.addTsConfigPath)(tree, `${(0, module_federation_1.normalizeProjectName)(options.appName)}/${exportName}`, [(0, devkit_1.joinPathFragments)(project.root, exportPath)]);
+    (0, js_1.addTsConfigPath)(tree, `${normalizeProjectName(options.appName)}/${exportName}`, [(0, devkit_1.joinPathFragments)(project.root, exportPath)]);
 }

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

@@ -27,6 +27,7 @@ async function setupMf(tree, rawOptions) {
             }, {
                 '@nx/web': versions_1.nxVersion,
                 '@nx/webpack': versions_1.nxVersion,
+                'webpack-merge': versions_1.webpackMergeVersion,
                 '@nx/module-federation': versions_1.nxVersion,
             }));
         }
@@ -50,6 +51,7 @@ async function setupMf(tree, rawOptions) {
         if (!options.skipPackageJson) {
             tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
                 '@nx/webpack': versions_1.nxVersion,
+                'webpack-merge': versions_1.webpackMergeVersion,
                 '@module-federation/enhanced': versions_1.moduleFederationEnhancedVersion,
                 '@nx/module-federation': versions_1.nxVersion,
             }));

package/dist/src/generators/setup-ssr/lib/add-dependencies.d.ts

@@ -1,2 +1,2 @@
 import { type Tree } from '@nx/devkit';
-export declare function addDependencies(tree: Tree, isUsingApplicationBuilder: boolean): void;
+export declare function addDependencies(tree: Tree, isUsingApplicationBuilder: boolean, isUsingWebpackBuilder: boolean): void;

package/dist/src/generators/setup-ssr/lib/add-dependencies.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDependencies = addDependencies;
 const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
-function addDependencies(tree, isUsingApplicationBuilder) {
+function addDependencies(tree, isUsingApplicationBuilder, isUsingWebpackBuilder) {
     const pkgVersions = (0, version_utils_1.versions)(tree);
     const dependencies = {
         '@angular/platform-server': (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/platform-server') ??
@@ -18,6 +19,10 @@ function addDependencies(tree, isUsingApplicationBuilder) {
     dependencies['@angular/ssr'] = angularDevkitVersion;
     if (!isUsingApplicationBuilder) {
         devDependencies['browser-sync'] = pkgVersions.browserSyncVersion;
+        if (isUsingWebpackBuilder) {
+            devDependencies['@nx/webpack'] = versions_1.nxVersion;
+            devDependencies['webpack-merge'] = pkgVersions.webpackMergeVersion;
+        }
     }
     else {
         dependencies['@angular-devkit/build-angular'] = angularDevkitVersion;

package/dist/src/generators/setup-ssr/lib/normalize-options.js

@@ -2,12 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 async function normalizeOptions(tree, options) {
     const { targets, root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const isUsingApplicationBuilder = targets.build.executor === '@angular-devkit/build-angular:application' ||
-        targets.build.executor === '@angular/build:application' ||
-        targets.build.executor === '@nx/angular:application';
+    // Resolve the executor via targetDefaults: readProjectConfiguration returns
+    // the raw config, so an inherited executor would otherwise read as undefined.
+    const buildTargetExecutor = targets.build.executor ??
+        (0, internal_1.readTargetDefaultsForTarget)('build', (0, devkit_1.readNxJson)(tree)?.targetDefaults)
+            ?.executor;
+    if (!buildTargetExecutor) {
+        throw new Error(`The "build" target of the "${options.project}" project does not specify an executor. Please add an executor to the "build" target.`);
+    }
+    const isUsingApplicationBuilder = buildTargetExecutor === '@angular-devkit/build-angular:application' ||
+        buildTargetExecutor === '@angular/build:application' ||
+        buildTargetExecutor === '@nx/angular:application';
+    const isUsingWebpackBuilder = buildTargetExecutor === '@nx/angular:webpack-browser';
     const isStandaloneApp = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
     return {
         project: options.project,
@@ -21,6 +31,8 @@ async function normalizeOptions(tree, options) {
         standalone: options.standalone ?? isStandaloneApp,
         hydration: options.hydration ?? true,
         isUsingApplicationBuilder,
+        isUsingWebpackBuilder,
+        buildTargetExecutor,
         buildTargetTsConfigPath: targets.build.options?.tsConfig ??
             (0, devkit_1.joinPathFragments)(root, 'tsconfig.app.json'),
     };

package/dist/src/generators/setup-ssr/lib/update-project-config.js

@@ -54,7 +54,7 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
     const sourceRoot = (0, internal_2.getProjectSourceRoot)(projectConfig, tree);
     projectConfig.targets.server = {
         dependsOn: ['build'],
-        executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')
+        executor: options.buildTargetExecutor.startsWith('@angular-devkit/build-angular:')
             ? '@angular-devkit/build-angular:server'
             : '@nx/angular:webpack-server',
         options: {

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

@@ -14,5 +14,7 @@ export interface Schema {
 
 export interface NormalizedGeneratorOptions extends Schema {
   isUsingApplicationBuilder: boolean;
+  isUsingWebpackBuilder: boolean;
+  buildTargetExecutor: string;
   buildTargetTsConfigPath: string;
 }

package/dist/src/generators/setup-ssr/setup-ssr.js

@@ -9,7 +9,7 @@ async function setupSsr(tree, schema) {
     (0, lib_1.validateOptions)(tree, schema);
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     if (!schema.skipPackageJson) {
-        (0, lib_1.addDependencies)(tree, options.isUsingApplicationBuilder);
+        (0, lib_1.addDependencies)(tree, options.isUsingApplicationBuilder, options.isUsingWebpackBuilder);
     }
     (0, lib_1.generateSSRFiles)(tree, options);
     if (options.hydration) {

package/dist/src/migrations/update-23-1-0/add-angular-build.md

@@ -1,6 +1,6 @@
 #### Add `@angular/build` When Used by an Executor
 
-The `@nx/angular:application` and `@nx/angular:unit-test` executors load the Angular builders by importing `@angular/build` directly, and any `@angular/build:*` executor is provided by that package, so `@angular/build` is a required runtime dependency for workspaces using those targets. Nothing declares it as a direct dependency, though: it has only ever been available transitively as a dependency of `@angular-devkit/build-angular`. That is not reliable (for example, under Yarn Berry it can be missing from `node_modules` even when `@angular-devkit/build-angular` is installed), and when `@angular/build` cannot be resolved the build fails with "This executor requires the package @angular/build to be installed". This migration adds `@angular/build` to `devDependencies` when a project uses one of those executors and it is not already installed, at the version the application generator installs. An existing version is preserved.
+The `@nx/angular:application` and `@nx/angular:unit-test` executors load the Angular builders by importing `@angular/build` directly, and any `@angular/build:*` executor is provided by that package, so `@angular/build` is a required runtime dependency for workspaces using those targets. Nothing declares it as a direct dependency, though: it has only ever been available transitively as a dependency of `@angular-devkit/build-angular`. That is not reliable (for example, under Yarn Berry it can be missing from `node_modules` even when `@angular-devkit/build-angular` is installed), and when `@angular/build` cannot be resolved the build fails with an error like `The "@angular/build" package is required by "@nx/angular:application" but is not installed`. This migration adds `@angular/build` to `devDependencies` when a project uses one of those executors and it is not already installed, at the version the application generator installs. An existing version is preserved.
 
 Executor usage is detected on any target using `@nx/angular:application`, `@nx/angular:unit-test`, or an `@angular/build:*` executor. Targets that inherit their executor from an `nx.json` `targetDefaults` entry are detected too.
 

package/dist/src/migrations/update-23-1-0/add-optional-webpack-packages.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function addOptionalWebpackPackages(tree: Tree): Promise<import("@nx/devkit").GeneratorCallback>;

package/dist/src/migrations/update-23-1-0/add-optional-webpack-packages.js

@@ -0,0 +1,101 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = addOptionalWebpackPackages;
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
+const versions_1 = require("../../utils/versions");
+const webpackExecutors = new Set([
+    '@nx/angular:webpack-browser',
+    '@nx/angular:webpack-server',
+]);
+const webpackBuildTargetExecutors = new Set([
+    '@nx/angular:webpack-browser',
+    '@angular-devkit/build-angular:browser',
+]);
+const moduleFederationExecutors = new Set([
+    '@nx/angular:module-federation-dev-server',
+    '@nx/angular:module-federation-dev-ssr',
+]);
+function resolveBuildTargetExecutor(targetString, projects, targetDefaults) {
+    const [projectName, targetName] = targetString.split(':');
+    const target = targetName
+        ? projects.get(projectName)?.targets?.[targetName]
+        : undefined;
+    if (target === undefined) {
+        return undefined;
+    }
+    // The referenced build target can inherit its executor from targetDefaults,
+    // which the raw project config does not merge, so resolve it before matching.
+    return (target.executor ??
+        (0, internal_1.readTargetDefaultsForTarget)(targetName, targetDefaults)?.executor);
+}
+function usesWebpackDevServer(target, projects, targetDefaults) {
+    if (target.executor !== '@nx/angular:dev-server') {
+        return false;
+    }
+    return [target.options, ...Object.values(target.configurations ?? {})].some((options) => {
+        const buildTarget = options?.buildTarget ?? options?.browserTarget;
+        if (typeof buildTarget !== 'string') {
+            return false;
+        }
+        const executor = resolveBuildTargetExecutor(buildTarget, projects, targetDefaults);
+        return (executor !== undefined && webpackBuildTargetExecutors.has(executor));
+    });
+}
+async function addOptionalWebpackPackages(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const targetDefaults = nxJson?.targetDefaults;
+    let needsWebpack = false;
+    let needsModuleFederation = false;
+    let needsRspack = false;
+    for (const [, project] of projects) {
+        for (const target of Object.values(project.targets ?? {})) {
+            needsWebpack ||=
+                webpackExecutors.has(target.executor) ||
+                    usesWebpackDevServer(target, projects, targetDefaults);
+            needsModuleFederation ||= moduleFederationExecutors.has(target.executor);
+            needsRspack ||= target.executor?.startsWith('@nx/rspack:') ?? false;
+        }
+        // Remotes get a plain dev-server (no Module Federation executor) but still
+        // generate a module-federation.config that requires @nx/module-federation
+        // at build time, so detect them by that config file too. This covers
+        // remotes whose host lives in a different workspace.
+        needsModuleFederation ||=
+            tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.ts')) ||
+                tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.js'));
+    }
+    // targetDefaults are keyed by target name or executor, and a default can set
+    // an executor that an empty project target inherits, so scan the keys and any
+    // executor on the default (both the object and array forms).
+    for (const [targetOrExecutor, config] of Object.entries(targetDefaults ?? {})) {
+        const executors = [targetOrExecutor];
+        for (const entry of Array.isArray(config) ? config : [config]) {
+            if (entry.executor != null) {
+                executors.push(entry.executor);
+            }
+        }
+        for (const executor of executors) {
+            needsWebpack ||= webpackExecutors.has(executor);
+            needsModuleFederation ||= moduleFederationExecutors.has(executor);
+            needsRspack ||= executor.startsWith('@nx/rspack:');
+        }
+    }
+    needsRspack ||=
+        nxJson?.plugins?.some((plugin) => typeof plugin === 'string'
+            ? plugin === '@nx/rspack/plugin'
+            : plugin.plugin === '@nx/rspack/plugin') ?? false;
+    if (!needsWebpack && !needsModuleFederation && !needsRspack) {
+        return;
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        ...(needsWebpack
+            ? {
+                '@nx/webpack': versions_1.nxVersion,
+                'webpack-merge': versions_1.webpackMergeVersion,
+            }
+            : {}),
+        ...(needsModuleFederation ? { '@nx/module-federation': versions_1.nxVersion } : {}),
+        ...(needsRspack ? { '@nx/rspack': versions_1.nxVersion } : {}),
+    }, undefined, true);
+}

package/dist/src/migrations/update-23-1-0/add-optional-webpack-packages.md

@@ -0,0 +1,39 @@
+#### Add Optional Webpack Packages
+
+Adds `@nx/webpack`, `@nx/module-federation`, `@nx/rspack`, and `webpack-merge` to the workspace when existing targets require them.
+
+These packages are no longer direct dependencies of `@nx/angular`; they are now optional peer dependencies, so installing `@nx/angular` no longer pulls webpack tooling into workspaces that only use the esbuild or Vite build stack. This migration backfills them for workspaces that already use webpack, Module Federation, or Rspack so those builds keep working after upgrading. Packages that are already present are left untouched.
+
+A package is added only when a matching target exists:
+
+- `@nx/webpack` and `webpack-merge`: an `@nx/angular:webpack-browser` or `@nx/angular:webpack-server` target, or an `@nx/angular:dev-server` whose build target uses `@nx/angular:webpack-browser` or `@angular-devkit/build-angular:browser`.
+- `@nx/module-federation`: an `@nx/angular:module-federation-dev-server` or `@nx/angular:module-federation-dev-ssr` target, or a project with a `module-federation.config.{js,ts}` file (covers remotes whose host lives in another workspace).
+- `@nx/rspack`: an `@nx/rspack:*` target or the `@nx/rspack/plugin` plugin in `nx.json`.
+
+Targets that inherit their executor from an `nx.json` `targetDefaults` entry are detected too.
+
+#### Examples
+
+For a workspace with an `@nx/angular:webpack-browser` build target, the migration adds the webpack packages to `devDependencies`.
+
+##### Before
+
+```jsonc title="package.json"
+{
+  "devDependencies": {
+    "@nx/angular": "23.1.0",
+  },
+}
+```
+
+##### After
+
+```jsonc title="package.json"
+{
+  "devDependencies": {
+    "@nx/angular": "23.1.0",
+    "@nx/webpack": "23.1.0",
+    "webpack-merge": "^5.8.0",
+  },
+}
+```

package/dist/tailwind.d.ts

@@ -1,5 +1,5 @@
 /**
  * @deprecated `@nx/angular/tailwind` will be removed in Nx 24. Migrate to Tailwind CSS v4 which no longer needs glob patterns.
- * See: https://nx.dev/docs/technologies/angular/guides/using-tailwind-css-with-angular
+ * See: https://nx.dev/docs/technologies/angular/guides/using-tailwind-css-with-angular-projects
  */
 export declare function createGlobPatternsForDependencies(dirPath: string, fileGlobPattern?: string): string[];

package/dist/tailwind.js

@@ -5,14 +5,14 @@ const internal_1 = require("@nx/js/internal");
 let hasWarned = false;
 /**
  * @deprecated `@nx/angular/tailwind` will be removed in Nx 24. Migrate to Tailwind CSS v4 which no longer needs glob patterns.
- * See: https://nx.dev/docs/technologies/angular/guides/using-tailwind-css-with-angular
+ * See: https://nx.dev/docs/technologies/angular/guides/using-tailwind-css-with-angular-projects
  */
 function createGlobPatternsForDependencies(dirPath, fileGlobPattern = '/**/!(*.stories|*.spec).{ts,html}') {
     if (!hasWarned) {
         hasWarned = true;
         console.warn(`\nWARNING: "@nx/angular/tailwind" is deprecated and will be removed in Nx 24.\n` +
             `Migrate to Tailwind CSS v4 which no longer needs glob patterns for content detection.\n` +
-            `See: https://nx.dev/docs/technologies/angular/guides/using-tailwind-css-with-angular\n`);
+            `See: https://nx.dev/docs/technologies/angular/guides/using-tailwind-css-with-angular-projects\n`);
     }
     try {
         return (0, internal_1.createGlobPatternsForDependencies)(dirPath, fileGlobPattern);

package/migrations.json

@@ -366,6 +366,12 @@
       "description": "Remove the `extendedDiagnostics` Angular compiler option from tsconfig files where `strictTemplates` resolves to `false`. Angular v22's `strict-templates-default` and `strict-safe-navigation-narrow` migrations can together produce this combination, which the Angular compiler rejects (`extendedDiagnostics` requires `strictTemplates` to be enabled).",
       "factory": "./dist/src/migrations/update-23-1-0/remove-conflicting-extended-diagnostics",
       "documentation": "./dist/src/migrations/update-23-1-0/remove-conflicting-extended-diagnostics.md"
+    },
+    "update-23-1-0-add-optional-webpack-packages": {
+      "version": "23.1.0-rc.3",
+      "description": "Add optional webpack, Module Federation, and Rspack packages when existing targets require them.",
+      "factory": "./dist/src/migrations/update-23-1-0/add-optional-webpack-packages",
+      "documentation": "./dist/src/migrations/update-23-1-0/add-optional-webpack-packages.md"
     }
   },
   "packageJsonUpdates": {

package/package.json

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