@nx/angular 0.0.0-pr-3-e51e28c → 0.0.0-pr-30418-0e58904

package/generators.json

@@ -38,6 +38,11 @@
       "schema": "./src/generators/convert-to-application-executor/schema.json",
       "description": "Converts projects to use the `@nx/angular:application` executor or the `@angular-devkit/build-angular:application` builder."
     },
+    "convert-to-rspack": {
+      "factory": "./src/generators/convert-to-rspack/convert-to-rspack",
+      "schema": "./src/generators/convert-to-rspack/schema.json",
+      "description": "Converts Angular Webpack projects to use Rspack."
+    },
     "directive": {
       "factory": "./src/generators/directive/directive",
       "schema": "./src/generators/directive/schema.json",

package/migrations.json

@@ -347,6 +347,15 @@
       },
       "description": "Update the @angular/cli package version to ~19.1.0.",
       "factory": "./src/migrations/update-20-4-0/update-angular-cli"
+    },
+    "update-angular-cli-version-19-2-0": {
+      "cli": "nx",
+      "version": "20.5.0-beta.5",
+      "requires": {
+        "@angular/core": ">=19.2.0"
+      },
+      "description": "Update the @angular/cli package version to ~19.2.0.",
+      "factory": "./src/migrations/update-20-5-0/update-angular-cli"
     }
   },
   "packageJsonUpdates": {
@@ -1049,6 +1058,22 @@
         "@angular-eslint/utils": {
           "version": "^18.0.1",
           "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/schematics": {
+          "version": "^18.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/test-utils": {
+          "version": "^18.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/builder": {
+          "version": "^18.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/bundled-angular-compiler": {
+          "version": "^18.0.1",
+          "alwaysAddToPackageJson": false
         }
       }
     },
@@ -1368,6 +1393,22 @@
         "@angular-eslint/utils": {
           "version": "^19.0.0",
           "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/schematics": {
+          "version": "^19.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/test-utils": {
+          "version": "^19.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/builder": {
+          "version": "^19.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/bundled-angular-compiler": {
+          "version": "^19.0.0",
+          "alwaysAddToPackageJson": false
         }
       }
     },
@@ -1410,6 +1451,22 @@
         "@angular-eslint/utils": {
           "version": "^19.0.2",
           "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/schematics": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/test-utils": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/builder": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/bundled-angular-compiler": {
+          "version": "^19.0.2",
+          "alwaysAddToPackageJson": false
         }
       }
     },
@@ -1485,6 +1542,112 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.5.0": {
+      "version": "20.5.0-beta.5",
+      "x-prompt": "Do you want to update the Angular version to v19.2?",
+      "requires": {
+        "@angular/core": ">=19.1.0 <19.2.0"
+      },
+      "packages": {
+        "@angular-devkit/build-angular": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/core": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/schematics": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/build": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/pwa": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/ssr": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@schematics/angular": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/architect": {
+          "version": "~0.1902.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-webpack": {
+          "version": "~0.1902.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/core": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@angular/material": {
+          "version": "~19.2.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/cdk": {
+          "version": "~19.2.1",
+          "alwaysAddToPackageJson": false
+        },
+        "ng-packagr": {
+          "version": "~19.2.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "20.5.0-angular-eslint": {
+      "version": "20.5.0-rc.1",
+      "requires": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "@angular/core": ">= 19.0.0 < 20.0.0"
+      },
+      "packages": {
+        "angular-eslint": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/eslint-plugin": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/eslint-plugin-template": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/template-parser": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/utils": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/schematics": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/test-utils": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/builder": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/bundled-angular-compiler": {
+          "version": "^19.2.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "0.0.0-pr-3-e51e28c",
+  "version": "0.0.0-pr-30418-0e58904",
   "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": {
@@ -65,19 +65,21 @@
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^8.0.0",
+    "enquirer": "~2.3.6",
     "picocolors": "^1.1.0",
     "magic-string": "~0.30.2",
     "minimatch": "9.0.3",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "0.0.0-pr-3-e51e28c",
-    "@nx/js": "0.0.0-pr-3-e51e28c",
-    "@nx/eslint": "0.0.0-pr-3-e51e28c",
-    "@nx/webpack": "0.0.0-pr-3-e51e28c",
-    "@nx/module-federation": "0.0.0-pr-3-e51e28c",
-    "@nx/web": "0.0.0-pr-3-e51e28c",
-    "@nx/workspace": "0.0.0-pr-3-e51e28c",
+    "@nx/devkit": "0.0.0-pr-30418-0e58904",
+    "@nx/js": "0.0.0-pr-30418-0e58904",
+    "@nx/eslint": "0.0.0-pr-30418-0e58904",
+    "@nx/webpack": "0.0.0-pr-30418-0e58904",
+    "@nx/rspack": "0.0.0-pr-30418-0e58904",
+    "@nx/module-federation": "0.0.0-pr-30418-0e58904",
+    "@nx/web": "0.0.0-pr-30418-0e58904",
+    "@nx/workspace": "0.0.0-pr-30418-0e58904",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/builders/dev-server/schema.json

@@ -78,11 +78,11 @@
     },
     "publicHost": {
       "type": "string",
-      "description": "The URL that the browser client (or live-reload client, if enabled) should use to connect to the development server. Use for a complex dev server setup, such as one with reverse proxies."
+      "description": "The URL that the browser client (or live-reload client, if enabled) should use to connect to the development server. Use for a complex dev server setup, such as one with reverse proxies. This option has no effect when using the 'application' or other esbuild-based builders."
     },
     "allowedHosts": {
       "type": "array",
-      "description": "List of hosts that are allowed to access the dev server.",
+      "description": "List of hosts that are allowed to access the dev server. This option has no effect when using the 'application' or other esbuild-based builders in Angular versions lower than 19.2.0.",
       "default": [],
       "items": {
         "type": "string"
@@ -94,7 +94,7 @@
     },
     "disableHostCheck": {
       "type": "boolean",
-      "description": "Don't verify connected clients are part of allowed hosts.",
+      "description": "Don't verify connected clients are part of allowed hosts. This option has no effect when using the 'application' or other esbuild-based builders in Angular versions lower than 19.2.0.",
       "default": false
     },
     "hmr": {

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

@@ -6,7 +6,7 @@ const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project
 const eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
     const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',

package/src/generators/convert-to-rspack/convert-to-rspack.d.ts

@@ -0,0 +1,4 @@
+import { type Tree, GeneratorCallback } from '@nx/devkit';
+import type { ConvertToRspackSchema } from './schema';
+export declare function convertToRspack(tree: Tree, schema: ConvertToRspackSchema): Promise<GeneratorCallback>;
+export default convertToRspack;

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

@@ -0,0 +1,318 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToRspack = convertToRspack;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
+const create_config_1 = require("./lib/create-config");
+const get_custom_webpack_config_1 = require("./lib/get-custom-webpack-config");
+const update_tsconfig_1 = require("./lib/update-tsconfig");
+const validate_supported_executor_1 = require("./lib/validate-supported-executor");
+const posix_1 = require("path/posix");
+const path_1 = require("path");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const enquirer_1 = require("enquirer");
+const SUPPORTED_EXECUTORS = [
+    '@angular-devkit/build-angular:browser',
+    '@angular-devkit/build-angular:dev-server',
+    '@nx/angular:webpack-browser',
+    '@nx/angular:dev-server',
+    '@nx/angular:module-federation-dev-server',
+];
+const RENAMED_OPTIONS = {
+    main: 'browser',
+    ngswConfigPath: 'serviceWorker',
+};
+const REMOVED_OPTIONS = [
+    'publicHost',
+    'disableHostCheck',
+    'resourcesOutputPath',
+    'routesFile',
+    'routes',
+    'discoverRoutes',
+    'appModuleBundle',
+    'inputIndexPath',
+    'outputIndexPath',
+    'buildOptimizer',
+    'deployUrl',
+    'buildTarget',
+    'browserTarget',
+];
+function normalizeFromProjectRoot(tree, path, projectRoot) {
+    if (projectRoot === '.') {
+        if (!path.startsWith('./')) {
+            return `./${path}`;
+        }
+        else {
+            return path;
+        }
+    }
+    else if (path.startsWith(projectRoot)) {
+        return path.replace(projectRoot, '.');
+    }
+    else if (!path.startsWith('./')) {
+        if (tree.exists(path)) {
+            const pathWithWorkspaceRoot = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, path);
+            const projectRootWithWorkspaceRoot = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, projectRoot);
+            return (0, path_1.relative)(projectRootWithWorkspaceRoot, pathWithWorkspaceRoot);
+        }
+        return `./${path}`;
+    }
+    return path;
+}
+const defaultNormalizer = (tree, path, root) => normalizeFromProjectRoot(tree, path, root);
+const PATH_NORMALIZER = {
+    index: (tree, path, root) => {
+        if (typeof path === 'string') {
+            return normalizeFromProjectRoot(tree, path, root);
+        }
+        return {
+            input: normalizeFromProjectRoot(tree, path.input, root),
+            output: path.output ?? 'index.html',
+        };
+    },
+    indexHtmlTransformer: defaultNormalizer,
+    main: defaultNormalizer,
+    server: defaultNormalizer,
+    tsConfig: defaultNormalizer,
+    outputPath: (tree, path, root) => {
+        const relativePathFromWorkspaceRoot = (0, path_1.relative)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, root), devkit_1.workspaceRoot);
+        return (0, devkit_1.joinPathFragments)(relativePathFromWorkspaceRoot, path);
+    },
+    proxyConfig: defaultNormalizer,
+    polyfills: (tree, paths, root) => {
+        const normalizedPaths = [];
+        const normalizeFn = (path) => {
+            try {
+                const resolvedPath = require.resolve(path, {
+                    paths: [(0, posix_1.join)(devkit_1.workspaceRoot, 'node_modules')],
+                });
+                normalizedPaths.push(path);
+            }
+            catch {
+                normalizedPaths.push(normalizeFromProjectRoot(tree, path, root));
+            }
+        };
+        if (typeof paths === 'string') {
+            normalizeFn(paths);
+        }
+        else {
+            for (const path of paths) {
+                normalizeFn(path);
+            }
+        }
+        return normalizedPaths;
+    },
+    styles: (tree, paths, root) => {
+        const normalizedPaths = [];
+        for (const path of paths) {
+            if (typeof path === 'string') {
+                normalizedPaths.push(normalizeFromProjectRoot(tree, path, root));
+            }
+            else {
+                normalizedPaths.push({
+                    input: normalizeFromProjectRoot(tree, path.input, root),
+                    bundleName: path.bundleName,
+                    inject: path.inject ?? true,
+                });
+            }
+        }
+        return normalizedPaths;
+    },
+    scripts: (tree, paths, root) => {
+        const normalizedPaths = [];
+        for (const path of paths) {
+            if (typeof path === 'string') {
+                normalizedPaths.push(normalizeFromProjectRoot(tree, path, root));
+            }
+            else {
+                normalizedPaths.push({
+                    input: normalizeFromProjectRoot(tree, path.input, root),
+                    bundleName: path.bundleName,
+                    inject: path.inject ?? true,
+                });
+            }
+        }
+        return normalizedPaths;
+    },
+    assets: (tree, paths, root) => {
+        const normalizedPaths = [];
+        for (const path of paths) {
+            if (typeof path === 'string') {
+                normalizedPaths.push(normalizeFromProjectRoot(tree, path, root));
+            }
+            else {
+                normalizedPaths.push({
+                    ...path,
+                    input: normalizeFromProjectRoot(tree, path.input, root),
+                });
+            }
+        }
+        return normalizedPaths;
+    },
+    fileReplacements: (tree, paths, root) => {
+        const normalizedPaths = [];
+        for (const path of paths) {
+            normalizedPaths.push({
+                replace: normalizeFromProjectRoot(tree, 'src' in path ? path.src : path.replace, root),
+                with: normalizeFromProjectRoot(tree, 'replaceWith' in path ? path.replaceWith : path.with, root),
+            });
+        }
+        return normalizedPaths;
+    },
+};
+function handleBuildTargetOptions(tree, options, newConfigurationOptions, root) {
+    let customWebpackConfigPath;
+    if (!options || Object.keys(options).length === 0) {
+        return customWebpackConfigPath;
+    }
+    if (options.customWebpackConfig) {
+        customWebpackConfigPath = options.customWebpackConfig.path;
+        delete options.customWebpackConfig;
+    }
+    if (options.outputs) {
+        // handled by the Rspack inference plugin
+        delete options.outputs;
+    }
+    for (const [key, value] of Object.entries(options)) {
+        let optionName = key;
+        let optionValue = key in PATH_NORMALIZER ? PATH_NORMALIZER[key](tree, value, root) : value;
+        if (REMOVED_OPTIONS.includes(key)) {
+            continue;
+        }
+        if (key in RENAMED_OPTIONS) {
+            optionName = RENAMED_OPTIONS[key];
+        }
+        newConfigurationOptions[optionName] = optionValue;
+    }
+    if (typeof newConfigurationOptions.polyfills === 'string') {
+        newConfigurationOptions.polyfills = [newConfigurationOptions.polyfills];
+    }
+    let outputPath = newConfigurationOptions.outputPath;
+    if (typeof outputPath === 'string') {
+        if (!/\/browser\/?$/.test(outputPath)) {
+            console.warn(`The output location of the browser build has been updated from "${outputPath}" to ` +
+                `"${(0, posix_1.join)(outputPath, 'browser')}". ` +
+                'You might need to adjust your deployment pipeline or, as an alternative, ' +
+                'set outputPath.browser to "" in order to maintain the previous functionality.');
+        }
+        else {
+            outputPath = outputPath.replace(/\/browser\/?$/, '');
+        }
+        newConfigurationOptions['outputPath'] = {
+            base: outputPath,
+        };
+        if (typeof newConfigurationOptions.resourcesOutputPath === 'string') {
+            const media = newConfigurationOptions.resourcesOutputPath.replaceAll('/', '');
+            if (media && media !== 'media') {
+                newConfigurationOptions['outputPath'] = {
+                    base: outputPath,
+                    media,
+                };
+            }
+        }
+    }
+    return customWebpackConfigPath;
+}
+function handleDevServerTargetOptions(tree, options, newConfigurationOptions, root) {
+    for (const [key, value] of Object.entries(options)) {
+        let optionName = key;
+        let optionValue = key in PATH_NORMALIZER ? PATH_NORMALIZER[key](tree, value, root) : value;
+        if (REMOVED_OPTIONS.includes(key)) {
+            continue;
+        }
+        if (key in RENAMED_OPTIONS) {
+            optionName = RENAMED_OPTIONS[key];
+        }
+        newConfigurationOptions[optionName] = optionValue;
+    }
+}
+async function getProjectToConvert(tree) {
+    const projects = new Set();
+    for (const executor of SUPPORTED_EXECUTORS) {
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (_, project) => {
+            projects.add(project);
+        });
+    }
+    const { project } = await (0, enquirer_1.prompt)({
+        type: 'select',
+        name: 'project',
+        message: 'Which project would you like to convert to rspack?',
+        choices: Array.from(projects),
+    });
+    return project;
+}
+async function convertToRspack(tree, schema) {
+    let { project: projectName } = schema;
+    if (!projectName) {
+        projectName = await getProjectToConvert(tree);
+    }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+    const tasks = [];
+    const createConfigOptions = {
+        root: project.root,
+    };
+    const configurationOptions = {};
+    const buildTargetNames = [];
+    const serveTargetNames = [];
+    let customWebpackConfigPath;
+    (0, validate_supported_executor_1.validateSupportedBuildExecutor)(Object.values(project.targets));
+    for (const [targetName, target] of Object.entries(project.targets)) {
+        if (target.executor === '@angular-devkit/build-angular:browser' ||
+            target.executor === '@nx/angular:webpack-browser') {
+            customWebpackConfigPath = handleBuildTargetOptions(tree, target.options, createConfigOptions, project.root);
+            if (target.configurations) {
+                for (const [configurationName, configuration] of Object.entries(target.configurations)) {
+                    configurationOptions[configurationName] = {};
+                    handleBuildTargetOptions(tree, configuration, configurationOptions[configurationName], project.root);
+                }
+            }
+            buildTargetNames.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') {
+            createConfigOptions.devServer = {};
+            if (target.options) {
+                handleDevServerTargetOptions(tree, target.options, createConfigOptions.devServer, project.root);
+            }
+            if (target.configurations) {
+                for (const [configurationName, configuration] of Object.entries(target.configurations)) {
+                    configurationOptions[configurationName] ??= {};
+                    configurationOptions[configurationName].devServer ??= {};
+                    handleDevServerTargetOptions(tree, configuration, configurationOptions[configurationName].devServer, project.root);
+                }
+            }
+        }
+        serveTargetNames.push(targetName);
+    }
+    const customWebpackConfigInfo = customWebpackConfigPath
+        ? await (0, get_custom_webpack_config_1.getCustomWebpackConfig)(tree, project.root, customWebpackConfigPath)
+        : undefined;
+    (0, create_config_1.createConfig)(tree, createConfigOptions, configurationOptions, customWebpackConfigInfo?.normalizedPathToCustomWebpackConfig, customWebpackConfigInfo?.isWebpackConfigFunction);
+    (0, update_tsconfig_1.updateTsconfig)(tree, project.root);
+    for (const targetName of [...buildTargetNames, ...serveTargetNames]) {
+        delete project.targets[targetName];
+    }
+    (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+    const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
+    await rspackInitGenerator(tree, {
+        addPlugin: true,
+    });
+    // This is needed to prevent a circular execution of the build target
+    const rootPkgJson = (0, devkit_1.readJson)(tree, 'package.json');
+    if (rootPkgJson.scripts?.build === 'nx build') {
+        delete rootPkgJson.scripts.build;
+        (0, devkit_1.writeJson)(tree, 'package.json', rootPkgJson);
+    }
+    if (!schema.skipInstall) {
+        const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@nx/angular-rspack': versions_1.angularRspackVersion,
+        });
+        tasks.push(installTask);
+    }
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
+}
+exports.default = convertToRspack;

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

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function createConfig(tree: Tree, opts: Record<string, any>, configurationOptions?: Record<string, Record<string, any>>, existingWebpackConfigPath?: string, isExistingWebpackConfigFunction?: boolean): void;

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

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createConfig = createConfig;
+const devkit_1 = require("@nx/devkit");
+function createConfig(tree, opts, configurationOptions = {}, existingWebpackConfigPath, isExistingWebpackConfigFunction) {
+    const { root, ...createConfigOptions } = opts;
+    const hasConfigurations = Object.keys(configurationOptions).length > 0;
+    const expandedConfigurationOptions = hasConfigurations
+        ? Object.entries(configurationOptions)
+            .map(([configurationName, configurationOptions]) => {
+            return `
+      ${configurationName}: {
+        options: {
+          ${JSON.stringify(configurationOptions, undefined, 2).slice(1, -1)}
+        }
+      }`;
+        })
+            .join(',\n')
+        : '';
+    const configContents = `
+  import { createConfig }from '@nx/angular-rspack';
+  ${existingWebpackConfigPath
+        ? `import baseWebpackConfig from '${existingWebpackConfigPath}';
+      ${isExistingWebpackConfigFunction
+            ? ''
+            : `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;
+        const browserConfig = baseConfig[0];
+        return oldConfig(browserConfig);
+        }`
+            : 'webpackMerge(baseConfig[0], baseWebpackConfig);'}
+  `
+        : ''}
+  `;
+    tree.write((0, devkit_1.joinPathFragments)(root, 'rspack.config.ts'), configContents);
+}

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

@@ -0,0 +1,6 @@
+import { 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/src/generators/convert-to-rspack/lib/get-custom-webpack-config.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCustomWebpackConfig = getCustomWebpackConfig;
+exports.convertWebpackConfigToUseNxModuleFederationPlugin = convertWebpackConfigToUseNxModuleFederationPlugin;
+const devkit_1 = require("@nx/devkit");
+const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+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, config_utils_1.loadConfigFile)((0, path_1.join)(tree.root, pathToCustomWebpackConfig));
+    const webpackConfig = 'default' in configFile ? configFile.default : configFile;
+    return {
+        isWebpackConfigFunction: typeof webpackConfig === 'function',
+        normalizedPathToCustomWebpackConfig: `./${(0, path_1.relative)(projectRoot, pathToCustomWebpackConfig).replace(FILE_EXTENSION_REGEX, '')}`,
+    };
+}
+function convertWebpackConfigToUseNxModuleFederationPlugin(webpackConfigContents) {
+    let newWebpackConfigContents = webpackConfigContents;
+    let ast = tsquery_1.tsquery.ast(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())}`;
+        ast = tsquery_1.tsquery.ast(newWebpackConfigContents);
+        const exportedWithModuleFederationNodes = (0, tsquery_1.tsquery)(ast, '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,
+        }),
+      ]
+    }
+    `;
+        }
+        else {
+            devkit_1.logger.warn("Could not find 'export default withModuleFederation' in the webpack config file. Skipping conversion.");
+        }
+    }
+    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())}`;
+        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) {
+            const exportedWithModuleFederationNode = exportedWithModuleFederationNodes[0];
+            newWebpackConfigContents = `${newWebpackConfigContents.slice(0, exportedWithModuleFederationNode.getStart())}${newWebpackConfigContents.slice(exportedWithModuleFederationNode.getEnd())}
+    module.exports = {
+      plugins: [
+        new NxModuleFederationPlugin({ config }, {
+          dts: false,
+        }),
+      ]
+    }
+    `;
+        }
+        else {
+            devkit_1.logger.warn("Could not find 'module.exports = withModuleFederation' in the webpack config file. Skipping conversion.");
+        }
+    }
+    return newWebpackConfigContents;
+}

package/src/generators/convert-to-rspack/lib/update-tsconfig.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function updateTsconfig(tree: Tree, projectRoot: string): void;

package/src/generators/convert-to-rspack/lib/update-tsconfig.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateTsconfig = updateTsconfig;
+const devkit_1 = require("@nx/devkit");
+function updateTsconfig(tree, projectRoot) {
+    const tsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, 'tsconfig.json');
+    const tsconfig = (0, devkit_1.readJson)(tree, tsconfigPath);
+    tsconfig['ts-node'] = {
+        compilerOptions: {
+            module: 'CommonJS',
+        },
+    };
+    (0, devkit_1.writeJson)(tree, tsconfigPath, tsconfig);
+}

package/src/generators/convert-to-rspack/lib/validate-supported-executor.d.ts

@@ -0,0 +1,2 @@
+import { TargetConfiguration } from '@nx/devkit';
+export declare function validateSupportedBuildExecutor(targets: TargetConfiguration[]): void;

package/src/generators/convert-to-rspack/lib/validate-supported-executor.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSupportedBuildExecutor = validateSupportedBuildExecutor;
+const SUPPORTED_BUILD_EXECUTORS = [
+    '@angular-devkit/build-angular:browser',
+    '@nx/angular:webpack-browser',
+];
+function validateSupportedBuildExecutor(targets) {
+    const executorsUsedByProject = targets.map((target) => target.executor);
+    if (!executorsUsedByProject.some((executor) => SUPPORTED_BUILD_EXECUTORS.includes(executor))) {
+        throw new Error('The project does not use a supported build executor. Please use one of the following executors: ' +
+            SUPPORTED_BUILD_EXECUTORS.join(', '));
+    }
+}

package/src/generators/convert-to-rspack/schema.d.ts

@@ -0,0 +1,5 @@
+export interface ConvertToRspackSchema {
+  project: string;
+  skipFormat?: boolean;
+  skipInstall?: boolean;
+}

package/src/generators/convert-to-rspack/schema.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "GeneratorNxApp",
+  "title": "Creates an Angular application.",
+  "description": "Creates an Angular application.",
+  "type": "object",
+  "cli": "nx",
+  "properties": {
+    "project": {
+      "type": "string",
+      "aliases": ["name", "projectName"],
+      "description": "Project for which to convert to rspack.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-priority": "important"
+    },
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false
+    },
+    "skipInstall": {
+      "description": "Skip installing dependencies.",
+      "type": "boolean",
+      "default": false
+    }
+  }
+}

package/src/generators/host/host.js

@@ -39,7 +39,7 @@ async function host(tree, schema) {
             }
         });
     }
-    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
     const { projectName: hostProjectName, projectRoot: appRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',

package/src/generators/library/lib/normalize-options.js

@@ -22,7 +22,7 @@ async function normalizeOptions(host, schema) {
         skipModule: schema.skipModule || schema.standalone,
         ...schema,
     };
-    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',

package/src/generators/ngrx-feature-store/schema.d.ts

@@ -2,7 +2,7 @@ export interface Schema {
   name: string;
   minimal: boolean;
   parent: string;
-  directory?: string;
+  directory: string;
   route?: string;
   barrels?: boolean;
   facade?: boolean;

package/src/generators/remote/remote.js

@@ -18,7 +18,7 @@ async function remote(tree, schema) {
     if (options.host && !projects.has(options.host)) {
         throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
     }
-    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
+    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
     const { projectName: remoteProjectName } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',

package/src/generators/setup-ssr/files/v19+/application-builder/ngmodule-src/app/__rootModuleFileName__

@@ -1,13 +1,13 @@
 import { NgModule } from '@angular/core';
 import { ServerModule } from '@angular/platform-server';<% if(serverRouting) { %>
-import { provideServerRoutesConfig } from '@angular/ssr';<% } %>
+import { <%= provideServerRoutingFn %> } from '@angular/ssr';<% } %>
 import { AppComponent } from './app.component';
 import { AppModule } from './app.module';<% if(serverRouting) { %>
 import { serverRoutes } from './app.routes.server';<% } %>
 
 @NgModule({
   imports: [AppModule, ServerModule],<% if(serverRouting) { %>
-  providers: [provideServerRoutesConfig(serverRoutes)],<% } %>
+  providers: [<%= provideServerRoutingFn %>(serverRoutes)],<% } %>
   bootstrap: [AppComponent],
 })
 export class <%= rootModuleClassName %> {}

package/src/generators/setup-ssr/files/v19+/application-builder/server/__serverFileName__

@@ -61,6 +61,6 @@ if (isMainModule(import.meta.url)) {
 }
 
 /**
- * The request handler used by the Angular CLI (dev-server and during build).
+ * Request handler used by the Angular CLI (for dev-server and during build) or Firebase Cloud Functions.
  */
 export const reqHandler = createNodeRequestHandler(app);

package/src/generators/setup-ssr/files/v19+/application-builder/standalone-src/app/app.config.server.ts__tpl__

@@ -1,13 +1,13 @@
 import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
 import { provideServerRendering } from '@angular/platform-server';<% if(serverRouting) { %>
-import { provideServerRoutesConfig } from '@angular/ssr';<% } %>
+import { <%= provideServerRoutingFn %> } from '@angular/ssr';<% } %>
 import { appConfig } from './app.config';<% if(serverRouting) { %>
 import { serverRoutes } from './app.routes.server';<% } %>
 
 const serverConfig: ApplicationConfig = {
   providers: [
     provideServerRendering()<% if(serverRouting) { %>,
-    provideServerRoutesConfig(serverRoutes)<% } %>
+    <%= provideServerRoutingFn %>(serverRoutes)<% } %>
   ]
 };
 

package/src/generators/setup-ssr/files/v19+/application-builder-common-engine/server/__serverFileName__

@@ -63,3 +63,5 @@ if (isMainModule(import.meta.url)) {
     console.log(`Node Express server listening on http://localhost:${port}`);
   });
 }
+
+export default app;

package/src/generators/setup-ssr/lib/generate-files.js

@@ -4,6 +4,7 @@ exports.generateSSRFiles = generateSSRFiles;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const version_utils_1 = require("../../utils/version-utils");
+const semver_1 = require("semver");
 function generateSSRFiles(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     if (project.targets.server ||
@@ -24,7 +25,17 @@ function generateSSRFiles(tree, options) {
         pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
     const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
-    (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, { ...options, tpl: '' });
+    const ssrVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/ssr');
+    const cleanedSsrVersion = ssrVersion
+        ? (0, semver_1.clean)(ssrVersion) ?? (0, semver_1.coerce)(ssrVersion).version
+        : null;
+    (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, {
+        ...options,
+        provideServerRoutingFn: !cleanedSsrVersion || (0, semver_1.gte)(cleanedSsrVersion, '19.2.0')
+            ? 'provideServerRouting'
+            : 'provideServerRoutesConfig',
+        tpl: '',
+    });
     if (angularMajorVersion >= 19 && !options.serverRouting) {
         tree.delete((0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.server.ts'));
     }

package/src/generators/utils/ensure-angular-dependencies.js

@@ -19,7 +19,6 @@ function ensureAngularDependencies(tree) {
         const rxjsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'rxjs') ?? pkgVersions.rxjsVersion;
         const tsLibVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'tslib') ?? pkgVersions.tsLibVersion;
         const zoneJsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'zone.js') ?? pkgVersions.zoneJsVersion;
-        dependencies['@angular/animations'] = angularVersion;
         dependencies['@angular/common'] = angularVersion;
         dependencies['@angular/compiler'] = angularVersion;
         dependencies['@angular/core'] = angularVersion;

package/src/migrations/update-20-5-0/update-angular-cli.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export declare const angularCliVersion = "~19.2.0";
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-20-5-0/update-angular-cli.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.angularCliVersion = void 0;
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+exports.angularCliVersion = '~19.2.0';
+async function default_1(tree) {
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+}

package/src/utils/backward-compatible-versions.js

@@ -6,6 +6,7 @@ exports.backwardCompatibleVersions = {
         angularVersion: '~17.3.0',
         angularDevkitVersion: '~17.3.0',
         ngPackagrVersion: '~17.3.0',
+        angularRspackVersion: '~20.6.1',
         ngrxVersion: '~17.0.0',
         rxjsVersion: '~7.8.0',
         zoneJsVersion: '~0.14.3',
@@ -33,6 +34,7 @@ exports.backwardCompatibleVersions = {
         angularVersion: '~18.2.0',
         angularDevkitVersion: '~18.2.0',
         ngPackagrVersion: '~18.2.0',
+        angularRspackVersion: '~20.6.1',
         ngrxVersion: '~18.0.2',
         rxjsVersion: '~7.8.0',
         zoneJsVersion: '~0.14.3',

package/src/utils/versions.d.ts

@@ -1,7 +1,8 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~19.1.0";
-export declare const angularDevkitVersion = "~19.1.0";
-export declare const ngPackagrVersion = "~19.1.0";
+export declare const angularVersion = "~19.2.0";
+export declare const angularDevkitVersion = "~19.2.0";
+export declare const ngPackagrVersion = "~19.2.0";
+export declare const angularRspackVersion = "~20.6.1";
 export declare const ngrxVersion = "^19.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.15.0";
@@ -12,9 +13,9 @@ export declare const typesCorsVersion = "~2.8.5";
 export declare const expressVersion = "^4.21.2";
 export declare const typesExpressVersion = "^4.17.21";
 export declare const browserSyncVersion = "^3.0.0";
-export declare const moduleFederationNodeVersion = "^2.6.21";
-export declare const moduleFederationEnhancedVersion = "^0.8.8";
-export declare const angularEslintVersion = "^19.0.2";
+export declare const moduleFederationNodeVersion = "^2.6.26";
+export declare const moduleFederationEnhancedVersion = "^0.9.0";
+export declare const angularEslintVersion = "^19.2.0";
 export declare const typescriptEslintVersion = "^7.16.0";
 export declare const tailwindVersion = "^3.0.2";
 export declare const postcssVersion = "^8.4.5";

package/src/utils/versions.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularRspackVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.angularVersion = '~19.1.0';
-exports.angularDevkitVersion = '~19.1.0';
-exports.ngPackagrVersion = '~19.1.0';
+exports.angularVersion = '~19.2.0';
+exports.angularDevkitVersion = '~19.2.0';
+exports.ngPackagrVersion = '~19.2.0';
+exports.angularRspackVersion = '~20.6.1';
 exports.ngrxVersion = '^19.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.15.0';
@@ -15,9 +16,9 @@ exports.typesCorsVersion = '~2.8.5';
 exports.expressVersion = '^4.21.2';
 exports.typesExpressVersion = '^4.17.21';
 exports.browserSyncVersion = '^3.0.0';
-exports.moduleFederationNodeVersion = '^2.6.21';
-exports.moduleFederationEnhancedVersion = '^0.8.8';
-exports.angularEslintVersion = '^19.0.2';
+exports.moduleFederationNodeVersion = '^2.6.26';
+exports.moduleFederationEnhancedVersion = '^0.9.0';
+exports.angularEslintVersion = '^19.2.0';
 exports.typescriptEslintVersion = '^7.16.0';
 exports.tailwindVersion = '^3.0.2';
 exports.postcssVersion = '^8.4.5';