@nx/angular 23.1.0-beta.4 → 23.1.0-beta.6

package/dist/src/generators/application/lib/add-e2e.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 async function addE2e(tree, options) {
@@ -65,12 +66,9 @@ async function addE2e(tree, options) {
 function getAngularE2EWebServerInfo(tree, projectName, portOverride) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = portOverride ?? 4200;
-    if (nxJson.targetDefaults?.['serve'] &&
-        (nxJson.targetDefaults?.['serve'].options?.port ||
-            nxJson.targetDefaults?.['serve'].options?.env?.PORT)) {
-        e2ePort =
-            nxJson.targetDefaults?.['serve'].options?.port ||
-                nxJson.targetDefaults?.['serve'].options?.env?.PORT;
+    const serveTargetOptions = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)?.options;
+    if (serveTargetOptions?.port || serveTargetOptions?.env?.PORT) {
+        e2ePort = serveTargetOptions.port || serveTargetOptions.env.PORT;
     }
     const pm = (0, devkit_1.getPackageManagerCommand)();
     return {

package/dist/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -148,9 +148,9 @@ async function configureCypressCT(tree, options) {
     else {
         ctConfigOptions.buildTarget = found.target;
     }
-    const { addDefaultCTConfig, getProjectCypressConfigPath } = require('@nx/cypress/internal');
+    const { addDefaultCTConfig, getProjectCypressConfigPath, getInstalledCypressMajorVersion, } = require('@nx/cypress/internal');
     const cypressConfigPath = getProjectCypressConfigPath(tree, projectConfig.root);
-    const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions, '@nx/angular/plugins/component-testing');
+    const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions, '@nx/angular/plugins/component-testing', getInstalledCypressMajorVersion(tree));
     tree.write(cypressConfigPath, updatedCyConfig);
 }
 exports.default = cypressComponentConfiguration;

package/dist/src/generators/ng-add/migrators/migrator.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Migrator = void 0;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
 class Migrator {
     constructor(tree, projectConfig, logger) {
@@ -66,11 +67,15 @@ class Migrator {
         if (!targetNames.length) {
             return;
         }
-        const nxJson = (0, devkit_1.readNxJson)(this.tree);
-        nxJson.targetDefaults ??= {};
-        for (const target of targetNames) {
-            nxJson.targetDefaults[target] ??= {};
-            nxJson.targetDefaults[target].cache ??= true;
+        const nxJson = (0, devkit_1.readNxJson)(this.tree) ?? {};
+        for (const name of targetNames) {
+            const existing = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, {
+                target: name,
+            });
+            (0, internal_1.upsertTargetDefault)(this.tree, nxJson, {
+                target: name,
+                cache: existing?.cache ?? true,
+            });
         }
         (0, devkit_1.updateNxJson)(this.tree, nxJson);
     }

package/dist/src/generators/setup-ssr/lib/update-project-config.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectConfigForApplicationBuilder = updateProjectConfigForApplicationBuilder;
 exports.updateProjectConfigForBrowserBuilder = updateProjectConfigForBrowserBuilder;
 const devkit_1 = require("@nx/devkit");
-const internal_1 = require("@nx/js/internal");
+const internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/js/internal");
 const constants_1 = require("./constants");
 function updateProjectConfigForApplicationBuilder(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -28,7 +29,7 @@ function updateProjectConfigForApplicationBuilder(tree, options) {
             }
         }
     }
-    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_2.getProjectSourceRoot)(project, tree);
     buildTarget.options ??= {};
     buildTarget.options.outputPath = outputPath;
     buildTarget.options.server = (0, devkit_1.joinPathFragments)(sourceRoot, options.main);
@@ -50,7 +51,7 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
             configurations[key] = getServerOptions(options);
         }
     }
-    const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
+    const sourceRoot = (0, internal_2.getProjectSourceRoot)(projectConfig, tree);
     projectConfig.targets.server = {
         dependsOn: ['build'],
         executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')
@@ -98,14 +99,17 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
         defaultConfiguration: 'production',
     };
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
-    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
     if (nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations &&
         !nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('server')) {
         nxJson.tasksRunnerOptions.default.options.cacheableOperations.push('server');
     }
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults.server ??= {};
-    nxJson.targetDefaults.server.cache ??= true;
+    const existing = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, {
+        target: 'server',
+    });
+    if (!existing || existing.cache === undefined) {
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, { target: 'server', cache: true });
+    }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function getServerOptions(options = {}) {

package/dist/src/generators/utils/add-mf-env-to-inputs.js

@@ -2,29 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addMfEnvToTargetDefaultInputs = addMfEnvToTargetDefaultInputs;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 function addMfEnvToTargetDefaultInputs(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
     const webpackExecutor = '@nx/angular:webpack-browser';
     const mfEnvVar = 'NX_MF_DEV_REMOTES';
-    const inputs = [
+    const defaultInputs = [
         ...(nxJson.namedInputs && 'production' in nxJson.namedInputs
             ? ['production', '^production']
             : ['default', '^default']),
     ];
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults[webpackExecutor] ??= {};
-    nxJson.targetDefaults[webpackExecutor].inputs ??= inputs;
-    nxJson.targetDefaults[webpackExecutor].dependsOn ??= ['^build'];
+    const existing = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, {
+        executor: webpackExecutor,
+    });
+    const inputs = [...(existing?.inputs ?? defaultInputs)];
     let mfEnvVarExists = false;
-    for (const input of nxJson.targetDefaults[webpackExecutor].inputs) {
+    for (const input of inputs) {
         if (typeof input === 'object' && input['env'] === mfEnvVar) {
             mfEnvVarExists = true;
             break;
         }
     }
     if (!mfEnvVarExists) {
-        nxJson.targetDefaults[webpackExecutor].inputs.push({ env: mfEnvVar });
+        inputs.push({ env: mfEnvVar });
     }
-    nxJson.targetDefaults[webpackExecutor].cache = true;
+    (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+        executor: webpackExecutor,
+        cache: true,
+        inputs,
+        dependsOn: existing?.dependsOn ?? ['^build'],
+    });
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addVitestAngular = addVitestAngular;
 exports.addVitestAnalog = addVitestAnalog;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const semver_1 = require("semver");
 const versions_1 = require("../../utils/versions");
@@ -16,15 +17,18 @@ async function addVitestAngular(tree, options) {
     project.targets ??= {};
     project.targets.test = { executor, options: { watch: false } };
     (0, devkit_1.updateProjectConfiguration)(tree, options.name, project);
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults[executor] ??= {
-        cache: true,
-        inputs: nxJson.namedInputs && 'production' in nxJson.namedInputs
-            ? ['default', '^production']
-            : ['default', '^default'],
-    };
-    (0, devkit_1.updateNxJson)(tree, nxJson);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
+    const existing = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, { executor });
+    if (!existing) {
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+            executor,
+            cache: true,
+            inputs: nxJson.namedInputs && 'production' in nxJson.namedInputs
+                ? ['default', '^production']
+                : ['default', '^default'],
+        });
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
     configureTypeScriptForVitest(tree, options.projectRoot);
     addVitestScreenshotsToGitIgnore(tree);
     if (options.skipPackageJson) {

package/dist/src/migrations/update-19-6-1/ensure-depends-on-for-mf.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 async function default_1(tree) {
     let usesModuleFederation = false;
-    (0, internal_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options, projectName, targetName) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options) => {
         const webpackConfig = options.webpackConfig;
         if (!webpackConfig) {
             return;
@@ -18,34 +18,40 @@ async function default_1(tree) {
     if (!usesModuleFederation) {
         return;
     }
-    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
     const nxMFDevRemotesEnvVar = 'NX_MF_DEV_REMOTES';
-    const inputs = [
+    const webpackExecutor = '@nx/angular:webpack-browser';
+    const defaultInputs = [
         ...(nxJson.namedInputs && 'production' in nxJson.namedInputs
             ? ['production', '^production']
             : ['default', '^default']),
         { env: nxMFDevRemotesEnvVar },
     ];
-    if (!nxJson.targetDefaults ||
-        !nxJson.targetDefaults?.['@nx/angular:webpack-browser']) {
-        nxJson.targetDefaults ??= {};
-        nxJson.targetDefaults['@nx/angular:webpack-browser'] = {
+    const existing = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, {
+        executor: webpackExecutor,
+    });
+    if (!existing) {
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+            executor: webpackExecutor,
             cache: true,
-            inputs,
+            inputs: defaultInputs,
             dependsOn: ['^build'],
-        };
+        });
     }
     else {
-        nxJson.targetDefaults['@nx/angular:webpack-browser'].dependsOn ??= [];
-        if (!nxJson.targetDefaults['@nx/angular:webpack-browser'].dependsOn.includes('^build')) {
-            nxJson.targetDefaults['@nx/angular:webpack-browser'].dependsOn.push('^build');
-        }
-        nxJson.targetDefaults['@nx/angular:webpack-browser'].inputs ??= [];
-        if (!nxJson.targetDefaults['@nx/angular:webpack-browser'].inputs.find((i) => typeof i === 'string' ? false : i['env'] === nxMFDevRemotesEnvVar)) {
-            nxJson.targetDefaults['@nx/angular:webpack-browser'].inputs.push({
-                env: nxMFDevRemotesEnvVar,
-            });
+        const dependsOn = [...(existing.dependsOn ?? [])];
+        if (!dependsOn.includes('^build'))
+            dependsOn.push('^build');
+        const inputs = [...(existing.inputs ?? [])];
+        if (!inputs.find((i) => typeof i === 'string' ? false : i['env'] === nxMFDevRemotesEnvVar)) {
+            inputs.push({ env: nxMFDevRemotesEnvVar });
         }
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+            executor: webpackExecutor,
+            ...(existing.cache !== undefined ? { cache: existing.cache } : {}),
+            inputs,
+            dependsOn,
+        });
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
     await (0, devkit_1.formatFiles)(tree);

package/dist/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.js

@@ -39,11 +39,7 @@ async function default_1(tree) {
     if (!nxJson.targetDefaults) {
         return;
     }
-    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
-        if (!exports.executors.includes(targetOrExecutor) &&
-            !exports.executors.includes(targetConfig.executor)) {
-            continue;
-        }
+    const cleanEntry = (targetConfig) => {
         if (targetConfig.options) {
             delete targetConfig.options.tailwindConfig;
             if (!Object.keys(targetConfig.options).length) {
@@ -59,9 +55,23 @@ async function default_1(tree) {
         if (!Object.keys(targetConfig.configurations ?? {}).length) {
             delete targetConfig.configurations;
         }
-        if (!Object.keys(targetConfig).length ||
-            (Object.keys(targetConfig).length === 1 &&
-                Object.keys(targetConfig)[0] === 'executor')) {
+        return {
+            empty: !Object.keys(targetConfig).length ||
+                (Object.keys(targetConfig).length === 1 &&
+                    Object.keys(targetConfig)[0] === 'executor'),
+        };
+    };
+    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        if (Array.isArray(targetConfig)) {
+            // This migration predates the filtered array value form; values are plain objects here.
+            continue;
+        }
+        if (!exports.executors.includes(targetOrExecutor) &&
+            !exports.executors.includes(targetConfig.executor)) {
+            continue;
+        }
+        const { empty } = cleanEntry(targetConfig);
+        if (empty) {
             delete nxJson.targetDefaults[targetOrExecutor];
         }
         if (!Object.keys(nxJson.targetDefaults).length) {

package/dist/src/migrations/update-23-1-0/add-angular-build.d.ts

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

package/dist/src/migrations/update-23-1-0/add-angular-build.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
+// The `@nx/angular:application` and `@nx/angular:unit-test` executors import
+// `@angular/build` directly to run the Angular builders, and any
+// `@angular/build:*` executor is provided by that package; it is a required
+// runtime dependency for these targets. Nothing declares it as a direct
+// dependency, though: it has only ever been pulled in transitively via
+// `@angular-devkit/build-angular`, which isn't reliable (it can be absent from
+// node_modules, e.g. under Yarn Berry), so `require.resolve('@angular/build')`
+// fails and the build breaks. Add it as a direct dependency when an executor
+// needs it, at the version the application generator installs.
+const angularBuildExecutors = [
+    '@nx/angular:application',
+    '@nx/angular:unit-test',
+];
+function usesAngularBuild(executors) {
+    return executors.some((e) => e != null &&
+        (angularBuildExecutors.includes(e) || e.startsWith('@angular/build:')));
+}
+async function default_1(tree) {
+    // Already a direct dependency -> nothing to add.
+    const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
+    if (dependencies?.['@angular/build'] || devDependencies?.['@angular/build']) {
+        return;
+    }
+    let needsAngularBuild = false;
+    // project.json targets
+    for (const [, project] of (0, devkit_1.getProjects)(tree)) {
+        needsAngularBuild = Object.values(project.targets ?? {}).some((target) => usesAngularBuild([target.executor]));
+        if (needsAngularBuild) {
+            break;
+        }
+    }
+    // nx.json targetDefaults (keyed by target name or executor): a project's empty
+    // target can inherit the executor from a default.
+    if (!needsAngularBuild) {
+        const targetDefaults = (0, devkit_1.readNxJson)(tree)?.targetDefaults;
+        if (targetDefaults) {
+            needsAngularBuild = Object.entries(targetDefaults).some(([targetOrExecutor, config]) => 
+            // Mirror `add-istanbul-instrumenter`: the filtered array value form is
+            // out of scope; only plain object defaults carry an inheritable executor.
+            !Array.isArray(config) &&
+                usesAngularBuild([targetOrExecutor, config.executor]));
+        }
+    }
+    if (!needsAngularBuild) {
+        return;
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/build': versions_1.angularDevkitVersion }, undefined, true);
+}

package/dist/src/migrations/update-23-1-0/add-angular-build.md

@@ -0,0 +1,61 @@
+#### Add `@angular/build` When Used by an Executor
+
+The `@nx/angular:application` and `@nx/angular:unit-test` executors load the Angular builders by importing `@angular/build` directly, and any `@angular/build:*` executor is provided by that package, so `@angular/build` is a required runtime dependency for workspaces using those targets. Nothing declares it as a direct dependency, though: it has only ever been available transitively as a dependency of `@angular-devkit/build-angular`. That is not reliable (for example, under Yarn Berry it can be missing from `node_modules` even when `@angular-devkit/build-angular` is installed), and when `@angular/build` cannot be resolved the build fails with "This executor requires the package @angular/build to be installed". This migration adds `@angular/build` to `devDependencies` when a project uses one of those executors and it is not already installed, at the version the application generator installs. An existing version is preserved.
+
+Executor usage is detected on any target using `@nx/angular:application`, `@nx/angular:unit-test`, or an `@angular/build:*` executor. Targets that inherit their executor from an `nx.json` `targetDefaults` entry are detected too.
+
+#### Examples
+
+##### `project.json`
+
+Before:
+
+```jsonc {5}
+// project.json
+{
+  "targets": {
+    "build": {
+      "executor": "@nx/angular:application",
+      "options": {},
+    },
+  },
+}
+```
+
+After (`package.json`):
+
+```jsonc {4}
+// package.json
+{
+  "devDependencies": {
+    "@angular/build": "~22.0.4",
+  },
+}
+```
+
+##### `nx.json` (`targetDefaults`)
+
+A project whose `build` target inherits its executor from an `nx.json` `targetDefaults` entry is also detected:
+
+```jsonc {5}
+// nx.json
+{
+  "targetDefaults": {
+    "build": {
+      "executor": "@nx/angular:application",
+      "options": {},
+    },
+  },
+}
+```
+
+```jsonc
+// apps/app1/project.json
+{
+  "targets": {
+    "build": {},
+  },
+}
+```
+
+`@angular/build` is added to `package.json` as shown above.

package/dist/src/migrations/update-23-1-0/add-istanbul-instrumenter.js

@@ -41,12 +41,16 @@ async function default_1(tree) {
             break;
         }
     }
-    // nx.json targetDefaults: a project's empty `test` target can inherit a Karma
-    // executor/runner from a default.
+    // nx.json targetDefaults (keyed by target name or executor): a project's empty
+    // `test` target can inherit a Karma executor/runner from a default.
     if (!needsInstrumenter) {
         const targetDefaults = (0, devkit_1.readNxJson)(tree)?.targetDefaults;
         if (targetDefaults) {
-            needsInstrumenter = Object.entries(targetDefaults).some(([targetOrExecutor, config]) => usesKarma([targetOrExecutor, config.executor], config));
+            needsInstrumenter = Object.entries(targetDefaults).some(([targetOrExecutor, config]) => 
+            // This migration predates the filtered array value form; values are
+            // plain objects here.
+            !Array.isArray(config) &&
+                usesKarma([targetOrExecutor, config.executor], config));
         }
     }
     if (!needsInstrumenter) {

package/dist/src/migrations/update-23-1-0/remove-conflicting-extended-diagnostics.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/dist/src/migrations/update-23-1-0/remove-conflicting-extended-diagnostics.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const node_path_1 = require("node:path");
+const jsonc_parser_1 = require("jsonc-parser");
+const FORMATTING_OPTIONS = {
+    formattingOptions: { keepLines: true, insertSpaces: true, tabSize: 2 },
+};
+// Angular v22's `strict-safe-navigation-narrow` migration adds an
+// `extendedDiagnostics` block to project tsconfigs unconditionally, while its
+// `strict-templates-default` migration pins `strictTemplates: false` on
+// workspaces that had not enabled strict templates. The Angular compiler rejects
+// that combination (it errors when `extendedDiagnostics` is set and
+// `strictTemplates` is `false`), so those projects fail to build. `@nx/angular`
+// migrations run after Angular's, so we reconcile it here: drop the
+// `extendedDiagnostics` block wherever `strictTemplates` resolves to `false`,
+// preserving the intended `strictTemplates: false` behavior (enabling strict
+// templates instead would change behavior and surface new template errors).
+async function default_1(tree) {
+    let removedCount = 0;
+    (0, devkit_1.visitNotIgnoredFiles)(tree, '.', (filePath) => {
+        const name = (0, node_path_1.basename)(filePath);
+        if (!name.startsWith('tsconfig') || !name.endsWith('.json')) {
+            return;
+        }
+        if (removeConflictingExtendedDiagnostics(tree, filePath)) {
+            removedCount += 1;
+        }
+    });
+    if (removedCount > 0) {
+        devkit_1.logger.info(`Removed the "extendedDiagnostics" Angular compiler option from ${removedCount} tsconfig file(s) where "strictTemplates" is disabled, resolving the conflict introduced by the Angular v22 template migrations.`);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function removeConflictingExtendedDiagnostics(tree, tsconfigPath) {
+    const original = tree.read(tsconfigPath, 'utf-8');
+    if (!original) {
+        return false;
+    }
+    const root = (0, jsonc_parser_1.parseTree)(original);
+    if (!root || root.type !== 'object') {
+        return false;
+    }
+    // Only touch files that locally declare `extendedDiagnostics`; the Angular
+    // migration adds it to project tsconfigs, never to a shared base.
+    const extendedDiagnosticsNode = (0, jsonc_parser_1.findNodeAtLocation)(root, [
+        'angularCompilerOptions',
+        'extendedDiagnostics',
+    ]);
+    if (!extendedDiagnosticsNode) {
+        return false;
+    }
+    // The compiler errors only when the resolved `strictTemplates` is explicitly
+    // `false` (an unset value doesn't trigger it), so mirror that exact condition.
+    if (resolveStrictTemplates(tree, tsconfigPath) !== false) {
+        return false;
+    }
+    const edits = (0, jsonc_parser_1.modify)(original, ['angularCompilerOptions', 'extendedDiagnostics'], undefined, FORMATTING_OPTIONS);
+    tree.write(tsconfigPath, (0, jsonc_parser_1.applyEdits)(original, edits));
+    return true;
+}
+// Resolves `angularCompilerOptions.strictTemplates` for a tsconfig, following
+// the `extends` chain (a local value wins over an inherited one). TypeScript
+// doesn't merge the non-standard `angularCompilerOptions`, so the chain is
+// traversed manually, matching how the Angular compiler resolves it.
+function resolveStrictTemplates(tree, tsconfigPath, seen = new Set()) {
+    if (seen.has(tsconfigPath)) {
+        return undefined;
+    }
+    seen.add(tsconfigPath);
+    const content = tree.read(tsconfigPath, 'utf-8');
+    if (!content) {
+        return undefined;
+    }
+    const root = (0, jsonc_parser_1.parseTree)(content);
+    if (!root || root.type !== 'object') {
+        return undefined;
+    }
+    const localNode = (0, jsonc_parser_1.findNodeAtLocation)(root, [
+        'angularCompilerOptions',
+        'strictTemplates',
+    ]);
+    if (localNode) {
+        const value = (0, jsonc_parser_1.getNodeValue)(localNode);
+        return typeof value === 'boolean' ? value : undefined;
+    }
+    const extendsNode = (0, jsonc_parser_1.findNodeAtLocation)(root, ['extends']);
+    if (!extendsNode) {
+        return undefined;
+    }
+    const extendsValue = (0, jsonc_parser_1.getNodeValue)(extendsNode);
+    // `extends` can be a single path or an ordered array (later entries win).
+    const parents = Array.isArray(extendsValue)
+        ? [...extendsValue].reverse()
+        : [extendsValue];
+    for (const parent of parents) {
+        const parentPath = resolveExtendsPath(tree, tsconfigPath, parent);
+        if (!parentPath) {
+            continue;
+        }
+        const resolved = resolveStrictTemplates(tree, parentPath, seen);
+        if (resolved !== undefined) {
+            return resolved;
+        }
+    }
+    return undefined;
+}
+// Resolves a relative `extends` target to a workspace path within the tree.
+// Package/`node_modules` bases (which never carry the migration's output) are
+// skipped by returning null.
+function resolveExtendsPath(tree, tsconfigPath, extendsValue) {
+    if (typeof extendsValue !== 'string' || !extendsValue.startsWith('.')) {
+        return null;
+    }
+    const base = node_path_1.posix.join(node_path_1.posix.dirname(tsconfigPath), extendsValue);
+    const candidates = base.endsWith('.json') ? [base] : [base, `${base}.json`];
+    return candidates.find((candidate) => tree.exists(candidate)) ?? null;
+}

package/dist/src/migrations/update-23-1-0/remove-conflicting-extended-diagnostics.md

@@ -0,0 +1,37 @@
+#### Remove `extendedDiagnostics` When `strictTemplates` Is Disabled
+
+Angular v22 ships two `ng update` migrations that can leave a project's `tsconfig` in a state the Angular compiler rejects. `strict-templates-default` adds `"strictTemplates": false` to projects that had not enabled strict templates, and `strict-safe-navigation-narrow` adds an `extendedDiagnostics` block to every project `tsconfig`. The compiler requires `strictTemplates` to be enabled whenever `extendedDiagnostics` is configured, so the two together fail the build with "Using extendedDiagnostics requires that strictTemplates is also enabled".
+
+Because `@nx/angular` migrations run after Angular's, this migration reconciles the result: for any `tsconfig` where `strictTemplates` resolves to `false` (following the `extends` chain), it removes the `extendedDiagnostics` block. This keeps the intended `strictTemplates: false` behavior rather than enabling strict templates, which would change behavior and surface new template errors. Projects that keep `strictTemplates` enabled are left untouched.
+
+#### Examples
+
+##### `tsconfig.app.json`
+
+Before:
+
+```jsonc {3,10}
+// tsconfig.app.json
+{
+  "angularCompilerOptions": {
+    "extendedDiagnostics": {
+      "checks": {
+        "nullishCoalescingNotNullable": "suppress",
+        "optionalChainNotNullable": "suppress",
+      },
+    },
+    "strictTemplates": false,
+  },
+}
+```
+
+After:
+
+```jsonc {3}
+// tsconfig.app.json
+{
+  "angularCompilerOptions": {
+    "strictTemplates": false,
+  },
+}
+```

package/dist/src/migrations/update-23-1-0/rename-ssr-experimental-platform.js

@@ -49,11 +49,16 @@ async function default_1(tree) {
             (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
         }
     }
-    // nx.json targetDefaults
+    // nx.json targetDefaults (keyed by target name or executor)
     const nxJson = (0, devkit_1.readNxJson)(tree);
     if (nxJson?.targetDefaults) {
         let isUpdated = false;
         for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+            // This migration predates the filtered array value form; values are
+            // plain objects here.
+            if (Array.isArray(targetConfig)) {
+                continue;
+            }
             if (!ssrApplicationExecutors.includes(targetOrExecutor) &&
                 !ssrApplicationExecutors.includes(targetConfig.executor)) {
                 continue;

package/dist/src/migrations/update-23-1-0/rename-ssr-experimental-platform.md

@@ -48,12 +48,11 @@ After:
 
 Before:
 
-```jsonc {9}
+```jsonc {8}
 // nx.json
 {
-  "targetDefaults": [
-    {
-      "executor": "@nx/angular:application",
+  "targetDefaults": {
+    "@nx/angular:application": {
       "options": {
         "ssr": {
           "entry": "src/server.ts",
@@ -61,18 +60,17 @@ Before:
         },
       },
     },
-  ],
+  },
 }
 ```
 
 After:
 
-```jsonc {9}
+```jsonc {8}
 // nx.json
 {
-  "targetDefaults": [
-    {
-      "executor": "@nx/angular:application",
+  "targetDefaults": {
+    "@nx/angular:application": {
       "options": {
         "ssr": {
           "entry": "src/server.ts",
@@ -80,6 +78,6 @@ After:
         },
       },
     },
-  ],
+  },
 }
 ```

package/dist/src/utils/versions.d.ts

@@ -1,6 +1,6 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~22.0.0";
-export declare const angularDevkitVersion = "~22.0.0";
+export declare const angularVersion = "~22.0.4";
+export declare const angularDevkitVersion = "~22.0.4";
 export declare const ngPackagrVersion = "~22.0.0";
 export declare const ngrxVersion = "^21.0.0";
 export declare const rxjsVersion = "~7.8.0";

package/dist/src/utils/versions.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsoncEslintParserVersion = exports.oxcProjectRuntimeVersion = exports.jsdomVersion = exports.vitestVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.lessVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.webpackMergeVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 const path_1 = require("path");
 exports.nxVersion = require((0, path_1.join)('@nx/angular', 'package.json')).version;
-exports.angularVersion = '~22.0.0';
-exports.angularDevkitVersion = '~22.0.0';
+exports.angularVersion = '~22.0.4';
+exports.angularDevkitVersion = '~22.0.4';
 exports.ngPackagrVersion = '~22.0.0';
 exports.ngrxVersion = '^21.0.0';
 exports.rxjsVersion = '~7.8.0';

package/migrations.json

@@ -348,6 +348,24 @@
       "description": "Add the `trustProxyHeaders` option to `AngularNodeAppEngine` and `AngularAppEngine` instantiations in SSR server files, matching the Angular v22 `trust-proxy-headers` migration.",
       "factory": "./dist/src/migrations/update-23-1-0/add-trust-proxy-headers",
       "documentation": "./dist/src/migrations/update-23-1-0/add-trust-proxy-headers.md"
+    },
+    "update-23-1-0-add-angular-build": {
+      "version": "23.1.0-beta.0",
+      "requires": {
+        "@angular/core": ">=22.0.0"
+      },
+      "description": "Add `@angular/build` to `devDependencies` when a project uses the `@nx/angular:application` or `@nx/angular:unit-test` executor, or an `@angular/build:*` executor, and it is not already installed. These executors import `@angular/build` directly at runtime, but it has only ever been available transitively via `@angular-devkit/build-angular`, which is not reliable across package managers.",
+      "factory": "./dist/src/migrations/update-23-1-0/add-angular-build",
+      "documentation": "./dist/src/migrations/update-23-1-0/add-angular-build.md"
+    },
+    "update-23-1-0-remove-conflicting-extended-diagnostics": {
+      "version": "23.1.0-beta.0",
+      "requires": {
+        "@angular/core": ">=22.0.0"
+      },
+      "description": "Remove the `extendedDiagnostics` Angular compiler option from tsconfig files where `strictTemplates` resolves to `false`. Angular v22's `strict-templates-default` and `strict-safe-navigation-narrow` migrations can together produce this combination, which the Angular compiler rejects (`extendedDiagnostics` requires `strictTemplates` to be enabled).",
+      "factory": "./dist/src/migrations/update-23-1-0/remove-conflicting-extended-diagnostics",
+      "documentation": "./dist/src/migrations/update-23-1-0/remove-conflicting-extended-diagnostics.md"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.1.0-beta.4",
+  "version": "23.1.0-beta.6",
   "private": false,
   "type": "commonjs",
   "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, 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.",
@@ -74,24 +74,25 @@
     "@phenomnomnominal/tsquery": "~6.2.0",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",
+    "jsonc-parser": "^3.2.0",
     "magic-string": "~0.30.2",
     "picocolors": "^1.1.0",
     "picomatch": "4.0.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "23.1.0-beta.4",
-    "@nx/eslint": "23.1.0-beta.4",
-    "@nx/module-federation": "23.1.0-beta.4",
-    "@nx/rspack": "23.1.0-beta.4",
-    "@nx/js": "23.1.0-beta.4",
-    "@nx/web": "23.1.0-beta.4",
-    "@nx/webpack": "23.1.0-beta.4"
+    "@nx/devkit": "23.1.0-beta.6",
+    "@nx/module-federation": "23.1.0-beta.6",
+    "@nx/rspack": "23.1.0-beta.6",
+    "@nx/eslint": "23.1.0-beta.6",
+    "@nx/js": "23.1.0-beta.6",
+    "@nx/webpack": "23.1.0-beta.6",
+    "@nx/web": "23.1.0-beta.6"
   },
   "devDependencies": {
-    "@nx/cypress": "23.1.0-beta.4",
-    "nx": "23.1.0-beta.4",
-    "@nx/vitest": "23.1.0-beta.4"
+    "@nx/cypress": "23.1.0-beta.6",
+    "nx": "23.1.0-beta.6",
+    "@nx/vitest": "23.1.0-beta.6"
   },
   "peerDependencies": {
     "@angular/build": ">= 20.0.0 < 23.0.0",