@nx/vitest 22.6.0-beta.0 → 22.6.0-beta.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/vitest",
   "description": "The Nx Plugin for Vitest to enable fast unit testing with Vitest.",
-  "version": "22.6.0-beta.0",
+  "version": "22.6.0-beta.10",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -52,8 +52,8 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "22.6.0-beta.0",
-    "@nx/js": "22.6.0-beta.0",
+    "@nx/devkit": "22.6.0-beta.10",
+    "@nx/js": "22.6.0-beta.10",
     "tslib": "^2.3.0",
     "semver": "^7.6.3",
     "@phenomnomnominal/tsquery": "~6.1.4"
@@ -71,7 +71,7 @@
     }
   },
   "devDependencies": {
-    "nx": "22.6.0-beta.0"
+    "nx": "22.6.0-beta.10"
   },
   "types": "./src/index.d.ts"
 }

package/src/executors/test/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vitest/src/executors/test/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAQlD,wBAAsB,UAAU,CAC9B,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAuF9B;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EAAE,CAcnE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vitest/src/executors/test/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAQlD,wBAAsB,UAAU,CAC9B,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAkG9B;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,EAAE,CAcnE"}

package/src/executors/test/lib/utils.js

@@ -38,7 +38,7 @@ async function getOptions(options, context, projectRoot) {
     // Filter out options that are handled specially or are parseCLI artifacts
     const { 
     // Handled specially by executor
-    testFiles: _testFiles, configFile: _configFile, mode: _mode, runMode: _runMode, reportsDirectory, coverage, 
+    testFiles: _testFiles, configFile: _configFile, mode: _mode, runMode: _runMode, reportsDirectory, coverage, reporter, reporters, 
     // parseCLI artifacts
     '--': _dashdash, color: _color, w: _w, 
     // Pass through any additional Vitest options
@@ -53,9 +53,17 @@ async function getOptions(options, context, projectRoot) {
         // but leaving it here in case someone did not migrate correctly
         root: resolved?.config?.root ?? root,
         config: viteConfigPath,
-        // Pass reporters from config so NxReporter can be merged without losing config reporters
-        // Safe: CLI options override (not merge with) config reporters, so no duplication
-        reporters: resolved?.config?.['test']?.reporters,
+        // Vitest's resolveConfig processes reporters in two steps:
+        // 1. options.reporters (plural) sets resolved.reporters
+        // 2. resolved.reporter (singular, from config) overwrites resolved.reporters
+        // Setting reporter to [] prevents config's reporter from overriding NxReporter
+        // (which is pushed onto reporters in vitest.impl.ts).
+        reporter: [],
+        reporters: reporter ??
+            reporters ??
+            // reporter (singular) has higher priority in vitest but is not declared in InlineConfig
+            resolved?.config?.['test']?.reporter ??
+            resolved?.config?.['test']?.reporters,
         coverage: {
             ...(coverage ?? {}),
             ...(reportsDirectory && { reportsDirectory }),

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

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/vitest/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EASjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAmCjD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAOlB;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAuMlB;AAgMD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/vitest/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EASjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAmCjD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAOlB;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAmNlB;AAuOD,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -68,10 +68,19 @@ async function configurationGeneratorInternal(tree, schema, hasPlugin = false) {
             const relativeTestSetupPath = (0, devkit_1.joinPathFragments)('src', 'test-setup.ts');
             const setupFile = (0, devkit_1.joinPathFragments)(root, relativeTestSetupPath);
             if (!tree.exists(setupFile)) {
-                if (isAngularV20(tree)) {
+                const angularMajorVersion = getAngularMajorVersion(tree);
+                const zoneless = schema.zoneless ?? isZonelessProject(tree, schema.project);
+                if (angularMajorVersion >= 21) {
                     tree.write(setupFile, `import '@angular/compiler';
-import '@analogjs/vitest-angular/setup-zone';
+import '@analogjs/vitest-angular/setup-snapshots';
+import { setupTestBed } from '@analogjs/vitest-angular/setup-testbed';
 
+setupTestBed(${zoneless ? '' : '{ zoneless: false }'});
+`);
+                }
+                else if (angularMajorVersion === 20) {
+                    tree.write(setupFile, `import '@angular/compiler';
+import '@analogjs/vitest-angular/${zoneless ? 'setup-snapshots' : 'setup-zone'}';
 import {
   BrowserTestingModule,
   platformBrowserTesting,
@@ -80,13 +89,12 @@ import { getTestBed } from '@angular/core/testing';
 
 getTestBed().initTestEnvironment(
   BrowserTestingModule,
-  platformBrowserTesting()
+  platformBrowserTesting(),
 );
 `);
                 }
                 else {
-                    tree.write(setupFile, `import '@analogjs/vitest-angular/setup-zone';
-
+                    tree.write(setupFile, `import '@analogjs/vitest-angular/${zoneless ? 'setup-snapshots' : 'setup-zone'}';
 import {
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting,
@@ -95,7 +103,7 @@ import { getTestBed } from '@angular/core/testing';
 
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(),
 );
 `);
                 }
@@ -302,17 +310,47 @@ function tryFindSetupFile(tree, projectRoot) {
         return setupFile;
     }
 }
-function isAngularV20(tree) {
+function getAngularMajorVersion(tree) {
     const angularVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/core');
     if (!angularVersion) {
-        // assume the latest version will be installed, which will be 20 or later
-        return true;
+        // assume the latest version will be installed
+        return 21;
     }
-    const cleanedAngularVersion = (0, semver_1.clean)(angularVersion) ?? (0, semver_1.coerce)(angularVersion).version;
+    const cleanedAngularVersion = (0, semver_1.clean)(angularVersion) ?? (0, semver_1.coerce)(angularVersion)?.version;
     if (typeof cleanedAngularVersion !== 'string') {
-        // assume the latest version will be installed,
-        return true;
+        // assume the latest version will be installed
+        return 21;
+    }
+    return (0, semver_1.major)(cleanedAngularVersion);
+}
+function isZonelessProject(tree, projectName) {
+    const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+    if (project.projectType === 'application') {
+        const buildTarget = findBuildTarget(project);
+        if (!buildTarget?.options?.polyfills) {
+            return true;
+        }
+        const polyfills = buildTarget.options.polyfills;
+        const polyfillsList = Array.isArray(polyfills) ? polyfills : [polyfills];
+        return !polyfillsList.includes('zone.js');
+    }
+    // For libraries, check if zone.js is installed in the workspace
+    return (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'zone.js') === null;
+}
+function findBuildTarget(project) {
+    for (const target of Object.values(project.targets ?? {})) {
+        if ([
+            '@angular-devkit/build-angular:browser',
+            '@angular-devkit/build-angular:browser-esbuild',
+            '@angular-devkit/build-angular:application',
+            '@angular/build:application',
+            '@nx/angular:application',
+            '@nx/angular:browser-esbuild',
+            '@nx/angular:webpack-browser',
+        ].includes(target.executor)) {
+            return target;
+        }
     }
-    return (0, semver_1.major)(cleanedAngularVersion) >= 20;
+    return project.targets?.build ?? null;
 }
 exports.default = configurationGenerator;

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

@@ -14,4 +14,5 @@ export interface VitestGeneratorSchema {
   // internal options
   projectType?: 'application' | 'library';
   viteVersion?: 5 | 6 | 7;
+  zoneless?: boolean;
 }

package/src/generators/configuration/schema.json

@@ -65,6 +65,11 @@
       "default": false,
       "description": "Do not add dependencies to `package.json`.",
       "x-priority": "internal"
+    },
+    "zoneless": {
+      "type": "boolean",
+      "description": "Whether the Angular project is zoneless. When not provided, it is auto-detected from the project configuration.",
+      "x-priority": "internal"
     }
   },
   "required": ["project"]