@nx/angular 0.0.0-pr-32490-e4fdfa9 → 0.0.0-pr-32868-a65a4a2

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

@@ -16,7 +16,7 @@ function generateSSRFiles(tree, options) {
         // server has already been added
         return;
     }
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const baseFilesPath = (0, path_1.join)(__dirname, '..', 'files');
     let pathToFiles;
     if (angularMajorVersion >= 20) {
@@ -40,6 +40,13 @@ function generateSSRFiles(tree, options) {
     const componentType = (0, artifact_types_1.getComponentType)(tree);
     const appComponentInfo = (0, app_components_info_1.getAppComponentInfo)(tree, componentType ? `.${componentType}` : '', project);
     const moduleTypeSeparator = (0, artifact_types_1.getModuleTypeSeparator)(tree);
+    const useBootstrapContext = 
+    // https://github.com/angular/angular-cli/releases/tag/20.3.0
+    (0, semver_1.gte)(angularVersion, '20.3.0') ||
+        // https://github.com/angular/angular-cli/releases/tag/19.2.16
+        (angularMajorVersion === 19 && (0, semver_1.gte)(angularVersion, '19.2.16')) ||
+        // https://github.com/angular/angular-cli/releases/tag/18.2.21
+        (angularMajorVersion === 18 && (0, semver_1.gte)(angularVersion, '18.2.21'));
     (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, {
         ...options,
         provideServerRoutingFn: !cleanedSsrVersion || (0, semver_1.gte)(cleanedSsrVersion, '19.2.0')
@@ -48,6 +55,7 @@ function generateSSRFiles(tree, options) {
         appFileName: appComponentInfo.extensionlessFileName,
         appSymbolName: appComponentInfo.symbolName,
         moduleTypeSeparator,
+        useBootstrapContext,
         tpl: '',
     });
     if (angularMajorVersion === 19 && !options.serverRouting) {

package/src/generators/utils/add-jest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-jest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-jest.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CAkDf"}
+{"version":3,"file":"add-jest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-jest.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CAsDf"}

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

@@ -11,7 +11,11 @@ async function addJest(tree, options) {
         (0, devkit_1.addDependenciesToPackageJson)(tree, {
             // TODO(leo): jest-preset-angular still needs this until https://github.com/thymikee/jest-preset-angular/pull/3079 is merged
             '@angular/platform-browser-dynamic': pkgVersions.angularVersion,
-        }, { 'jest-preset-angular': pkgVersions.jestPresetAngularVersion }, undefined, true);
+        }, {
+            // force jest v29.7.0, Angular doesn't support Jest v30 yet: https://github.com/angular/angular-cli/pull/30761
+            jest: '^29.7.0',
+            'jest-preset-angular': pkgVersions.jestPresetAngularVersion,
+        }, undefined, true);
     }
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
     await configurationGenerator(tree, {

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

@@ -13,4 +13,9 @@ export declare function getInstalledPackageVersionInfo(tree: Tree, pkgName: stri
     version: string;
 };
 export declare function versions(tree: Tree): PackageLatestVersions | PackageCompatVersions;
+/**
+ * Temporary helper to abstract away the version of angular-rspack to be installed
+ * until we stop supporting Angular 19.
+ */
+export declare function getAngularRspackVersion(tree: Tree): string | null;
 //# sourceMappingURL=version-utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC3B,MAAM,0CAA0C,CAAC;AAIlD,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAK1E;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAgB7D;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAElE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI;;;EAOxD;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAKf;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAIzE;AAED,wBAAgB,QAAQ,CACtB,IAAI,EAAE,IAAI,GACT,qBAAqB,GAAG,qBAAqB,CAU/C"}
+{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC3B,MAAM,0CAA0C,CAAC;AAIlD,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAK1E;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAgB7D;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAElE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI;;;EAOxD;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAKf;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM;;;EAIzE;AAED,wBAAgB,QAAQ,CACtB,IAAI,EAAE,IAAI,GACT,qBAAqB,GAAG,qBAAqB,CAU/C;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAcjE"}

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

@@ -7,6 +7,7 @@ exports.getInstalledAngularVersionInfo = getInstalledAngularVersionInfo;
 exports.getInstalledPackageVersion = getInstalledPackageVersion;
 exports.getInstalledPackageVersionInfo = getInstalledPackageVersionInfo;
 exports.versions = versions;
+exports.getAngularRspackVersion = getAngularRspackVersion;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
@@ -57,3 +58,20 @@ function versions(tree) {
             return latestVersions;
     }
 }
+/**
+ * Temporary helper to abstract away the version of angular-rspack to be installed
+ * until we stop supporting Angular 19.
+ */
+function getAngularRspackVersion(tree) {
+    const majorAngularVersion = getInstalledAngularMajorVersion(tree);
+    if (majorAngularVersion === 19) {
+        return backward_compatible_versions_1.backwardCompatibleVersions.angularV19.angularRspackVersion;
+    }
+    if (majorAngularVersion >= 20) {
+        // Starting with Angular 20, we can use an Angular Rspack version that is
+        // aligned with the Nx version
+        return latestVersions.nxVersion;
+    }
+    // Lower versions of Angular are not supported
+    return null;
+}

package/src/migrations/update-21-5-0/remove-default-karma-configuration-files.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=remove-default-karma-configuration-files.d.ts.map

package/src/migrations/update-21-5-0/remove-default-karma-configuration-files.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-default-karma-configuration-files.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-5-0/remove-default-karma-configuration-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,yBAA+B,IAAI,EAAE,IAAI,iBA4DxC"}

package/src/migrations/update-21-5-0/remove-default-karma-configuration-files.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const targets_1 = require("../../utils/targets");
+const karma_config_analyzer_1 = require("./utils/karma-config-analyzer");
+const karma_config_comparer_1 = require("./utils/karma-config-comparer");
+async function default_1(tree) {
+    const removableKarmaConfigs = new Map();
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [projectName, project] of projects) {
+        for (const [, target] of (0, targets_1.allProjectTargets)(project)) {
+            let needDevkitPlugin = false;
+            switch (target.executor) {
+                case '@angular-devkit/build-angular:karma':
+                    needDevkitPlugin = true;
+                    break;
+                case '@angular/build:karma':
+                    break;
+                default:
+                    continue;
+            }
+            for (const [, options] of (0, targets_1.allTargetOptions)(target)) {
+                const karmaConfig = options['karmaConfig'];
+                if (typeof karmaConfig !== 'string') {
+                    continue;
+                }
+                let isRemovable = removableKarmaConfigs.get(karmaConfig);
+                if (isRemovable === undefined && tree.exists(karmaConfig)) {
+                    const content = tree.read(karmaConfig, 'utf-8');
+                    const analysis = (0, karma_config_analyzer_1.analyzeKarmaConfig)(content);
+                    if (analysis.hasUnsupportedValues) {
+                        // Cannot safely determine if the file is removable.
+                        isRemovable = false;
+                    }
+                    else {
+                        const diff = await (0, karma_config_comparer_1.compareKarmaConfigToDefault)(analysis, projectName, karmaConfig, needDevkitPlugin);
+                        isRemovable = !(0, karma_config_comparer_1.hasDifferences)(diff) && diff.isReliable;
+                    }
+                    removableKarmaConfigs.set(karmaConfig, isRemovable);
+                    if (isRemovable) {
+                        tree.delete(karmaConfig);
+                    }
+                }
+                if (isRemovable) {
+                    delete options['karmaConfig'];
+                    (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+                }
+            }
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}

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

@@ -0,0 +1,4 @@
+import { Tree } from '@nx/devkit';
+export declare const angularCliVersion = "~20.2.0";
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=update-angular-cli.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-5-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-21-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 = '~20.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/migrations/update-21-5-0/utils/karma-config-analyzer.d.ts

@@ -0,0 +1,28 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+export interface RequireInfo {
+    module: string;
+    export?: string;
+    isCall?: boolean;
+    arguments?: KarmaConfigValue[];
+}
+export type KarmaConfigValue = string | boolean | number | KarmaConfigValue[] | {
+    [key: string]: KarmaConfigValue;
+} | RequireInfo | undefined;
+export interface KarmaConfigAnalysis {
+    settings: Map<string, KarmaConfigValue>;
+    hasUnsupportedValues: boolean;
+}
+/**
+ * Analyzes the content of a Karma configuration file to extract its settings.
+ *
+ * @param content The string content of the `karma.conf.js` file.
+ * @returns An object containing the configuration settings and a flag indicating if unsupported values were found.
+ */
+export declare function analyzeKarmaConfig(content: string): KarmaConfigAnalysis;
+//# sourceMappingURL=karma-config-analyzer.d.ts.map

package/src/migrations/update-21-5-0/utils/karma-config-analyzer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"karma-config-analyzer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/migrations/update-21-5-0/utils/karma-config-analyzer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAqBH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAChC;AAED,MAAM,MAAM,gBAAgB,GACxB,MAAM,GACN,OAAO,GACP,MAAM,GACN,gBAAgB,EAAE,GAClB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;CAAE,GACnC,WAAW,GACX,SAAS,CAAC;AAEd,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACxC,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAID;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB,CA+HvE"}

package/src/migrations/update-21-5-0/utils/karma-config-analyzer.js

@@ -0,0 +1,139 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.analyzeKarmaConfig = analyzeKarmaConfig;
+/**
+ * Adapts the private utility from Angular CLI to be used in the migration.
+ */
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+let ts;
+/**
+ * Analyzes the content of a Karma configuration file to extract its settings.
+ *
+ * @param content The string content of the `karma.conf.js` file.
+ * @returns An object containing the configuration settings and a flag indicating if unsupported values were found.
+ */
+function analyzeKarmaConfig(content) {
+    if (!ts) {
+        ts = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const sourceFile = ts.createSourceFile('karma.conf.js', content, ts.ScriptTarget.Latest, true);
+    const settings = new Map();
+    let hasUnsupportedValues = false;
+    function visit(node) {
+        // The Karma configuration is defined within a `config.set({ ... })` call.
+        if (ts.isCallExpression(node) &&
+            ts.isPropertyAccessExpression(node.expression) &&
+            node.expression.expression.getText(sourceFile) === 'config' &&
+            node.expression.name.text === 'set' &&
+            node.arguments.length === 1 &&
+            ts.isObjectLiteralExpression(node.arguments[0])) {
+            // We found `config.set`, now we extract the properties from the object literal.
+            for (const prop of node.arguments[0].properties) {
+                if (isSupportedPropertyAssignment(prop)) {
+                    const key = prop.name.text;
+                    const value = extractValue(prop.initializer);
+                    settings.set(key, value);
+                }
+                else {
+                    hasUnsupportedValues = true;
+                }
+            }
+        }
+        else {
+            ts.forEachChild(node, visit);
+        }
+    }
+    function extractValue(node) {
+        switch (node.kind) {
+            case ts.SyntaxKind.StringLiteral:
+                return node.text;
+            case ts.SyntaxKind.NumericLiteral:
+                return Number(node.text);
+            case ts.SyntaxKind.TrueKeyword:
+                return true;
+            case ts.SyntaxKind.FalseKeyword:
+                return false;
+            case ts.SyntaxKind.Identifier: {
+                const identifier = node.text;
+                if (identifier === '__dirname' || identifier === '__filename') {
+                    return identifier;
+                }
+                break;
+            }
+            case ts.SyntaxKind.CallExpression: {
+                const callExpr = node;
+                // Handle require('...')
+                if (ts.isIdentifier(callExpr.expression) &&
+                    callExpr.expression.text === 'require' &&
+                    callExpr.arguments.length === 1 &&
+                    ts.isStringLiteral(callExpr.arguments[0])) {
+                    return { module: callExpr.arguments[0].text };
+                }
+                // Handle calls on a require, e.g. require('path').join()
+                const calleeValue = extractValue(callExpr.expression);
+                if (isRequireInfo(calleeValue)) {
+                    return {
+                        ...calleeValue,
+                        isCall: true,
+                        arguments: callExpr.arguments.map(extractValue),
+                    };
+                }
+                break;
+            }
+            case ts.SyntaxKind.PropertyAccessExpression: {
+                const propAccessExpr = node;
+                // Handle config constants like `config.LOG_INFO`
+                if (ts.isIdentifier(propAccessExpr.expression) &&
+                    propAccessExpr.expression.text === 'config') {
+                    return `config.${propAccessExpr.name.text}`;
+                }
+                const value = extractValue(propAccessExpr.expression);
+                if (isRequireInfo(value)) {
+                    const currentExport = value.export
+                        ? `${value.export}.${propAccessExpr.name.text}`
+                        : propAccessExpr.name.text;
+                    return { ...value, export: currentExport };
+                }
+                break;
+            }
+            case ts.SyntaxKind.ArrayLiteralExpression:
+                return node.elements.map(extractValue);
+            case ts.SyntaxKind.ObjectLiteralExpression: {
+                const obj = {};
+                for (const prop of node.properties) {
+                    if (isSupportedPropertyAssignment(prop)) {
+                        // Recursively extract values for nested objects.
+                        obj[prop.name.text] = extractValue(prop.initializer);
+                    }
+                    else {
+                        hasUnsupportedValues = true;
+                    }
+                }
+                return obj;
+            }
+        }
+        // For complex expressions (like variables) that we don't need to resolve,
+        // we mark the analysis as potentially incomplete.
+        hasUnsupportedValues = true;
+        return undefined;
+    }
+    visit(sourceFile);
+    return { settings, hasUnsupportedValues };
+}
+function isRequireInfo(value) {
+    return (typeof value === 'object' &&
+        value !== null &&
+        !Array.isArray(value) &&
+        'module' in value);
+}
+function isSupportedPropertyAssignment(prop) {
+    return (ts.isPropertyAssignment(prop) &&
+        (ts.isIdentifier(prop.name) || ts.isStringLiteral(prop.name)));
+}

package/src/migrations/update-21-5-0/utils/karma-config-comparer.d.ts

@@ -0,0 +1,64 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+import { type KarmaConfigAnalysis, type KarmaConfigValue } from './karma-config-analyzer';
+/**
+ * Represents the difference between two Karma configurations.
+ */
+export interface KarmaConfigDiff {
+    /** A map of settings that were added in the project's configuration. */
+    added: Map<string, KarmaConfigValue>;
+    /** A map of settings that were removed from the project's configuration. */
+    removed: Map<string, KarmaConfigValue>;
+    /** A map of settings that were modified between the two configurations. */
+    modified: Map<string, {
+        projectValue: KarmaConfigValue;
+        defaultValue: KarmaConfigValue;
+    }>;
+    /** A boolean indicating if the comparison is reliable (i.e., no unsupported values were found). */
+    isReliable: boolean;
+}
+/**
+ * Generates the default Karma configuration file content as a string.
+ * @param relativePathToWorkspaceRoot The relative path from the Karma config file to the workspace root.
+ * @param projectName The name of the project.
+ * @param needDevkitPlugin A boolean indicating if the devkit plugin is needed.
+ * @returns The content of the default `karma.conf.js` file.
+ */
+export declare function generateDefaultKarmaConfig(relativePathToWorkspaceRoot: string, projectName: string, needDevkitPlugin: boolean): Promise<string>;
+/**
+ * Compares two Karma configuration analyses and returns the difference.
+ * @param projectAnalysis The analysis of the project's configuration.
+ * @param defaultAnalysis The analysis of the default configuration to compare against.
+ * @returns A diff object representing the changes between the two configurations.
+ */
+export declare function compareKarmaConfigs(projectAnalysis: KarmaConfigAnalysis, defaultAnalysis: KarmaConfigAnalysis): KarmaConfigDiff;
+/**
+ * Checks if there are any differences in the provided Karma configuration diff.
+ * @param diff The Karma configuration diff object to check.
+ * @returns True if there are any differences; false otherwise.
+ */
+export declare function hasDifferences(diff: KarmaConfigDiff): boolean;
+/**
+ * Compares a project's Karma configuration with the default configuration.
+ * @param projectConfigContent The content of the project's `karma.conf.js` file.
+ * @param projectRoot The root directory of the project.
+ * @param needDevkitPlugin A boolean indicating if the devkit plugin is needed for the default config.
+ * @param karmaConfigPath The path to the Karma configuration file, used to resolve relative paths.
+ * @returns A diff object representing the changes.
+ */
+export declare function compareKarmaConfigToDefault(projectConfigContent: string, projectName: string, karmaConfigPath: string, needDevkitPlugin: boolean): Promise<KarmaConfigDiff>;
+/**
+ * Compares a project's Karma configuration with the default configuration.
+ * @param projectAnalysis The analysis of the project's configuration.
+ * @param projectRoot The root directory of the project.
+ * @param needDevkitPlugin A boolean indicating if the devkit plugin is needed for the default config.
+ * @param karmaConfigPath The path to the Karma configuration file, used to resolve relative paths.
+ * @returns A diff object representing the changes.
+ */
+export declare function compareKarmaConfigToDefault(projectAnalysis: KarmaConfigAnalysis, projectName: string, karmaConfigPath: string, needDevkitPlugin: boolean): Promise<KarmaConfigDiff>;
+//# sourceMappingURL=karma-config-comparer.d.ts.map

package/src/migrations/update-21-5-0/utils/karma-config-comparer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"karma-config-comparer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/migrations/update-21-5-0/utils/karma-config-comparer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACtB,MAAM,yBAAyB,CAAC;AAEjC;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAErC,4EAA4E;IAC5E,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAEvC,2EAA2E;IAC3E,QAAQ,EAAE,GAAG,CACX,MAAM,EACN;QAAE,YAAY,EAAE,gBAAgB,CAAC;QAAC,YAAY,EAAE,gBAAgB,CAAA;KAAE,CACnE,CAAC;IAEF,mGAAmG;IACnG,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,0BAA0B,CAC9C,2BAA2B,EAAE,MAAM,EACnC,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,eAAe,EAAE,mBAAmB,EACpC,eAAe,EAAE,mBAAmB,GACnC,eAAe,CAoCjB;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAE7D;AAED;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,oBAAoB,EAAE,MAAM,EAC5B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,eAAe,CAAC,CAAC;AAE5B;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,eAAe,EAAE,mBAAmB,EACpC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,eAAe,CAAC,CAAC"}

package/src/migrations/update-21-5-0/utils/karma-config-comparer.js

@@ -0,0 +1,145 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateDefaultKarmaConfig = generateDefaultKarmaConfig;
+exports.compareKarmaConfigs = compareKarmaConfigs;
+exports.hasDifferences = hasDifferences;
+exports.compareKarmaConfigToDefault = compareKarmaConfigToDefault;
+/**
+ * Adapts the private utility from Angular CLI to be used in the migration.
+ */
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const node_util_1 = require("node:util");
+const karma_config_analyzer_1 = require("./karma-config-analyzer");
+/**
+ * Generates the default Karma configuration file content as a string.
+ * @param relativePathToWorkspaceRoot The relative path from the Karma config file to the workspace root.
+ * @param projectName The name of the project.
+ * @param needDevkitPlugin A boolean indicating if the devkit plugin is needed.
+ * @returns The content of the default `karma.conf.js` file.
+ */
+async function generateDefaultKarmaConfig(relativePathToWorkspaceRoot, projectName, needDevkitPlugin) {
+    let template = await getKarmaConfigTemplate();
+    // TODO: Replace this with the actual schematic templating logic.
+    template = template
+        .replace(/<%= relativePathToWorkspaceRoot %>/g, (0, node_path_1.normalize)(relativePathToWorkspaceRoot).replace(/\\/g, '/'))
+        .replace(/<%= folderName %>/g, projectName);
+    const devkitPluginRegex = /<% if \(needDevkitPlugin\) { %>(.*?)<% } %>/gs;
+    const replacement = needDevkitPlugin ? '$1' : '';
+    template = template.replace(devkitPluginRegex, replacement);
+    return template;
+}
+/**
+ * Compares two Karma configuration analyses and returns the difference.
+ * @param projectAnalysis The analysis of the project's configuration.
+ * @param defaultAnalysis The analysis of the default configuration to compare against.
+ * @returns A diff object representing the changes between the two configurations.
+ */
+function compareKarmaConfigs(projectAnalysis, defaultAnalysis) {
+    const added = new Map();
+    const removed = new Map();
+    const modified = new Map();
+    const allKeys = new Set([
+        ...projectAnalysis.settings.keys(),
+        ...defaultAnalysis.settings.keys(),
+    ]);
+    for (const key of allKeys) {
+        const projectValue = projectAnalysis.settings.get(key);
+        const defaultValue = defaultAnalysis.settings.get(key);
+        if (projectValue !== undefined && defaultValue === undefined) {
+            added.set(key, projectValue);
+        }
+        else if (projectValue === undefined && defaultValue !== undefined) {
+            removed.set(key, defaultValue);
+        }
+        else if (projectValue !== undefined && defaultValue !== undefined) {
+            if (!(0, node_util_1.isDeepStrictEqual)(projectValue, defaultValue)) {
+                modified.set(key, { projectValue, defaultValue });
+            }
+        }
+    }
+    return {
+        added,
+        removed,
+        modified,
+        isReliable: !projectAnalysis.hasUnsupportedValues &&
+            !defaultAnalysis.hasUnsupportedValues,
+    };
+}
+/**
+ * Checks if there are any differences in the provided Karma configuration diff.
+ * @param diff The Karma configuration diff object to check.
+ * @returns True if there are any differences; false otherwise.
+ */
+function hasDifferences(diff) {
+    return diff.added.size > 0 || diff.removed.size > 0 || diff.modified.size > 0;
+}
+async function compareKarmaConfigToDefault(projectConfigOrAnalysis, projectName, karmaConfigPath, needDevkitPlugin) {
+    const projectAnalysis = typeof projectConfigOrAnalysis === 'string'
+        ? (0, karma_config_analyzer_1.analyzeKarmaConfig)(projectConfigOrAnalysis)
+        : projectConfigOrAnalysis;
+    const defaultContent = await generateDefaultKarmaConfig(relativePathToWorkspaceRoot((0, node_path_1.dirname)(karmaConfigPath)), projectName, needDevkitPlugin);
+    const defaultAnalysis = (0, karma_config_analyzer_1.analyzeKarmaConfig)(defaultContent);
+    return compareKarmaConfigs(projectAnalysis, defaultAnalysis);
+}
+function relativePathToWorkspaceRoot(projectRoot) {
+    if (!projectRoot) {
+        return '.';
+    }
+    return (0, node_path_1.relative)((0, node_path_1.join)('/', projectRoot), '/') || '.';
+}
+const karmaConfigTemplateFallback = `// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine'<% if (needDevkitPlugin) { %>, '@angular-devkit/build-angular'<% } %>],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage'),<% if (needDevkitPlugin) { %>
+      require('@angular-devkit/build-angular/plugins/karma')<% } %>
+    ],
+    client: {
+      jasmine: {
+        // you can add configuration options for Jasmine here
+        // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
+        // for example, you can disable the random execution with \`random: false\`
+        // or set a specific seed with \`seed: 4321\`
+      },
+    },
+    jasmineHtmlReporter: {
+      suppressAll: true // removes the duplicated traces
+    },
+    coverageReporter: {
+      dir: require('path').join(__dirname, '<%= relativePathToWorkspaceRoot %>/coverage/<%= folderName %>'),
+      subdir: '.',
+      reporters: [
+        { type: 'html' },
+        { type: 'text-summary' }
+      ]
+    },
+    reporters: ['progress', 'kjhtml'],
+    browsers: ['Chrome'],
+    restartOnFileChange: true
+  });
+};
+`;
+async function getKarmaConfigTemplate() {
+    try {
+        const templatePath = require.resolve('@schematics/angular/config/files/karma.conf.js.template');
+        return await (0, promises_1.readFile)(templatePath, 'utf-8');
+    }
+    catch (e) {
+        return karmaConfigTemplateFallback;
+    }
+}

package/src/migrations/update-21-6-1/update-angular-cli.d.ts

@@ -0,0 +1,4 @@
+import { Tree } from '@nx/devkit';
+export declare const angularCliVersion = "~20.3.0";
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=update-angular-cli.d.ts.map

package/src/migrations/update-21-6-1/update-angular-cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-6-1/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAc,MAAM,YAAY,CAAC;AAE3D,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-21-6-1/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 = '~20.3.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.d.ts

@@ -5,7 +5,7 @@ type CompatPackageVersionNames = LatestPackageVersionNames;
 export type PackageVersionNames = LatestPackageVersionNames | CompatPackageVersionNames;
 export type VersionMap = {
     angularV18: Record<CompatPackageVersionNames, string>;
-    angularV19: Record<CompatPackageVersionNames, string>;
+    angularV19: Record<CompatPackageVersionNames | 'angularRspackVersion', string>;
 };
 export type PackageLatestVersions = Record<LatestPackageVersionNames, string>;
 export type PackageCompatVersions = VersionMap[SupportedVersions];

package/src/utils/backward-compatible-versions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backward-compatible-versions.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/backward-compatible-versions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,YAAY,CAAC;AAE7C,KAAK,iBAAiB,GAAG,YAAY,GAAG,YAAY,CAAC;AAErD,KAAK,yBAAyB,GAAG,OAAO,CACtC,MAAM,OAAO,cAAc,EAC3B,WAAW,CACZ,CAAC;AACF,KAAK,yBAAyB,GAAG,yBAAyB,CAAC;AAE3D,MAAM,MAAM,mBAAmB,GAC3B,yBAAyB,GACzB,yBAAyB,CAAC;AAE9B,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;IACtD,UAAU,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;AAC9E,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,EAAE,UA+DxC,CAAC"}
+{"version":3,"file":"backward-compatible-versions.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/backward-compatible-versions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,YAAY,CAAC;AAE7C,KAAK,iBAAiB,GAAG,YAAY,GAAG,YAAY,CAAC;AAErD,KAAK,yBAAyB,GAAG,OAAO,CACtC,MAAM,OAAO,cAAc,EAC3B,WAAW,CACZ,CAAC;AACF,KAAK,yBAAyB,GAAG,yBAAyB,CAAC;AAE3D,MAAM,MAAM,mBAAmB,GAC3B,yBAAyB,GACzB,yBAAyB,CAAC;AAE9B,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;IACtD,UAAU,EAAE,MAAM,CAChB,yBAAyB,GAAG,sBAAsB,EAClD,MAAM,CACP,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;AAC9E,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,EAAE,UA8DxC,CAAC"}

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

@@ -6,7 +6,6 @@ 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',