@nx/vitest 23.2.1 → 23.3.0-beta.1

package/dist/src/plugins/plugin.js

@@ -448,16 +448,39 @@ function collectTsconfigInputsByProjectRoot(projectRoots, workspaceRoot) {
     const jsonCache = new Map();
     const result = new Map();
     const rootTsConfigName = (0, js_1.getRootTsConfigFileName)();
+    // A directory cache requires project-specific filtering on replay.
+    const dirChainCache = new Map();
+    const collectDirChain = (dir) => {
+        const cached = dirChainCache.get(dir);
+        if (cached !== undefined)
+            return cached;
+        const paths = [];
+        const localSeen = new Set();
+        const tsconfigPath = dir
+            ? (0, node_path_1.join)(workspaceRoot, dir, 'tsconfig.json')
+            : (0, node_path_1.join)(workspaceRoot, 'tsconfig.json');
+        if ((0, node_fs_1.existsSync)(tsconfigPath)) {
+            (0, internal_2.walkTsconfigExtendsChain)(tsconfigPath, (absPath) => {
+                const wsRelative = (0, node_path_1.relative)(workspaceRoot, absPath)
+                    .split(node_path_1.sep)
+                    .join('/');
+                if (!localSeen.has(wsRelative)) {
+                    localSeen.add(wsRelative);
+                    paths.push(wsRelative);
+                }
+                return 'continue';
+            }, { jsonCache });
+        }
+        dirChainCache.set(dir, paths);
+        return paths;
+    };
     for (const projectRoot of projectRoots) {
         if (projectRoot === '.')
             continue;
         const outside = [];
         const seen = new Set();
         const projectPrefix = `${projectRoot}/`;
-        const collect = (absolutePath) => {
-            const wsRelative = (0, node_path_1.relative)(workspaceRoot, absolutePath)
-                .split(node_path_1.sep)
-                .join('/');
+        const collectWsRelative = (wsRelative) => {
             if (seen.has(wsRelative))
                 return;
             seen.add(wsRelative);
@@ -472,11 +495,13 @@ function collectTsconfigInputsByProjectRoot(projectRoots, workspaceRoot) {
                 return;
             outside.push(wsRelative);
         };
-        // 1. Walk the project tsconfig's extends chain
         const projectTsconfig = (0, node_path_1.join)(workspaceRoot, projectRoot, 'tsconfig.json');
         if ((0, node_fs_1.existsSync)(projectTsconfig)) {
             (0, internal_2.walkTsconfigExtendsChain)(projectTsconfig, (absPath) => {
-                collect(absPath);
+                const wsRelative = (0, node_path_1.relative)(workspaceRoot, absPath)
+                    .split(node_path_1.sep)
+                    .join('/');
+                collectWsRelative(wsRelative);
                 return 'continue';
             }, { jsonCache });
         }
@@ -484,12 +509,8 @@ function collectTsconfigInputsByProjectRoot(projectRoots, workspaceRoot) {
         //    between the entry point and the filesystem root)
         let dir = (0, node_path_1.dirname)(projectRoot);
         while (dir && dir !== '.') {
-            const ancestorTsconfig = (0, node_path_1.join)(workspaceRoot, dir, 'tsconfig.json');
-            if ((0, node_fs_1.existsSync)(ancestorTsconfig)) {
-                (0, internal_2.walkTsconfigExtendsChain)(ancestorTsconfig, (absPath) => {
-                    collect(absPath);
-                    return 'continue';
-                }, { jsonCache });
+            for (const wsRelative of collectDirChain(dir)) {
+                collectWsRelative(wsRelative);
             }
             const parent = (0, node_path_1.dirname)(dir);
             if (parent === dir)
@@ -497,12 +518,8 @@ function collectTsconfigInputsByProjectRoot(projectRoots, workspaceRoot) {
             dir = parent;
         }
         // 3. Check the workspace root itself (dirname loop above stops at '.')
-        const rootTsconfig = (0, node_path_1.join)(workspaceRoot, 'tsconfig.json');
-        if ((0, node_fs_1.existsSync)(rootTsconfig)) {
-            (0, internal_2.walkTsconfigExtendsChain)(rootTsconfig, (absPath) => {
-                collect(absPath);
-                return 'continue';
-            }, { jsonCache });
+        for (const wsRelative of collectDirChain('')) {
+            collectWsRelative(wsRelative);
         }
         if (outside.length > 0) {
             result.set(projectRoot, outside);

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.2.1",
+  "version": "23.3.0-beta.1",
   "type": "commonjs",
   "files": [
     "dist",
@@ -81,13 +81,13 @@
     "tslib": "^2.3.0",
     "semver": "^7.6.3",
     "@phenomnomnominal/tsquery": "~6.2.0",
-    "@nx/devkit": "23.2.1",
-    "@nx/js": "23.2.1"
+    "@nx/devkit": "23.3.0-beta.1",
+    "@nx/js": "23.3.0-beta.1"
   },
   "peerDependencies": {
     "vitest": "^3.0.0 || ^4.0.0",
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
-    "@nx/eslint": "23.2.1"
+    "@nx/eslint": "23.3.0-beta.1"
   },
   "peerDependenciesMeta": {
     "@nx/eslint": {
@@ -101,6 +101,6 @@
     }
   },
   "devDependencies": {
-    "nx": "23.2.1"
+    "nx": "23.3.0-beta.1"
   }
 }