fix: use consistent virtual module ID in module graph

vitejs · May 2, 2023 · 7cc1d96 · 7cc1d96
1 parent 229c592
commit 7cc1d96
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -34,6 +34,7 @@ import {
   isExternalUrl,
   isInNodeModules,
   isJSRequest,
+  isVirtualModule,
   joinUrlSegments,
   moduleListContains,
   normalizePath,
@@ -281,8 +282,9 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
       const importedBindings = enablePartialAccept
         ? new Map<string, Set<string>>()
         : null
-      const toAbsoluteUrl = (url: string) =>
-        path.posix.resolve(path.posix.dirname(importerModule.url), url)
+      const toAbsoluteUrl = (url: string) => {
+        return path.posix.resolve(path.posix.dirname(importerModule.url), url)
+      }
 
       const normalizeUrl = async (
         url: string,
@@ -742,7 +744,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
       const normalizedAcceptedUrls = new Set<string>()
       for (const { url, start, end } of acceptedUrls) {
         const [normalized] = await moduleGraph.resolveUrl(
-          toAbsoluteUrl(url),
+          isVirtualModule(url) ? url : toAbsoluteUrl(url),
           ssr,
         )
         normalizedAcceptedUrls.add(normalized)

diff --git a/packages/vite/src/node/plugins/importMetaGlob.ts b/packages/vite/src/node/plugins/importMetaGlob.ts
@@ -25,6 +25,7 @@ import type { ModuleNode } from '../server/moduleGraph'
 import type { ResolvedConfig } from '../config'
 import {
   evalValue,
+  isVirtualModule,
   normalizePath,
   slash,
   transformStableResult,
@@ -629,8 +630,3 @@ export function getCommonBase(globsResolved: string[]): null | string {
 
   return commonAncestor
 }
-
-export function isVirtualModule(id: string): boolean {
-  // https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
-  return id.startsWith('virtual:') || id[0] === '\0' || !id.includes('/')
-}
diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
@@ -1214,3 +1214,8 @@ const escapeRegexRE = /[-/\\^$*+?.()|[\]{}]/g
 export function escapeRegex(str: string): string {
   return str.replace(escapeRegexRE, '\\$&')
 }
+
+export function isVirtualModule(id: string): boolean {
+  // https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
+  return id.startsWith('virtual:') || id[0] === '\0' || !id.includes('/')
+}
diff --git a/playground/hmr/__tests__/hmr.spec.ts b/playground/hmr/__tests__/hmr.spec.ts
@@ -9,6 +9,7 @@ import {
   removeFile,
   untilBrowserLogAfter,
   untilUpdated,
+  viteServer,
   viteTestUrl,
 } from '~utils'
 
@@ -672,6 +673,14 @@ if (!isBuild) {
     expect(await btn.textContent()).toBe('Compteur 0')
   })
 
+  test('virtual module in module graph', async () => {
+    const moduleGraph = viteServer.moduleGraph
+    const virtualId = Array.from(moduleGraph.idToModuleMap.keys()).filter(
+      (id: string) => id.includes('virtual'),
+    )
+    expect(virtualId).toEqual(['\x00virtual:file', '/@id/__x00__virtual:file'])
+  })
+
   test('handle virtual module updates', async () => {
     await page.goto(viteTestUrl)
     const el = await page.$('.virtual')

diff --git a/playground/hmr/hmr.ts b/playground/hmr/hmr.ts
@@ -42,6 +42,13 @@ if (import.meta.hot) {
     handleDep('multi deps', foo, nestedFoo)
   })
 
+  import.meta.hot.accept(
+    ['virtual:file', '/@id/__x00__virtual:file'],
+    ([rawVirtualPath, acceptedVirtualPath]) => {
+      text('.virtual', acceptedVirtualPath.virtual)
+    },
+  )
+
   import.meta.hot.dispose(() => {
     console.log(`foo was:`, foo)
   })