@nx/angular 23.0.0-beta.16 → 23.0.0-beta.18

package/package.json

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

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":"AACA,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,CA8I5B;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;AAE1D,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,iBAAiB,CAAC,CA8I5B;AAED,eAAe,mBAAmB,CAAC"}

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

@@ -5,11 +5,9 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
-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");
+const internal_2 = require("@nx/eslint/internal");
 const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
 const buildable_project_1 = require("./lib/buildable-project");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 async function addLintingGenerator(tree, options) {
     (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const tasks = [];
@@ -29,16 +27,16 @@ async function addLintingGenerator(tree, options) {
         skipPackageJson: options.skipPackageJson,
     });
     tasks.push(lintTask);
-    if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {
-        const eslintFile = (0, eslint_file_1.findEslintFile)(tree, options.projectRoot);
+    if ((0, internal_2.isEslintConfigSupported)(tree)) {
+        const eslintFile = (0, internal_2.findEslintFile)(tree, options.projectRoot);
         // keep parser options if they exist
         const hasParserOptions = tree
             .read((0, devkit_1.joinPathFragments)(options.projectRoot, eslintFile), 'utf8')
             .includes(`${options.projectRoot}/tsconfig.*?.json`);
-        if ((0, flat_config_1.useFlatConfig)(tree)) {
-            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular', { checkBaseConfig: true });
-            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular-template', { checkBaseConfig: true });
-            (0, eslint_file_1.addOverrideToLintConfig)(tree, options.projectRoot, {
+        if ((0, internal_2.useFlatConfig)(tree)) {
+            (0, internal_2.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular', { checkBaseConfig: true });
+            (0, internal_2.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular-template', { checkBaseConfig: true });
+            (0, internal_2.addOverrideToLintConfig)(tree, options.projectRoot, {
                 files: ['*.ts'],
                 rules: {
                     '@angular-eslint/directive-selector': [
@@ -59,14 +57,14 @@ async function addLintingGenerator(tree, options) {
                     ],
                 },
             });
-            (0, eslint_file_1.addOverrideToLintConfig)(tree, options.projectRoot, {
+            (0, internal_2.addOverrideToLintConfig)(tree, options.projectRoot, {
                 files: ['*.html'],
                 rules: {},
             });
         }
         else {
-            (0, eslint_file_1.replaceOverridesInLintConfig)(tree, options.projectRoot, [
-                ...(rootProject ? [global_eslint_config_1.typeScriptOverride, global_eslint_config_1.javaScriptOverride] : []),
+            (0, internal_2.replaceOverridesInLintConfig)(tree, options.projectRoot, [
+                ...(rootProject ? [internal_2.typeScriptOverride, internal_2.javaScriptOverride] : []),
                 {
                     files: ['*.ts'],
                     ...(hasParserOptions

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-angular-eslint-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAMpB,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,GAClB,iBAAiB,CAiCnB"}
+{"version":3,"file":"add-angular-eslint-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,GAClB,iBAAiB,CAiCnB"}

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAngularEsLintDependencies = addAngularEsLintDependencies;
 const devkit_1 = require("@nx/devkit");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
-const versions_1 = require("@nx/eslint/src/utils/versions");
+const internal_1 = require("@nx/eslint/internal");
 const version_utils_1 = require("../../utils/version-utils");
 const buildable_project_1 = require("./buildable-project");
 function addAngularEsLintDependencies(tree, projectName) {
     const compatVersions = (0, version_utils_1.versions)(tree);
     const angularEslintVersionToInstall = compatVersions.angularEslintVersion;
-    const usesEslintFlatConfig = (0, flat_config_1.useFlatConfig)(tree);
+    const usesEslintFlatConfig = (0, internal_1.useFlatConfig)(tree);
     const devDependencies = usesEslintFlatConfig
         ? {
             'angular-eslint': angularEslintVersionToInstall,
@@ -21,7 +20,7 @@ function addAngularEsLintDependencies(tree, projectName) {
         };
     if ('typescriptEslintVersion' in compatVersions) {
         devDependencies['@typescript-eslint/utils'] = usesEslintFlatConfig
-            ? versions_1.eslint9__typescriptESLintVersion
+            ? internal_1.eslint9__typescriptESLintVersion
             : compatVersions.typescriptEslintVersion;
     }
     if ((0, buildable_project_1.isBuildableLibraryProject)(tree, projectName)) {

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/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/ng-add/utilities/workspace.js

@@ -15,10 +15,10 @@ exports.deleteAngularJson = deleteAngularJson;
 exports.deleteGitKeepFilesIfNotNeeded = deleteGitKeepFilesIfNotNeeded;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
-const setup_root_eslint_1 = require("@nx/eslint/src/generators/lint-project/setup-root-eslint");
+const internal_1 = require("@nx/eslint/internal");
 const js_1 = require("@nx/js");
 const default_base_1 = require("nx/src/utils/default-base");
-const internal_1 = require("@nx/js/internal");
+const internal_2 = require("@nx/js/internal");
 const angular_json_1 = require("nx/src/adapter/angular-json");
 const versions_1 = require("../../../utils/versions");
 const path_1 = require("path");
@@ -151,7 +151,7 @@ function updatePackageJson(tree) {
             packageJson.devDependencies['nx'] = versions_1.nxVersion;
         }
         if (!packageJson.devDependencies['prettier']) {
-            packageJson.devDependencies['prettier'] = internal_1.prettierVersion;
+            packageJson.devDependencies['prettier'] = internal_2.prettierVersion;
         }
         return packageJson;
     });
@@ -162,7 +162,7 @@ async function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner
     });
     if (!existingEsLintConfig) {
         // There was no eslint config in the root, so we set it up and use it as-is
-        (0, setup_root_eslint_1.setupRootEsLint)(tree, { unitTestRunner });
+        (0, internal_1.setupRootEsLint)(tree, { unitTestRunner });
         return;
     }
     existingEsLintConfig.ignorePatterns = ['**/*'];

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/migrations/update-20-2-0/disable-angular-eslint-prefer-standalone.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const internal_1 = require("@nx/eslint/internal");
 const projects_1 = require("../utils/projects");
 const preferStandaloneRule = '@angular-eslint/prefer-standalone';
 async function default_1(tree) {
@@ -11,20 +11,20 @@ async function default_1(tree) {
     ]);
     for (const graphNode of projects) {
         const root = graphNode.data.root;
-        if (!(0, eslint_file_1.isEslintConfigSupported)(tree, root)) {
+        if (!(0, internal_1.isEslintConfigSupported)(tree, root)) {
             // ESLint config is not supported, skip
             continue;
         }
-        if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, (o) => !!o.rules?.[preferStandaloneRule], true)) {
+        if ((0, internal_1.lintConfigHasOverride)(tree, root, (o) => !!o.rules?.[preferStandaloneRule], true)) {
             // the @angular-eslint/prefer-standalone rule is set in an override, skip
             continue;
         }
         const ngEslintOverrideLookup = (o) => o.files?.includes('*.ts') &&
             Object.keys(o.rules ?? {}).some((r) => r.startsWith('@angular-eslint/'));
         const tsFilesOverrideLookup = (o) => o.files?.length === 1 && o.files[0] === '*.ts';
-        if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, ngEslintOverrideLookup, false)) {
+        if ((0, internal_1.lintConfigHasOverride)(tree, root, ngEslintOverrideLookup, false)) {
             // there is an override containing an Angular ESLint rule
-            (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, ngEslintOverrideLookup, (o) => {
+            (0, internal_1.updateOverrideInLintConfig)(tree, root, ngEslintOverrideLookup, (o) => {
                 o.rules = {
                     ...o.rules,
                     [preferStandaloneRule]: 'off',
@@ -32,9 +32,9 @@ async function default_1(tree) {
                 return o;
             });
         }
-        else if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, tsFilesOverrideLookup, false)) {
+        else if ((0, internal_1.lintConfigHasOverride)(tree, root, tsFilesOverrideLookup, false)) {
             // there is an override for just *.ts files
-            (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, tsFilesOverrideLookup, (o) => {
+            (0, internal_1.updateOverrideInLintConfig)(tree, root, tsFilesOverrideLookup, (o) => {
                 o.rules = {
                     ...o.rules,
                     [preferStandaloneRule]: 'off',
@@ -44,7 +44,7 @@ async function default_1(tree) {
         }
         else {
             // there are no overrides for any Angular ESLint rule or just *.ts files, add a new override
-            (0, eslint_file_1.addOverrideToLintConfig)(tree, root, {
+            (0, internal_1.addOverrideToLintConfig)(tree, root, {
                 files: ['*.ts'],
                 rules: {
                     [preferStandaloneRule]: 'off',

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

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

package/src/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';