@nx/angular 23.0.0-rc.3 → 23.0.0

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

@@ -1,7 +1,6 @@
 "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) {
@@ -66,9 +65,12 @@ async function addE2e(tree, options) {
 function getAngularE2EWebServerInfo(tree, projectName, portOverride) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = portOverride ?? 4200;
-    const serveTargetOptions = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)?.options;
-    if (serveTargetOptions?.port || serveTargetOptions?.env?.PORT) {
-        e2ePort = serveTargetOptions.port || serveTargetOptions.env.PORT;
+    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 pm = (0, devkit_1.getPackageManagerCommand)();
     return {

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

@@ -2,7 +2,6 @@
 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) {
@@ -67,15 +66,11 @@ class Migrator {
         if (!targetNames.length) {
             return;
         }
-        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,
-            });
+        const nxJson = (0, devkit_1.readNxJson)(this.tree);
+        nxJson.targetDefaults ??= {};
+        for (const target of targetNames) {
+            nxJson.targetDefaults[target] ??= {};
+            nxJson.targetDefaults[target].cache ??= true;
         }
         (0, devkit_1.updateNxJson)(this.tree, nxJson);
     }

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

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectConfigForApplicationBuilder = updateProjectConfigForApplicationBuilder;
 exports.updateProjectConfigForBrowserBuilder = updateProjectConfigForBrowserBuilder;
 const devkit_1 = require("@nx/devkit");
-const internal_1 = require("@nx/devkit/internal");
-const internal_2 = require("@nx/js/internal");
+const internal_1 = require("@nx/js/internal");
 const constants_1 = require("./constants");
 function updateProjectConfigForApplicationBuilder(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -29,7 +28,7 @@ function updateProjectConfigForApplicationBuilder(tree, options) {
             }
         }
     }
-    const sourceRoot = (0, internal_2.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     buildTarget.options ??= {};
     buildTarget.options.outputPath = outputPath;
     buildTarget.options.server = (0, devkit_1.joinPathFragments)(sourceRoot, options.main);
@@ -56,7 +55,7 @@ function updateProjectConfigForBrowserBuilder(tree, options) {
             configurations[key] = getServerOptions(options);
         }
     }
-    const sourceRoot = (0, internal_2.getProjectSourceRoot)(projectConfig, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
     projectConfig.targets.server = {
         dependsOn: ['build'],
         executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')
@@ -104,27 +103,16 @@ 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');
     }
-    const existing = findServerDefault(nxJson.targetDefaults);
-    if (!existing || existing.cache === undefined) {
-        (0, internal_1.upsertTargetDefault)(tree, nxJson, { target: 'server', cache: true });
-    }
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults.server ??= {};
+    nxJson.targetDefaults.server.cache ??= true;
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-function findServerDefault(td) {
-    if (!td)
-        return undefined;
-    if (Array.isArray(td)) {
-        return td.find((e) => e.target === 'server' &&
-            e.projects === undefined &&
-            e.plugin === undefined);
-    }
-    return td['server'];
-}
 function getServerOptions(options = {}) {
     return {
         buildOptimizer: options?.buildOptimizer,

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

@@ -2,36 +2,29 @@
 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 defaultInputs = [
+    const inputs = [
         ...(nxJson.namedInputs && 'production' in nxJson.namedInputs
             ? ['production', '^production']
             : ['default', '^default']),
     ];
-    const existing = (0, internal_1.normalizeTargetDefaults)(nxJson.targetDefaults).find((e) => e.executor === webpackExecutor &&
-        e.target === undefined &&
-        e.projects === undefined &&
-        e.plugin === undefined);
-    const inputs = [...(existing?.inputs ?? defaultInputs)];
+    nxJson.targetDefaults ??= {};
+    nxJson.targetDefaults[webpackExecutor] ??= {};
+    nxJson.targetDefaults[webpackExecutor].inputs ??= inputs;
+    nxJson.targetDefaults[webpackExecutor].dependsOn ??= ['^build'];
     let mfEnvVarExists = false;
-    for (const input of inputs) {
+    for (const input of nxJson.targetDefaults[webpackExecutor].inputs) {
         if (typeof input === 'object' && input['env'] === mfEnvVar) {
             mfEnvVarExists = true;
             break;
         }
     }
     if (!mfEnvVarExists) {
-        inputs.push({ env: mfEnvVar });
+        nxJson.targetDefaults[webpackExecutor].inputs.push({ env: mfEnvVar });
     }
-    (0, internal_1.upsertTargetDefault)(tree, nxJson, {
-        executor: webpackExecutor,
-        cache: true,
-        inputs,
-        dependsOn: existing?.dependsOn ?? ['^build'],
-    });
+    nxJson.targetDefaults[webpackExecutor].cache = true;
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }

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

@@ -3,7 +3,6 @@ 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");
@@ -17,21 +16,15 @@ 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) ?? {};
-    const existing = (0, internal_1.normalizeTargetDefaults)(nxJson.targetDefaults).find((entry) => entry.executor === executor &&
-        entry.target === undefined &&
-        entry.projects === undefined &&
-        entry.plugin === undefined);
-    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);
-    }
+    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);
     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) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options, projectName, targetName) => {
         const webpackConfig = options.webpackConfig;
         if (!webpackConfig) {
             return;
@@ -18,41 +18,34 @@ 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 webpackExecutor = '@nx/angular:webpack-browser';
-    const defaultInputs = [
+    const inputs = [
         ...(nxJson.namedInputs && 'production' in nxJson.namedInputs
             ? ['production', '^production']
             : ['default', '^default']),
         { env: nxMFDevRemotesEnvVar },
     ];
-    const existing = (0, internal_1.normalizeTargetDefaults)(nxJson.targetDefaults).find((e) => e.executor === webpackExecutor &&
-        e.target === undefined &&
-        e.projects === undefined &&
-        e.plugin === undefined);
-    if (!existing) {
-        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
-            executor: webpackExecutor,
+    if (!nxJson.targetDefaults ||
+        !nxJson.targetDefaults?.['@nx/angular:webpack-browser']) {
+        nxJson.targetDefaults ??= {};
+        nxJson.targetDefaults['@nx/angular:webpack-browser'] = {
             cache: true,
-            inputs: defaultInputs,
+            inputs,
             dependsOn: ['^build'],
-        });
+        };
     }
     else {
-        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 });
+        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,
+            });
         }
-        (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,7 +39,11 @@ async function default_1(tree) {
     if (!nxJson.targetDefaults) {
         return;
     }
-    const cleanEntry = (targetConfig) => {
+    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        if (!exports.executors.includes(targetOrExecutor) &&
+            !exports.executors.includes(targetConfig.executor)) {
+            continue;
+        }
         if (targetConfig.options) {
             delete targetConfig.options.tailwindConfig;
             if (!Object.keys(targetConfig.options).length) {
@@ -55,51 +59,14 @@ async function default_1(tree) {
         if (!Object.keys(targetConfig.configurations ?? {}).length) {
             delete targetConfig.configurations;
         }
-        return {
-            empty: !Object.keys(targetConfig).length ||
-                (Object.keys(targetConfig).length === 1 &&
-                    Object.keys(targetConfig)[0] === 'executor'),
-        };
-    };
-    if (Array.isArray(nxJson.targetDefaults)) {
-        const remaining = [];
-        for (const entry of nxJson.targetDefaults) {
-            const matches = exports.executors.includes(entry.executor) || exports.executors.includes(entry.target);
-            if (!matches) {
-                remaining.push(entry);
-                continue;
-            }
-            const { empty } = cleanEntry(entry);
-            // Empty entries that only described executor/target wrappers are dropped.
-            const onlyKeys = Object.keys(entry).filter((k) => k !== 'target' &&
-                k !== 'executor' &&
-                k !== 'projects' &&
-                k !== 'plugin');
-            if (empty && onlyKeys.length === 0)
-                continue;
-            remaining.push(entry);
+        if (!Object.keys(targetConfig).length ||
+            (Object.keys(targetConfig).length === 1 &&
+                Object.keys(targetConfig)[0] === 'executor')) {
+            delete nxJson.targetDefaults[targetOrExecutor];
         }
-        if (remaining.length === 0) {
+        if (!Object.keys(nxJson.targetDefaults).length) {
             delete nxJson.targetDefaults;
         }
-        else {
-            nxJson.targetDefaults = remaining;
-        }
-    }
-    else {
-        for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
-            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) {
-                delete nxJson.targetDefaults;
-            }
-        }
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
     await (0, devkit_1.formatFiles)(tree);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.0.0-rc.3",
+  "version": "23.0.0",
   "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, 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": {
@@ -79,18 +79,18 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/eslint": "23.0.0-rc.3",
-    "@nx/devkit": "23.0.0-rc.3",
-    "@nx/js": "23.0.0-rc.3",
-    "@nx/module-federation": "23.0.0-rc.3",
-    "@nx/rspack": "23.0.0-rc.3",
-    "@nx/web": "23.0.0-rc.3",
-    "@nx/webpack": "23.0.0-rc.3"
+    "@nx/devkit": "23.0.0",
+    "@nx/js": "23.0.0",
+    "@nx/eslint": "23.0.0",
+    "@nx/rspack": "23.0.0",
+    "@nx/module-federation": "23.0.0",
+    "@nx/web": "23.0.0",
+    "@nx/webpack": "23.0.0"
   },
   "devDependencies": {
-    "@nx/cypress": "23.0.0-rc.3",
-    "@nx/vitest": "23.0.0-rc.3",
-    "nx": "23.0.0-rc.3"
+    "@nx/vitest": "23.0.0",
+    "@nx/cypress": "23.0.0",
+    "nx": "23.0.0"
   },
   "peerDependencies": {
     "@angular/build": ">= 19.0.0 < 22.0.0",