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

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/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-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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.1.0-beta.4",
+  "version": "23.1.0-beta.5",
   "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.",
@@ -80,18 +80,18 @@
     "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.5",
+    "@nx/eslint": "23.1.0-beta.5",
+    "@nx/module-federation": "23.1.0-beta.5",
+    "@nx/rspack": "23.1.0-beta.5",
+    "@nx/web": "23.1.0-beta.5",
+    "@nx/webpack": "23.1.0-beta.5",
+    "@nx/js": "23.1.0-beta.5"
   },
   "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.5",
+    "@nx/vitest": "23.1.0-beta.5",
+    "nx": "23.1.0-beta.5"
   },
   "peerDependencies": {
     "@angular/build": ">= 20.0.0 < 23.0.0",