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

package/src/generators/scam-to-standalone/scam-to-standalone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scam-to-standalone.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-to-standalone/scam-to-standalone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAWvC,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,MAAM,iBAkDxD;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"scam-to-standalone.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-to-standalone/scam-to-standalone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAWvC,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,MAAM,iBAmDxD;AAED,eAAe,gBAAgB,CAAC"}

package/src/generators/scam-to-standalone/scam-to-standalone.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scamToStandalone = scamToStandalone;
 const devkit_1 = require("@nx/devkit");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const lib_1 = require("./lib");
 async function scamToStandalone(tree, { component, project: projectName, skipFormat }) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const projects = (0, devkit_1.getProjects)(tree);
     let project = (0, lib_1.getTargetProject)(projectName, projects);
     const normalizedComponentPath = (0, devkit_1.joinPathFragments)(project.root, component);

package/src/generators/setup-mf/files/ts-webpack/module-federation.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import { ModuleFederationConfig } from '@nx/module-federation';
+import type { ModuleFederationConfig } from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= name %>',<% if(type === 'host') { %>

package/src/generators/setup-mf/lib/add-cypress-workaround.js

@@ -5,7 +5,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCypressOnErrorWorkaround = addCypressOnErrorWorkaround;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function addCypressOnErrorWorkaround(tree, schema) {
     if (!schema.e2eProjectName) {
         return;
@@ -26,7 +26,7 @@ function addCypressOnErrorWorkaround(tree, schema) {
     if (e2eProject.targets?.e2e?.executor !== '@nx/cypress:cypress') {
         try {
             // don't ensure package is installed, if it's not installed, we don't need to add the workaround
-            const { CYPRESS_CONFIG_FILE_NAME_PATTERN, } = require('@nx/cypress/src/utils/config');
+            const { CYPRESS_CONFIG_FILE_NAME_PATTERN, } = require('@nx/cypress/internal');
             if (!(0, devkit_1.glob)(tree, [`${e2eProject.root}/${CYPRESS_CONFIG_FILE_NAME_PATTERN}`])
                 .length) {
                 // Not a cypress e2e project, skip
@@ -44,7 +44,7 @@ function addCypressOnErrorWorkaround(tree, schema) {
     }
     return true;
   });`;
-    const pathToCommandsFile = (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(e2eProject, tree), 'support/e2e.ts');
+    const pathToCommandsFile = (0, devkit_1.joinPathFragments)((0, internal_1.getProjectSourceRoot)(e2eProject, tree), 'support/e2e.ts');
     const commandsContent = tree.exists(pathToCommandsFile)
         ? tree.read(pathToCommandsFile, 'utf-8')
         : '';

package/src/generators/setup-mf/lib/add-remote-to-host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-remote-to-host.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AASpB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,WAOtD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QA4BpE"}
+{"version":3,"file":"add-remote-to-host.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAQpB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,WAOtD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QA4BpE"}

package/src/generators/setup-mf/lib/add-remote-to-host.js

@@ -4,8 +4,7 @@ exports.checkIsCommaNeeded = checkIsCommaNeeded;
 exports.addRemoteToHost = addRemoteToHost;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
 let tsModule;
 function checkIsCommaNeeded(mfRemoteText) {
@@ -26,7 +25,7 @@ function addRemoteToHost(tree, options) {
             addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescriptConfig);
         }
         else if (hostFederationType === 'dynamic') {
-            addRemoteToDynamicHost(tree, options, pathToMFManifest, (0, ts_solution_setup_1.getProjectSourceRoot)(hostProject, tree));
+            addRemoteToDynamicHost(tree, options, pathToMFManifest, (0, internal_1.getProjectSourceRoot)(hostProject, tree));
         }
         addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType);
     }
@@ -40,7 +39,7 @@ function getDynamicManifestFile(tree, project) {
     // at the old path.
     return [
         (0, devkit_1.joinPathFragments)(project.root, 'public/module-federation.manifest.json'),
-        (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(project, tree), 'assets/module-federation.manifest.json'),
+        (0, devkit_1.joinPathFragments)((0, internal_1.getProjectSourceRoot)(project, tree), 'assets/module-federation.manifest.json'),
     ].find((path) => tree.exists(path));
 }
 function addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescript) {
@@ -73,10 +72,10 @@ function addRemoteToDynamicHost(tree, options, pathToMfManifest, hostSourceRoot)
 }
 function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const hostAppConfig = (0, devkit_1.readProjectConfiguration)(tree, options.host);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(hostAppConfig, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(hostAppConfig, tree);
     const pathToHostRootRouting = `${sourceRoot}/app/app.routes.ts`;
     if (!tree.exists(pathToHostRootRouting)) {
         return;

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-mf/lib/remove-dead-code-from-remote.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeDeadCodeFromRemote = removeDeadCodeFromRemote;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function removeDeadCodeFromRemote(tree, options) {
     const projectName = options.appName;
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     const { appComponentInfo, nxWelcomeComponentInfo, entryModuleFileName } = options;
     ['css', 'less', 'scss', 'sass'].forEach((style) => {
         const pathToComponentStyle = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${appComponentInfo.extensionlessFileName}.${style}`);

package/src/generators/setup-mf/setup-mf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-mf.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AA2BpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BA0G3D;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"setup-mf.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AA6BpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BA0H3D;AAED,eAAe,OAAO,CAAC"}

package/src/generators/setup-mf/setup-mf.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupMf = setupMf;
 const devkit_1 = require("@nx/devkit");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const versions_1 = require("../../utils/versions");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function setupMf(tree, rawOptions) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
     const tasks = [];
@@ -65,6 +67,12 @@ async function setupMf(tree, rawOptions) {
     if (!options.skipE2E) {
         (0, lib_1.addCypressOnErrorWorkaround)(tree, options);
     }
+    if (!options.skipPackageJson && options.typescriptConfiguration) {
+        // Angular custom-webpack loads webpack.config.ts at build time. Node native
+        // TS strip can't resolve the extensionless `./module-federation.config`
+        // import under strict ESM, so loadTsFile needs ts-node as the fallback.
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { 'ts-node': versions_1.tsNodeVersion }, undefined, true));
+    }
     if (!options.skipPackageJson) {
         const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
         if (angularMajorVersion >= 20) {

package/src/generators/setup-ssr/lib/add-hydration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-hydration.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/add-hydration.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AASpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAK5D,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,0BAA0B,QA0E3E"}
+{"version":3,"file":"add-hydration.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/add-hydration.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAK5D,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,0BAA0B,QA0E3E"}

package/src/generators/setup-ssr/lib/add-hydration.js

@@ -3,16 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addHydration = addHydration;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 let tsModule;
 let tsquery;
 function addHydration(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
         tsquery = require('@phenomnomnominal/tsquery').tsquery;
     }
     let pathToClientConfigFile;

package/src/generators/setup-ssr/lib/add-server-file.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addServerFile = addServerFile;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const zoneless_1 = require("../../../utils/zoneless");
 const version_utils_1 = require("../../utils/version-utils");
@@ -27,7 +27,7 @@ function addServerFile(tree, options) {
                 (options.serverRouting ? '' : '-common-engine')
             : 'server-builder', 'server');
     }
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     const zoneless = (0, zoneless_1.isZonelessApp)(project);
     (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, {
         ...options,

package/src/generators/setup-ssr/lib/generate-files.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSSRFiles = generateSSRFiles;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const app_components_info_1 = require("../../utils/app-components-info");
@@ -29,7 +29,7 @@ function generateSSRFiles(tree, options) {
             ? 'application-builder'
             : 'server-builder', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     const ssrVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/ssr');
     const cleanedSsrVersion = ssrVersion
         ? ((0, semver_1.clean)(ssrVersion) ?? (0, semver_1.coerce)(ssrVersion).version)

package/src/generators/setup-ssr/lib/generate-server-ts-config.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setServerTsConfigOptionsForApplicationBuilder = setServerTsConfigOptionsForApplicationBuilder;
 exports.generateTsConfigServerJsonForBrowserBuilder = generateTsConfigServerJsonForBrowserBuilder;
 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 path_1 = require("path");
 const tsconfig_utils_1 = require("../../utils/tsconfig-utils");
 const version_utils_1 = require("../../utils/version-utils");
@@ -75,7 +75,7 @@ function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
         });
         // read the parsed compiler options from tsconfig.server.json
         const compilerOptions = (0, tsconfig_utils_1.readCompilerOptionsFromTsConfig)(tree, tsconfigServerPath);
-        const ts = (0, ensure_typescript_1.ensureTypescript)();
+        const ts = (0, internal_1.ensureTypescript)();
         if (compilerOptions.module === ts.ModuleKind.Preserve &&
             compilerOptions.moduleResolution === ts.ModuleResolutionKind.Bundler) {
             return;

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/generators/setup-ssr/lib/update-project-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-project-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAUvC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAO5D,wBAAgB,wCAAwC,CACtD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,GAClC,IAAI,CAmDN;AAED,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAmFpC"}
+{"version":3,"file":"update-project-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAGV,IAAI,EACL,MAAM,YAAY,CAAC;AAWpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAO5D,wBAAgB,wCAAwC,CACtD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,GAClC,IAAI,CAmDN;AAED,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,0BAA0B,QAoFpC"}

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

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

package/src/generators/setup-ssr/setup-ssr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-ssr.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAmBvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,uBAkCxD;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"setup-ssr.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAoBvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,uBAmCxD;AAED,eAAe,QAAQ,CAAC"}

package/src/generators/setup-ssr/setup-ssr.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsr = setupSsr;
 const devkit_1 = require("@nx/devkit");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const lib_1 = require("./lib");
 async function setupSsr(tree, schema) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     (0, lib_1.validateOptions)(tree, schema);
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     if (!schema.skipPackageJson) {

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

@@ -1 +1 @@
-{"version":3,"file":"stories.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/stories/stories.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,IAAI,EACL,MAAM,YAAY,CAAC;AASpB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAIxD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,iBA4CjC;AAED,eAAe,uBAAuB,CAAC"}
+{"version":3,"file":"stories.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/stories/stories.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,IAAI,EACL,MAAM,YAAY,CAAC;AAUpB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAIxD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,iBA6CjC;AAED,eAAe,uBAAuB,CAAC"}

package/src/generators/stories/stories.js

@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularStoriesGenerator = angularStoriesGenerator;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const component_story_1 = tslib_1.__importDefault(require("../component-story/component-story"));
 const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const module_info_1 = require("../utils/storybook-ast/module-info");
 const picomatch = require("picomatch");
 async function angularStoriesGenerator(tree, options) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
     const componentsInfo = [];
     for (const entryPoint of entryPoints) {

package/src/generators/storybook-configuration/storybook-configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storybook-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAKpB,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAE9D,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,iBAAiB,CAAC,CA8B5B;AAED,eAAe,+BAA+B,CAAC"}
+{"version":3,"file":"storybook-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAMpB,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAE9D,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,iBAAiB,CAAC,CA+B5B;AAED,eAAe,+BAA+B,CAAC"}

package/src/generators/storybook-configuration/storybook-configuration.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
 const devkit_1 = require("@nx/devkit");
+const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
 const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
 const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-storybook-version");
 const generate_stories_1 = require("./lib/generate-stories");
 const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
 async function storybookConfigurationGenerator(tree, options) {
+    (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     (0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
     const storybookGeneratorInstallTask = await (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, {
         ...options,

package/src/generators/utils/add-mf-env-to-inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-mf-env-to-inputs.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-mf-env-to-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAA4B,MAAM,YAAY,CAAC;AAEjE,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,QA4BvD"}
+{"version":3,"file":"add-mf-env-to-inputs.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-mf-env-to-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAA4B,MAAM,YAAY,CAAC;AAMjE,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,QAsCvD"}

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

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

package/src/generators/utils/add-vitest.d.ts

@@ -1,4 +1,4 @@
-import { type Tree } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
 export type AddVitestAngularOptions = {
     name: string;
     projectRoot: string;
@@ -14,6 +14,6 @@ export type AddVitestAnalogOptions = {
     zoneless: boolean;
     addPlugin?: boolean;
 };
-export declare function addVitestAngular(tree: Tree, options: AddVitestAngularOptions): Promise<void>;
-export declare function addVitestAnalog(tree: Tree, options: AddVitestAnalogOptions): Promise<void>;
+export declare function addVitestAngular(tree: Tree, options: AddVitestAngularOptions): Promise<GeneratorCallback>;
+export declare function addVitestAnalog(tree: Tree, options: AddVitestAnalogOptions): Promise<GeneratorCallback>;
 //# sourceMappingURL=add-vitest.d.ts.map

package/src/generators/utils/add-vitest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-vitest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-vitest.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAUpB,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,IAAI,CAAC,CA8Cf;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAsCf"}
+{"version":3,"file":"add-vitest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/add-vitest.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EAQtB,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAcpB,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC,CAqD5B;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAuD5B"}

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

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addVitestAngular = addVitestAngular;
 exports.addVitestAnalog = addVitestAnalog;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const semver_1 = require("semver");
 const versions_1 = require("../../utils/versions");
@@ -49,40 +50,53 @@ async function addVitestAngular(tree, options) {
     project.targets ??= {};
     project.targets.test = { executor, options: { watch: false } };
     (0, devkit_1.updateProjectConfiguration)(tree, options.name, project);
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults[executor] ??= {
-        cache: true,
-        inputs: nxJson.namedInputs && 'production' in nxJson.namedInputs
-            ? ['default', '^production']
-            : ['default', '^default'],
-    };
-    (0, devkit_1.updateNxJson)(tree, nxJson);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
+    const existing = (0, internal_1.normalizeTargetDefaults)(nxJson.targetDefaults).find((entry) => entry.executor === executor &&
+        entry.target === undefined &&
+        entry.projects === undefined &&
+        entry.plugin === undefined);
+    if (!existing) {
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+            executor,
+            cache: true,
+            inputs: nxJson.namedInputs && 'production' in nxJson.namedInputs
+                ? ['default', '^production']
+                : ['default', '^default'],
+        });
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
     configureTypeScriptForVitest(tree, options.projectRoot);
     addVitestScreenshotsToGitIgnore(tree);
-    if (!options.skipPackageJson) {
-        const pkgVersions = (0, version_utils_1.versions)(tree, { minAngularMajorVersion: 21 });
-        const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ??
-            pkgVersions.angularDevkitVersion;
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@angular/build': angularDevkitVersion,
-            // @angular/build uses rolldown which injects @oxc-project/runtime
-            // helpers at transform time but doesn't declare it as a dependency
-            '@oxc-project/runtime': versions_1.oxcProjectRuntimeVersion,
-            jsdom: pkgVersions.jsdomVersion,
-            vitest: pkgVersions.vitestVersion,
-        }, undefined, true);
+    if (options.skipPackageJson) {
+        return () => { };
     }
+    const pkgVersions = (0, version_utils_1.versions)(tree, { minAngularMajorVersion: 21 });
+    const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ?? pkgVersions.angularDevkitVersion;
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@angular/build': angularDevkitVersion,
+        jsdom: pkgVersions.jsdomVersion,
+        vitest: pkgVersions.vitestVersion,
+    }, undefined, true);
 }
 async function addVitestAnalog(tree, options) {
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const tasks = [];
     if (!options.skipPackageJson) {
         const angularDevkitVersion = (0, version_utils_1.getInstalledAngularDevkitVersion)(tree) ??
             (0, version_utils_1.versions)(tree).angularDevkitVersion;
         const devDependencies = {
             '@angular/build': angularDevkitVersion,
-            // @angular/build uses rolldown which injects @oxc-project/runtime
-            // helpers at transform time but doesn't declare it as a dependency
+            // `@analogjs/vite-plugin-angular` (wired in by `@nx/vitest`'s
+            // configurationGenerator for `uiFramework: 'angular'`) registers
+            // an `angularVitestPlugin` whose `transform` hook downlevels
+            // `@angular/*` fesm2022 modules via
+            // `vite.transformWithOxc({ target: 'es2016', … })` so Zone.js
+            // `fakeAsync` can intercept async/await. The lowered code emits
+            // external `@oxc-project/runtime/helpers/*` imports (oxc default
+            // `HelperMode = 'Runtime'`). Nothing in the upstream chain
+            // (analogjs, @angular/core, vite, rolldown) declares the runtime
+            // in a way that's resolvable from the consumer's workspace, so
+            // it must be added here.
             '@oxc-project/runtime': versions_1.oxcProjectRuntimeVersion,
         };
         // Add compatible vitest/jsdom versions BEFORE calling configurationGenerator
@@ -92,11 +106,11 @@ async function addVitestAnalog(tree, options) {
             devDependencies['vitest'] = pkgVersions.vitestVersion;
             devDependencies['jsdom'] = pkgVersions.jsdomVersion;
         }
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true);
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true));
     }
     (0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);
     const { configurationGenerator } = await Promise.resolve().then(() => __importStar(require('@nx/vitest/generators')));
-    await configurationGenerator(tree, {
+    tasks.push(await configurationGenerator(tree, {
         project: options.name,
         uiFramework: 'angular',
         testEnvironment: 'jsdom',
@@ -105,7 +119,8 @@ async function addVitestAnalog(tree, options) {
         skipFormat: options.skipFormat,
         skipPackageJson: options.skipPackageJson,
         zoneless: options.zoneless,
-    });
+    }));
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 function validateVitestVersion(tree) {
     let installedVitestVersion = null;

package/src/generators/utils/app-components-info.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppComponentInfo = getAppComponentInfo;
 exports.getNxWelcomeComponentInfo = getNxWelcomeComponentInfo;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const node_path_1 = require("node:path");
 const version_utils_1 = require("./version-utils");
 function getAppComponentInfo(tree, componentFileSuffix, project) {
@@ -14,7 +14,7 @@ function getNxWelcomeComponentInfo(tree, componentFileSuffix, project) {
 }
 // TODO(leo): follow this up and improve it by using static analysis
 function getComponentInfo(tree, component, componentFileSuffix, project) {
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     let componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${component}.component.ts`);
     if (!tree.exists(componentPath)) {
         componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, `app/${component}.ts`);