chore: merge main

vitejs · patak-dev · Apr 19, 2024 · Mar 10, 2024 · Mar 10, 2024 · Mar 11, 2024
commit 36463d21b72a6b7f6f261999df1017008f4f805a
diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -745,10 +745,19 @@ export async function _createServer(
     _forceOptimizeOnRestart: false,
     _pendingRequests: new Map(),
     _safeModulesPath: new Set(),
-    _fsDenyGlob: picomatch(config.server.fs.deny, {
-      matchBase: true,
-      nocase: true,
-    }),
+    _fsDenyGlob: picomatch(
+      // matchBase: true does not work as it's documented
+      // https://github.com/micromatch/picomatch/issues/89
+      // convert patterns without `/` on our side for now
+      config.server.fs.deny.map((pattern) =>
+        pattern.includes('/') ? pattern : `**/${pattern}`,
+      ),
+      {
+        matchBase: false,
+        nocase: true,
+        dot: true,
+      },
+    ),
     _shortcutsOptions: undefined,
   }
 
@@ -1212,7 +1221,7 @@ async function restartServer(server: ViteDevServer) {
   // server instance and set the user instance to be used in the new server.
   // This allows us to keep the same server instance for the user.
   {
-    let newServer = null
+    let newServer: ViteDevServer | null = null
     try {
       // delay ws server listen
       newServer = await _createServer(inlineConfig, { hotListen: false })

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml