@nx/angular 21.0.0-canary.20250422-8619c1d → 21.0.0-canary.20250424-e23b25f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "21.0.0-canary.20250422-8619c1d",
+  "version": "21.0.0-canary.20250424-e23b25f",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -67,14 +67,14 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "21.0.0-canary.20250422-8619c1d",
-    "@nx/js": "21.0.0-canary.20250422-8619c1d",
-    "@nx/eslint": "21.0.0-canary.20250422-8619c1d",
-    "@nx/webpack": "21.0.0-canary.20250422-8619c1d",
-    "@nx/rspack": "21.0.0-canary.20250422-8619c1d",
-    "@nx/module-federation": "21.0.0-canary.20250422-8619c1d",
-    "@nx/web": "21.0.0-canary.20250422-8619c1d",
-    "@nx/workspace": "21.0.0-canary.20250422-8619c1d",
+    "@nx/devkit": "21.0.0-canary.20250424-e23b25f",
+    "@nx/js": "21.0.0-canary.20250424-e23b25f",
+    "@nx/eslint": "21.0.0-canary.20250424-e23b25f",
+    "@nx/webpack": "21.0.0-canary.20250424-e23b25f",
+    "@nx/rspack": "21.0.0-canary.20250424-e23b25f",
+    "@nx/module-federation": "21.0.0-canary.20250424-e23b25f",
+    "@nx/web": "21.0.0-canary.20250424-e23b25f",
+    "@nx/workspace": "21.0.0-canary.20250424-e23b25f",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

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

@@ -24,7 +24,13 @@ const RENAMED_OPTIONS = {
     main: 'browser',
     ngswConfigPath: 'serviceWorker',
 };
-const REMOVED_OPTIONS = ['buildOptimizer', 'buildTarget', 'browserTarget'];
+const DEFAULT_PORT = 4200;
+const REMOVED_OPTIONS = [
+    'buildOptimizer',
+    'buildTarget',
+    'browserTarget',
+    'publicHost',
+];
 function normalizeFromProjectRoot(tree, path, projectRoot) {
     if (projectRoot === '.') {
         if (!path.startsWith('./')) {
@@ -244,6 +250,7 @@ async function convertToRspack(tree, schema) {
     const serveTargetNames = [];
     let customWebpackConfigPath;
     (0, validate_supported_executor_1.validateSupportedBuildExecutor)(Object.values(project.targets));
+    let projectServePort = DEFAULT_PORT;
     for (const [targetName, target] of Object.entries(project.targets)) {
         if (target.executor === '@angular-devkit/build-angular:browser' ||
             target.executor === '@nx/angular:webpack-browser') {
@@ -269,6 +276,9 @@ async function convertToRspack(tree, schema) {
             createConfigOptions.devServer = {};
             if (target.options) {
                 handleDevServerTargetOptions(tree, target.options, createConfigOptions.devServer, project.root);
+                if (target.options.port !== DEFAULT_PORT) {
+                    projectServePort = target.options.port;
+                }
             }
             if (target.configurations) {
                 for (const [configurationName, configuration] of Object.entries(target.configurations)) {
@@ -288,6 +298,11 @@ async function convertToRspack(tree, schema) {
     for (const targetName of [...buildTargetNames, ...serveTargetNames]) {
         delete project.targets[targetName];
     }
+    if (projectServePort !== DEFAULT_PORT) {
+        project.targets.serve ??= {};
+        project.targets.serve.options ??= {};
+        project.targets.serve.options.port = projectServePort;
+    }
     (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
     const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
     await rspackInitGenerator(tree, {

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

@@ -9,7 +9,7 @@ function createConfig(tree, opts, configurationOptions = {}, existingWebpackConf
         ? Object.entries(configurationOptions)
             .map(([configurationName, configurationOptions]) => {
             return `
-      ${configurationName}: {
+      "${configurationName}": {
         options: {
           ${JSON.stringify(configurationOptions, undefined, 2).slice(1, -1)}
         }
@@ -17,6 +17,12 @@ function createConfig(tree, opts, configurationOptions = {}, existingWebpackConf
         })
             .join(',\n')
         : '';
+    const createConfigContents = `createConfig({ 
+    options: {
+      root: __dirname,
+      ${JSON.stringify(createConfigOptions, undefined, 2).slice(1, -1)}
+    }
+  }${hasConfigurations ? `, {${expandedConfigurationOptions}}` : ''});`;
     const configContents = `
   import { createConfig }from '@nx/angular-rspack';
   ${existingWebpackConfigPath
@@ -26,23 +32,14 @@ function createConfig(tree, opts, configurationOptions = {}, existingWebpackConf
             : `import webpackMerge from 'webpack-merge';`}`
         : ''}
   
-  ${existingWebpackConfigPath ? 'const baseConfig = ' : 'export default '}createConfig({ 
-    options: {
-      root: __dirname,
-      ${JSON.stringify(createConfigOptions, undefined, 2).slice(1, -1)}
-    }
-  }${hasConfigurations ? `, {${expandedConfigurationOptions}}` : ''});
   ${existingWebpackConfigPath
-        ? `
-    export default ${isExistingWebpackConfigFunction
-            ? `async function (env, argv) { 
-        const oldConfig = await baseWebpackConfig;
+        ? `export default async () => {
+        const baseConfig = await ${createConfigContents}
+        ${isExistingWebpackConfigFunction
+            ? `const oldConfig = await baseWebpackConfig;
         const browserConfig = baseConfig[0];
-        return oldConfig(browserConfig);
-        }`
-            : 'webpackMerge(baseConfig[0], baseWebpackConfig);'}
-  `
-        : ''}
-  `;
+        return oldConfig(browserConfig);`
+            : 'return webpackMerge(baseConfig[0], baseWebpackConfig);'}};`
+        : `export default ${createConfigContents}`}`;
     tree.write((0, devkit_1.joinPathFragments)(root, 'rspack.config.ts'), configContents);
 }

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

@@ -30,7 +30,7 @@ function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents
     const withModuleFederationImportNodes = (0, tsquery_1.tsquery)(ast, 'ImportDeclaration:has(StringLiteral[value=@nx/module-federation/angular])');
     if (withModuleFederationImportNodes.length > 0) {
         const withModuleFederationImportNode = withModuleFederationImportNodes[0];
-        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationImportNode.getStart())}import { NxModuleFederationPlugin } from '@nx/module-federation/rspack';${webpackConfigContents.slice(withModuleFederationImportNode.getEnd())}`;
+        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationImportNode.getStart())}import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack';${webpackConfigContents.slice(withModuleFederationImportNode.getEnd())}`;
         ast = tsquery_1.tsquery.ast(newWebpackConfigContents);
         const exportedWithModuleFederationNodes = (0, tsquery_1.tsquery)(ast, 'ExportAssignment:has(CallExpression > Identifier[name=withModuleFederation])');
         if (exportedWithModuleFederationNodes.length > 0) {
@@ -38,9 +38,10 @@ function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents
             newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}
     export default {
       plugins: [
-        new NxModuleFederationPlugin(config, {
+        new NxModuleFederationPlugin({ config }, {
           dts: false,
         }),
+        new NxModuleFederationDevServerPlugin({ config }),
       ]
     }
     `;
@@ -52,7 +53,7 @@ function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents
     const withModuleFederationRequireNodes = (0, tsquery_1.tsquery)(ast, '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 } = require('@nx/module-federation/rspack');${webpackConfigContents.slice(withModuleFederationRequireNode.getEnd())}`;
+        newWebpackConfigContents = `${webpackConfigContents.slice(0, withModuleFederationRequireNode.getStart())}const { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } = require('@nx/module-federation/rspack');${webpackConfigContents.slice(withModuleFederationRequireNode.getEnd())}`;
         ast = tsquery_1.tsquery.ast(newWebpackConfigContents);
         const exportedWithModuleFederationNodes = (0, tsquery_1.tsquery)(ast, 'ExpressionStatement:has(BinaryExpression > PropertyAccessExpression:has(Identifier[name=module], Identifier[name=exports]), CallExpression:has(Identifier[name=withModuleFederation]))');
         if (exportedWithModuleFederationNodes.length > 0) {
@@ -63,6 +64,7 @@ function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents
         new NxModuleFederationPlugin({ config }, {
           dts: false,
         }),
+        new NxModuleFederationDevServerPlugin({ config }),
       ]
     }
     `;