Revert "chore: remove unused logic"

This reverts commit 6fe72f0.
vitejs · Jan 28, 2021 · 6b154f0 · 6b154f0
1 parent ca862a2
commit 6b154f0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/packages/vite/src/node/optimizer/registerMissing.ts b/packages/vite/src/node/optimizer/registerMissing.ts
@@ -11,6 +11,8 @@ export function createMissingImpoterRegisterFn(server: ViteDevServer) {
   let currentImporters = new Set<string>()
   let handle: NodeJS.Timeout
 
+  let pendingResolve: (() => void) | null = null
+
   async function rerun() {
     const newDeps = currentMissing
     currentMissing = {}
@@ -61,6 +63,9 @@ export function createMissingImpoterRegisterFn(server: ViteDevServer) {
         chalk.red(`error while updating dependencies:\n${e.stack}`),
         { timestamp: true }
       )
+    } finally {
+      pendingResolve && pendingResolve()
+      server._pendingReload = pendingResolve = null
     }
 
     logger.info(chalk.greenBright(`✨ dependencies updated.`), {
@@ -78,6 +83,9 @@ export function createMissingImpoterRegisterFn(server: ViteDevServer) {
       if (importer) currentImporters.add(importer)
       if (handle) clearTimeout(handle)
       handle = setTimeout(rerun, debounceMs)
+      server._pendingReload = new Promise((r) => {
+        pendingResolve = r
+      })
     }
   }
 }
diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -246,6 +246,10 @@ export interface ViteDevServer {
   _registerMissingImport:
     | ((id: string, resolved: string, importer?: string) => void)
     | null
+  /**
+   * @internal
+   */
+  _pendingReload: Promise<void> | null
 }
 
 export async function createServer(
@@ -318,7 +322,8 @@ export async function createServer(
     _optimizeDepsMetadata: null,
     _ssrExternals: null,
     _globImporters: {},
-    _registerMissingImport: null
+    _registerMissingImport: null,
+    _pendingReload: null
   }
 
   process.once('SIGTERM', async () => {