@nx/angular 20.4.0-beta.0 → 20.4.0-beta.1

package/executors.json

@@ -13,7 +13,7 @@
     "package": {
       "implementation": "./src/executors/package/package.impl",
       "schema": "./src/executors/package/schema.json",
-      "description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\n\nThis executor is a drop-in replacement for the `@angular-devkit/build-angular:ng-packagr` with additional support for incremental builds."
+      "description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\n\nThis executor is a drop-in replacement for the `@angular-devkit/build-angular:ng-packagr` and `@angular/build:ng-packagr` builders, with additional support for incremental builds."
     },
     "browser-esbuild": {
       "implementation": "./src/executors/browser-esbuild/browser-esbuild.impl",

package/migrations.json

@@ -338,6 +338,15 @@
       "version": "20.3.0-beta.2",
       "description": "If workspace includes Module Federation projects, ensure the new @nx/module-federation package is installed.",
       "factory": "./src/migrations/update-20-3-0/ensure-nx-module-federation-package"
+    },
+    "update-angular-cli-version-19-1-0": {
+      "cli": "nx",
+      "version": "20.4.0-beta.1",
+      "requires": {
+        "@angular/core": ">=19.1.0"
+      },
+      "description": "Update the @angular/cli package version to ~19.1.0.",
+      "factory": "./src/migrations/update-20-4-0/update-angular-cli"
     }
   },
   "packageJsonUpdates": {
@@ -1415,6 +1424,67 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.4.0": {
+      "version": "20.4.0-beta.1",
+      "x-prompt": "Do you want to update the Angular version to v19.1?",
+      "requires": {
+        "@angular/core": ">=19.0.0 <19.1.0"
+      },
+      "packages": {
+        "@angular-devkit/build-angular": {
+          "version": "~19.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/core": {
+          "version": "~19.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/schematics": {
+          "version": "~19.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/build": {
+          "version": "~19.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/pwa": {
+          "version": "~19.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/ssr": {
+          "version": "~19.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@schematics/angular": {
+          "version": "~19.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/architect": {
+          "version": "~0.1901.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-webpack": {
+          "version": "~0.1901.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/core": {
+          "version": "~19.1.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@angular/material": {
+          "version": "~19.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/cdk": {
+          "version": "~19.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "ng-packagr": {
+          "version": "~19.1.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "20.4.0-beta.0",
+  "version": "20.4.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": {
@@ -71,13 +71,13 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "20.4.0-beta.0",
-    "@nx/js": "20.4.0-beta.0",
-    "@nx/eslint": "20.4.0-beta.0",
-    "@nx/webpack": "20.4.0-beta.0",
-    "@nx/module-federation": "20.4.0-beta.0",
-    "@nx/web": "20.4.0-beta.0",
-    "@nx/workspace": "20.4.0-beta.0",
+    "@nx/devkit": "20.4.0-beta.1",
+    "@nx/js": "20.4.0-beta.1",
+    "@nx/eslint": "20.4.0-beta.1",
+    "@nx/webpack": "20.4.0-beta.1",
+    "@nx/module-federation": "20.4.0-beta.1",
+    "@nx/web": "20.4.0-beta.1",
+    "@nx/workspace": "20.4.0-beta.1",
     "piscina": "^4.4.0"
   },
   "peerDependencies": {

package/src/executors/package/schema.json

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "$schema": "https://json-schema.org/schema",
   "title": "ng-packagr Target",
-  "description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\n\nThis executor is a drop-in replacement for the `@angular-devkit/build-angular:ng-packagr` with additional support for incremental builds.",
+  "description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\n\nThis executor is a drop-in replacement for the `@angular-devkit/build-angular:ng-packagr` and `@angular/build:ng-packagr` builders, with additional support for incremental builds.",
   "cli": "nx",
   "type": "object",
   "presets": [

package/src/generators/move/lib/update-secondary-entry-points.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const libraryExecutors = [
     '@angular-devkit/build-angular:ng-packagr',
+    '@angular/build:ng-packagr',
     '@nx/angular:ng-packagr-lite',
     '@nx/angular:package',
     // TODO(v17): remove when @nrwl/* scope is removed

package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js

@@ -7,7 +7,7 @@ const path_1 = require("path");
 const builder_migrator_1 = require("./builder.migrator");
 class AngularDevkitKarmaMigrator extends builder_migrator_1.BuilderMigrator {
     constructor(tree, project, projectConfig, logger) {
-        super(tree, '@angular-devkit/build-angular:karma', 'karma', project, projectConfig, logger);
+        super(tree, ['@angular-devkit/build-angular:karma'], 'karma', project, projectConfig, logger);
     }
     migrate() {
         if (this.skipMigration) {

package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js

@@ -8,15 +8,16 @@ const dependencies_1 = require("../../../utils/dependencies");
 const builder_migrator_1 = require("./builder.migrator");
 class AngularDevkitNgPackagrMigrator extends builder_migrator_1.BuilderMigrator {
     constructor(tree, project, projectConfig, logger) {
-        super(tree, '@angular-devkit/build-angular:ng-packagr', undefined, project, projectConfig, logger);
+        super(tree, ['@angular-devkit/build-angular:ng-packagr', '@angular/build:ng-packagr'], undefined, project, projectConfig, logger);
     }
     migrate() {
         if (this.skipMigration) {
             return;
         }
         if (!this.targets.size) {
-            this.logger.warn(`There is no target in the project configuration using the ${this.builderName} builder. This might not be an issue. ` +
-                `Skipping updating the build configuration.`);
+            this.logger.warn(`There is no target in the project configuration using the ${this.possibleBuilderNames
+                .map((b) => `"${b}"`)
+                .join(', ')} builder${this.possibleBuilderNames.length > 1 ? 's' : ''}. This might not be an issue. Skipping updating the build configuration.`);
             return;
         }
         for (const [name, target] of this.targets) {

package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js

@@ -7,7 +7,7 @@ const path_1 = require("path");
 const builder_migrator_1 = require("./builder.migrator");
 class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
     constructor(tree, project, projectConfig, logger) {
-        super(tree, '@angular-eslint/builder:lint', 'eslint', project, projectConfig, logger);
+        super(tree, ['@angular-eslint/builder:lint'], 'eslint', project, projectConfig, logger);
     }
     migrate() {
         if (this.skipMigration) {

package/src/generators/ng-add/migrators/builders/builder.migrator.d.ts

@@ -2,11 +2,11 @@ import type { ProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit
 import type { Logger, ProjectMigrationInfo, ValidationResult, WorkspaceRootFileType } from '../../utilities';
 import { Migrator } from '../migrator';
 export declare abstract class BuilderMigrator extends Migrator {
-    readonly builderName: string;
+    readonly possibleBuilderNames: string[];
     readonly rootFileType: WorkspaceRootFileType | undefined;
     targets: Map<string, TargetConfiguration>;
     protected skipMigration: boolean;
-    constructor(tree: Tree, builderName: string, rootFileType: WorkspaceRootFileType | undefined, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
+    constructor(tree: Tree, possibleBuilderNames: string[], rootFileType: WorkspaceRootFileType | undefined, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
     validate(): ValidationResult;
     isBuilderUsed(): boolean;
     protected collectBuilderTargets(): void;

package/src/generators/ng-add/migrators/builders/builder.migrator.js

@@ -4,9 +4,9 @@ exports.BuilderMigrator = void 0;
 const utilities_1 = require("../../utilities");
 const migrator_1 = require("../migrator");
 class BuilderMigrator extends migrator_1.Migrator {
-    constructor(tree, builderName, rootFileType, project, projectConfig, logger) {
+    constructor(tree, possibleBuilderNames, rootFileType, project, projectConfig, logger) {
         super(tree, projectConfig, logger);
-        this.builderName = builderName;
+        this.possibleBuilderNames = possibleBuilderNames;
         this.rootFileType = rootFileType;
         this.targets = new Map();
         this.skipMigration = false;
@@ -20,7 +20,7 @@ class BuilderMigrator extends migrator_1.Migrator {
         // expanding what's supported.
         if (this.targets.size > 1) {
             errors.push({
-                message: `There is more than one target using the builder "${this.builderName}": ${(0, utilities_1.arrayToString)([
+                message: `There is more than one target using the builder${this.possibleBuilderNames.length > 1 ? 's' : ''} ${(0, utilities_1.arrayToString)(this.possibleBuilderNames)}: ${(0, utilities_1.arrayToString)([
                     ...this.targets.keys(),
                 ])}. This is not currently supported by the automated migration. These targets will be skipped.`,
                 hint: 'Make sure to manually migrate their configuration and any possible associated files.',
@@ -34,7 +34,7 @@ class BuilderMigrator extends migrator_1.Migrator {
     }
     collectBuilderTargets() {
         for (const [name, target] of Object.entries(this.projectConfig.targets ?? {})) {
-            if (target.executor === this.builderName) {
+            if (this.possibleBuilderNames.includes(target.executor)) {
                 this.targets.set(name, target);
             }
         }

package/src/generators/ng-add/migrators/projects/project.migrator.js

@@ -88,7 +88,7 @@ class ProjectMigrator extends migrator_1.Migrator {
                 .map((x) => x.builders)
                 .flat(),
         ];
-        allSupportedBuilders.push(...this.builderMigrators.map((migrator) => migrator.builderName));
+        allSupportedBuilders.push(...this.builderMigrators.flatMap((migrator) => migrator.possibleBuilderNames));
         const unsupportedBuilders = [];
         Object.entries(this.projectConfig.targets ?? {}).forEach(([targetName, target]) => {
             if (!allSupportedBuilders.includes(target.executor)) {

package/src/generators/setup-ssr/lib/normalize-options.js

@@ -24,6 +24,10 @@ async function normalizeOptions(tree, options) {
             options.serverRouting = false;
         }
     }
+    else if (options.serverRouting !== undefined &&
+        !isUsingApplicationBuilder) {
+        throw new Error('Server routing APIs can only be added to a project using `application` builder.');
+    }
     const isStandaloneApp = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
     return {
         project: options.project,

package/src/generators/setup-tailwind/lib/validate-build-target.js

@@ -11,6 +11,7 @@ function validateBuildTarget(options, project) {
     }
     const supportedLibraryExecutors = [
         '@angular-devkit/build-angular:ng-packagr',
+        '@angular/build:ng-packagr',
         '@nx/angular:ng-packagr-lite',
         '@nx/angular:package',
     ];

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

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

package/src/migrations/update-20-4-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.1.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/plugins/plugin.js

@@ -19,6 +19,7 @@ const knownExecutors = {
         '@angular-devkit/build-angular:browser-esbuild',
         '@angular-devkit/build-angular:browser',
         '@angular-devkit/build-angular:ng-packagr',
+        '@angular/build:ng-packagr',
     ]),
     devServer: new Set(['@angular-devkit/build-angular:dev-server']),
     extractI18n: new Set(['@angular-devkit/build-angular:extract-i18n']),
@@ -201,7 +202,8 @@ async function updateBuildTarget(targetName, target, angularTarget, context, ang
             getOutput(fullOutputPath, context.workspaceRoot, angularWorkspaceRoot, projectRoot),
         ];
     }
-    else if (angularTarget.builder === '@angular-devkit/build-angular:ng-packagr') {
+    else if (angularTarget.builder === '@angular-devkit/build-angular:ng-packagr' ||
+        angularTarget.builder === '@angular/build:ng-packagr') {
         const outputs = await getNgPackagrOutputs(angularTarget, angularWorkspaceRoot, projectRoot, context);
         if (outputs.length) {
             target.outputs = outputs;
@@ -215,7 +217,8 @@ async function updateBuildTarget(targetName, target, angularTarget, context, ang
                 ? ['production', '^production']
                 : ['default', '^default'];
     }
-    if (angularTarget.builder === '@angular-devkit/build-angular:ng-packagr') {
+    if (angularTarget.builder === '@angular-devkit/build-angular:ng-packagr' ||
+        angularTarget.builder === '@angular/build:ng-packagr') {
         target.metadata.help.example.options = { watch: true };
     }
     else {

package/src/utils/versions.d.ts

@@ -1,7 +1,7 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~19.0.0";
-export declare const angularDevkitVersion = "~19.0.0";
-export declare const ngPackagrVersion = "~19.0.0";
+export declare const angularVersion = "~19.1.0";
+export declare const angularDevkitVersion = "~19.1.0";
+export declare const ngPackagrVersion = "~19.1.0";
 export declare const ngrxVersion = "^19.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.15.0";

package/src/utils/versions.js

@@ -2,9 +2,9 @@
 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.nxVersion = require('../../package.json').version;
-exports.angularVersion = '~19.0.0';
-exports.angularDevkitVersion = '~19.0.0';
-exports.ngPackagrVersion = '~19.0.0';
+exports.angularVersion = '~19.1.0';
+exports.angularDevkitVersion = '~19.1.0';
+exports.ngPackagrVersion = '~19.1.0';
 exports.ngrxVersion = '^19.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.15.0';