fix: register files added by addWatchFile() as current module's depen…

…dency fix vitejs#3216
aleclarson · Nov 8, 2021 · c4be70f · c4be70f
1 parent 575cf23
commit c4be70f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -486,6 +486,17 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
       // node CSS imports does its own graph update in the css plugin so we
       // only handle js graph updates here.
       if (!isCSSRequest(importer)) {
+        // attached by pluginContainer.addWatchFile
+        const pluginImports = (this as any)._addedImports as
+          | Set<string>
+          | undefined
+        if (pluginImports) {
+          ;(
+            await Promise.all(
+              [...pluginImports].map((id) => normalizeUrl(id, 0))
+            )
+          ).forEach(([url]) => importedUrls.add(url))
+        }
         const prunedImports = await moduleGraph.updateModuleInfo(
           importerModule,
           importedUrls,

diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts
@@ -171,6 +171,7 @@ export async function createPluginContainer(
     _activeId: string | null = null
     _activeCode: string | null = null
     _resolveSkips?: Set<Plugin>
+    _addedImports: Set<string> | null = null
 
     constructor(initialPlugin?: Plugin) {
       this._activePlugin = initialPlugin || null
@@ -216,8 +217,9 @@ export async function createPluginContainer(
       return MODULES.keys()
     }
 
-    addWatchFile(id: string) {
+    async addWatchFile(id: string) {
       watchFiles.add(id)
+      ;(this._addedImports || (this._addedImports = new Set())).add(id)
       if (watcher) ensureWatchedFile(watcher, id, root)
     }