@nx/angular 0.0.0-pr-31369-292b003 → 0.0.0-pr-31432-8c8eba6

package/migrations.json

@@ -303,43 +303,43 @@
       "description": "Change the data persistence operator imports to '@ngrx/router-store/data-persistence'.",
       "factory": "./src/migrations/update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence"
     },
-    "update-angular-cli-version-20-0-0": {
+    "update-angular-cli-version-20-0-0-rc-3": {
       "cli": "nx",
-      "version": "21.2.0-beta.2",
+      "version": "21.2.0-beta.0",
       "requires": {
-        "@angular/core": ">=20.0.0"
+        "@angular/core": ">=20.0.0-rc.2"
       },
-      "description": "Update the @angular/cli package version to ~20.0.0.",
+      "description": "Update the @angular/cli package version to 20.0.0-rc.3.",
       "factory": "./src/migrations/update-21-2-0/update-angular-cli"
     },
     "migrate-provide-server-rendering-import": {
-      "version": "21.2.0-beta.2",
+      "version": "21.2.0-beta.0",
       "requires": {
-        "@angular/core": ">=20.0.0"
+        "@angular/core": ">=20.0.0-rc.2"
       },
       "description": "Migrate imports of `provideServerRendering` from `@angular/platform-server` to `@angular/ssr`.",
       "factory": "./src/migrations/update-21-2-0/migrate-provide-server-rendering-import"
     },
     "replace-provide-server-routing": {
-      "version": "21.2.0-beta.2",
+      "version": "21.2.0-beta.0",
       "requires": {
-        "@angular/core": ">=20.0.0"
+        "@angular/core": ">=20.0.0-rc.2"
       },
-      "description": "Replace `provideServerRouting` and `provideServerRoutesConfig` with `provideServerRendering` using `withRoutes`.",
+      "description": "Replace `provideServerRouting` with `provideServerRendering` using `withRoutes`.",
       "factory": "./src/migrations/update-21-2-0/replace-provide-server-routing"
     },
     "set-generator-defaults-for-previous-style-guide": {
-      "version": "21.2.0-beta.2",
+      "version": "21.2.0-beta.0",
       "requires": {
-        "@angular/core": ">=20.0.0"
+        "@angular/core": ">=20.0.0-rc.2"
       },
       "description": "Update the generator defaults to maintain the previous style guide behavior.",
       "factory": "./src/migrations/update-21-2-0/set-generator-defaults-for-previous-style-guide"
     },
     "update-module-resolution": {
-      "version": "21.2.0-beta.2",
+      "version": "21.2.0-beta.0",
       "requires": {
-        "@angular/core": ">=20.0.0"
+        "@angular/core": ">=20.0.0-rc.2"
       },
       "description": "Update 'moduleResolution' to 'bundler' in TypeScript configurations. You can read more about this here: https://www.typescriptlang.org/tsconfig/#moduleResolution.",
       "factory": "./src/migrations/update-21-2-0/update-module-resolution"
@@ -1667,130 +1667,66 @@
       }
     },
     "21.2.0": {
-      "version": "21.2.0-beta.2",
+      "version": "21.2.0-beta.0",
       "x-prompt": "Do you want to update the Angular version to v20?",
       "requires": {
-        "@angular/core": ">=19.2.0 <20.0.0"
+        "@angular/core": ">=19.2.0 <20.0.0-rc.2"
       },
       "packages": {
         "@angular-devkit/build-angular": {
-          "version": "~20.0.0",
+          "version": "20.0.0-rc.3",
           "alwaysAddToPackageJson": false
         },
         "@angular-devkit/core": {
-          "version": "~20.0.0",
+          "version": "20.0.0-rc.3",
           "alwaysAddToPackageJson": false
         },
         "@angular-devkit/schematics": {
-          "version": "~20.0.0",
+          "version": "20.0.0-rc.3",
           "alwaysAddToPackageJson": false
         },
         "@angular/build": {
-          "version": "~20.0.0",
+          "version": "20.0.0-rc.3",
           "alwaysAddToPackageJson": false
         },
         "@angular/pwa": {
-          "version": "~20.0.0",
+          "version": "20.0.0-rc.3",
           "alwaysAddToPackageJson": false
         },
         "@angular/ssr": {
-          "version": "~20.0.0",
+          "version": "20.0.0-rc.3",
           "alwaysAddToPackageJson": false
         },
         "@schematics/angular": {
-          "version": "~20.0.0",
+          "version": "20.0.0-rc.3",
           "alwaysAddToPackageJson": false
         },
         "@angular-devkit/architect": {
-          "version": "~0.2000.0",
+          "version": "0.2000.0-rc.3",
           "alwaysAddToPackageJson": false
         },
         "@angular-devkit/build-webpack": {
-          "version": "~0.2000.0",
+          "version": "0.2000.0-rc.3",
           "alwaysAddToPackageJson": false
         },
         "@angular/core": {
-          "version": "~20.0.0",
+          "version": "20.0.0-rc.2",
           "alwaysAddToPackageJson": true
         },
         "@angular/material": {
-          "version": "~20.0.0",
+          "version": "20.0.0-rc.2",
           "alwaysAddToPackageJson": false
         },
         "@angular/cdk": {
-          "version": "~20.0.0",
+          "version": "20.0.0-rc.2",
           "alwaysAddToPackageJson": false
         },
         "@angular/google-maps": {
-          "version": "~20.0.0",
+          "version": "20.0.0-rc.2",
           "alwaysAddToPackageJson": false
         },
         "ng-packagr": {
-          "version": "~20.0.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "21.2.0-angular-eslint": {
-      "version": "21.2.0-beta.2",
-      "requires": {
-        "@angular/core": ">= 20.0.0 < 21.0.0",
-        "typescript-eslint": "^8.0.0",
-        "eslint": "^8.57.0 || ^9.0.0"
-      },
-      "packages": {
-        "angular-eslint": {
-          "version": "^20.0.0-alpha.1",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "21.2.0-@angular-eslint": {
-      "version": "21.2.0-beta.2",
-      "requires": {
-        "@angular/core": ">= 20.0.0 < 21.0.0",
-        "eslint": "^8.57.0 || ^9.0.0"
-      },
-      "packages": {
-        "@angular-eslint/eslint-plugin": {
-          "version": "^20.0.0-alpha.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@angular-eslint/eslint-plugin-template": {
-          "version": "^20.0.0-alpha.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@angular-eslint/template-parser": {
-          "version": "^20.0.0-alpha.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@angular-eslint/utils": {
-          "version": "^20.0.0-alpha.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@angular-eslint/schematics": {
-          "version": "^20.0.0-alpha.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@angular-eslint/test-utils": {
-          "version": "^20.0.0-alpha.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@angular-eslint/builder": {
-          "version": "^20.0.0-alpha.1",
-          "alwaysAddToPackageJson": false
-        },
-        "@angular-eslint/bundled-angular-compiler": {
-          "version": "^20.0.0-alpha.1",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "21.2.0-angular-rspack": {
-      "version": "21.2.0-beta.2",
-      "packages": {
-        "@nx/angular-rspack": {
-          "version": "^21.1.0",
+          "version": "20.0.0-rc.1",
           "alwaysAddToPackageJson": false
         }
       }

package/ng-package.json

@@ -7,14 +7,28 @@
   "deleteDestPath": false,
   "allowedNonPeerDependencies": [
     "@nx/",
+    "@angular-devkit",
+    "@angular-eslint/",
+    "@module-federation/enhanced",
+    "@schematics",
     "@phenomnomnominal/tsquery",
     "@typescript-eslint/",
-    "enquirer",
-    "magic-string",
     "picocolors",
+    "ignore",
     "picomatch",
+    "rxjs-for-await",
+    "webpack-merge",
+    "ts-node",
+    "tsconfig-paths",
     "semver",
-    "webpack-merge"
+    "webpack",
+    "express",
+    "http-proxy-middleware",
+    "http-server",
+    "magic-string",
+    "enquirer",
+    "find-cache-dir",
+    "webpack"
   ],
   "keepLifecycleScripts": true
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "0.0.0-pr-31369-292b003",
+  "version": "0.0.0-pr-31432-8c8eba6",
   "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": {
@@ -58,14 +58,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-31369-292b003",
-    "@nx/eslint": "0.0.0-pr-31369-292b003",
-    "@nx/js": "0.0.0-pr-31369-292b003",
-    "@nx/module-federation": "0.0.0-pr-31369-292b003",
-    "@nx/rspack": "0.0.0-pr-31369-292b003",
-    "@nx/web": "0.0.0-pr-31369-292b003",
-    "@nx/webpack": "0.0.0-pr-31369-292b003",
-    "@nx/workspace": "0.0.0-pr-31369-292b003",
+    "@nx/devkit": "0.0.0-pr-31432-8c8eba6",
+    "@nx/eslint": "0.0.0-pr-31432-8c8eba6",
+    "@nx/js": "0.0.0-pr-31432-8c8eba6",
+    "@nx/module-federation": "0.0.0-pr-31432-8c8eba6",
+    "@nx/rspack": "0.0.0-pr-31432-8c8eba6",
+    "@nx/web": "0.0.0-pr-31432-8c8eba6",
+    "@nx/webpack": "0.0.0-pr-31432-8c8eba6",
+    "@nx/workspace": "0.0.0-pr-31432-8c8eba6",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

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

@@ -1,4 +1,4 @@
-import { type Tree, GeneratorCallback } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } 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

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToRspack = convertToRspack;
 const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
+const enquirer_1 = require("enquirer");
+const path_1 = require("path");
+const posix_1 = require("path/posix");
 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',
@@ -164,10 +165,6 @@ function handleBuildTargetOptions(tree, options, newConfigurationOptions, root)
         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;
@@ -247,8 +244,9 @@ async function convertToRspack(tree, schema) {
         root: project.root,
     };
     const configurationOptions = {};
-    const buildTargetNames = [];
-    const serveTargetNames = [];
+    let buildTarget;
+    let serveTarget;
+    const targetsToRemove = [];
     let customWebpackConfigPath;
     (0, validate_supported_executor_1.validateSupportedBuildExecutor)(Object.values(project.targets));
     let projectServePort = DEFAULT_PORT;
@@ -262,14 +260,15 @@ async function convertToRspack(tree, schema) {
                     handleBuildTargetOptions(tree, configuration, configurationOptions[configurationName], project.root);
                 }
             }
-            buildTargetNames.push(targetName);
+            buildTarget = { name: targetName, config: target };
+            targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:server' ||
             target.executor === '@nx/angular:webpack-server') {
             createConfigOptions.ssr ??= {};
             createConfigOptions.ssr.entry ??= normalizeFromProjectRoot(tree, target.options.main, project.root);
             createConfigOptions.server = './src/main.server.ts';
-            buildTargetNames.push(targetName);
+            targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:dev-server' ||
             target.executor === '@nx/angular:dev-server' ||
@@ -277,7 +276,7 @@ async function convertToRspack(tree, schema) {
             createConfigOptions.devServer = {};
             if (target.options) {
                 handleDevServerTargetOptions(tree, target.options, createConfigOptions.devServer, project.root);
-                if (target.options.port !== DEFAULT_PORT) {
+                if (target.options.port && target.options.port !== DEFAULT_PORT) {
                     projectServePort = target.options.port;
                 }
             }
@@ -288,7 +287,8 @@ async function convertToRspack(tree, schema) {
                     handleDevServerTargetOptions(tree, configuration, configurationOptions[configurationName].devServer, project.root);
                 }
             }
-            serveTargetNames.push(targetName);
+            serveTarget = { name: targetName, config: target };
+            targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:prerender') {
             if (target.options) {
@@ -309,11 +309,11 @@ async function convertToRspack(tree, schema) {
                     }
                 }
             }
-            buildTargetNames.push(targetName);
+            targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:app-shell') {
             createConfigOptions.appShell = true;
-            buildTargetNames.push(targetName);
+            targetsToRemove.push(targetName);
         }
     }
     const customWebpackConfigInfo = customWebpackConfigPath
@@ -321,20 +321,169 @@ async function convertToRspack(tree, schema) {
         : 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]) {
+    for (const targetName of targetsToRemove) {
         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);
+    // 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
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let inferredBuildTargetName = 'build';
+    let inferredServeTargetName = 'serve';
+    const pluginRegistration = nxJson.plugins.find((p) => typeof p === 'string' ? false : p.plugin === '@nx/rspack/plugin');
+    if (pluginRegistration) {
+        inferredBuildTargetName =
+            pluginRegistration.options.buildTargetName ?? inferredBuildTargetName;
+        inferredServeTargetName =
+            pluginRegistration.options.serveTargetName ?? inferredServeTargetName;
+    }
+    if (buildTarget) {
+        // these are all replaced by the inferred task
+        delete buildTarget.config.options;
+        delete buildTarget.config.configurations;
+        delete buildTarget.config.defaultConfiguration;
+        delete buildTarget.config.executor;
+        const shouldOverrideInputs = (inputs) => {
+            if (!inputs?.length) {
+                return false;
+            }
+            if (inputs.length === 2) {
+                // check whether the existing inputs would match the inferred task
+                // inputs with the exception of the @rspack/cli external dependency
+                // which webpack tasks wouldn't have
+                const namedInputs = (0, get_named_inputs_1.getNamedInputs)(project.root, {
+                    nxJsonConfiguration: nxJson,
+                    configFiles: [],
+                    workspaceRoot: devkit_1.workspaceRoot,
+                });
+                if ('production' in namedInputs) {
+                    return !['production', '^production'].every((input) => inputs.includes(input));
+                }
+                return !['default', '^default'].every((input) => inputs.includes(input));
+            }
+            return true;
+        };
+        if (shouldOverrideInputs(buildTarget.config.inputs)) {
+            // keep existing inputs and add the @rspack/cli external dependency
+            buildTarget.config.inputs = [
+                ...buildTarget.config.inputs,
+                { externalDependencies: ['@rspack/cli'] },
+            ];
+        }
+        else {
+            delete buildTarget.config.inputs;
+        }
+        if (buildTarget.config.cache) {
+            delete buildTarget.config.cache;
+        }
+        if (buildTarget.config.dependsOn?.length === 1 &&
+            buildTarget.config.dependsOn[0] === `^${buildTarget.name}`) {
+            delete buildTarget.config.dependsOn;
+        }
+        else if (buildTarget.config.dependsOn) {
+            buildTarget.config.dependsOn = buildTarget.config.dependsOn.map((dep) => dep === `^${buildTarget.name}` ? `^${inferredBuildTargetName}` : dep);
+        }
+        const newOutputPath = (0, devkit_1.joinPathFragments)(project.root, createConfigOptions.outputPath.base);
+        const shouldOverrideOutputs = (outputs) => {
+            if (!outputs?.length) {
+                // this means the target was wrongly configured, so, we don't override
+                // anything and let the inferred outputs be used
+                return false;
+            }
+            if (outputs.length === 1) {
+                if (outputs[0] === '{options.outputPath}') {
+                    // the inferred task output is created after the createConfig
+                    // outputPath option, so we don't need to keep this
+                    return false;
+                }
+                const normalizedOutputPath = outputs[0]
+                    .replace('{workspaceRoot}/', '')
+                    .replace('{projectRoot}', project.root)
+                    .replace('{projectName}', '');
+                if (normalizedOutputPath === newOutputPath ||
+                    normalizedOutputPath.replace(/\/browser\/?$/, '') === newOutputPath) {
+                    return false;
+                }
+            }
+            return true;
+        };
+        const normalizeOutput = (path, workspaceRoot, projectRoot) => {
+            const fullProjectRoot = (0, path_1.resolve)(workspaceRoot, projectRoot);
+            const fullPath = (0, path_1.resolve)(workspaceRoot, path);
+            const pathRelativeToProjectRoot = (0, devkit_1.normalizePath)((0, path_1.relative)(fullProjectRoot, fullPath));
+            if (pathRelativeToProjectRoot.startsWith('..')) {
+                return (0, devkit_1.joinPathFragments)('{workspaceRoot}', (0, path_1.relative)(workspaceRoot, fullPath));
+            }
+            return (0, devkit_1.joinPathFragments)('{projectRoot}', pathRelativeToProjectRoot);
+        };
+        if (shouldOverrideOutputs(buildTarget.config.outputs)) {
+            buildTarget.config.outputs = buildTarget.config.outputs.map((output) => {
+                if (output === '{options.outputPath}') {
+                    // the target won't have an outputPath option, so we replace it with the new output path
+                    return normalizeOutput(newOutputPath, devkit_1.workspaceRoot, project.root);
+                }
+                const normalizedOutputPath = output
+                    .replace('{workspaceRoot}/', '')
+                    .replace('{projectRoot}', project.root)
+                    .replace('{projectName}', '');
+                if (/\/browser\/?$/.test(normalizedOutputPath) &&
+                    normalizedOutputPath.replace(/\/browser\/?$/, '') === newOutputPath) {
+                    return normalizeOutput(newOutputPath, devkit_1.workspaceRoot, project.root);
+                }
+                return output;
+            });
+        }
+        else {
+            delete buildTarget.config.outputs;
+        }
+        if (buildTarget.config.syncGenerators?.length === 1 &&
+            buildTarget.config.syncGenerators[0] === '@nx/js:typescript-sync') {
+            delete buildTarget.config.syncGenerators;
+        }
+        else if (buildTarget.config.syncGenerators?.length) {
+            buildTarget.config.syncGenerators = Array.from(new Set([
+                ...buildTarget.config.syncGenerators,
+                '@nx/js:typescript-sync',
+            ]));
+        }
+        if (Object.keys(buildTarget.config).length) {
+            // there's extra target metadata left that wouldn't be inferred, we keep it
+            project.targets[inferredBuildTargetName] = buildTarget.config;
+        }
+    }
+    if (serveTarget) {
+        delete serveTarget.config.options;
+        delete serveTarget.config.configurations;
+        delete serveTarget.config.defaultConfiguration;
+        delete serveTarget.config.executor;
+        if (serveTarget.config.continuous) {
+            delete serveTarget.config.continuous;
+        }
+        if (serveTarget.config.syncGenerators?.length === 1 &&
+            serveTarget.config.syncGenerators[0] === '@nx/js:typescript-sync') {
+            delete serveTarget.config.syncGenerators;
+        }
+        else if (serveTarget.config.syncGenerators?.length) {
+            serveTarget.config.syncGenerators = Array.from(new Set([
+                ...serveTarget.config.syncGenerators,
+                '@nx/js:typescript-sync',
+            ]));
+        }
+        if (projectServePort !== DEFAULT_PORT) {
+            serveTarget.config.options = {};
+            serveTarget.config.options.port = projectServePort;
+        }
+        if (Object.keys(serveTarget.config).length) {
+            // there's extra target metadata left that wouldn't be inferred, we keep it
+            project.targets[inferredServeTargetName] = serveTarget.config;
+        }
+    }
+    (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
     // 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') {

package/src/migrations/update-21-2-0/replace-provide-server-routing.js

@@ -26,22 +26,15 @@ async function default_1(tree) {
 }
 function processFile(tree, filePath) {
     const content = tree.read(filePath, 'utf-8');
-    if ((!content.includes('provideServerRouting') &&
-        !content.includes('provideServerRoutesConfig')) ||
+    if (!content.includes('provideServerRouting') ||
         !content.includes('@angular/ssr')) {
         return;
     }
     const sourceFile = tsquery_1.tsquery.ast(content);
-    const providersArray = tsquery_1.tsquery.query(sourceFile, 'PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression', { visitAllChildren: true })[0];
+    const providersArray = tsquery_1.tsquery.query(sourceFile, 'PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression:has(CallExpression > Identifier[name=provideServerRouting])', { visitAllChildren: true })[0];
     if (!providersArray) {
         return;
     }
-    if (!providersArray.elements.some((el) => ts.isCallExpression(el) &&
-        ts.isIdentifier(el.expression) &&
-        (el.expression.getText() === 'provideServerRouting' ||
-            el.expression.getText() === 'provideServerRoutesConfig'))) {
-        return;
-    }
     const recorder = new file_change_recorder_1.FileChangeRecorder(tree, filePath);
     const printer = ts.createPrinter({
         newLine: ts.NewLineKind.LineFeed,
@@ -53,21 +46,18 @@ function processFile(tree, filePath) {
         if (node.expression.getText() === 'provideServerRendering') {
             provideServerRenderingCall = node;
         }
-        else if (node.expression.getText() === 'provideServerRouting' ||
-            node.expression.getText() === 'provideServerRoutesConfig') {
+        else if (node.expression.getText() === 'provideServerRouting') {
             provideServerRoutingCall = node;
         }
     }
     const withRoutesCall = ts.factory.createCallExpression(ts.factory.createIdentifier('withRoutes'), undefined, [provideServerRoutingCall.arguments.at(0)]);
     let updatedProvidersArray;
     if (provideServerRenderingCall) {
-        // remove the "provideServerRouting" and "provideServerRoutesConfig"
-        // calls and update the existing "provideServerRendering" call
+        // remove the "provideServerRouting" call and update the existing "provideServerRendering" call
         updatedProvidersArray = ts.factory.updateArrayLiteralExpression(providersArray, providersArray.elements
             .filter((el) => !(ts.isCallExpression(el) &&
             ts.isIdentifier(el.expression) &&
-            (el.expression.text === 'provideServerRouting' ||
-                el.expression.text === 'provideServerRoutesConfig')))
+            el.expression.text === 'provideServerRouting'))
             .map((el) => {
             if (ts.isCallExpression(el) &&
                 ts.isIdentifier(el.expression) &&
@@ -78,13 +68,11 @@ function processFile(tree, filePath) {
         }));
     }
     else {
-        // replace the "provideServerRouting" and "provideServerRoutesConfig"
-        // calls with the new "provideServerRendering" call
+        // replace the "provideServerRouting" call with the new "provideServerRendering" call
         updatedProvidersArray = ts.factory.updateArrayLiteralExpression(providersArray, providersArray.elements.map((el) => {
             if (ts.isCallExpression(el) &&
                 ts.isIdentifier(el.expression) &&
-                (el.expression.text === 'provideServerRouting' ||
-                    el.expression.text === 'provideServerRoutesConfig')) {
+                el.expression.text === 'provideServerRouting') {
                 return ts.factory.createCallExpression(ts.factory.createIdentifier('provideServerRendering'), undefined, [withRoutesCall, ...provideServerRoutingCall.arguments.slice(1)]);
             }
             return el;
@@ -97,12 +85,11 @@ function processFile(tree, filePath) {
     if (importDecl?.importClause?.namedBindings) {
         const namedBindings = importDecl?.importClause.namedBindings;
         if (ts.isNamedImports(namedBindings)) {
-            // remove the "provideServerRouting" and "provideServerRoutesConfig"
-            // imports and ensure we have the "withRoutes" import
+            // remove the "provideServerRouting" import and ensure we have the "withRoutes" import
             const updatedElementNames = new Set([
                 ...namedBindings.elements
                     .map((el) => el.getText())
-                    .filter((x) => x !== 'provideServerRouting' && x !== 'provideServerRoutesConfig'),
+                    .filter((x) => x !== 'provideServerRouting'),
                 'withRoutes',
             ]);
             const updatedNamedBindings = ts.factory.updateNamedImports(namedBindings, Array.from(updatedElementNames).map((name) => ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(name))));

package/src/migrations/update-21-2-0/update-angular-cli.d.ts

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

package/src/migrations/update-21-2-0/update-angular-cli.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularCliVersion = void 0;
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-exports.angularCliVersion = '~20.0.0';
+exports.angularCliVersion = '20.0.0-rc.3';
 async function default_1(tree) {
     let shouldFormat = false;
     (0, devkit_1.updateJson)(tree, 'package.json', (json) => {

package/src/utils/versions.d.ts

@@ -1,8 +1,8 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~20.0.0";
-export declare const angularDevkitVersion = "~20.0.0";
-export declare const ngPackagrVersion = "~20.0.0";
-export declare const angularRspackVersion = "^21.1.0";
+export declare const angularVersion = "20.0.0-rc.2";
+export declare const angularDevkitVersion = "20.0.0-rc.3";
+export declare const ngPackagrVersion = "20.0.0-rc.1";
+export declare const angularRspackVersion = "^21.0.1";
 export declare const ngrxVersion = "^19.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.15.0";
@@ -16,7 +16,7 @@ export declare const browserSyncVersion = "^3.0.0";
 export declare const moduleFederationNodeVersion = "^2.6.26";
 export declare const moduleFederationEnhancedVersion = "^0.9.0";
 export declare const webpackMergeVersion = "^5.8.0";
-export declare const angularEslintVersion = "^20.0.0-alpha.1";
+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

@@ -2,10 +2,10 @@
 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.webpackMergeVersion = 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 = '~20.0.0';
-exports.angularDevkitVersion = '~20.0.0';
-exports.ngPackagrVersion = '~20.0.0';
-exports.angularRspackVersion = '^21.1.0';
+exports.angularVersion = '20.0.0-rc.2';
+exports.angularDevkitVersion = '20.0.0-rc.3';
+exports.ngPackagrVersion = '20.0.0-rc.1';
+exports.angularRspackVersion = '^21.0.1';
 exports.ngrxVersion = '^19.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.15.0';
@@ -19,7 +19,7 @@ exports.browserSyncVersion = '^3.0.0';
 exports.moduleFederationNodeVersion = '^2.6.26';
 exports.moduleFederationEnhancedVersion = '^0.9.0';
 exports.webpackMergeVersion = '^5.8.0';
-exports.angularEslintVersion = '^20.0.0-alpha.1';
+exports.angularEslintVersion = '^19.2.0';
 exports.typescriptEslintVersion = '^7.16.0';
 exports.tailwindVersion = '^3.0.2';
 exports.postcssVersion = '^8.4.5';