@nx/angular 23.0.0-beta.17 → 23.0.0-beta.19

package/package.json

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

package/plugins/component-testing.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxComponentTestingPreset = nxComponentTestingPreset;
 const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
-const ct_helpers_1 = require("@nx/cypress/src/utils/ct-helpers");
+const internal_1 = require("@nx/cypress/internal");
 const devkit_1 = require("@nx/devkit");
-const internal_1 = require("@nx/js/internal");
+const internal_2 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const semver_1 = require("semver");
@@ -46,9 +46,9 @@ This is likely due to not running via nx. i.e. 'nx component-test my-project'.
 Please open an issue if this error persists.
 ${e.stack ? e.stack : e}`);
     }
-    const ctProjectConfig = (0, ct_helpers_1.getProjectConfigByPath)(graph, pathToConfig);
+    const ctProjectConfig = (0, internal_1.getProjectConfigByPath)(graph, pathToConfig);
     const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
-    const ctContext = (0, ct_helpers_1.createExecutorContext)(graph, ctProjectConfig.targets, ctProjectConfig.name, options?.ctTargetName || 'component-test', ctConfigurationName);
+    const ctContext = (0, internal_1.createExecutorContext)(graph, ctProjectConfig.targets, ctProjectConfig.name, options?.ctTargetName || 'component-test', ctConfigurationName);
     const buildTarget = options?.buildTarget
         ? (0, devkit_1.parseTargetString)(options.buildTarget, graph)
         : // for backwards compat, if no buildTargetin the preset options, get it from the target options
@@ -65,7 +65,7 @@ ${e.stack ? e.stack : e}`);
     const offset = isOffsetNeeded(ctContext, ctProjectConfig)
         ? (0, devkit_1.offsetFromRoot)(normalizedFromWorkspaceRootPath)
         : undefined;
-    const buildContext = (0, ct_helpers_1.createExecutorContext)(graph, graph.nodes[buildTarget.project]?.data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
+    const buildContext = (0, internal_1.createExecutorContext)(graph, graph.nodes[buildTarget.project]?.data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
     const buildableProjectConfig = normalizeBuildTargetOptions(buildContext, ctContext, offset);
     return {
         ...(0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig, { testingType: 'component' }),
@@ -116,7 +116,7 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
         configuration: buildContext.configurationName,
     }, buildContext);
     const project = buildContext.projectsConfigurations.projects[buildContext.projectName];
-    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project);
+    const sourceRoot = (0, internal_2.getProjectSourceRoot)(project);
     const buildOptions = withSchemaDefaults(options, sourceRoot, buildContext.root);
     // cypress creates a tsconfig if one isn't preset
     // that contains all the support required for angular and component tests
@@ -158,7 +158,7 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
     // then we don't want to have the assets/scripts/styles be included to
     // prevent inclusion of unintended stuff like tailwind
     if (buildContext.projectName === ctContext.projectName ||
-        (0, ct_helpers_1.isCtProjectUsingBuildProject)(ctContext.projectGraph, buildContext.projectName, ctContext.projectName)) {
+        (0, internal_1.isCtProjectUsingBuildProject)(ctContext.projectGraph, buildContext.projectName, ctContext.projectName)) {
         if (offset) {
             buildOptions.assets = buildOptions.assets.map((asset) => {
                 return typeof asset === 'string'
@@ -248,7 +248,7 @@ function getTempStylesForTailwind(ctExecutorContext) {
     const rootTailwindPath = (0, path_1.join)(ctExecutorContext.root, 'tailwind.config');
     const isTailWindInRoot = exts.some((ext) => (0, fs_1.existsSync)(`${rootTailwindPath}.${ext}`));
     if (isTailWindInRoot || isTailWindInCtProject) {
-        const pathToStyle = (0, ct_helpers_1.getTempTailwindPath)(ctExecutorContext);
+        const pathToStyle = (0, internal_1.getTempTailwindPath)(ctExecutorContext);
         try {
             (0, fs_1.mkdirSync)((0, path_1.dirname)(pathToStyle), { recursive: true });
             (0, fs_1.writeFileSync)(pathToStyle, `

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":"AACA,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,CA+H5B;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;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,CAgI5B;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/application/application.js

@@ -39,7 +39,7 @@ async function applicationGenerator(tree, schema) {
     (0, lib_1.createProject)(tree, options);
     await (0, lib_1.createFiles)(tree, options, rootOffset);
     await (0, lib_1.addLinting)(tree, options);
-    await (0, lib_1.addUnitTestRunner)(tree, options);
+    const unitTestRunnerTask = await (0, lib_1.addUnitTestRunner)(tree, options);
     const e2ePort = await (0, lib_1.addE2e)(tree, options);
     (0, lib_1.addServeStaticTarget)(tree, options, options.e2eTestRunner !== 'none' ? e2ePort : options.port);
     (0, lib_1.updateTsconfigFiles)(tree, options);
@@ -105,7 +105,8 @@ async function applicationGenerator(tree, schema) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return () => {
+    return async () => {
+        await unitTestRunnerTask();
         (0, devkit_1.installPackagesTask)(tree);
         (0, internal_1.logShowProjectCommand)(options.name);
     };

package/src/generators/application/lib/add-unit-test-runner.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from '@nx/devkit';
+import type { GeneratorCallback, Tree } from '@nx/devkit';
 import type { NormalizedSchema } from './normalized-schema';
-export declare function addUnitTestRunner(host: Tree, options: NormalizedSchema): Promise<void>;
+export declare function addUnitTestRunner(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
 //# sourceMappingURL=add-unit-test-runner.d.ts.map

package/src/generators/application/lib/add-unit-test-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-unit-test-runner.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,iBAgC5E"}
+{"version":3,"file":"add-unit-test-runner.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAI1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAgC5B"}

package/src/generators/application/lib/add-unit-test-runner.js

@@ -16,16 +16,15 @@ async function addUnitTestRunner(host, options) {
                 runtimeTsconfigFileName: 'tsconfig.app.json',
                 zoneless: options.zoneless,
             });
-            break;
+            return () => { };
         case test_runners_1.UnitTestRunner.VitestAngular:
-            await (0, add_vitest_1.addVitestAngular)(host, {
+            return (0, add_vitest_1.addVitestAngular)(host, {
                 name: options.name,
                 projectRoot: options.appProjectRoot,
                 skipPackageJson: options.skipPackageJson,
             });
-            break;
         case test_runners_1.UnitTestRunner.VitestAnalog:
-            await (0, add_vitest_1.addVitestAnalog)(host, {
+            return (0, add_vitest_1.addVitestAnalog)(host, {
                 name: options.name,
                 projectRoot: options.appProjectRoot,
                 skipFormat: options.skipFormat,
@@ -34,6 +33,7 @@ async function addUnitTestRunner(host, options) {
                 addPlugin: options.addPlugin,
                 zoneless: options.zoneless,
             });
-            break;
+        default:
+            return () => { };
     }
 }

package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cypress-component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,iBAAiB,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAiBxD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAuD5B;AAkJD,eAAe,6BAA6B,CAAC"}
+{"version":3,"file":"cypress-component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,iBAAiB,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAiBxD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAqD5B;AAkJD,eAAe,6BAA6B,CAAC"}

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -75,7 +75,7 @@ async function cypressComponentConfiguration(tree, options) {
         isZoneless = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'zone.js') === null;
     }
     if (isZoneless) {
-        const { getInstalledCypressVersion } = await Promise.resolve().then(() => __importStar(require('@nx/cypress/src/utils/versions')));
+        const { getInstalledCypressVersion } = await Promise.resolve().then(() => __importStar(require('@nx/cypress/internal')));
         const installedCypressVersion = getInstalledCypressVersion(tree);
         // Zoneless support was introduced in Cypress 15.8.0
         // If Cypress is not yet installed, we'll install the latest version, which will have zoneless support
@@ -105,7 +105,7 @@ async function cypressComponentConfiguration(tree, options) {
 }
 async function addFiles(tree, projectConfig, options, isZoneless) {
     const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
-    const { addMountDefinition } = require('@nx/cypress/src/utils/config');
+    const { addMountDefinition } = (require('@nx/cypress/internal'));
     const updatedCmpContents = await addMountDefinition(tree.read(componentFile, 'utf-8'));
     tree.write(componentFile, `import { mount } from '${isZoneless ? 'cypress/angular-zoneless' : 'cypress/angular'}';\n${updatedCmpContents}`);
     if (!options.generateTests) {
@@ -143,7 +143,7 @@ async function addFiles(tree, projectConfig, options, isZoneless) {
 async function configureCypressCT(tree, options) {
     let found = { target: options.buildTarget, config: undefined };
     if (!options.buildTarget) {
-        const { findBuildConfig } = require('@nx/cypress/src/utils/find-target-options');
+        const { findBuildConfig } = (require('@nx/cypress/internal'));
         found = await findBuildConfig(tree, {
             project: options.project,
             buildTarget: options.buildTarget,
@@ -181,7 +181,7 @@ async function configureCypressCT(tree, options) {
     else {
         ctConfigOptions.buildTarget = found.target;
     }
-    const { addDefaultCTConfig, getProjectCypressConfigPath } = require('@nx/cypress/src/utils/config');
+    const { addDefaultCTConfig, getProjectCypressConfigPath } = require('@nx/cypress/internal');
     const cypressConfigPath = getProjectCypressConfigPath(tree, projectConfig.root);
     const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions, '@nx/angular/plugins/component-testing');
     tree.write(cypressConfigPath, updatedCyConfig);

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":"AACA,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,CAkE5B;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;AAuBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAqE5B;AAoED,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -45,7 +45,7 @@ async function libraryGenerator(tree, schema) {
     }
     const project = await (0, add_project_1.addProject)(tree, libraryOptions);
     (0, create_files_1.createFiles)(tree, options, project);
-    await addUnitTestRunner(tree, libraryOptions);
+    const unitTestRunnerTask = await addUnitTestRunner(tree, libraryOptions);
     (0, update_tsconfig_files_1.updateTsConfigFiles)(tree, libraryOptions);
     updateNpmScopeIfBuildableOrPublishable(tree, libraryOptions);
     (0, set_generator_defaults_1.setGeneratorDefaults)(tree, options);
@@ -66,7 +66,10 @@ async function libraryGenerator(tree, schema) {
     if (!libraryOptions.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    const tasks = [() => (0, devkit_1.installPackagesTask)(tree)];
+    const tasks = [
+        unitTestRunnerTask,
+        () => (0, devkit_1.installPackagesTask)(tree),
+    ];
     if (libraryOptions.publishable) {
         tasks.push(await (0, internal_2.releaseTasks)(tree));
     }
@@ -85,17 +88,16 @@ async function addUnitTestRunner(host, options) {
                 runtimeTsconfigFileName: 'tsconfig.lib.json',
                 zoneless,
             });
-            break;
+            return () => { };
         case test_runners_1.UnitTestRunner.VitestAngular:
-            await (0, add_vitest_1.addVitestAngular)(host, {
+            return (0, add_vitest_1.addVitestAngular)(host, {
                 name: options.name,
                 projectRoot: options.projectRoot,
                 skipPackageJson: options.skipPackageJson,
                 useNxUnitTestRunnerExecutor: true,
             });
-            break;
         case test_runners_1.UnitTestRunner.VitestAnalog:
-            await (0, add_vitest_1.addVitestAnalog)(host, {
+            return (0, add_vitest_1.addVitestAnalog)(host, {
                 name: options.name,
                 projectRoot: options.projectRoot,
                 skipFormat: options.skipFormat,
@@ -103,7 +105,8 @@ async function addUnitTestRunner(host, options) {
                 strict: options.strict,
                 zoneless,
             });
-            break;
+        default:
+            return () => { };
     }
 }
 function updateNpmScopeIfBuildableOrPublishable(host, options) {

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

@@ -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

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;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,IAAI,CAAC,CAuDf;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

@@ -67,29 +67,36 @@ async function addVitestAngular(tree, options) {
     }
     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
@@ -99,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',
@@ -112,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/plugins/plugin.d.ts.map

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

package/src/plugins/plugin.js

@@ -55,21 +55,35 @@ exports.createNodesV2 = [
         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, lockFileName), configFiles, options, context);
+            const { entries, preErrors } = await filterAngularConfigs(configFiles, context);
+            const projectHashes = await (0, internal_1.calculateHashesForCreateNodes)(entries.map((e) => e.angularWorkspaceRoot), options ?? {}, context, entries.map(() => [lockFileName]));
+            let results = [];
+            let nodeErrors = [];
+            try {
+                results = await (0, devkit_1.createNodesFromFiles)((configFile, opts, ctx, idx) => createNodesInternal(configFile, opts, ctx, projectsCache, pmc, projectHashes[idx]), entries.map((e) => e.configFile), options, context);
+            }
+            catch (e) {
+                if (e instanceof devkit_1.AggregateCreateNodesError) {
+                    results = e.partialResults ?? [];
+                    nodeErrors = e.errors;
+                }
+                else {
+                    throw e;
+                }
+            }
+            const allErrors = [...preErrors, ...nodeErrors];
+            if (allErrors.length > 0) {
+                throw new devkit_1.AggregateCreateNodesError(allErrors, results);
+            }
+            return results;
         }
         finally {
             projectsCache.writeToDisk();
         }
     },
 ];
-async function createNodesInternal(configFilePath, options, context, projectsCache, pmc, lockFileName) {
+async function createNodesInternal(configFilePath, options, context, projectsCache, pmc, hash) {
     const angularWorkspaceRoot = (0, node_path_1.dirname)(configFilePath);
-    // Do not create a project if package.json isn't there
-    const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot));
-    if (!siblingFiles.includes('package.json')) {
-        return {};
-    }
-    const hash = await (0, internal_1.calculateHashForCreateNodes)(angularWorkspaceRoot, options, context, [lockFileName]);
     if (!projectsCache.has(hash)) {
         projectsCache.set(hash, await buildAngularProjects(configFilePath, options, angularWorkspaceRoot, context, pmc));
     }
@@ -522,3 +536,24 @@ function getOutput(path, workspaceRoot, angularWorkspaceRoot, projectRoot) {
 function getAngularJsonProjectTargets(project) {
     return project.architect ?? project.targets;
 }
+async function filterAngularConfigs(configFiles, context) {
+    const preErrors = [];
+    const candidates = await Promise.all(configFiles.map(async (configFile) => {
+        try {
+            const angularWorkspaceRoot = (0, node_path_1.dirname)(configFile);
+            const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot));
+            if (!siblingFiles.includes('package.json')) {
+                return null;
+            }
+            return { configFile, angularWorkspaceRoot };
+        }
+        catch (e) {
+            preErrors.push([configFile, e]);
+            return null;
+        }
+    }));
+    return {
+        entries: candidates.filter((c) => c !== null),
+        preErrors,
+    };
+}

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

@@ -1 +1 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,WAAW,YAAY,CAAC;AACrC,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,aAAa,YAAY,CAAC;AACvC,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,gBAAgB,WAAW,CAAC;AACzC,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAC9C,eAAO,MAAM,kBAAkB,WAAW,CAAC;AAC3C,eAAO,MAAM,2BAA2B,YAAY,CAAC;AACrD,eAAO,MAAM,+BAA+B,WAAW,CAAC;AACxD,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAE5C,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,uBAAuB,YAAY,CAAC;AACjD,eAAO,MAAM,cAAc,WAAW,CAAC;AACvC,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,eAAO,MAAM,wBAAwB,YAAY,CAAC;AAClD,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,qBAAqB,WAAW,CAAC;AAE9C,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,YAAY,YAAY,CAAC;AAGtC,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD,eAAO,MAAM,wBAAwB,WAAW,CAAC"}
+{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,WAAW,YAAY,CAAC;AACrC,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,aAAa,YAAY,CAAC;AACvC,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,gBAAgB,WAAW,CAAC;AACzC,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAC9C,eAAO,MAAM,kBAAkB,WAAW,CAAC;AAC3C,eAAO,MAAM,2BAA2B,YAAY,CAAC;AACrD,eAAO,MAAM,+BAA+B,WAAW,CAAC;AACxD,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAE5C,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,uBAAuB,YAAY,CAAC;AACjD,eAAO,MAAM,cAAc,WAAW,CAAC;AACvC,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,eAAO,MAAM,wBAAwB,YAAY,CAAC;AAClD,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,qBAAqB,WAAW,CAAC;AAE9C,eAAO,MAAM,aAAa,WAAW,CAAC;AACtC,eAAO,MAAM,YAAY,YAAY,CAAC;AAQtC,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD,eAAO,MAAM,wBAAwB,WAAW,CAAC"}

package/src/utils/versions.js

@@ -29,7 +29,12 @@ exports.typesNodeVersion = '^22.0.0';
 exports.jasmineMarblesVersion = '^0.9.2';
 exports.vitestVersion = '^4.0.8';
 exports.jsdomVersion = '^27.1.0';
-// @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` (vitest-analog path) 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 upstream declares the runtime, so
+// we add it explicitly to user projects.
 exports.oxcProjectRuntimeVersion = '^0.115.0';
 exports.jsoncEslintParserVersion = '^2.1.0';