@nx/angular 24.0.0-beta.2 → 24.0.0-beta.4

package/dist/executors.d.ts

@@ -1,11 +1,9 @@
 export * from './src/builders/webpack-browser/webpack-browser.impl';
 export * from './src/builders/webpack-server/webpack-server.impl';
-export * from './src/executors/module-federation-dev-server/module-federation-dev-server.impl';
 export * from './src/executors/delegate-build/delegate-build.impl';
 export * from './src/executors/ng-packagr-lite/ng-packagr-lite.impl';
 export * from './src/executors/package/package.impl';
 export * from './src/executors/browser-esbuild/browser-esbuild.impl';
 export * from './src/executors/application/application.impl';
 export * from './src/executors/extract-i18n/extract-i18n.impl';
-export * from './src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl';
 export { executeDevServerBuilder } from './src/builders/dev-server/dev-server.impl';

package/dist/executors.js

@@ -4,13 +4,11 @@ exports.executeDevServerBuilder = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./src/builders/webpack-browser/webpack-browser.impl"), exports);
 tslib_1.__exportStar(require("./src/builders/webpack-server/webpack-server.impl"), exports);
-tslib_1.__exportStar(require("./src/executors/module-federation-dev-server/module-federation-dev-server.impl"), exports);
 tslib_1.__exportStar(require("./src/executors/delegate-build/delegate-build.impl"), exports);
 tslib_1.__exportStar(require("./src/executors/ng-packagr-lite/ng-packagr-lite.impl"), exports);
 tslib_1.__exportStar(require("./src/executors/package/package.impl"), exports);
 tslib_1.__exportStar(require("./src/executors/browser-esbuild/browser-esbuild.impl"), exports);
 tslib_1.__exportStar(require("./src/executors/application/application.impl"), exports);
 tslib_1.__exportStar(require("./src/executors/extract-i18n/extract-i18n.impl"), exports);
-tslib_1.__exportStar(require("./src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl"), exports);
 var dev_server_impl_1 = require("./src/builders/dev-server/dev-server.impl");
 Object.defineProperty(exports, "executeDevServerBuilder", { enumerable: true, get: function () { return dev_server_impl_1.executeDevServerBuilder; } });

package/dist/fesm2022/nx-angular.mjs

@@ -1,4 +0,0 @@
-/**
- * Generated bundle index. Do not edit.
- */
-//# sourceMappingURL=nx-angular.mjs.map

package/dist/generators.d.ts

@@ -3,20 +3,16 @@ export * from './src/generators/application/application';
 export * from './src/generators/component-story/component-story';
 export * from './src/generators/component/component';
 export * from './src/generators/directive/directive';
-export * from './src/generators/federate-module/federate-module';
-export * from './src/generators/host/host';
 export * from './src/generators/init/init';
 export * from './src/generators/library-secondary-entry-point/library-secondary-entry-point';
 export * from './src/generators/library/library';
 export * from './src/generators/ngrx-feature-store/ngrx-feature-store';
 export * from './src/generators/ngrx-root-store/ngrx-root-store';
 export * from './src/generators/pipe/pipe';
-export * from './src/generators/remote/remote';
 export * from './src/generators/scam-directive/scam-directive';
 export * from './src/generators/scam-pipe/scam-pipe';
 export * from './src/generators/scam-to-standalone/scam-to-standalone';
 export * from './src/generators/scam/scam';
-export * from './src/generators/setup-mf/setup-mf';
 export * from './src/generators/setup-ssr/setup-ssr';
 export * from './src/generators/stories/stories';
 export * from './src/generators/storybook-configuration/storybook-configuration';

package/dist/generators.js

@@ -7,20 +7,16 @@ tslib_1.__exportStar(require("./src/generators/application/application"), export
 tslib_1.__exportStar(require("./src/generators/component-story/component-story"), exports);
 tslib_1.__exportStar(require("./src/generators/component/component"), exports);
 tslib_1.__exportStar(require("./src/generators/directive/directive"), exports);
-tslib_1.__exportStar(require("./src/generators/federate-module/federate-module"), exports);
-tslib_1.__exportStar(require("./src/generators/host/host"), exports);
 tslib_1.__exportStar(require("./src/generators/init/init"), exports);
 tslib_1.__exportStar(require("./src/generators/library-secondary-entry-point/library-secondary-entry-point"), exports);
 tslib_1.__exportStar(require("./src/generators/library/library"), exports);
 tslib_1.__exportStar(require("./src/generators/ngrx-feature-store/ngrx-feature-store"), exports);
 tslib_1.__exportStar(require("./src/generators/ngrx-root-store/ngrx-root-store"), exports);
 tslib_1.__exportStar(require("./src/generators/pipe/pipe"), exports);
-tslib_1.__exportStar(require("./src/generators/remote/remote"), exports);
 tslib_1.__exportStar(require("./src/generators/scam-directive/scam-directive"), exports);
 tslib_1.__exportStar(require("./src/generators/scam-pipe/scam-pipe"), exports);
 tslib_1.__exportStar(require("./src/generators/scam-to-standalone/scam-to-standalone"), exports);
 tslib_1.__exportStar(require("./src/generators/scam/scam"), exports);
-tslib_1.__exportStar(require("./src/generators/setup-mf/setup-mf"), exports);
 tslib_1.__exportStar(require("./src/generators/setup-ssr/setup-ssr"), exports);
 tslib_1.__exportStar(require("./src/generators/stories/stories"), exports);
 tslib_1.__exportStar(require("./src/generators/storybook-configuration/storybook-configuration"), exports);

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

@@ -522,8 +522,7 @@
             },
             "preloadInitial": {
               "type": "boolean",
-              "default": true,
-              "description": "Generates 'preload', 'modulepreload', and 'preconnect' link elements for initial application files and resources."
+              "description": "Generates 'preload', 'modulepreload', and 'preconnect' link elements for initial application files and resources. Defaults to false when a service worker is enabled; otherwise true. _Note: defaulting to false when a service worker is enabled only applies in Angular versions >= 22.2.0. Earlier versions default to true._"
             }
           },
           "required": ["input"]

package/dist/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-bundles.transform.js

@@ -12,8 +12,10 @@ exports.writeBundlesTransform = void 0;
 exports.removeSourceMappingUrl = removeSourceMappingUrl;
 exports.remapDeclarationMapSources = remapDeclarationMapSources;
 exports.normalizeEsm2022Path = normalizeEsm2022Path;
+const tslib_1 = require("tslib");
 const transform_1 = require("ng-packagr/src/lib/graph/transform");
 const nodes_1 = require("ng-packagr/src/lib/ng-package/nodes");
+const ngPackagrNodes = tslib_1.__importStar(require("ng-packagr/src/lib/ng-package/nodes"));
 const package_1 = require("ng-packagr/src/lib/ng-package/package");
 const path_1 = require("ng-packagr/src/lib/utils/path");
 const promises_1 = require("node:fs/promises");
@@ -29,9 +31,15 @@ async function shouldWriteFile(filePath, newContent) {
         return true;
     }
 }
+// ng-packagr 22.2.0 to 22.2.3 build entry points in parallel and export this
+// to find the one a graph is scoped to. 22.2.4 reverted that:
+// https://github.com/ng-packagr/ng-packagr/issues/3451
+const { getActiveEntryPoint } = ngPackagrNodes;
 const writeBundlesTransform = (_options) => {
     return (0, transform_1.transformFromPromise)(async (graph) => {
-        const entryPointNode = graph.find((0, nodes_1.isEntryPointInProgress)());
+        const entryPointNode = getActiveEntryPoint
+            ? getActiveEntryPoint(graph)
+            : graph.find((0, nodes_1.isEntryPointInProgress)());
         if (!entryPointNode) {
             return;
         }

package/dist/src/executors/unit-test/schema.json

@@ -22,7 +22,7 @@
     },
     "runnerConfig": {
       "type": ["string", "boolean"],
-      "description": "Specifies the configuration file for the selected test runner. If a string is provided, it will be used as the path to the configuration file. If `true`, the builder will search for a default configuration file (e.g., `vitest.config.ts` or `karma.conf.js`). If `false`, no external configuration file will be used.\\nFor Vitest, this enables advanced options and the use of custom plugins. Please note that while the file is loaded, the Angular team does not provide direct support for its specific contents or any third-party plugins used within it.",
+      "description": "Specifies the configuration file for the selected test runner. If a string is provided, it will be used as the path to the configuration file. If `true`, the builder will search for a default configuration file (e.g., `vitest-base.config.mts` or `karma.conf.js`). If `false`, no external configuration file will be used.\\nFor Vitest, this enables advanced options and the use of custom plugins. Please note that while the file is loaded, the Angular team does not provide direct support for its specific contents or any third-party plugins used within it.",
       "default": false
     },
     "browsers": {
@@ -46,6 +46,11 @@
       "type": "boolean",
       "description": "Enables isolation for test execution. When true, Vitest runs tests in separate threads or processes. This option is only available for the Vitest runner. Defaults to false to align with the Karma/Jasmine experience. _Note: this is only supported in Angular versions >= 22.0.0_."
     },
+    "splitting": {
+      "type": "boolean",
+      "description": "Enables code splitting for test execution. When enabled, shared code between test files is split into separate chunks. Issues with live ESM bindings in Node.js environments (such as uninitialized exports or mocking failures) can be resolved by disabling splitting. This option is only available for the Vitest runner. Defaults to `true`. _Note: this is only supported in Angular versions >= 22.2.0_.",
+      "x-deprecated": "No longer needed with Vitest 5."
+    },
     "quiet": {
       "type": "boolean",
       "description": "Suppresses the verbose build summary and stats table on each rebuild. Defaults to `true` locally and `false` in CI environments. _Note: this is only supported in Angular versions >= 22.0.0_."

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

@@ -47,6 +47,11 @@ function validateOptions(options) {
             throw new Error(`The "quiet" option requires Angular version 22.0.0 or greater. You are currently using version ${angularVersion}.`);
         }
     }
+    if ((0, semver_1.lt)(angularVersion, '22.2.0')) {
+        if (options.splitting !== undefined) {
+            throw new Error(`The "splitting" option requires Angular version 22.2.0 or greater. You are currently using version ${angularVersion}.`);
+        }
+    }
 }
 /**
  * The Angular CLI unit-test builder only accepts the `@angular/build:application`

package/dist/src/executors/utilities/ng-packagr/stylesheet-processor.js

@@ -13,6 +13,7 @@ const devkit_1 = require("@nx/devkit");
 const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
 const component_stylesheets_1 = require("ng-packagr/src/lib/styles/component-stylesheets");
 const postcss_configuration_1 = require("ng-packagr/src/lib/styles/postcss-configuration");
+const semver_1 = require("semver");
 const ng_packagr_version_1 = require("./ng-packagr-version");
 var CssUrl;
 (function (CssUrl) {
@@ -20,7 +21,13 @@ var CssUrl;
     CssUrl["none"] = "none";
 })(CssUrl || (exports.CssUrl = CssUrl = {}));
 function getStylesheetProcessor() {
-    const { major: ngPackagrMajorVersion } = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
+    const { major: ngPackagrMajorVersion, version: ngPackagrVersion } = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
+    // ng-packagr >= 22.2 resolves the style config once per package, older
+    // versions resolve it for each entry point
+    const resolvePerPackage = !(0, semver_1.lt)(ngPackagrVersion, '22.2.0');
+    // ng-packagr calls this factory once per build, so a later build in the
+    // same process reads config changes
+    const styleConfigCache = new Map();
     class StylesheetProcessor extends component_stylesheets_1.ComponentStylesheetBundler {
         constructor(projectBasePath, basePath, cssUrl, includePaths, sass, cacheDirectory, watch) {
             if (ngPackagrMajorVersion === 22) {
@@ -34,21 +41,17 @@ function getStylesheetProcessor() {
                     path: require.resolve('ng-packagr/.browserslistrc'),
                 });
             }
-            const browserslistData = (0, browserslist_1.default)(undefined, { path: basePath });
-            let searchDirs = (0, postcss_configuration_1.generateSearchDirectories)([projectBasePath]);
-            const postcssConfiguration = (0, postcss_configuration_1.loadPostcssConfiguration)(searchDirs);
-            // (nx-specific): we support loading the TailwindCSS config from the root of the workspace
-            searchDirs = (0, postcss_configuration_1.generateSearchDirectories)([projectBasePath, devkit_1.workspaceRoot]);
+            const { postcssConfiguration, tailwindConfiguration, target } = resolvePerPackage
+                ? getPackageStyleConfig(styleConfigCache, projectBasePath)
+                : resolveStyleConfig(projectBasePath, basePath);
             super({
                 cacheDirectory: cacheDirectory,
                 postcssConfiguration: postcssConfiguration,
-                tailwindConfiguration: postcssConfiguration
-                    ? undefined
-                    : (0, postcss_configuration_1.getTailwindConfig)(searchDirs, projectBasePath),
+                tailwindConfiguration: tailwindConfiguration,
                 sass: sass,
                 workspaceRoot: projectBasePath,
                 cssUrl: cssUrl,
-                target: transformSupportedBrowsersToTargets(browserslistData),
+                target: target,
                 includePaths: includePaths,
             }, 'css', watch);
             this.projectBasePath = projectBasePath;
@@ -65,6 +68,28 @@ function getStylesheetProcessor() {
     }
     return StylesheetProcessor;
 }
+function getPackageStyleConfig(styleConfigCache, projectBasePath) {
+    let config = styleConfigCache.get(projectBasePath);
+    if (!config) {
+        config = resolveStyleConfig(projectBasePath, projectBasePath);
+        styleConfigCache.set(projectBasePath, config);
+    }
+    return config;
+}
+function resolveStyleConfig(projectBasePath, browserslistPath) {
+    const browserslistData = (0, browserslist_1.default)(undefined, { path: browserslistPath });
+    let searchDirs = (0, postcss_configuration_1.generateSearchDirectories)([projectBasePath]);
+    const postcssConfiguration = (0, postcss_configuration_1.loadPostcssConfiguration)(searchDirs);
+    // (nx-specific): we support loading the TailwindCSS config from the root of the workspace
+    searchDirs = (0, postcss_configuration_1.generateSearchDirectories)([projectBasePath, devkit_1.workspaceRoot]);
+    return {
+        postcssConfiguration,
+        tailwindConfiguration: postcssConfiguration
+            ? undefined
+            : (0, postcss_configuration_1.getTailwindConfig)(searchDirs, projectBasePath),
+        target: transformSupportedBrowsersToTargets(browserslistData),
+    };
+}
 function transformSupportedBrowsersToTargets(supportedBrowsers) {
     const transformed = [];
     // https://esbuild.github.io/api/#target

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

@@ -26,8 +26,6 @@ async function addLintingGenerator(tree, options) {
         unitTestRunner: options.unitTestRunner,
         enableTypedLinting: (0, internal_3.isTypedLintingEnabled)(options),
         rootProject: rootProject,
-        addPlugin: options.addPlugin ?? false,
-        addExplicitTargets: true,
         skipPackageJson: options.skipPackageJson,
     }));
     // The angular-eslint presets, selector rules and dependency install below have

package/dist/src/generators/add-linting/schema.d.ts

@@ -13,5 +13,4 @@ export interface AddLintingGeneratorSchema {
   skipFormat?: boolean;
   skipPackageJson?: boolean;
   unitTestRunner?: string;
-  addPlugin?: boolean;
 }

package/dist/src/generators/application/application.js

@@ -21,7 +21,7 @@ async function applicationGenerator(tree, schema) {
     if (isRspack) {
         schema.bundler = 'webpack';
     }
-    const options = await (0, lib_1.normalizeOptions)(tree, schema, isRspack);
+    const options = await (0, lib_1.normalizeOptions)(tree, schema);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
     await (0, js_1.initGenerator)(tree, {
         ...options,
@@ -32,7 +32,6 @@ async function applicationGenerator(tree, schema) {
     await (0, init_1.angularInitGenerator)(tree, {
         ...options,
         skipFormat: true,
-        addPlugin: options.addPlugin,
     });
     if (!options.skipPackageJson) {
         (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree, options.zoneless);

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

@@ -6,10 +6,6 @@ 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
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPlugin = nxJson['useInferencePlugins'] !== false &&
-        process.env.NX_ADD_PLUGINS !== 'false';
     const e2eWebServerInfo = getAngularE2EWebServerInfo(tree, options.name, options.port);
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
@@ -36,7 +32,6 @@ async function addE2e(tree, options) {
             ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
             ciBaseUrl: e2eWebServerInfo.e2eCiBaseUrl,
             rootProject: options.rootProject,
-            addPlugin,
         });
     }
     else if (options.e2eTestRunner === 'playwright') {
@@ -59,7 +54,6 @@ async function addE2e(tree, options) {
             webServerCommand: e2eWebServerInfo.e2eWebServerCommand,
             webServerAddress: e2eWebServerInfo.e2eWebServerAddress,
             rootProject: options.rootProject,
-            addPlugin,
         });
     }
     return e2eWebServerInfo.e2ePort;

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

@@ -17,6 +17,5 @@ async function addLinting(host, options) {
         skipPackageJson: options.skipPackageJson,
         unitTestRunner: options.unitTestRunner,
         skipFormat: true,
-        addPlugin: options.addPlugin,
     });
 }

package/dist/src/generators/application/lib/add-unit-test-runner.js

@@ -12,7 +12,6 @@ async function addUnitTestRunner(host, options) {
                 projectRoot: options.appProjectRoot,
                 skipPackageJson: options.skipPackageJson,
                 strict: options.strict,
-                addPlugin: options.addPlugin,
                 runtimeTsconfigFileName: 'tsconfig.app.json',
                 zoneless: options.zoneless,
             });
@@ -30,7 +29,6 @@ async function addUnitTestRunner(host, options) {
                 skipFormat: options.skipFormat,
                 skipPackageJson: options.skipPackageJson,
                 strict: options.strict,
-                addPlugin: options.addPlugin,
                 zoneless: options.zoneless,
             });
         default:

package/dist/src/generators/application/lib/normalize-options.d.ts

@@ -1,4 +1,4 @@
 import { type Tree } from '@nx/devkit';
 import type { Schema } from '../schema';
 import type { NormalizedSchema } from './normalized-schema';
-export declare function normalizeOptions(host: Tree, options: Partial<Schema>, isRspack?: boolean): Promise<NormalizedSchema>;
+export declare function normalizeOptions(host: Tree, options: Partial<Schema>): Promise<NormalizedSchema>;

package/dist/src/generators/application/lib/normalize-options.js

@@ -6,18 +6,13 @@ const internal_1 = require("@nx/devkit/internal");
 const internal_2 = require("@nx/js/internal");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
-function arePluginsExplicitlyDisabled(host) {
-    const { useInferencePlugins } = (0, devkit_1.readNxJson)(host);
-    const addPluginEnvVar = process.env.NX_ADD_PLUGINS;
-    return useInferencePlugins === false || addPluginEnvVar === 'false';
-}
 function validateBundler(bundler) {
     if (['esbuild', 'webpack', 'rspack'].includes(bundler)) {
         return bundler;
     }
     throw new Error(`Invalid bundler: ${bundler}. Please use one of the following: 'esbuild', 'webpack', 'rspack'.`);
 }
-async function normalizeOptions(host, options, isRspack) {
+async function normalizeOptions(host, options) {
     await (0, internal_1.ensureRootProjectName)(options, 'application');
     const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
@@ -32,7 +27,6 @@ async function normalizeOptions(host, options, isRspack) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const bundler = validateBundler(options.bundler ?? 'esbuild');
-    const addPlugin = options.addPlugin ?? (!arePluginsExplicitlyDisabled(host) && isRspack);
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(host);
     const zonelessDefaultValue = angularMajorVersion >= 21 ? true : false;
     const unitTestRunner = options.unitTestRunner ??
@@ -43,7 +37,6 @@ async function normalizeOptions(host, options, isRspack) {
                 : test_runners_1.UnitTestRunner.Jest);
     // Set defaults and then overwrite with user options
     return {
-        addPlugin,
         style: 'css',
         routing: true,
         inlineStyle: false,

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

@@ -32,7 +32,6 @@ export interface Schema {
   bundler?: 'webpack' | 'esbuild' | 'rspack';
   ssr?: boolean;
   nxCloudToken?: string;
-  addPlugin?: boolean;
   zoneless?: boolean;
   formatter?: 'prettier' | 'oxfmt' | 'none';
 }

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

@@ -130,7 +130,7 @@
     },
     "port": {
       "type": "number",
-      "description": "The port at which the remote application should be served."
+      "description": "The port at which the application should be served."
     },
     "enableTypedLinting": {
       "type": "boolean",

package/dist/src/generators/convert-to-rspack/convert-to-rspack.js

@@ -13,6 +13,7 @@ const create_config_1 = require("./lib/create-config");
 const get_custom_webpack_config_1 = require("./lib/get-custom-webpack-config");
 const merge_server_tsconfig_1 = require("./lib/merge-server-tsconfig");
 const update_tsconfig_1 = require("./lib/update-tsconfig");
+const validate_no_module_federation_1 = require("./lib/validate-no-module-federation");
 const validate_supported_executor_1 = require("./lib/validate-supported-executor");
 const SUPPORTED_EXECUTORS = [
     '@angular-devkit/build-angular:browser',
@@ -23,7 +24,6 @@ const SUPPORTED_EXECUTORS = [
     '@nx/angular:webpack-browser',
     '@nx/angular:webpack-server',
     '@nx/angular:dev-server',
-    '@nx/angular:module-federation-dev-server',
 ];
 const RENAMED_OPTIONS = {
     main: 'browser',
@@ -251,6 +251,7 @@ async function convertToRspack(tree, schema) {
     const targetsToRemove = [];
     let customWebpackConfigPath;
     (0, validate_supported_executor_1.validateSupportedBuildExecutor)(Object.values(project.targets));
+    (0, validate_no_module_federation_1.validateNoModuleFederation)(tree, project);
     let projectServePort = DEFAULT_PORT;
     const projectServeConfigurationOptions = {};
     for (const [targetName, target] of Object.entries(project.targets)) {
@@ -284,8 +285,7 @@ async function convertToRspack(tree, schema) {
             targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:dev-server' ||
-            target.executor === '@nx/angular:dev-server' ||
-            target.executor === '@nx/angular:module-federation-dev-server') {
+            target.executor === '@nx/angular:dev-server') {
             createConfigOptions.devServer = {};
             if (target.options) {
                 handleDevServerTargetOptions(tree, target.options, createConfigOptions.devServer, project.root);
@@ -356,7 +356,6 @@ async function convertToRspack(tree, schema) {
     // ensure plugin is registered
     const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
     await rspackInitGenerator(tree, {
-        addPlugin: true,
         framework: 'angular',
     });
     // find the inferred target names

package/dist/src/generators/convert-to-rspack/lib/get-custom-webpack-config.d.ts

@@ -1,6 +1,5 @@
-import { Tree } from '@nx/devkit';
+import type { Tree } from '@nx/devkit';
 export declare function getCustomWebpackConfig(tree: Tree, projectRoot: string, pathToCustomWebpackConfig: string): Promise<{
     isWebpackConfigFunction: boolean;
     normalizedPathToCustomWebpackConfig: string;
 }>;
-export declare function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents: string): string;

package/dist/src/generators/convert-to-rspack/lib/get-custom-webpack-config.js

@@ -1,22 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCustomWebpackConfig = getCustomWebpackConfig;
-exports.convertWebpackConfigToUseNxModuleFederationPlugin = convertWebpackConfigToUseNxModuleFederationPlugin;
-const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
 const FILE_EXTENSION_REGEX = /\.[^.]+$/;
 async function getCustomWebpackConfig(tree, projectRoot, pathToCustomWebpackConfig) {
-    const webpackConfigContents = tree.read(pathToCustomWebpackConfig, 'utf-8');
-    if (webpackConfigContents.includes('@nx/module-federation/angular') &&
-        webpackConfigContents.includes('withModuleFederation')) {
-        tree.write(pathToCustomWebpackConfig, convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents));
-        return {
-            isWebpackConfigFunction: false,
-            normalizedPathToCustomWebpackConfig: `./${(0, path_1.relative)(projectRoot, pathToCustomWebpackConfig).replace(FILE_EXTENSION_REGEX, '')}`,
-        };
-    }
     const configFile = await (0, internal_1.loadConfigFile)((0, path_1.join)(tree.root, pathToCustomWebpackConfig));
     const webpackConfig = 'default' in configFile ? configFile.default : configFile;
     return {
@@ -24,54 +12,3 @@ async function getCustomWebpackConfig(tree, projectRoot, pathToCustomWebpackConf
         normalizedPathToCustomWebpackConfig: `./${(0, path_1.relative)(projectRoot, pathToCustomWebpackConfig).replace(FILE_EXTENSION_REGEX, '')}`,
     };
 }
-function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents) {
-    let newWebpackConfigContents = webpackConfigContents;
-    let sourceFile = (0, tsquery_1.ast)(webpackConfigContents);
-    const withModuleFederationImportNodes = (0, tsquery_1.query)(sourceFile, 'ImportDeclaration:has(StringLiteral[value=@nx/module-federation/angular])');
-    if (withModuleFederationImportNodes.length > 0) {
-        const withModuleFederationImportNode = withModuleFederationImportNodes[0];
-        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationImportNode.getStart())}import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/angular';${webpackConfigContents.slice(withModuleFederationImportNode.getEnd())}`;
-        sourceFile = (0, tsquery_1.ast)(newWebpackConfigContents);
-        const exportedWithModuleFederationNodes = (0, tsquery_1.query)(sourceFile, 'ExportAssignment:has(CallExpression > Identifier[name=withModuleFederation])');
-        if (exportedWithModuleFederationNodes.length > 0) {
-            const exportedWithModuleFederationNode = exportedWithModuleFederationNodes[0];
-            newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}
-    export default {
-      plugins: [
-        new NxModuleFederationPlugin({ config }, {
-          dts: false,
-        }),
-        new NxModuleFederationDevServerPlugin({ config }),
-      ]
-    }
-    `;
-        }
-        else {
-            devkit_1.logger.warn("Could not find 'export default withModuleFederation' in the webpack config file. Skipping conversion.");
-        }
-    }
-    const withModuleFederationRequireNodes = (0, tsquery_1.query)(sourceFile, 'VariableStatement:has(CallExpression > Identifier[name=withModuleFederation], StringLiteral[value=@nx/module-federation/angular])');
-    if (withModuleFederationRequireNodes.length > 0) {
-        const withModuleFederationRequireNode = withModuleFederationRequireNodes[0];
-        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationRequireNode.getStart())}const { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } = require('@nx/module-federation/rspack');${webpackConfigContents.slice(withModuleFederationRequireNode.getEnd())}`;
-        sourceFile = (0, tsquery_1.ast)(newWebpackConfigContents);
-        const exportedWithModuleFederationNodes = (0, tsquery_1.query)(sourceFile, 'ExpressionStatement:has(BinaryExpression > PropertyAccessExpression:has(Identifier[name=module], Identifier[name=exports]), CallExpression:has(Identifier[name=withModuleFederation]))');
-        if (exportedWithModuleFederationNodes.length > 0) {
-            const exportedWithModuleFederationNode = exportedWithModuleFederationNodes[0];
-            newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}
-    module.exports = {
-      plugins: [
-        new NxModuleFederationPlugin({ config }, {
-          dts: false,
-        }),
-        new NxModuleFederationDevServerPlugin({ config }),
-      ]
-    }
-    `;
-        }
-        else {
-            devkit_1.logger.warn("Could not find 'module.exports = withModuleFederation' in the webpack config file. Skipping conversion.");
-        }
-    }
-    return newWebpackConfigContents;
-}

package/dist/src/generators/convert-to-rspack/lib/validate-no-module-federation.d.ts

@@ -0,0 +1,2 @@
+import type { ProjectConfiguration, Tree } from '@nx/devkit';
+export declare function validateNoModuleFederation(tree: Tree, project: ProjectConfiguration): void;

package/dist/src/generators/convert-to-rspack/lib/validate-no-module-federation.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateNoModuleFederation = validateNoModuleFederation;
+const MODULE_FEDERATION_EXECUTORS = [
+    '@nx/angular:module-federation-dev-server',
+    '@nx/angular:module-federation-dev-ssr',
+];
+function validateNoModuleFederation(tree, project) {
+    if (usesModuleFederation(tree, project)) {
+        throw new Error(`The project ${project.name} is using Module Federation. At the moment, we don't support migrating projects that use Module Federation. See https://nx.dev/docs/kb/migrate-angular-module-federation.`);
+    }
+}
+function usesModuleFederation(tree, project) {
+    for (const target of Object.values(project.targets ?? {})) {
+        if (MODULE_FEDERATION_EXECUTORS.includes(target.executor)) {
+            return true;
+        }
+        const allOptions = [
+            target.options,
+            ...Object.values(target.configurations ?? {}),
+        ];
+        for (const options of allOptions) {
+            const configPath = options?.customWebpackConfig?.path;
+            if (configPath &&
+                tree.exists(configPath) &&
+                tree.read(configPath, 'utf-8').includes('@nx/module-federation')) {
+                return true;
+            }
+        }
+    }
+    return false;
+}

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

@@ -64,8 +64,6 @@ async function cypressComponentConfiguration(tree, options) {
     tasks.push(await baseCyCTConfig(tree, {
         project: options.project,
         skipFormat: true,
-        addPlugin: false,
-        addExplicitTargets: true,
         skipPackageJson: options.skipPackageJson,
     }));
     await configureCypressCT(tree, options);
@@ -142,20 +140,10 @@ async function configureCypressCT(tree, options) {
             throw new Error('Unable to find a valid build configuration. Try passing in a target for an Angular app (e.g. --build-target=<project>:<target>[:<configuration>]).');
         }
     }
-    const ctConfigOptions = {};
+    const ctConfigOptions = {
+        buildTarget: found.target,
+    };
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if (projectConfig.targets?.['component-test']?.executor ===
-        '@nx/cypress:cypress') {
-        projectConfig.targets['component-test'].options = {
-            ...projectConfig.targets['component-test'].options,
-            skipServe: true,
-            devServerTarget: found.target,
-        };
-        (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
-    }
-    else {
-        ctConfigOptions.buildTarget = found.target;
-    }
     const { addDefaultCTConfig, getProjectCypressConfigPath, getInstalledCypressMajorVersion, } = require('@nx/cypress/internal');
     const cypressConfigPath = getProjectCypressConfigPath(tree, projectConfig.root);
     const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions, '@nx/angular/plugins/component-testing', getInstalledCypressMajorVersion(tree));

package/dist/src/generators/init/init.js

@@ -16,8 +16,7 @@ async function angularInitGenerator(tree, options) {
     // generators do not use `angular.json`, and `nx init` should split
     // `angular.json` into multiple `project.json` files -- as this is preferred
     // by most folks we've talked to.
-    options.addPlugin ??= process.env.NX_RUNNING_NX_IMPORT === 'true';
-    if (options.addPlugin) {
+    if (process.env.NX_RUNNING_NX_IMPORT === 'true') {
         await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/angular/plugin', plugin_1.createNodes, {
             targetNamePrefix: ['', 'angular:', 'angular-'],
         }, options.updatePackageScripts);

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

@@ -3,7 +3,5 @@ export interface Schema {
   skipInstall?: boolean;
   skipPackageJson?: boolean;
   keepExistingVersions?: boolean;
-  /* internal */
-  addPlugin?: boolean;
   updatePackageScripts?: boolean;
 }

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

@@ -39,6 +39,5 @@ export interface Schema {
   skipTests?: boolean;
   selector?: string;
   skipSelector?: boolean;
-  addPlugin?: boolean;
   skipTsConfig?: boolean;
 }