@nx/vitest 23.0.0-beta.21 → 23.0.0-beta.23

package/dist/src/generators/configuration/configuration.js

@@ -13,6 +13,8 @@ const generator_utils_1 = require("../../utils/generator-utils");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
 const detect_ui_framework_1 = require("../../utils/detect-ui-framework");
 const version_utils_1 = require("../../utils/version-utils");
+const versions_1 = require("../../utils/versions");
+const assert_supported_vitest_version_1 = require("../../utils/assert-supported-vitest-version");
 const semver_1 = require("semver");
 /**
  * Determines whether to use vitest.config.mts instead of vite.config.mts.
@@ -39,6 +41,7 @@ function configurationGenerator(tree, schema, hasPlugin = false) {
     return configurationGeneratorInternal(tree, { addPlugin: false, ...schema }, hasPlugin);
 }
 async function configurationGeneratorInternal(tree, schema, hasPlugin = false) {
+    (0, assert_supported_vitest_version_1.assertSupportedVitestVersion)(tree);
     // Setting default to jsdom since it is the most common use case (React, Web).
     // The @nx/js:lib generator specifically sets this to node to be more generic.
     schema.testEnvironment ??= 'jsdom';
@@ -287,20 +290,20 @@ function createFiles(tree, options, projectRoot, isTsSolutionSetup) {
             : `${rootOffset}dist/out-tsc`,
     });
 }
-async function getCoverageProviderDependency(tree, coverageProvider) {
-    const { vitestCoverageV8, vitestCoverageIstanbul } = await (0, version_utils_1.getVitestDependenciesVersionsToInstall)(tree);
+function getCoverageProviderDependency(tree, coverageProvider) {
+    const { vitestCoverageV8Version, vitestCoverageIstanbulVersion } = (0, versions_1.versions)(tree);
     switch (coverageProvider) {
         case 'v8':
             return {
-                '@vitest/coverage-v8': vitestCoverageV8,
+                '@vitest/coverage-v8': vitestCoverageV8Version,
             };
         case 'istanbul':
             return {
-                '@vitest/coverage-istanbul': vitestCoverageIstanbul,
+                '@vitest/coverage-istanbul': vitestCoverageIstanbulVersion,
             };
         default:
             return {
-                '@vitest/coverage-v8': vitestCoverageV8,
+                '@vitest/coverage-v8': vitestCoverageV8Version,
             };
     }
 }

package/dist/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -5,7 +5,9 @@ const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const plugin_1 = require("../../plugins/plugin");
 const test_post_target_transformer_1 = require("./lib/test-post-target-transformer");
+const assert_supported_vitest_version_1 = require("../../utils/assert-supported-vitest-version");
 async function convertToInferred(tree, options) {
+    (0, assert_supported_vitest_version_1.assertSupportedVitestVersion)(tree);
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/vitest', plugin_1.createNodesV2, { testTargetName: 'test' }, [
         {

package/dist/src/generators/init/init.js

@@ -9,6 +9,7 @@ const versions_1 = require("../../utils/versions");
 const plugin_1 = require("../../plugins/plugin");
 const version_utils_1 = require("../../utils/version-utils");
 const ignore_vitest_temp_files_1 = require("../../utils/ignore-vitest-temp-files");
+const assert_supported_vitest_version_1 = require("../../utils/assert-supported-vitest-version");
 function updateDependencies(tree, schema) {
     // Determine which vite version to install:
     // 1. Explicit viteVersion flag takes priority
@@ -26,7 +27,7 @@ function updateDependencies(tree, schema) {
         '@nx/vitest': versions_1.nxVersion,
         vitest: versions_1.vitestVersion,
         vite: viteVersionToUse,
-    }, undefined, schema.keepExistingVersions);
+    }, undefined, schema.keepExistingVersions ?? true);
 }
 function updateNxJsonSettings(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
@@ -53,6 +54,7 @@ function updateNxJsonSettings(tree) {
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 async function initGenerator(tree, schema) {
+    (0, assert_supported_vitest_version_1.assertSupportedVitestVersion)(tree);
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

package/dist/src/generators/init/schema.json

@@ -18,7 +18,7 @@
       "type": "boolean",
       "x-priority": "internal",
       "description": "Keep existing dependencies versions",
-      "default": false
+      "default": true
     },
     "updatePackageScripts": {
       "type": "boolean",

package/dist/src/plugins/plugin.d.ts

@@ -1,4 +1,4 @@
-import { CreateDependencies, CreateNodesV2 } from '@nx/devkit';
+import { CreateDependencies, CreateNodes } from '@nx/devkit';
 export interface VitestPluginOptions {
     testTargetName?: string;
     /**
@@ -20,5 +20,5 @@ export interface VitestPluginOptions {
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
 export declare const createDependencies: CreateDependencies;
-export declare const createNodes: CreateNodesV2<VitestPluginOptions>;
-export declare const createNodesV2: CreateNodesV2<VitestPluginOptions>;
+export declare const createNodes: CreateNodes<VitestPluginOptions>;
+export declare const createNodesV2: CreateNodes<VitestPluginOptions>;

package/dist/src/plugins/plugin.js

@@ -215,8 +215,26 @@ async function testTarget(namedInputs, outputs, projectRoot, testMode = 'watch',
         options: { cwd: (0, devkit_1.joinPathFragments)(projectRoot) },
         cache: true,
         inputs: [
+            // Vitest runs on Vite, which transforms a dependency's sources and
+            // resolves their TypeScript project references. When a dependency's root
+            // tsconfig references its tsconfig.spec.json / tsconfig.storybook.json,
+            // those files are read during resolution, yet the `production` named
+            // input excludes them (so `^production` does not cover them). When
+            // `production` is in use, declare them explicitly so the dependency's
+            // spec/storybook tsconfigs are tracked as inputs.
             ...('production' in namedInputs
-                ? ['default', '^production']
+                ? [
+                    'default',
+                    '^production',
+                    {
+                        fileset: '{projectRoot}/tsconfig.spec.json',
+                        dependencies: true,
+                    },
+                    {
+                        fileset: '{projectRoot}/tsconfig.storybook.json',
+                        dependencies: true,
+                    },
+                ]
                 : ['default', '^default']),
             ...tsconfigInputs.map((f) => ({
                 json: `{workspaceRoot}/${f}`,

package/dist/src/utils/assert-supported-vitest-version.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function assertSupportedVitestVersion(tree: Tree): void;

package/dist/src/utils/assert-supported-vitest-version.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertSupportedVitestVersion = assertSupportedVitestVersion;
+const internal_1 = require("@nx/devkit/internal");
+const versions_1 = require("./versions");
+function assertSupportedVitestVersion(tree) {
+    (0, internal_1.assertSupportedPackageVersion)(tree, 'vitest', versions_1.minSupportedVitestVersion);
+}

package/dist/src/utils/ensure-dependencies.js

@@ -4,7 +4,6 @@ exports.ensureDependencies = ensureDependencies;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const versions_1 = require("./versions");
-const version_utils_1 = require("./version-utils");
 async function ensureDependencies(tree, schema) {
     const useVitestUi = schema.uiFramework === 'angular' ||
         schema.uiFramework === 'react' ||
@@ -49,8 +48,7 @@ async function ensureDependencies(tree, schema) {
         }
     }
     if (useVitestUi) {
-        const { vitestUi } = await (0, version_utils_1.getVitestDependenciesVersionsToInstall)(tree);
-        devDependencies['@vitest/ui'] = vitestUi;
+        devDependencies['@vitest/ui'] = (0, versions_1.versions)(tree).vitestVersion;
     }
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true);
 }

package/dist/src/utils/version-utils.d.ts

@@ -1,15 +1,3 @@
 import type { Tree } from 'nx/src/generators/tree';
-type VitestDependenciesVersions = {
-    vitest: string;
-    vitestUi: string;
-    vitestCoverageV8: string;
-    vitestCoverageIstanbul: string;
-};
-export declare function getVitestDependenciesVersionsToInstall(tree: Tree): Promise<VitestDependenciesVersions>;
-export declare function isVitestV3(tree: Tree): Promise<boolean>;
-export declare function isVitestV2(tree: Tree): Promise<boolean>;
-export declare function getInstalledVitestVersion(tree: Tree): string;
 export declare function getInstalledViteVersion(tree: Tree): string;
 export declare function getInstalledViteMajorVersion(tree: Tree): 5 | 6 | 7 | 8 | undefined;
-export declare function getInstalledVitestVersionFromGraph(): Promise<string>;
-export {};

package/dist/src/utils/version-utils.js

@@ -1,65 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVitestDependenciesVersionsToInstall = getVitestDependenciesVersionsToInstall;
-exports.isVitestV3 = isVitestV3;
-exports.isVitestV2 = isVitestV2;
-exports.getInstalledVitestVersion = getInstalledVitestVersion;
 exports.getInstalledViteVersion = getInstalledViteVersion;
 exports.getInstalledViteMajorVersion = getInstalledViteMajorVersion;
-exports.getInstalledVitestVersionFromGraph = getInstalledVitestVersionFromGraph;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const versions_1 = require("./versions");
-async function getVitestDependenciesVersionsToInstall(tree) {
-    if (await isVitestV3(tree)) {
-        return {
-            vitest: versions_1.vitestV3Version,
-            vitestUi: versions_1.vitestV3Version,
-            vitestCoverageV8: versions_1.vitestV3CoverageV8Version,
-            vitestCoverageIstanbul: versions_1.vitestV3CoverageIstanbulVersion,
-        };
-    }
-    else if (await isVitestV2(tree)) {
-        return {
-            vitest: versions_1.vitestV2Version,
-            vitestUi: versions_1.vitestV2Version,
-            vitestCoverageV8: versions_1.vitestV2CoverageV8Version,
-            vitestCoverageIstanbul: versions_1.vitestV2CoverageIstanbulVersion,
-        };
-    }
-    else {
-        // Default to latest (v3)
-        return {
-            vitest: versions_1.vitestVersion,
-            vitestUi: versions_1.vitestVersion,
-            vitestCoverageV8: versions_1.vitestCoverageV8Version,
-            vitestCoverageIstanbul: versions_1.vitestCoverageIstanbulVersion,
-        };
-    }
-}
-async function isVitestV3(tree) {
-    let installedVitestVersion = await getInstalledVitestVersionFromGraph();
-    if (!installedVitestVersion) {
-        installedVitestVersion = getInstalledVitestVersion(tree);
-    }
-    return (0, semver_1.major)(installedVitestVersion) === 3;
-}
-async function isVitestV2(tree) {
-    let installedVitestVersion = await getInstalledVitestVersionFromGraph();
-    if (!installedVitestVersion) {
-        installedVitestVersion = getInstalledVitestVersion(tree);
-    }
-    return (0, semver_1.major)(installedVitestVersion) === 2;
-}
-function getInstalledVitestVersion(tree) {
-    const installedVitestVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'vitest');
-    if (!installedVitestVersion ||
-        installedVitestVersion === 'latest' ||
-        installedVitestVersion === 'beta') {
-        return (0, semver_1.clean)(versions_1.vitestVersion) ?? (0, semver_1.coerce)(versions_1.vitestVersion).version;
-    }
-    return ((0, semver_1.clean)(installedVitestVersion) ?? (0, semver_1.coerce)(installedVitestVersion).version);
-}
 function getInstalledViteVersion(tree) {
     const installedViteVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'vite');
     if (!installedViteVersion ||
@@ -80,11 +25,3 @@ function getInstalledViteMajorVersion(tree) {
     }
     return installedMajor;
 }
-async function getInstalledVitestVersionFromGraph() {
-    const graph = await (0, devkit_1.createProjectGraphAsync)();
-    const vitestDep = graph.externalNodes?.['npm:vitest'];
-    if (!vitestDep) {
-        return undefined;
-    }
-    return ((0, semver_1.clean)(vitestDep.data.version) ?? (0, semver_1.coerce)(vitestDep.data.version).version);
-}

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

@@ -1,12 +1,13 @@
+import { type Tree } from '@nx/devkit';
 export declare const nxVersion: any;
+export declare const minSupportedVitestVersion = "3.0.0";
+export declare const vitestVersion = "~4.1.0";
+export declare const vitestCoverageV8Version = "~4.1.0";
+export declare const vitestCoverageIstanbulVersion = "~4.1.0";
 export declare const viteVersion = "^8.0.0";
 export declare const viteV7Version = "^7.0.0";
 export declare const viteV6Version = "^6.0.0";
 export declare const viteV5Version = "^5.0.0";
-export declare const vitestV4Version = "~4.1.0";
-export declare const vitestV3Version = "^3.0.0";
-export declare const vitestV2Version = "^2.1.8";
-export declare const vitestVersion = "~4.1.0";
 export declare const vitePluginReactVersion = "^6.0.0";
 export declare const vitePluginReactV4Version = "^4.2.0";
 export declare const vitePluginReactSwcVersion = "^4.3.0";
@@ -17,11 +18,12 @@ export declare const happyDomVersion = "~9.20.3";
 export declare const edgeRuntimeVmVersion = "~3.0.2";
 export declare const jitiVersion = "2.4.2";
 export declare const analogVitestAngular = "~2.1.2";
-export declare const vitestV4CoverageV8Version = "~4.1.0";
-export declare const vitestV3CoverageV8Version = "^3.0.5";
-export declare const vitestV2CoverageV8Version = "^2.1.8";
-export declare const vitestCoverageV8Version = "~4.1.0";
-export declare const vitestV4CoverageIstanbulVersion = "~4.1.0";
-export declare const vitestV3CoverageIstanbulVersion = "^3.0.5";
-export declare const vitestV2CoverageIstanbulVersion = "^2.1.8";
-export declare const vitestCoverageIstanbulVersion = "~4.1.0";
+type VitestVersions = {
+    vitestVersion: string;
+    vitestCoverageV8Version: string;
+    vitestCoverageIstanbulVersion: string;
+};
+export declare function versions(tree: Tree): VitestVersions;
+export declare function getInstalledVitestVersion(tree?: Tree): string | null;
+export declare function getInstalledVitestMajorVersion(tree?: Tree): number | null;
+export {};

package/dist/src/utils/versions.js

@@ -1,16 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vitestCoverageIstanbulVersion = exports.vitestV2CoverageIstanbulVersion = exports.vitestV3CoverageIstanbulVersion = exports.vitestV4CoverageIstanbulVersion = exports.vitestCoverageV8Version = exports.vitestV2CoverageV8Version = exports.vitestV3CoverageV8Version = exports.vitestV4CoverageV8Version = exports.analogVitestAngular = exports.jitiVersion = exports.edgeRuntimeVmVersion = exports.happyDomVersion = exports.ajvVersion = exports.vitePluginDtsVersion = exports.jsdomVersion = exports.vitePluginReactSwcVersion = exports.vitePluginReactV4Version = exports.vitePluginReactVersion = exports.vitestVersion = exports.vitestV2Version = exports.vitestV3Version = exports.vitestV4Version = exports.viteV5Version = exports.viteV6Version = exports.viteV7Version = exports.viteVersion = exports.nxVersion = void 0;
+exports.analogVitestAngular = exports.jitiVersion = exports.edgeRuntimeVmVersion = exports.happyDomVersion = exports.ajvVersion = exports.vitePluginDtsVersion = exports.jsdomVersion = exports.vitePluginReactSwcVersion = exports.vitePluginReactV4Version = exports.vitePluginReactVersion = exports.viteV5Version = exports.viteV6Version = exports.viteV7Version = exports.viteVersion = exports.vitestCoverageIstanbulVersion = exports.vitestCoverageV8Version = exports.vitestVersion = exports.minSupportedVitestVersion = exports.nxVersion = void 0;
+exports.versions = versions;
+exports.getInstalledVitestVersion = getInstalledVitestVersion;
+exports.getInstalledVitestMajorVersion = getInstalledVitestMajorVersion;
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
+const semver_1 = require("semver");
 exports.nxVersion = require((0, path_1.join)('@nx/vitest', 'package.json')).version;
+exports.minSupportedVitestVersion = '3.0.0';
+exports.vitestVersion = '~4.1.0';
+exports.vitestCoverageV8Version = '~4.1.0';
+exports.vitestCoverageIstanbulVersion = '~4.1.0';
 exports.viteVersion = '^8.0.0';
 exports.viteV7Version = '^7.0.0';
 exports.viteV6Version = '^6.0.0';
 exports.viteV5Version = '^5.0.0';
-exports.vitestV4Version = '~4.1.0';
-exports.vitestV3Version = '^3.0.0';
-exports.vitestV2Version = '^2.1.8';
-exports.vitestVersion = exports.vitestV4Version;
 exports.vitePluginReactVersion = '^6.0.0';
 exports.vitePluginReactV4Version = '^4.2.0';
 exports.vitePluginReactSwcVersion = '^4.3.0';
@@ -21,12 +27,40 @@ exports.happyDomVersion = '~9.20.3';
 exports.edgeRuntimeVmVersion = '~3.0.2';
 exports.jitiVersion = '2.4.2';
 exports.analogVitestAngular = '~2.1.2';
-// Coverage providers
-exports.vitestV4CoverageV8Version = '~4.1.0';
-exports.vitestV3CoverageV8Version = '^3.0.5';
-exports.vitestV2CoverageV8Version = '^2.1.8';
-exports.vitestCoverageV8Version = exports.vitestV4CoverageV8Version;
-exports.vitestV4CoverageIstanbulVersion = '~4.1.0';
-exports.vitestV3CoverageIstanbulVersion = '^3.0.5';
-exports.vitestV2CoverageIstanbulVersion = '^2.1.8';
-exports.vitestCoverageIstanbulVersion = exports.vitestV4CoverageIstanbulVersion;
+const latestVersions = {
+    vitestVersion: exports.vitestVersion,
+    vitestCoverageV8Version: exports.vitestCoverageV8Version,
+    vitestCoverageIstanbulVersion: exports.vitestCoverageIstanbulVersion,
+};
+const versionMap = {
+    3: {
+        vitestVersion: '^3.0.0',
+        vitestCoverageV8Version: '^3.0.5',
+        vitestCoverageIstanbulVersion: '^3.0.5',
+    },
+};
+function versions(tree) {
+    const installedVitestVersion = getInstalledVitestVersion(tree);
+    if (!installedVitestVersion) {
+        return latestVersions;
+    }
+    const vitestMajorVersion = (0, semver_1.major)(installedVitestVersion);
+    return versionMap[vitestMajorVersion] ?? latestVersions;
+}
+function getInstalledVitestVersion(tree) {
+    if (!tree) {
+        return (0, internal_1.getInstalledPackageVersion)('vitest');
+    }
+    const installedVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'vitest');
+    if (!installedVersion) {
+        return null;
+    }
+    if (installedVersion === 'latest' || installedVersion === 'next') {
+        return (0, semver_1.clean)(exports.vitestVersion) ?? (0, semver_1.coerce)(exports.vitestVersion)?.version ?? null;
+    }
+    return (0, semver_1.clean)(installedVersion) ?? (0, semver_1.coerce)(installedVersion)?.version ?? null;
+}
+function getInstalledVitestMajorVersion(tree) {
+    const installedVitestVersion = getInstalledVitestVersion(tree);
+    return installedVitestVersion ? (0, semver_1.major)(installedVitestVersion) : null;
+}

package/migrations.json

@@ -3,17 +3,22 @@
     "update-20-3-0": {
       "version": "20.3.0-beta.2",
       "description": "Add gitignore entry for temporary vitest config files.",
-      "implementation": "./dist/src/migrations/update-20-3-0/add-vitest-temp-files-to-git-ignore"
+      "implementation": "./dist/src/migrations/update-20-3-0/add-vitest-temp-files-to-git-ignore",
+      "documentation": "./dist/src/migrations/update-20-3-0/add-vitest-temp-files-to-git-ignore.md"
     },
     "update-22-1-0": {
       "version": "22.1.0-beta.8",
+      "requires": {
+        "vitest": ">=4.0.0"
+      },
       "description": "Create AI Instructions to help migrate users workspaces past breaking changes for Vitest 4.",
       "prompt": "./dist/src/migrations/update-22-1-0/ai-instructions-for-vitest-4.md"
     },
     "update-22-3-2": {
       "version": "22.3.2-beta.0",
       "requires": {
-        "@angular/build": ">=21.0.0"
+        "@angular/build": ">=21.0.0",
+        "vitest": ">=4.0.0"
       },
       "description": "Create AI Instructions to help migrate users workspaces past breaking changes for Vitest 4.",
       "prompt": "./dist/src/migrations/update-22-1-0/ai-instructions-for-vitest-4.md"
@@ -21,7 +26,8 @@
     "update-22-6-0-prefix-reports-directory": {
       "version": "22.6.0-beta.11",
       "description": "Prefix reportsDirectory with {projectRoot} to maintain correct resolution after workspace-root-relative behavior change.",
-      "implementation": "./dist/src/migrations/update-22-6-0/prefix-reports-directory-with-project-root"
+      "implementation": "./dist/src/migrations/update-22-6-0/prefix-reports-directory-with-project-root",
+      "documentation": "./dist/src/migrations/update-22-6-0/prefix-reports-directory-with-project-root.md"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/vitest",
   "description": "The Nx Plugin for Vitest to enable fast unit testing with Vitest.",
-  "version": "23.0.0-beta.21",
+  "version": "23.0.0-beta.23",
   "type": "commonjs",
   "files": [
     "dist",
@@ -73,13 +73,13 @@
     "tslib": "^2.3.0",
     "semver": "^7.6.3",
     "@phenomnomnominal/tsquery": "~6.2.0",
-    "@nx/devkit": "23.0.0-beta.21",
-    "@nx/js": "23.0.0-beta.21"
+    "@nx/devkit": "23.0.0-beta.23",
+    "@nx/js": "23.0.0-beta.23"
   },
   "peerDependencies": {
-    "vitest": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0",
+    "vitest": "^3.0.0 || ^4.0.0",
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
-    "@nx/eslint": "23.0.0-beta.21"
+    "@nx/eslint": "23.0.0-beta.23"
   },
   "peerDependenciesMeta": {
     "@nx/eslint": {
@@ -93,6 +93,6 @@
     }
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.21"
+    "nx": "23.0.0-beta.23"
   }
 }