@nx/vitest 24.0.0-beta.1 → 24.0.0-beta.2

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

@@ -194,9 +194,9 @@ getTestBed().initTestEnvironment(
         (0, internal_1.upsertTargetDefault)(tree, nxJson, { target: testTarget, dependsOn });
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }
-    const devDependencies = await getCoverageProviderDependency(tree, schema.coverageProvider);
-    devDependencies['@types/node'] = internal_2.typesNodeVersion;
     if (!schema.skipPackageJson) {
+        const devDependencies = await getCoverageProviderDependency(tree, schema.coverageProvider);
+        devDependencies['@types/node'] = internal_2.typesNodeVersion;
         const installDependenciesTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies, undefined, true);
         tasks.push(installDependenciesTask);
     }

package/dist/src/utils/versions.js

@@ -77,13 +77,45 @@ function versions(tree, options) {
     return (supported ?? VITEST_COMPAT[0]).versions;
 }
 /**
- * `@analogjs/vitest-angular` at the version Nx installs, and `@angular/build`,
- * both peer vitest 4. A workspace carrying either cannot take vitest 5.
+ * Packages that peer vitest, with the first version whose peer range takes
+ * vitest 5. Older versions peer vitest 4 and below.
  */
+const VITEST_PEERS = {
+    '@angular/build': '22.2.0',
+    '@analogjs/vitest-angular': '2.8.0',
+};
 function highestMajorTheWorkspacePeersAllow(tree) {
-    return (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@analogjs/vitest-angular') || (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@angular/build')
-        ? 4
-        : 5;
+    let cap = VITEST_COMPAT[0].major;
+    for (const [peer, firstVitestV5Version] of Object.entries(VITEST_PEERS)) {
+        if ((0, devkit_1.getDependencyVersionFromPackageJson)(tree, peer)) {
+            cap = Math.min(cap, highestVitestMajorAllowedBy(tree, peer, firstVitestV5Version));
+        }
+    }
+    return cap;
+}
+function highestVitestMajorAllowedBy(tree, peer, firstVitestV5Version) {
+    const installedPeerRange = readInstalledPeerVitestRange(tree, peer);
+    if (installedPeerRange) {
+        const allowed = VITEST_COMPAT.find((compat) => (0, semver_1.intersects)(`^${compat.major}.0.0`, installedPeerRange));
+        if (allowed) {
+            return allowed.major;
+        }
+    }
+    const declaredVersion = (0, internal_1.getDeclaredPackageVersion)(tree, peer);
+    return declaredVersion && (0, semver_1.gte)(declaredVersion, firstVitestV5Version) ? 5 : 4;
+}
+function readInstalledPeerVitestRange(tree, peer) {
+    const packageJsonPath = `node_modules/${peer}/package.json`;
+    if (!tree.exists(packageJsonPath)) {
+        return null;
+    }
+    try {
+        const range = (0, devkit_1.readJson)(tree, packageJsonPath).peerDependencies?.vitest;
+        return typeof range === 'string' && (0, semver_1.validRange)(range) ? range : null;
+    }
+    catch {
+        return null;
+    }
 }
 function getInstalledVitestVersion(tree) {
     if (!tree) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/vitest",
   "description": "The Nx Plugin for Vitest to enable fast unit testing with Vitest.",
-  "version": "24.0.0-beta.1",
+  "version": "24.0.0-beta.2",
   "type": "commonjs",
   "files": [
     "dist",
@@ -78,14 +78,14 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "24.0.0-beta.1",
-    "@nx/js": "24.0.0-beta.1",
+    "@nx/devkit": "24.0.0-beta.2",
+    "@nx/js": "24.0.0-beta.2",
     "tslib": "^2.3.0",
     "semver": "^7.6.3",
     "@phenomnomnominal/tsquery": "~6.2.0"
   },
   "peerDependencies": {
-    "@nx/eslint": "24.0.0-beta.1",
+    "@nx/eslint": "24.0.0-beta.2",
     "vitest": "^3.0.0 || ^4.0.0 || ^5.0.0",
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
   },
@@ -101,6 +101,6 @@
     }
   },
   "devDependencies": {
-    "nx": "24.0.0-beta.1"
+    "nx": "24.0.0-beta.2"
   }
 }