@nx/angular 23.0.0-beta.2 → 23.0.0-beta.21

package/src/migrations/update-20-2-0/remove-angular-eslint-rules.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rulesToRemove = void 0;
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const internal_1 = require("@nx/eslint/internal");
 const projects_1 = require("../utils/projects");
 exports.rulesToRemove = [
     '@angular-eslint/no-host-metadata-property',
@@ -17,7 +17,7 @@ async function default_1(tree) {
     let hasRootProject = false;
     for (const graphNode of projects) {
         const root = graphNode.data.root;
-        if (!(0, eslint_file_1.isEslintConfigSupported)(tree, root)) {
+        if (!(0, internal_1.isEslintConfigSupported)(tree, root)) {
             // ESLint config is not supported, skip
             continue;
         }
@@ -36,12 +36,12 @@ async function default_1(tree) {
     // check root config, provide a root so it doesn't try to lookup a base config
     if (!hasRootProject) {
         // if there is no root project the root eslint config has not been processed
-        if ((0, eslint_file_1.isEslintConfigSupported)(tree, '')) {
+        if ((0, internal_1.isEslintConfigSupported)(tree, '')) {
             removeRules(tree, '');
         }
     }
     // handle root base config, not providing a root will prioritize a base config
-    const baseEslintConfig = (0, eslint_file_1.findEslintFile)(tree);
+    const baseEslintConfig = (0, internal_1.findEslintFile)(tree);
     if (baseEslintConfig && baseEslintConfig.includes('.base.')) {
         removeRules(tree, baseEslintConfig);
     }
@@ -50,12 +50,12 @@ async function default_1(tree) {
 function removeRules(tree, root) {
     for (const rule of exports.rulesToRemove) {
         const lookup = (o) => !!o.rules?.[rule];
-        if (!(0, eslint_file_1.lintConfigHasOverride)(tree, root, lookup)) {
+        if (!(0, internal_1.lintConfigHasOverride)(tree, root, lookup)) {
             // it's not using the rule, skip
             continue;
         }
         // there is an override containing the rule, remove the rule
-        (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, lookup, (o) => {
+        (0, internal_1.updateOverrideInLintConfig)(tree, root, lookup, (o) => {
             delete o.rules[rule];
             return o;
         });

package/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-tailwind-config-from-ng-packagr-executors.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,eAAO,MAAM,SAAS,UAAyD,CAAC;AAEhF,yBAA+B,IAAI,EAAE,IAAI,iBA4FxC"}
+{"version":3,"file":"remove-tailwind-config-from-ng-packagr-executors.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-2-0/remove-tailwind-config-from-ng-packagr-executors.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,SAAS,UAAyD,CAAC;AAEhF,yBAA+B,IAAI,EAAE,IAAI,iBAgIxC"}

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

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executors = void 0;
 exports.default = default_1;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 exports.executors = ['@nx/angular:ng-packagr-lite', '@nx/angular:package'];
 async function default_1(tree) {
     // update options from project configs
     exports.executors.forEach((executor) => {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (options, project, target, configuration) => {
+        (0, internal_1.forEachExecutorOptions)(tree, executor, (options, project, target, configuration) => {
             if (options.tailwindConfig === undefined) {
                 return;
             }
@@ -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,14 +55,51 @@ 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')) {
-            delete nxJson.targetDefaults[targetOrExecutor];
+        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(nxJson.targetDefaults).length) {
+        if (remaining.length === 0) {
             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/src/migrations/update-20-3-0/ensure-nx-module-federation-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-nx-module-federation-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAIpB,wBAA8B,eAAe,CAAC,IAAI,EAAE,IAAI,iBAqBvD"}
+{"version":3,"file":"ensure-nx-module-federation-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAGpB,wBAA8B,eAAe,CAAC,IAAI,EAAE,IAAI,iBAqBvD"}

package/src/migrations/update-20-3-0/ensure-nx-module-federation-package.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = ensureMfPackage;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const versions_1 = require("../../utils/versions");
 async function ensureMfPackage(tree) {
     const projects = new Set();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/angular:module-federation-dev-server', (options, project, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/angular:module-federation-dev-server', (options, project, target) => {
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
         projects.add(projectConfig.root);
     });

package/src/migrations/update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const project_graph_1 = require("nx/src/config/project-graph");
 const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
 const version_utils_1 = require("../../generators/utils/version-utils");
@@ -23,7 +23,7 @@ async function default_1(tree) {
     if (!projects.length) {
         return;
     }
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const tsqueryModule = require('@phenomnomnominal/tsquery');
     tsqueryAst = tsqueryModule.ast;
     tsqueryQuery = tsqueryModule.query;

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

@@ -11,7 +11,7 @@ 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");
+const internal_1 = require("@nx/js/internal");
 let ts;
 /**
  * Analyzes the content of a Karma configuration file to extract its settings.
@@ -21,7 +21,7 @@ let ts;
  */
 function analyzeKarmaConfig(content) {
     if (!ts) {
-        ts = (0, ensure_typescript_1.ensureTypescript)();
+        ts = (0, internal_1.ensureTypescript)();
     }
     const sourceFile = ts.createSourceFile('karma.conf.js', content, ts.ScriptTarget.Latest, true);
     const settings = new Map();

package/src/migrations/update-22-3-0/update-module-resolution.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const tsconfig_utils_1 = require("../../generators/utils/tsconfig-utils");
 const targets_1 = require("../../utils/targets");
 const projects_1 = require("../utils/projects");
@@ -43,7 +43,7 @@ async function default_1(tree) {
     await (0, devkit_1.formatFiles)(tree);
 }
 function updateModuleAndModuleResolution(tree, tsConfigPath) {
-    const ts = (0, ensure_typescript_1.ensureTypescript)();
+    const ts = (0, internal_1.ensureTypescript)();
     // Read the resolved compiler options from the tsconfig
     const compilerOptions = (0, tsconfig_utils_1.readCompilerOptionsFromTsConfig)(tree, tsConfigPath);
     // Check if both module and moduleResolution are already set correctly

package/src/migrations/update-22-3-0/update-ssr-webpack-config.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const tsconfig_utils_1 = require("../../generators/utils/tsconfig-utils");
 const file_change_recorder_1 = require("../../utils/file-change-recorder");
 const targets_1 = require("../../utils/targets");
@@ -52,7 +52,7 @@ async function default_1(tree) {
         return;
     }
     // Second pass: process each project
-    ts = (0, ensure_typescript_1.ensureTypescript)();
+    ts = (0, internal_1.ensureTypescript)();
     for (const { tsConfigPath, serverFiles } of projectFilesMap.values()) {
         const wasUpdated = updateTsConfigServer(tree, tsConfigPath);
         // Only update server files if tsconfig was actually modified

package/src/migrations/{update-17-2-0/rename-webpack-dev-server.d.ts → update-23-0-0/migrate-ngrx-generator-defaults.d.ts}

@@ -1,3 +1,3 @@
 import { type Tree } from '@nx/devkit';
 export default function (tree: Tree): Promise<void>;
-//# sourceMappingURL=rename-webpack-dev-server.d.ts.map
+//# sourceMappingURL=migrate-ngrx-generator-defaults.d.ts.map

package/src/migrations/update-23-0-0/migrate-ngrx-generator-defaults.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-ngrx-generator-defaults.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-23-0-0/migrate-ngrx-generator-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAsCpB,yBAA+B,IAAI,EAAE,IAAI,iBAcxC"}

package/src/migrations/update-23-0-0/migrate-ngrx-generator-defaults.js

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const COLLECTION = '@nx/angular';
+const OLD_GENERATOR = 'ngrx';
+const OLD_KEY = `${COLLECTION}:${OLD_GENERATOR}`;
+const ROOT_STORE = 'ngrx-root-store';
+const FEATURE_STORE = 'ngrx-feature-store';
+// Options supported by ngrx-root-store. The `minimal` option is included here
+// because its semantics match the old generator (skip generating root feature
+// state files).
+const ROOT_STORE_OPTIONS = [
+    'name',
+    'route',
+    'directory',
+    'facade',
+    'minimal',
+    'skipImport',
+    'skipPackageJson',
+    'skipFormat',
+];
+// Options supported by ngrx-feature-store. `minimal` is intentionally excluded:
+// in the old generator it was a no-op for feature usage, but in
+// ngrx-feature-store it skips template generation while still wiring imports,
+// which would produce broken modules.
+const FEATURE_STORE_OPTIONS = [
+    'name',
+    'parent',
+    'route',
+    'directory',
+    'facade',
+    'barrels',
+    'skipImport',
+    'skipPackageJson',
+    'skipFormat',
+];
+async function default_1(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (nxJson?.generators && migrateGenerators(nxJson.generators)) {
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [projectName, project] of projects) {
+        if (project.generators && migrateGenerators(project.generators)) {
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function migrateGenerators(generators) {
+    const flatDefaults = generators[OLD_KEY];
+    const nestedDefaults = generators[COLLECTION]?.[OLD_GENERATOR];
+    if (!flatDefaults && !nestedDefaults) {
+        return false;
+    }
+    // Match Nx's runtime merge: nested first, then flat overrides.
+    // See `getGeneratorDefaults` in packages/nx/src/utils/params.ts.
+    const oldDefaults = {
+        ...(nestedDefaults ?? {}),
+        ...(flatDefaults ?? {}),
+    };
+    // Prefer flat when both shapes exist (it's the dominant runtime shape).
+    const useNestedFormat = !flatDefaults && !!nestedDefaults;
+    // The deprecated `module` option was an alias for `parent`. The old
+    // generator resolved `options.module ?? options.parent`, so `module` won
+    // when both were set — preserve that precedence here.
+    if (oldDefaults.module !== undefined) {
+        oldDefaults.parent = oldDefaults.module;
+    }
+    const rootStoreDefaults = pick(oldDefaults, ROOT_STORE_OPTIONS);
+    const featureStoreDefaults = pick(oldDefaults, FEATURE_STORE_OPTIONS);
+    if (Object.keys(rootStoreDefaults).length > 0) {
+        setNewDefaults(generators, ROOT_STORE, rootStoreDefaults, useNestedFormat);
+    }
+    if (Object.keys(featureStoreDefaults).length > 0) {
+        setNewDefaults(generators, FEATURE_STORE, featureStoreDefaults, useNestedFormat);
+    }
+    delete generators[OLD_KEY];
+    if (generators[COLLECTION]?.[OLD_GENERATOR] !== undefined) {
+        delete generators[COLLECTION][OLD_GENERATOR];
+        if (Object.keys(generators[COLLECTION]).length === 0) {
+            delete generators[COLLECTION];
+        }
+    }
+    return true;
+}
+function pick(obj, keys) {
+    const result = {};
+    for (const key of keys) {
+        if (obj[key] !== undefined) {
+            result[key] = obj[key];
+        }
+    }
+    return result;
+}
+function setNewDefaults(generators, generator, newDefaults, preferNestedFormat) {
+    const flatKey = `${COLLECTION}:${generator}`;
+    const existingFlat = generators[flatKey];
+    const existingNested = generators[COLLECTION]?.[generator];
+    // Per-generator destination: prefer whichever shape the user already uses
+    // for the replacement key, so the migrated defaults layer correctly under
+    // their existing values. Fall back to the input shape when neither exists.
+    const writeNested = existingNested !== undefined
+        ? true
+        : existingFlat !== undefined
+            ? false
+            : preferNestedFormat;
+    if (writeNested) {
+        generators[COLLECTION] ??= {};
+        // Existing user-set defaults take precedence over the migrated ones.
+        generators[COLLECTION][generator] = {
+            ...newDefaults,
+            ...(existingNested ?? {}),
+        };
+    }
+    else {
+        generators[flatKey] = { ...newDefaults, ...(existingFlat ?? {}) };
+    }
+}

package/src/migrations/update-23-0-0/migrate-with-mf-import-to-new-package.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function migrateWithMfImport(tree: Tree): Promise<void>;
+//# sourceMappingURL=migrate-with-mf-import-to-new-package.d.ts.map

package/src/migrations/update-23-0-0/migrate-with-mf-import-to-new-package.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-with-mf-import-to-new-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-23-0-0/migrate-with-mf-import-to-new-package.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAIV,MAAM,YAAY,CAAC;AASpB,wBAA8B,mBAAmB,CAAC,IAAI,EAAE,IAAI,iBAmD3D"}

package/src/migrations/update-23-0-0/migrate-with-mf-import-to-new-package.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = migrateWithMfImport;
+const devkit_1 = require("@nx/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const projects_1 = require("../utils/projects");
+const versions_1 = require("../../utils/versions");
+const NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR = 'ImportDeclaration > StringLiteral[value=@nx/angular/module-federation], VariableStatement CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/angular/module-federation]';
+const NEW_IMPORT_PATH = `'@nx/module-federation/angular'`;
+async function migrateWithMfImport(tree) {
+    const angularProjects = await (0, projects_1.getProjectsFilteredByDependencies)([
+        'npm:@nx/angular',
+    ]);
+    if (!angularProjects.length) {
+        return;
+    }
+    let anyUpdated = false;
+    for (const { data } of angularProjects) {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, data.root, (filePath) => {
+            if (!filePath.endsWith('.ts') && !filePath.endsWith('.js')) {
+                return;
+            }
+            let contents = tree.read(filePath, 'utf-8');
+            if (!contents.includes('@nx/angular/module-federation')) {
+                return;
+            }
+            const sourceFile = (0, tsquery_1.ast)(contents);
+            const importNodes = (0, tsquery_1.query)(sourceFile, NX_ANGULAR_MODULE_FEDERATION_IMPORT_SELECTOR);
+            if (importNodes.length === 0) {
+                return;
+            }
+            // Iterate end-to-start so earlier replacements don't shift later offsets.
+            for (let i = importNodes.length - 1; i >= 0; i--) {
+                const node = importNodes[i];
+                contents = `${contents.slice(0, node.getStart())}${NEW_IMPORT_PATH}${contents.slice(node.getEnd())}`;
+            }
+            tree.write(filePath, contents);
+            anyUpdated = true;
+        });
+    }
+    if (anyUpdated) {
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/module-federation': versions_1.nxVersion });
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAYpB,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAOD,KAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;CACtD,CAAC;AAgDF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CAwB7D,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/plugins/plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EAML,KAAK,aAAa,EAOnB,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAOD,KAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;CACtD,CAAC;AAqCF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CA6D7D,CAAC"}

package/src/plugins/plugin.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = void 0;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const js_1 = require("@nx/js");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -46,37 +45,49 @@ const knownExecutors = {
         '@angular/build:unit-test',
     ]),
 };
-function readProjectsCache(cachePath) {
-    return (0, node_fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
-}
-function writeProjectsToCache(cachePath, results) {
-    (0, devkit_1.writeJsonFile)(cachePath, results);
-}
 exports.createNodesV2 = [
     '**/angular.json',
     async (configFiles, options, context) => {
         const optionsHash = (0, devkit_internals_1.hashObject)(options);
         const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `angular-${optionsHash}.hash`);
-        const projectsCache = readProjectsCache(cachePath);
-        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
+        const projectsCache = new internal_1.PluginCache(cachePath);
+        const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
+        const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
+        const lockFileName = (0, js_1.getLockFileName)(packageManager);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, projectsCache, pmc), configFiles, options, context);
+            const { entries, preErrors } = await filterAngularConfigs(configFiles, context);
+            const projectHashes = await (0, internal_1.calculateHashesForCreateNodes)(entries.map((e) => e.angularWorkspaceRoot), options ?? {}, context, entries.map(() => [lockFileName]));
+            let results = [];
+            let nodeErrors = [];
+            try {
+                results = await (0, devkit_1.createNodesFromFiles)((configFile, opts, ctx, idx) => createNodesInternal(configFile, opts, ctx, projectsCache, pmc, projectHashes[idx]), entries.map((e) => e.configFile), options, context);
+            }
+            catch (e) {
+                if (e instanceof devkit_1.AggregateCreateNodesError) {
+                    results = e.partialResults ?? [];
+                    nodeErrors = e.errors;
+                }
+                else {
+                    throw e;
+                }
+            }
+            const allErrors = [...preErrors, ...nodeErrors];
+            if (allErrors.length > 0) {
+                throw new devkit_1.AggregateCreateNodesError(allErrors, results);
+            }
+            return results;
         }
         finally {
-            writeProjectsToCache(cachePath, projectsCache);
+            projectsCache.writeToDisk();
         }
     },
 ];
-async function createNodesInternal(configFilePath, options, context, projectsCache, pmc) {
+async function createNodesInternal(configFilePath, options, context, projectsCache, pmc, hash) {
     const angularWorkspaceRoot = (0, node_path_1.dirname)(configFilePath);
-    // Do not create a project if package.json isn't there
-    const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot));
-    if (!siblingFiles.includes('package.json')) {
-        return {};
-    }
-    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(angularWorkspaceRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
-    projectsCache[hash] ??= await buildAngularProjects(configFilePath, options, angularWorkspaceRoot, context, pmc);
-    return { projects: projectsCache[hash] };
+    if (!projectsCache.has(hash)) {
+        projectsCache.set(hash, await buildAngularProjects(configFilePath, options, angularWorkspaceRoot, context, pmc));
+    }
+    return { projects: projectsCache.get(hash) };
 }
 async function buildAngularProjects(configFilePath, options, angularWorkspaceRoot, context, pmc) {
     const projects = {};
@@ -90,7 +101,7 @@ async function buildAngularProjects(configFilePath, options, angularWorkspaceRoo
         if (!projectTargets) {
             continue;
         }
-        const namedInputs = (0, get_named_inputs_1.getNamedInputs)(project.root, context);
+        const namedInputs = (0, internal_1.getNamedInputs)(project.root, context);
         for (const [angularTargetName, angularTarget] of Object.entries(projectTargets)) {
             const nxTargetName = options?.targetNamePrefix
                 ? `${options.targetNamePrefix}${angularTargetName}`
@@ -525,3 +536,24 @@ function getOutput(path, workspaceRoot, angularWorkspaceRoot, projectRoot) {
 function getAngularJsonProjectTargets(project) {
     return project.architect ?? project.targets;
 }
+async function filterAngularConfigs(configFiles, context) {
+    const preErrors = [];
+    const candidates = await Promise.all(configFiles.map(async (configFile) => {
+        try {
+            const angularWorkspaceRoot = (0, node_path_1.dirname)(configFile);
+            const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot));
+            if (!siblingFiles.includes('package.json')) {
+                return null;
+            }
+            return { configFile, angularWorkspaceRoot };
+        }
+        catch (e) {
+            preErrors.push([configFile, e]);
+            return null;
+        }
+    }));
+    return {
+        entries: candidates.filter((c) => c !== null),
+        preErrors,
+    };
+}

package/src/utils/assert-supported-angular-version.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export declare function assertSupportedAngularVersion(tree: Tree): void;
+//# sourceMappingURL=assert-supported-angular-version.d.ts.map

package/src/utils/assert-supported-angular-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assert-supported-angular-version.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/assert-supported-angular-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvC,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAM9D"}

package/src/utils/assert-supported-angular-version.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertSupportedAngularVersion = assertSupportedAngularVersion;
+const internal_1 = require("@nx/devkit/internal");
+const backward_compatible_versions_1 = require("./backward-compatible-versions");
+const minSupportedAngularMajor = Math.min(...backward_compatible_versions_1.supportedVersions);
+function assertSupportedAngularVersion(tree) {
+    (0, internal_1.assertSupportedPackageVersion)(tree, '@angular/core', `${minSupportedAngularMajor}.0.0`);
+}

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

@@ -29,7 +29,7 @@ exports.backwardCompatibleVersions = {
         tsNodeVersion: '10.9.1',
         lessVersion: '^4.3.0',
         jestPresetAngularVersion: '~14.6.1',
-        typesNodeVersion: '20.19.9',
+        typesNodeVersion: '^22.0.0',
         jasmineMarblesVersion: '^0.9.2',
         jsoncEslintParserVersion: '^2.1.0',
         webpackMergeVersion: '^5.8.0',
@@ -61,7 +61,7 @@ exports.backwardCompatibleVersions = {
         tsNodeVersion: '10.9.1',
         lessVersion: '^4.3.0',
         jestPresetAngularVersion: '~14.4.0',
-        typesNodeVersion: '20.19.9',
+        typesNodeVersion: '^22.0.0',
         jasmineMarblesVersion: '^0.9.2',
         jsoncEslintParserVersion: '^2.1.0',
         webpackMergeVersion: '^5.8.0',

package/src/utils/get-mf-projects.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMFProjects = getMFProjects;
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const internal_1 = require("@nx/devkit/internal");
 function _getMfProjects(tree, CUSTOM_WEBPACK_OPTION, MODULE_FEDERATION_IDENTIFIER, projects) {
     return (opts, projectName) => {
         const webpackPath = opts[CUSTOM_WEBPACK_OPTION]?.path;
@@ -25,7 +25,7 @@ function getMFProjects(tree, { legacy } = { legacy: false }) {
         ? 'Identifier[name=ModuleFederationPlugin]'
         : 'Identifier[name=withModuleFederation]';
     const projects = [];
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', _getMfProjects(tree, CUSTOM_WEBPACK_OPTION, MODULE_FEDERATION_IDENTIFIER, projects));
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/angular:webpack-browser', _getMfProjects(tree, CUSTOM_WEBPACK_OPTION, MODULE_FEDERATION_IDENTIFIER, projects));
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', _getMfProjects(tree, CUSTOM_WEBPACK_OPTION, MODULE_FEDERATION_IDENTIFIER, projects));
+    (0, internal_1.forEachExecutorOptions)(tree, '@nrwl/angular:webpack-browser', _getMfProjects(tree, CUSTOM_WEBPACK_OPTION, MODULE_FEDERATION_IDENTIFIER, projects));
     return projects;
 }

package/src/utils/index.d.ts

@@ -5,4 +5,5 @@
  */
 export { isStandalone, addImportToComponent, addImportToDirective, addImportToPipe, addImportToModule, addProviderToBootstrapApplication, addProviderToAppConfig, addProviderToComponent, addProviderToModule, addViewProviderToComponent, } from './nx-devkit/ast-utils';
 export { addRoute, addProviderToRoute } from './nx-devkit/route-utils';
+export { angularDevkitVersion } from './versions';
 //# sourceMappingURL=index.d.ts.map

package/src/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EACf,iBAAiB,EACjB,iCAAiC,EACjC,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EACf,iBAAiB,EACjB,iCAAiC,EACjC,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC"}

package/src/utils/index.js

@@ -5,7 +5,7 @@
  * Try hard to not add to this API to reduce the surface area we need to maintain.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addProviderToRoute = exports.addRoute = exports.addViewProviderToComponent = exports.addProviderToModule = exports.addProviderToComponent = exports.addProviderToAppConfig = exports.addProviderToBootstrapApplication = exports.addImportToModule = exports.addImportToPipe = exports.addImportToDirective = exports.addImportToComponent = exports.isStandalone = void 0;
+exports.angularDevkitVersion = exports.addProviderToRoute = exports.addRoute = exports.addViewProviderToComponent = exports.addProviderToModule = exports.addProviderToComponent = exports.addProviderToAppConfig = exports.addProviderToBootstrapApplication = exports.addImportToModule = exports.addImportToPipe = exports.addImportToDirective = exports.addImportToComponent = exports.isStandalone = void 0;
 var ast_utils_1 = require("./nx-devkit/ast-utils");
 Object.defineProperty(exports, "isStandalone", { enumerable: true, get: function () { return ast_utils_1.isStandalone; } });
 Object.defineProperty(exports, "addImportToComponent", { enumerable: true, get: function () { return ast_utils_1.addImportToComponent; } });
@@ -20,3 +20,5 @@ Object.defineProperty(exports, "addViewProviderToComponent", { enumerable: true,
 var route_utils_1 = require("./nx-devkit/route-utils");
 Object.defineProperty(exports, "addRoute", { enumerable: true, get: function () { return route_utils_1.addRoute; } });
 Object.defineProperty(exports, "addProviderToRoute", { enumerable: true, get: function () { return route_utils_1.addProviderToRoute; } });
+var versions_1 = require("./versions");
+Object.defineProperty(exports, "angularDevkitVersion", { enumerable: true, get: function () { return versions_1.angularDevkitVersion; } });