@nx/angular 21.0.4-beta.0 → 21.1.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "21.0.4-beta.0",
+  "version": "21.1.0-beta.1",
   "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.4-beta.0",
-    "@nx/js": "21.0.4-beta.0",
-    "@nx/eslint": "21.0.4-beta.0",
-    "@nx/webpack": "21.0.4-beta.0",
-    "@nx/rspack": "21.0.4-beta.0",
-    "@nx/module-federation": "21.0.4-beta.0",
-    "@nx/web": "21.0.4-beta.0",
-    "@nx/workspace": "21.0.4-beta.0",
+    "@nx/devkit": "21.1.0-beta.1",
+    "@nx/js": "21.1.0-beta.1",
+    "@nx/eslint": "21.1.0-beta.1",
+    "@nx/webpack": "21.1.0-beta.1",
+    "@nx/rspack": "21.1.0-beta.1",
+    "@nx/module-federation": "21.1.0-beta.1",
+    "@nx/web": "21.1.0-beta.1",
+    "@nx/workspace": "21.1.0-beta.1",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/generators/application/lib/create-files.js

@@ -44,7 +44,7 @@ async function createFiles(tree, options, rootOffset) {
         connectCloudUrl,
         tutorialUrl: options.standalone
             ? 'https://nx.dev/getting-started/tutorials/angular-standalone-tutorial?utm_source=nx-project'
-            : 'https://nx.dev/tutorials/3-angular-monorepo/1a-introduction/1-welcome?utm_source=nx-project',
+            : 'https://nx.dev/getting-started/tutorials/angular-monorepo-tutorial?utm_source=nx-project',
         tpl: '',
     };
     const angularAppType = options.standalone ? 'standalone' : 'ng-module';

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

@@ -15,6 +15,8 @@ const SUPPORTED_EXECUTORS = [
     '@angular-devkit/build-angular:browser',
     '@angular-devkit/build-angular:dev-server',
     '@angular-devkit/build-angular:server',
+    '@angular-devkit/build-angular:prerender',
+    '@angular-devkit/build-angular:app-shell',
     '@nx/angular:webpack-browser',
     '@nx/angular:webpack-server',
     '@nx/angular:dev-server',
@@ -293,6 +295,31 @@ async function convertToRspack(tree, schema) {
             }
             serveTargetNames.push(targetName);
         }
+        else if (target.executor === '@angular-devkit/build-angular:prerender') {
+            if (target.options) {
+                const prerenderOptions = {
+                    routesFile: target.options.routesFile,
+                    discoverRoutes: target.options.discoverRoutes ?? true,
+                    routes: target.options.routes ?? [],
+                };
+                createConfigOptions.prerender = prerenderOptions;
+                if (target.configurations) {
+                    for (const [configurationName, configuration] of Object.entries(target.configurations)) {
+                        configurationOptions[configurationName] ??= {};
+                        configurationOptions[configurationName].prerender ??= {
+                            routesFile: configuration.routesFile,
+                            discoverRoutes: configuration.discoverRoutes ?? true,
+                            routes: configuration.routes ?? [],
+                        };
+                    }
+                }
+            }
+            buildTargetNames.push(targetName);
+        }
+        else if (target.executor === '@angular-devkit/build-angular:app-shell') {
+            createConfigOptions.appShell = true;
+            buildTargetNames.push(targetName);
+        }
     }
     const customWebpackConfigInfo = customWebpackConfigPath
         ? await (0, get_custom_webpack_config_1.getCustomWebpackConfig)(tree, project.root, customWebpackConfigPath)
@@ -311,6 +338,7 @@ async function convertToRspack(tree, schema) {
     const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
     await rspackInitGenerator(tree, {
         addPlugin: true,
+        framework: 'angular',
     });
     // This is needed to prevent a circular execution of the build target
     const rootPkgJson = (0, devkit_1.readJson)(tree, 'package.json');

package/src/generators/utils/add-vitest.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addVitest = addVitest;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
+const version_utils_1 = require("./version-utils");
 async function addVitest(tree, options) {
     const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
     await vitestGenerator(tree, {
@@ -12,4 +13,9 @@ async function addVitest(tree, options) {
         coverageProvider: 'v8',
         addPlugin: options.addPlugin ?? false,
     });
+    if (!options.skipPackageJson) {
+        const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ??
+            (0, version_utils_1.versions)(tree).angularDevkitVersion;
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/build': angularDevkitVersion }, undefined, true);
+    }
 }

package/src/generators/utils/version-utils.d.ts

@@ -1,5 +1,6 @@
 import { type Tree } from '@nx/devkit';
 import { type PackageCompatVersions, type PackageLatestVersions } from '../../utils/backward-compatible-versions';
+export declare function getInstalledAngularDevkitVersion(tree: Tree): string | null;
 export declare function getInstalledAngularVersion(tree: Tree): string;
 export declare function getInstalledAngularMajorVersion(tree: Tree): number;
 export declare function getInstalledAngularVersionInfo(tree: Tree): {

package/src/generators/utils/version-utils.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInstalledAngularDevkitVersion = getInstalledAngularDevkitVersion;
 exports.getInstalledAngularVersion = getInstalledAngularVersion;
 exports.getInstalledAngularMajorVersion = getInstalledAngularMajorVersion;
 exports.getInstalledAngularVersionInfo = getInstalledAngularVersionInfo;
@@ -12,6 +13,10 @@ const semver_1 = require("semver");
 const backward_compatible_versions_1 = require("../../utils/backward-compatible-versions");
 const latestVersions = tslib_1.__importStar(require("../../utils/versions"));
 const versions_1 = require("../../utils/versions");
+function getInstalledAngularDevkitVersion(tree) {
+    return (getInstalledPackageVersion(tree, '@angular-devkit/build-angular') ??
+        getInstalledPackageVersion(tree, '@angular/build'));
+}
 function getInstalledAngularVersion(tree) {
     const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
     const installedAngularVersion = pkgJson.dependencies && pkgJson.dependencies['@angular/core'];