@nx/angular 23.0.0-beta.5 → 23.0.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.0.0-beta.5",
+  "version": "23.0.0-beta.7",
   "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": {
@@ -61,14 +61,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.5",
-    "@nx/eslint": "23.0.0-beta.5",
-    "@nx/js": "23.0.0-beta.5",
-    "@nx/module-federation": "23.0.0-beta.5",
-    "@nx/rspack": "23.0.0-beta.5",
-    "@nx/web": "23.0.0-beta.5",
-    "@nx/webpack": "23.0.0-beta.5",
-    "@phenomnomnominal/tsquery": "~6.1.4",
+    "@nx/devkit": "23.0.0-beta.7",
+    "@nx/eslint": "23.0.0-beta.7",
+    "@nx/js": "23.0.0-beta.7",
+    "@nx/module-federation": "23.0.0-beta.7",
+    "@nx/rspack": "23.0.0-beta.7",
+    "@nx/web": "23.0.0-beta.7",
+    "@nx/webpack": "23.0.0-beta.7",
+    "@phenomnomnominal/tsquery": "~6.2.0",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",
     "magic-string": "~0.30.2",

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-federation-dev-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAwCvC,wBAAuB,iCAAiC,CACtD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,iCAgIzB;AAED,eAAe,iCAAiC,CAAC"}
+{"version":3,"file":"module-federation-dev-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAkCvC,wBAAuB,iCAAiC,CACtD,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,eAAe,iCAgIzB;AAED,eAAe,iCAAiC,CAAC"}

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.moduleFederationDevServerExecutor = moduleFederationDevServerExecutor;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
-const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const utils_1 = require("@nx/module-federation/src/executors/utils");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
@@ -46,7 +45,7 @@ async function* moduleFederationDevServerExecutor(schema, context) {
             cors: true,
             cacheSeconds: -1,
         }, context)
-        : (0, rxjs_for_await_1.eachValueFrom)((0, dev_server_impl_1.executeDevServerBuilder)(options, await (0, ngcli_adapter_1.createBuilderContext)({
+        : (0, internal_1.eachValueFrom)((0, dev_server_impl_1.executeDevServerBuilder)(options, await (0, ngcli_adapter_1.createBuilderContext)({
             builderName: '@nx/angular:webpack-browser',
             description: 'Build a browser application',
             optionSchema: require('../../builders/webpack-browser/schema.json'),
@@ -70,11 +69,11 @@ async function* moduleFederationDevServerExecutor(schema, context) {
     }
     (0, module_federation_1.validateDevRemotes)(options, workspaceProjects);
     const { remotes, staticRemotesIter, devRemoteIters } = await (0, utils_1.startRemoteIterators)(options, context, lib_1.startRemotes, pathToManifestFile, 'angular');
-    const removeBaseUrlEmission = (iter) => (0, async_iterable_1.mapAsyncIterable)(iter, (v) => ({
+    const removeBaseUrlEmission = (iter) => (0, internal_1.mapAsyncIterable)(iter, (v) => ({
         ...v,
         baseUrl: undefined,
     }));
-    return yield* (0, async_iterable_1.combineAsyncIterables)(removeBaseUrlEmission(currIter), ...devRemoteIters.map(removeBaseUrlEmission), ...(staticRemotesIter ? [removeBaseUrlEmission(staticRemotesIter)] : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    return yield* (0, internal_1.combineAsyncIterables)(removeBaseUrlEmission(currIter), ...devRemoteIters.map(removeBaseUrlEmission), ...(staticRemotesIter ? [removeBaseUrlEmission(staticRemotesIter)] : []), (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
         if (!options.isInitialHost) {
             done();
             return;

package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js

@@ -35,8 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.moduleFederationSsrDevServerExecutor = moduleFederationSsrDevServerExecutor;
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
+const internal_1 = require("@nx/devkit/internal");
 const utils_1 = require("@nx/module-federation/src/executors/utils");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const fs_1 = require("fs");
@@ -67,7 +66,7 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
     const options = (0, normalize_options_1.normalizeOptions)(schema);
     (0, builder_package_1.assertBuilderPackageIsInstalled)('@angular-devkit/build-angular');
     const { executeSSRDevServerBuilder } = await Promise.resolve().then(() => __importStar(require('@angular-devkit/build-angular')));
-    const currIter = (0, rxjs_for_await_1.eachValueFrom)(executeSSRDevServerBuilder(options, await (0, ngcli_adapter_1.createBuilderContext)({
+    const currIter = (0, internal_1.eachValueFrom)(executeSSRDevServerBuilder(options, await (0, ngcli_adapter_1.createBuilderContext)({
         builderName: '@nx/angular:webpack-server',
         description: 'Build a ssr application',
         optionSchema: require('../../builders/webpack-server/schema.json'),
@@ -93,11 +92,11 @@ async function* moduleFederationSsrDevServerExecutor(schema, context) {
     }
     (0, module_federation_1.validateDevRemotes)({ devRemotes: options.devRemotes }, workspaceProjects);
     const { remotes, staticRemotesIter, devRemoteIters } = await (0, utils_1.startRemoteIterators)(options, context, start_dev_remotes_1.startRemotes, pathToManifestFile, 'angular', true);
-    const removeBaseUrlEmission = (iter) => (0, async_iterable_1.mapAsyncIterable)(iter, (v) => ({
+    const removeBaseUrlEmission = (iter) => (0, internal_1.mapAsyncIterable)(iter, (v) => ({
         ...v,
         baseUrl: undefined,
     }));
-    const combined = (0, async_iterable_1.combineAsyncIterables)(removeBaseUrlEmission(staticRemotesIter), ...(devRemoteIters ? devRemoteIters.map(removeBaseUrlEmission) : []), (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+    const combined = (0, internal_1.combineAsyncIterables)(removeBaseUrlEmission(staticRemotesIter), ...(devRemoteIters ? devRemoteIters.map(removeBaseUrlEmission) : []), (0, internal_1.createAsyncIterable)(async ({ next, done }) => {
         if (!options.isInitialHost) {
             done();
             return;

package/src/executors/package/package.impl.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageExecutor = void 0;
 exports.createLibraryExecutor = createLibraryExecutor;
-const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
+const internal_1 = require("@nx/devkit/internal");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
@@ -29,7 +29,7 @@ function createLibraryExecutor(initializeNgPackagr) {
         options.project ??= (0, path_1.join)(context.projectsConfigurations.projects[context.projectName].root, 'ng-package.json');
         const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
         if (options.watch) {
-            return yield* (0, rxjs_for_await_1.eachValueFrom)((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies)).pipe((0, operators_1.switchMap)((packagr) => packagr.watch()), (0, operators_1.mapTo)({ success: true })));
+            return yield* (0, internal_1.eachValueFrom)((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies)).pipe((0, operators_1.switchMap)((packagr) => packagr.watch()), (0, operators_1.mapTo)({ success: true })));
         }
         return (0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies))
             .pipe((0, operators_1.switchMap)((packagr) => packagr.build()), (0, operators_1.mapTo)({ success: true }))

package/src/generators/add-linting/add-linting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-linting.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAgBpB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAG1D,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,iBAAiB,CAAC,CA6I5B;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"add-linting.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAepB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAG1D,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,iBAAiB,CAAC,CA6I5B;AAED,eAAe,mBAAmB,CAAC"}

package/src/generators/add-linting/add-linting.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLintingGenerator = addLintingGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
 const eslint_1 = require("@nx/eslint");
 const global_eslint_config_1 = require("@nx/eslint/src/generators/init/global-eslint-config");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
@@ -43,7 +43,7 @@ async function addLintingGenerator(tree, options) {
                         'error',
                         {
                             type: 'attribute',
-                            prefix: (0, string_utils_1.camelize)(options.prefix),
+                            prefix: (0, internal_1.camelize)(options.prefix),
                             style: 'camelCase',
                         },
                     ],
@@ -51,7 +51,7 @@ async function addLintingGenerator(tree, options) {
                         'error',
                         {
                             type: 'element',
-                            prefix: (0, string_utils_1.dasherize)(options.prefix),
+                            prefix: (0, internal_1.dasherize)(options.prefix),
                             style: 'kebab-case',
                         },
                     ],
@@ -83,7 +83,7 @@ async function addLintingGenerator(tree, options) {
                             'error',
                             {
                                 type: 'attribute',
-                                prefix: (0, string_utils_1.camelize)(options.prefix),
+                                prefix: (0, internal_1.camelize)(options.prefix),
                                 style: 'camelCase',
                             },
                         ],
@@ -91,7 +91,7 @@ async function addLintingGenerator(tree, options) {
                             'error',
                             {
                                 type: 'element',
-                                prefix: (0, string_utils_1.dasherize)(options.prefix),
+                                prefix: (0, internal_1.dasherize)(options.prefix),
                                 style: 'kebab-case',
                             },
                         ],

package/src/generators/application/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAKjB,IAAI,EAEL,MAAM,YAAY,CAAC;AA0BpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CA8H5B;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAKjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAyBpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CA8H5B;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/application/application.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
 const convert_to_rspack_1 = require("../convert-to-rspack/convert-to-rspack");
 const init_1 = require("../init/init");
@@ -105,7 +105,7 @@ async function applicationGenerator(tree, schema) {
     }
     return () => {
         (0, devkit_1.installPackagesTask)(tree);
-        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
+        (0, internal_1.logShowProjectCommand)(options.name);
     };
 }
 exports.default = applicationGenerator;

package/src/generators/application/lib/add-e2e.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AASlC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAG5D,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,mBAsEjE"}
+{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAUlC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,mBAsEjE"}

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

@@ -74,7 +74,7 @@ function getAngularE2EWebServerInfo(tree, projectName, portOverride) {
     }
     const pm = (0, devkit_1.getPackageManagerCommand)();
     return {
-        e2eCiBaseUrl: 'http://localhost:4200',
+        e2eCiBaseUrl: `http://localhost:${e2ePort}`,
         e2eCiWebServerCommand: `${pm.exec} nx run ${projectName}:serve-static`,
         e2eWebServerCommand: `${pm.exec} nx run ${projectName}:serve`,
         e2eWebServerAddress: `http://localhost:${e2ePort}`,

package/src/generators/application/lib/create-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-project.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/create-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QAUlE"}
+{"version":3,"file":"create-project.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/create-project.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QAUlE"}

package/src/generators/application/lib/create-project.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProject = createProject;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const version_utils_1 = require("../../utils/version-utils");
 function createProject(tree, options) {
     let project;
@@ -19,7 +19,7 @@ function createProjectForEsbuild(tree, options) {
     const buildExecutor = angularMajorVersion >= 20
         ? '@angular/build:application'
         : '@angular-devkit/build-angular:application';
-    (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, buildExecutor);
+    (0, internal_1.addBuildTargetDefaults)(tree, buildExecutor);
     let budgets = undefined;
     if (options.strict) {
         budgets = [
@@ -115,7 +115,7 @@ function createProjectForEsbuild(tree, options) {
 }
 function createProjectForWebpack(tree, options) {
     const buildExecutor = '@angular-devkit/build-angular:browser';
-    (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, buildExecutor);
+    (0, internal_1.addBuildTargetDefaults)(tree, buildExecutor);
     let budgets = undefined;
     if (options.strict) {
         budgets = [

package/src/generators/application/lib/normalize-options.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const internal_1 = require("@nx/devkit/internal");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
 function arePluginsExplicitlyDisabled(host) {
@@ -17,8 +17,8 @@ function validateBundler(bundler) {
     throw new Error(`Invalid bundler: ${bundler}. Please use one of the following: 'esbuild', 'webpack', 'rspack'.`);
 }
 async function normalizeOptions(host, options, isRspack) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,

package/src/generators/component/lib/normalize-options.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const internal_1 = require("@nx/devkit/internal");
 const selector_1 = require("../../utils/selector");
 const validations_1 = require("../../utils/validations");
 const version_utils_1 = require("../../utils/version-utils");
@@ -11,7 +11,7 @@ async function normalizeOptions(tree, options) {
     if (angularMajorVersion < 20) {
         options.type ??= 'component';
     }
-    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
         path: options.path,
         suffix: options.type,

package/src/generators/convert-to-rspack/convert-to-rspack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-rspack.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-to-rspack/convert-to-rspack.ts"],"names":[],"mappings":"AAAA,OAAO,EAcL,KAAK,iBAAiB,EAEtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAapB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA6StD,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,8BAiZ9B;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"convert-to-rspack.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/convert-to-rspack/convert-to-rspack.ts"],"names":[],"mappings":"AACA,OAAO,EAcL,KAAK,iBAAiB,EAEtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAWpB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA6StD,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,8BAiZ9B;AAED,eAAe,eAAe,CAAC"}

package/src/generators/convert-to-rspack/convert-to-rspack.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToRspack = convertToRspack;
+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 get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const enquirer_1 = require("enquirer");
 const path_1 = require("path");
 const posix_1 = require("path/posix");
@@ -222,7 +221,7 @@ function handleDevServerTargetOptions(tree, options, newConfigurationOptions, ro
 async function getProjectToConvert(tree) {
     const projects = new Set();
     for (const executor of SUPPORTED_EXECUTORS) {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (_, project) => {
+        (0, internal_1.forEachExecutorOptions)(tree, executor, (_, project) => {
             projects.add(project);
         });
     }
@@ -363,7 +362,7 @@ async function convertToRspack(tree, schema) {
                 // check whether the existing inputs would match the inferred task
                 // inputs with the exception of the @rspack/cli external dependency
                 // which webpack tasks wouldn't have
-                const namedInputs = (0, get_named_inputs_1.getNamedInputs)(project.root, {
+                const namedInputs = (0, internal_1.getNamedInputs)(project.root, {
                     nxJsonConfiguration: nxJson,
                     workspaceRoot: devkit_1.workspaceRoot,
                 });

package/src/generators/convert-to-rspack/lib/get-custom-webpack-config.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCustomWebpackConfig = getCustomWebpackConfig;
 exports.convertWebpackConfigToUseNxModuleFederationPlugin = convertWebpackConfigToUseNxModuleFederationPlugin;
 const devkit_1 = require("@nx/devkit");
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const FILE_EXTENSION_REGEX = /\.[^.]+$/;
@@ -17,7 +17,7 @@ async function getCustomWebpackConfig(tree, projectRoot, pathToCustomWebpackConf
             normalizedPathToCustomWebpackConfig: `./${(0, path_1.relative)(projectRoot, pathToCustomWebpackConfig).replace(FILE_EXTENSION_REGEX, '')}`,
         };
     }
-    const configFile = await (0, config_utils_1.loadConfigFile)((0, path_1.join)(tree.root, pathToCustomWebpackConfig));
+    const configFile = await (0, internal_1.loadConfigFile)((0, path_1.join)(tree.root, pathToCustomWebpackConfig));
     const webpackConfig = 'default' in configFile ? configFile.default : configFile;
     return {
         isWebpackConfigFunction: typeof webpackConfig === 'function',

package/src/generators/directive/lib/normalize-options.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const internal_1 = require("@nx/devkit/internal");
 const selector_1 = require("../../utils/selector");
 const validations_1 = require("../../utils/validations");
 const version_utils_1 = require("../../utils/version-utils");
@@ -11,7 +11,7 @@ async function normalizeOptions(tree, options) {
     if (angularMajorVersion < 20) {
         options.type ??= 'directive';
     }
-    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
         path: options.path,
         suffix: options.type,

package/src/generators/federate-module/lib/add-remote.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRemote = addRemote;
 const tslib_1 = require("tslib");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const internal_1 = require("@nx/devkit/internal");
 const test_runners_1 = require("../../../utils/test-runners");
 const remote_1 = tslib_1.__importDefault(require("../../remote/remote"));
 const check_remote_exists_1 = require("./check-remote-exists");
@@ -21,7 +21,7 @@ async function addRemote(tree, schema) {
             skipFormat: true,
         });
         tasks.push(remoteGeneratorCallback);
-        const { projectName, projectRoot: remoteRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+        const { projectName, projectRoot: remoteRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
             name: schema.remote,
             directory: schema.remoteDirectory,
             projectType: 'application',

package/src/generators/host/host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAEL,MAAM,YAAY,CAAC;AAgBpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAgIpD;AAED,eAAe,IAAI,CAAC"}
+{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EAEL,MAAM,YAAY,CAAC;AAYpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAkIpD;AAED,eAAe,IAAI,CAAC"}

package/src/generators/host/host.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.host = host;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const js_1 = require("@nx/js");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = tslib_1.__importDefault(require("../application/application"));
@@ -49,17 +49,18 @@ async function host(tree, schema) {
             }
         });
     }
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName: hostProjectName, projectRoot: appRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
+    const { projectName: hostProjectName, projectRoot: appRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
     });
+    const hostPort = options.port ?? 4200;
     const appInstallTask = await (0, application_1.default)(tree, {
         ...options,
         standalone: options.standalone,
         routing: true,
-        port: 4200,
+        port: hostPort,
         skipFormat: true,
         bundler: 'webpack',
     });
@@ -68,7 +69,7 @@ async function host(tree, schema) {
         appName: hostProjectName,
         mfType: 'host',
         routing: true,
-        port: 4200,
+        port: hostPort,
         remotes: remotesToIntegrate ?? [],
         federationType: options.dynamic ? 'dynamic' : 'static',
         skipPackageJson: options.skipPackageJson,
@@ -97,7 +98,7 @@ async function host(tree, schema) {
             name: remote,
             directory: remoteDirectory,
             host: hostProjectName,
-            port: isRspack ? 4200 + i + 1 : undefined,
+            port: isRspack ? hostPort + i + 1 : undefined,
             skipFormat: true,
             standalone: options.standalone,
             typescriptConfiguration,
@@ -114,7 +115,7 @@ async function host(tree, schema) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, hostProjectName);
     project.targets.serve ??= {};
     project.targets.serve.options ??= {};
-    project.targets.serve.options.port = 4200;
+    project.targets.serve.options.port = hostPort;
     (0, devkit_1.updateProjectConfiguration)(tree, hostProjectName, project);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/host/schema.d.ts

@@ -6,6 +6,7 @@ export interface Schema {
   directory: string;
   name?: string;
   bundler?: 'webpack' | 'rspack';
+  port?: number;
   remotes?: string[];
   dynamic?: boolean;
   setParserOptionsProject?: boolean;

package/src/generators/host/schema.json

@@ -43,6 +43,10 @@
       "default": "webpack",
       "enum": ["webpack", "rspack"]
     },
+    "port": {
+      "type": "number",
+      "description": "The port at which the Consumer (host) application should be served. Defaults to 4200."
+    },
     "dynamic": {
       "type": "boolean",
       "description": "Should the host application use dynamic federation?",

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EAItB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,CAAC,CA8B5B;AA2ED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,iBAAiB,EAItB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,CAAC,CA8B5B;AA2ED,eAAe,oBAAoB,CAAC"}

package/src/generators/init/init.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularInitGenerator = angularInitGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
 const validations_1 = require("../utils/validations");
 const version_utils_1 = require("../utils/version-utils");
@@ -16,7 +16,7 @@ async function angularInitGenerator(tree, options) {
     // by most folks we've talked to.
     options.addPlugin ??= process.env.NX_RUNNING_NX_IMPORT === 'true';
     if (options.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/angular/plugin', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/angular/plugin', plugin_1.createNodesV2, {
             targetNamePrefix: ['', 'angular:', 'angular-'],
         }, options.updatePackageScripts);
     }

package/src/generators/library/lib/add-project.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
 async function addProject(tree, libraryOptions) {
     const project = {
@@ -18,7 +18,7 @@ async function addProject(tree, libraryOptions) {
         const executor = libraryOptions.publishable
             ? '@nx/angular:package'
             : '@nx/angular:ng-packagr-lite';
-        (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, executor);
+        (0, internal_1.addBuildTargetDefaults)(tree, executor);
         project.targets.build = {
             executor,
             outputs: ['{workspaceRoot}/dist/{projectRoot}'],

package/src/generators/library/lib/normalize-options.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const internal_1 = require("@nx/devkit/internal");
 const test_runners_1 = require("../../../utils/test-runners");
 const artifact_types_1 = require("../../utils/artifact-types");
 const version_utils_1 = require("../../utils/version-utils");
@@ -21,8 +21,8 @@ async function normalizeOptions(host, schema) {
         skipModule: schema.skipModule || schema.standalone,
         ...schema,
     };
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
-    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, internal_1.ensureRootProjectName)(options, 'library');
+    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,

package/src/generators/library/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EACL,MAAM,YAAY,CAAC;AAuBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAiE5B;AAoED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EACL,MAAM,YAAY,CAAC;AAsBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAiE5B;AAoED,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
 const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
 const init_1 = tslib_1.__importDefault(require("../../generators/init/init"));
@@ -68,7 +68,7 @@ async function libraryGenerator(tree, schema) {
     if (libraryOptions.publishable) {
         tasks.push(await (0, add_release_config_1.releaseTasks)(tree));
     }
-    tasks.push(() => (0, log_show_project_command_1.logShowProjectCommand)(libraryOptions.name));
+    tasks.push(() => (0, internal_1.logShowProjectCommand)(libraryOptions.name));
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function addUnitTestRunner(host, options) {

package/src/generators/ngrx/lib/normalize-options.js

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const semver_1 = require("@nx/devkit/src/utils/semver");
+const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
-const semver_2 = require("semver");
+const semver_1 = require("semver");
 const versions_1 = require("../../../utils/versions");
 function normalizeOptions(tree, options) {
     let rxjsVersion;
     try {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)(tree, 'rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
+        rxjsVersion = (0, internal_1.checkAndCleanWithSemver)(tree, 'rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
     }
     catch {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)(tree, 'rxjs', versions_1.rxjsVersion);
+        rxjsVersion = (0, internal_1.checkAndCleanWithSemver)(tree, 'rxjs', versions_1.rxjsVersion);
     }
-    const rxjsMajorVersion = (0, semver_2.major)(rxjsVersion);
+    const rxjsMajorVersion = (0, semver_1.major)(rxjsVersion);
     return {
         ...options,
         parentDirectory: options.module

package/src/generators/ngrx-feature-store/lib/normalize-options.js

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const semver_1 = require("@nx/devkit/src/utils/semver");
+const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
-const semver_2 = require("semver");
+const semver_1 = require("semver");
 const versions_1 = require("../../../utils/versions");
 function normalizeOptions(tree, options) {
     let rxjsVersion;
     try {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)(tree, 'rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
+        rxjsVersion = (0, internal_1.checkAndCleanWithSemver)(tree, 'rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
     }
     catch {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)(tree, 'rxjs', versions_1.rxjsVersion);
+        rxjsVersion = (0, internal_1.checkAndCleanWithSemver)(tree, 'rxjs', versions_1.rxjsVersion);
     }
-    const rxjsMajorVersion = (0, semver_2.major)(rxjsVersion);
+    const rxjsMajorVersion = (0, semver_1.major)(rxjsVersion);
     const { subdirectory, name } = determineSubdirectoryAndName(options.name);
     return {
         ...options,

package/src/generators/ngrx-root-store/lib/normalize-options.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const semver_1 = require("@nx/devkit/src/utils/semver");
 const versions_1 = require("../../../utils/versions");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
@@ -10,10 +10,10 @@ function normalizeOptions(tree, options) {
     let rxjsVersion;
     try {
         const rxjsVersionFromPackageJson = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'rxjs', 'package.json', ['dependencies']);
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)(tree, 'rxjs', rxjsVersionFromPackageJson);
+        rxjsVersion = (0, internal_1.checkAndCleanWithSemver)(tree, 'rxjs', rxjsVersionFromPackageJson);
     }
     catch {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)(tree, 'rxjs', versions_1.rxjsVersion);
+        rxjsVersion = (0, internal_1.checkAndCleanWithSemver)(tree, 'rxjs', versions_1.rxjsVersion);
     }
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const isStandalone = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);

package/src/generators/pipe/lib/normalize-options.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const internal_1 = require("@nx/devkit/internal");
 const validations_1 = require("../../utils/validations");
 const version_utils_1 = require("../../utils/version-utils");
 async function normalizeOptions(tree, options) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     options.typeSeparator ??= angularMajorVersion < 20 ? '.' : '-';
-    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
         path: options.path,
         suffix: 'pipe',

package/src/generators/remote/remote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAEL,MAAM,YAAY,CAAC;AAepB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAqHtD;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":"AAIA,OAAO,EAOL,IAAI,EAEL,MAAM,YAAY,CAAC;AAWpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAqHtD;AAED,eAAe,MAAM,CAAC"}

package/src/generators/remote/remote.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remote = remote;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const versions_1 = require("@nx/js/src/utils/versions");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = require("../application/application");
@@ -29,8 +29,8 @@ async function remote(tree, schema) {
     if (options.host && !projects.has(options.host)) {
         throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
     }
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName: remoteProjectName } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
+    const { projectName: remoteProjectName } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,

package/src/generators/scam/lib/normalize-options.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const internal_1 = require("@nx/devkit/internal");
 const artifact_types_1 = require("../../utils/artifact-types");
 const validations_1 = require("../../utils/validations");
 const version_utils_1 = require("../../utils/version-utils");
@@ -11,7 +11,7 @@ async function normalizeOptions(tree, options) {
     if (angularMajorVersion < 20) {
         options.type ??= 'component';
     }
-    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
         path: options.path,
         suffix: options.type,

package/src/generators/scam-directive/lib/normalize-options.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const internal_1 = require("@nx/devkit/internal");
 const artifact_types_1 = require("../../utils/artifact-types");
 const validations_1 = require("../../utils/validations");
 const version_utils_1 = require("../../utils/version-utils");
@@ -11,7 +11,7 @@ async function normalizeOptions(tree, options) {
     if (angularMajorVersion < 20) {
         options.type ??= 'directive';
     }
-    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
         path: options.path,
         suffix: options.type,

package/src/generators/scam-pipe/lib/normalize-options.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const internal_1 = require("@nx/devkit/internal");
 const artifact_types_1 = require("../../utils/artifact-types");
 const validations_1 = require("../../utils/validations");
 const version_utils_1 = require("../../utils/version-utils");
 async function normalizeOptions(tree, options) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     options.typeSeparator ??= angularMajorVersion < 20 ? '.' : '-';
-    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
         name: options.name,
         path: options.path,
         suffix: 'pipe',

package/src/generators/setup-mf/lib/change-build-target.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"change-build-target.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/change-build-target.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAQxC,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAuB5D"}
+{"version":3,"file":"change-build-target.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/change-build-target.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAOxC,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAuB5D"}

package/src/generators/setup-mf/lib/change-build-target.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.changeBuildTarget = changeBuildTarget;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 function changeBuildTarget(host, options) {
     const appConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
     const configExtName = options.typescriptConfiguration ? 'ts' : 'js';
@@ -20,5 +20,5 @@ function changeBuildTarget(host, options) {
         },
     };
     (0, devkit_1.updateProjectConfiguration)(host, options.appName, appConfig);
-    (0, target_defaults_utils_1.addBuildTargetDefaults)(host, '@nx/angular:webpack-browser');
+    (0, internal_1.addBuildTargetDefaults)(host, '@nx/angular:webpack-browser');
 }

package/src/generators/setup-ssr/lib/normalize-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEpE,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,0BAA0B,CAAC,CA+CrC"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/normalize-options.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEpE,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,0BAA0B,CAAC,CA+CrC"}

package/src/generators/setup-ssr/lib/normalize-options.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const prompt_1 = require("@nx/devkit/src/generators/prompt");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 const version_utils_1 = require("../../utils/version-utils");
 async function normalizeOptions(tree, options) {
@@ -13,7 +13,7 @@ async function normalizeOptions(tree, options) {
     if (options.serverRouting === undefined && isUsingApplicationBuilder) {
         const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
         if (angularMajorVersion === 19) {
-            options.serverRouting = await (0, prompt_1.promptWhenInteractive)({
+            options.serverRouting = await (0, internal_1.promptWhenInteractive)({
                 type: 'confirm',
                 name: 'serverRouting',
                 message: 'Would you like to use the Server Routing and App Engine APIs (Developer Preview) for this server application?',

package/src/migrations/update-17-1-0/browser-target-to-build-target.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser-target-to-build-target.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-17-1-0/browser-target-to-build-target.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,eAAO,MAAM,SAAS,UAKrB,CAAC;AAEF,yBAA+B,IAAI,EAAE,IAAI,iBA8CxC"}
+{"version":3,"file":"browser-target-to-build-target.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-17-1-0/browser-target-to-build-target.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,SAAS,UAKrB,CAAC;AAEF,yBAA+B,IAAI,EAAE,IAAI,iBA8CxC"}

package/src/migrations/update-17-1-0/browser-target-to-build-target.js

@@ -2,8 +2,8 @@
 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 = [
     '@angular-devkit/build-angular:dev-server',
     '@angular-devkit/build-angular:extract-i18n',
@@ -13,7 +13,7 @@ exports.executors = [
 async function default_1(tree) {
     // update options from project configs
     exports.executors.forEach((executor) => {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (_, project, target, configuration) => {
+        (0, internal_1.forEachExecutorOptions)(tree, executor, (_, project, target, configuration) => {
             const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, project);
             const config = configuration
                 ? projectConfiguration.targets[target].configurations[configuration]

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const internal_1 = require("@nx/devkit/internal");
 async function default_1(tree) {
     let usesModuleFederation = false;
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options, projectName, targetName) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options, projectName, targetName) => {
         const webpackConfig = options.webpackConfig;
         if (!webpackConfig) {
             return;

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

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

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

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = migrateWithMfImport;
+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 tsquery_1 = require("@phenomnomnominal/tsquery");
 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 projects = new Set();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options, project, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/angular:webpack-browser', (options, project, target) => {
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
         projects.add(projectConfig.root);
     });

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,iBA4FxC"}

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;
             }

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/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,EAIL,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,CA+B7D,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,35 @@ 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);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, projectsCache, pmc, lockFileName), configFiles, options, context);
         }
         finally {
-            writeProjectsToCache(cachePath, projectsCache);
+            projectsCache.writeToDisk();
         }
     },
 ];
-async function createNodesInternal(configFilePath, options, context, projectsCache, pmc) {
+async function createNodesInternal(configFilePath, options, context, projectsCache, pmc, lockFileName) {
     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] };
+    const hash = await (0, internal_1.calculateHashForCreateNodes)(angularWorkspaceRoot, options, context, [lockFileName]);
+    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 +87,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}`

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;
 }