fix: handle warmup glob hang (#18462)

bluwy · web-flow · commit 409fa5c9dee0 · 2024-10-26T10:52:08.000+02:00
diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -148,7 +148,7 @@
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.1.0",
     "strip-literal": "^2.1.0",
-    "tinyglobby": "^0.2.9",
+    "tinyglobby": "^0.2.10",
     "tsconfck": "^3.1.4",
     "tslib": "^2.8.0",
     "types": "link:./types",
diff --git a/packages/vite/src/node/server/warmup.ts b/packages/vite/src/node/server/warmup.ts
@@ -70,10 +70,12 @@ function fileToUrl(file: string, root: string) {
   return '/' + normalizePath(url)
 }
 
-function mapFiles(files: string[], root: string) {
-  return glob(files, {
+async function mapFiles(files: string[], root: string) {
+  if (!files.length) return []
+  return await glob(files, {
     absolute: true,
     cwd: root,
     expandDirectories: false,
+    ignore: ['**/.git/**', '**/node_modules/**'],
   })
 }
diff --git a/playground/backend-integration/package.json b/playground/backend-integration/package.json
@@ -12,6 +12,6 @@
   "devDependencies": {
     "sass": "^1.80.3",
     "tailwindcss": "^3.4.14",
-    "tinyglobby": "^0.2.9"
+    "tinyglobby": "^0.2.10"
   }
 }
diff --git a/playground/css/package.json b/playground/css/package.json
@@ -26,7 +26,7 @@
     "sass": "^1.80.3",
     "stylus": "^0.64.0",
     "sugarss": "^4.0.1",
-    "tinyglobby": "^0.2.9"
+    "tinyglobby": "^0.2.10"
   },
   "imports": {
     "#imports": "./imports-field.css"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,12 @@ function fileToUrl(file: string, root: string) {`
`70`	`70`	`return '/' + normalizePath(url)`
`71`	`71`	`}`
`72`	`72`
`73`		`-function mapFiles(files: string[], root: string) {`
`74`		`- return glob(files, {`
	`73`	`+async function mapFiles(files: string[], root: string) {`
	`74`	`+ if (!files.length) return []`
	`75`	`+ return await glob(files, {`
`75`	`76`	`absolute: true,`
`76`	`77`	`cwd: root,`
`77`	`78`	`expandDirectories: false,`
	`79`	`+ ignore: ['/.git/', '/node_modules/'],`
`78`	`80`	`})`
`79`	`81`	`}`