fix(optimizer): invalidate all modules on deps rebundle

vitejs · Jan 28, 2021 · 02053a2 · 02053a2
1 parent 216ae8e
commit 02053a2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/packages/vite/src/node/optimizer/registerMissing.ts b/packages/vite/src/node/optimizer/registerMissing.ts
@@ -12,7 +12,6 @@ export function createMissingImpoterRegisterFn(server: ViteDevServer) {
   const { logger } = server.config
   let knownOptimized = server._optimizeDepsMetadata!.optimized
   let currentMissing: Record<string, string> = {}
-  let currentImporters = new Set<string>()
   let handle: NodeJS.Timeout
 
   let pendingResolve: (() => void) | null = null
@@ -64,29 +63,20 @@ export function createMissingImpoterRegisterFn(server: ViteDevServer) {
       server._pendingReload = pendingResolve = null
     }
 
-    // Importers' cached transform results have stale imports (resolved to
+    // Cached transform results have stale imports (resolved to
     // old locations) so they need to be invalidated before the page is
     // reloaded.
-    currentImporters.forEach((importer) => {
-      const mod = server.moduleGraph.getModuleById(importer)
-      if (mod) server.moduleGraph.invalidateModule(mod)
-    })
-    currentImporters.clear()
+    server.moduleGraph.invalidateAll()
 
     server.ws.send({
       type: 'full-reload',
       path: '*'
     })
   }
 
-  return function registerMissingImport(
-    id: string,
-    resolved: string,
-    importer?: string
-  ) {
+  return function registerMissingImport(id: string, resolved: string) {
     if (!knownOptimized[id]) {
       currentMissing[id] = resolved
-      if (importer) currentImporters.add(importer)
       if (handle) clearTimeout(handle)
       handle = setTimeout(rerun, debounceMs)
       server._pendingReload = new Promise((r) => {

diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -354,6 +354,7 @@ export function tryNodeResolve(
     // if we reach here, it's a valid dep import that hasn't been optimzied.
     const exclude = server.config.optimizeDeps?.exclude
     if (
+      importer?.includes('node_modules') ||
       exclude?.includes(pkgId) ||
       exclude?.includes(id) ||
       isCSSRequest(resolved) ||
@@ -370,7 +371,7 @@ export function tryNodeResolve(
     } else {
       // this is a missing import.
       // queue optimize-deps re-run.
-      server._registerMissingImport?.(id, resolved, importer)
+      server._registerMissingImport?.(id, resolved)
     }
     return { id: resolved }
   }

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -247,9 +247,7 @@ export interface ViteDevServer {
   /**
    * @internal
    */
-  _registerMissingImport:
-    | ((id: string, resolved: string, importer?: string) => void)
-    | null
+  _registerMissingImport: ((id: string, resolved: string) => void) | null
   /**
    * @internal
    */

diff --git a/packages/vite/src/node/server/moduleGraph.ts b/packages/vite/src/node/server/moduleGraph.ts
@@ -84,6 +84,13 @@ export class ModuleGraph {
     invalidateSSRModule(mod, seen)
   }
 
+  invalidateAll() {
+    const seen = new Set<ModuleNode>()
+    this.idToModuleMap.forEach((mod) => {
+      this.invalidateModule(mod, seen)
+    })
+  }
+
   /**
    * Update the module graph based on a module's updated imports information
    * If there are dependencies that no longer have any importers, they are