fix: more stable request hold

vitejs · Jan 28, 2021 · be0e698 · be0e698
1 parent c3e52f2
commit be0e698
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/packages/vite/src/node/optimizer/registerMissing.ts b/packages/vite/src/node/optimizer/registerMissing.ts
@@ -2,6 +2,10 @@ import chalk from 'chalk'
 import { optimizeDeps } from '.'
 import { ViteDevServer } from '..'
 
+/**
+ * The amount to wait for requests to register newfound deps before triggering
+ * a re-bundle + page reload
+ */
 const debounceMs = 100
 
 export function createMissingImpoterRegisterFn(server: ViteDevServer) {

diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -45,7 +45,6 @@ function resolveExports(
 // special id for paths marked with browser: false
 // https://github.com/defunctzombie/package-browser-field-spec#ignore-a-module
 export const browserExternalId = '__vite-browser-external'
-export const pendingDepId = '__vite-pending-dep'
 
 const isDebug = process.env.DEBUG
 const debug = createDebugger('vite:resolve-details', {
@@ -347,7 +346,8 @@ export function tryNodeResolve(
     if (
       !resolved.includes('node_modules') || // linked
       !server || // build
-      server._isRunningOptimizer // optimizer resolve
+      server._isRunningOptimizer || // optimizing
+      !server._optimizeDepsMetadata
     ) {
       return { id: resolved }
     }
@@ -367,13 +367,12 @@ export function tryNodeResolve(
       if (versionHash) {
         resolved = injectQuery(resolved, `v=${versionHash}`)
       }
-      return { id: resolved }
     } else {
       // this is a missing import.
       // queue optimize-deps re-run.
       server._registerMissingImport?.(id, resolved, importer)
-      return { id: pendingDepId }
     }
+    return { id: resolved }
   }
 }
 

diff --git a/packages/vite/src/node/server/middlewares/transform.ts b/packages/vite/src/node/server/middlewares/transform.ts
@@ -15,12 +15,12 @@ import { transformRequest } from '../transformRequest'
 import { isHTMLProxy } from '../../plugins/html'
 import chalk from 'chalk'
 import {
+  CLIENT_PUBLIC_PATH,
   DEP_CACHE_DIR,
   DEP_VERSION_RE,
   NULL_BYTE_PLACEHOLDER,
   VALID_ID_PREFIX
 } from '../../constants'
-import { pendingDepId } from '../../plugins/resolve'
 import { isCSSRequest, isDirectCSSRequest } from '../../plugins/css'
 
 const debugCache = createDebugger('vite:cache')
@@ -45,8 +45,13 @@ export function transformMiddleware(
       return next()
     }
 
-    if (server._pendingReload && req.url!.endsWith(pendingDepId)) {
-      // missing dep pending reload, hold request
+    if (
+      server._pendingReload &&
+      // always allow vite client requests so that it can trigger page reload
+      !req.url?.startsWith(CLIENT_PUBLIC_PATH) &&
+      !req.url?.includes('vite/dist/client')
+    ) {
+      // missing dep pending reload, hold request until reload happens
       server._pendingReload.then(() => res.end())
       return
     }