chore: use tinyglobby instead of fast-glob in Vitest (#7504)

Author: benmccann

packages/vitest/LICENSE.md

@@ -193,7 +193,6 @@
     "birpc": "0.2.19",
     "cac": "^6.7.14",
     "chai-subset": "^1.6.0",
-    "fast-glob": "3.3.3",
     "find-up": "^6.3.0",
     "flatted": "^3.3.2",
     "get-tsconfig": "^4.10.0",
@@ -204,6 +203,7 @@
     "pretty-format": "^29.7.0",
     "prompts": "^2.4.2",
     "strip-literal": "^2.1.1",
+    "tinyglobby": "^0.2.10",
     "ws": "^8.18.0"
   }
 }

packages/vitest/package.json

@@ -4,12 +4,12 @@ import { fileURLToPath } from 'node:url'
 import commonjs from '@rollup/plugin-commonjs'
 import json from '@rollup/plugin-json'
 import nodeResolve from '@rollup/plugin-node-resolve'
-import fg from 'fast-glob'
 import { dirname, join, normalize, resolve } from 'pathe'
 import { defineConfig } from 'rollup'
 import dts from 'rollup-plugin-dts'
 import esbuild from 'rollup-plugin-esbuild'
 import license from 'rollup-plugin-license'
+import { globSync } from 'tinyglobby'
 import c from 'tinyrainbow'
 
 const require = createRequire(import.meta.url)
@@ -199,8 +199,9 @@ function licensePlugin() {
                     preserveSymlinks: false,
                   }),
                 )
-                const [licenseFile] = fg.sync(`${pkgDir}/LICENSE*`, {
+                const [licenseFile] = globSync(`${pkgDir}/LICENSE*`, {
                   caseSensitiveMatch: false,
+                  expandDirectories: false,
                 })
                 if (licenseFile) {
                   licenseText = fs.readFileSync(licenseFile, 'utf-8')

packages/vitest/rollup.config.js

@@ -22,9 +22,9 @@ import { rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import path from 'node:path'
 import { deepMerge, nanoid, slash } from '@vitest/utils'
-import fg from 'fast-glob'
 import mm from 'micromatch'
 import { isAbsolute, join, relative } from 'pathe'
+import { glob, type GlobOptions } from 'tinyglobby'
 import { ViteNodeRunner } from 'vite-node/client'
 import { ViteNodeServer } from 'vite-node/server'
 import { setup } from '../api/setup'
@@ -421,13 +421,14 @@ export class TestProject {
 
   /** @internal */
   async globFiles(include: string[], exclude: string[], cwd: string) {
-    const globOptions: fg.Options = {
+    const globOptions: GlobOptions = {
       dot: true,
       cwd,
       ignore: exclude,
+      expandDirectories: false,
     }
 
-    const files = await fg(include, globOptions)
+    const files = await glob(include, globOptions)
     // keep the slashes consistent with Vite
     // we are not using the pathe here because it normalizes the drive letter on Windows
     // and we want to keep it the same as working dir

packages/vitest/src/node/project.ts

@@ -4,15 +4,14 @@ import { existsSync, promises as fs } from 'node:fs'
 import os from 'node:os'
 import { limitConcurrency } from '@vitest/runner/utils'
 import { deepClone } from '@vitest/utils'
-import fg from 'fast-glob'
 import { dirname, relative, resolve } from 'pathe'
+import { glob, type GlobOptions, isDynamicPattern } from 'tinyglobby'
 import { mergeConfig } from 'vite'
 import { configFiles as defaultConfigFiles } from '../../constants'
 import { isTTY } from '../../utils/env'
 import { VitestFilteredOutProjectError } from '../errors'
 import { initializeProject, TestProject } from '../project'
 import { withLabel } from '../reporters/renderers/utils'
-import { isDynamicPattern } from './fast-glob-pattern'
 
 export async function resolveWorkspace(
   vitest: Vitest,
@@ -397,14 +396,12 @@ async function resolveTestProjectConfigs(
   }
 
   if (workspaceGlobMatches.length) {
-    const globOptions: fg.Options = {
+    const globOptions: GlobOptions = {
       absolute: true,
       dot: true,
       onlyFiles: false,
       cwd: vitest.config.root,
-      markDirectories: true,
-      // TODO: revert option when we go back to tinyglobby
-      // expandDirectories: false,
+      expandDirectories: false,
       ignore: [
         '**/node_modules/**',
         // temporary vite config file
@@ -414,7 +411,7 @@ async function resolveTestProjectConfigs(
       ],
     }
 
-    const workspacesFs = await fg.glob(workspaceGlobMatches, globOptions)
+    const workspacesFs = await glob(workspaceGlobMatches, globOptions)
 
     await Promise.all(workspacesFs.map(async (path) => {
       // directories are allowed with a glob like `packages/*`

packages/vitest/src/node/workspace/fast-glob-pattern.ts

@@ -1,13 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`basic output shows error 1`] = `
-"Error: top level error
- ❯ top-level-error.test.ts:1:7
-      1| throw new Error('top level error')
-       |       ^
-      2| 
-
-Error: describe error
+"Error: describe error
  ❯ describe-error.test.ts:4:9
       2| 
       3| describe('describe error', () => {
@@ -16,6 +10,12 @@ Error: describe error
       5| 
       6|   it('wont run', () => {
 
+Error: top level error
+ ❯ top-level-error.test.ts:1:7
+      1| throw new Error('top level error')
+       |       ^
+      2| 
+
 "
 `;
 
@@ -60,13 +60,7 @@ math.test.ts > failing test
 `;
 
 exports[`json output shows error 1`] = `
-"Error: top level error
- ❯ top-level-error.test.ts:1:7
-      1| throw new Error('top level error')
-       |       ^
-      2| 
-
-Error: describe error
+"Error: describe error
  ❯ describe-error.test.ts:4:9
       2| 
       3| describe('describe error', () => {
@@ -75,17 +69,17 @@ Error: describe error
       5| 
       6|   it('wont run', () => {
 
-"
-`;
-
-exports[`json with a file output shows error 1`] = `
-"Error: top level error
+Error: top level error
  ❯ top-level-error.test.ts:1:7
       1| throw new Error('top level error')
        |       ^
       2| 
 
-Error: describe error
+"
+`;
+
+exports[`json with a file output shows error 1`] = `
+"Error: describe error
  ❯ describe-error.test.ts:4:9
       2| 
       3| describe('describe error', () => {
@@ -94,5 +88,11 @@ Error: describe error
       5| 
       6|   it('wont run', () => {
 
+Error: top level error
+ ❯ top-level-error.test.ts:1:7
+      1| throw new Error('top level error')
+       |       ^
+      2| 
+
 "
 `;