fix(rspack): prevent vfs concurrency issues (#504)

elbywan · web-flow · commit 9f68016ebb28 · 2025-05-06T11:31:53.000+08:00
diff --git a/src/rspack/index.ts b/src/rspack/index.ts
@@ -56,7 +56,7 @@ export function getRspackPlugin<UserOptions = Record<string, never>>(
           if (plugin.resolveId) {
             const vfs = new FakeVirtualModulesPlugin(plugin)
             vfs.apply(compiler)
-            plugin.__vfsModules = new Set()
+            plugin.__vfsModules = new Map()
             plugin.__vfs = vfs as any
 
             compiler.hooks.compilation.tap(plugin.name, (compilation, { normalModuleFactory }) => {
@@ -105,8 +105,14 @@ export function getRspackPlugin<UserOptions = Record<string, never>>(
                 // we treat it as a virtual module
                 if (!fs.existsSync(resolved)) {
                   if (!plugin.__vfsModules!.has(resolved)) {
-                    plugin.__vfsModules!.add(resolved)
-                    await vfs.writeModule(resolved)
+                    const fsPromise = vfs.writeModule(resolved)
+                    plugin.__vfsModules!.set(resolved, fsPromise)
+                    await fsPromise
+                  }
+                  else {
+                    // Ensure that the module is written to the virtual file system
+                    // before we use it.
+                    await plugin.__vfsModules!.get(resolved)
                   }
                   resolved = encodeVirtualModuleId(resolved, plugin)
                 }
diff --git a/src/types.ts b/src/types.ts
@@ -147,7 +147,7 @@ export interface UnpluginOptions {
 export interface ResolvedUnpluginOptions extends UnpluginOptions {
   // injected internal objects
   __vfs?: VirtualModulesPlugin
-  __vfsModules?: Set<string>
+  __vfsModules?: Map<string, Promise<string>>
   __virtualModulePrefix: string
 }
 
diff --git a/src/webpack/index.ts b/src/webpack/index.ts
@@ -54,7 +54,7 @@ export function getWebpackPlugin<UserOptions = Record<string, never>>(
               vfs = new VirtualModulesPlugin()
               compiler.options.plugins.push(vfs)
             }
-            plugin.__vfsModules = new Set()
+            plugin.__vfsModules = new Map()
             plugin.__vfs = vfs
 
             const resolverPlugin: ResolvePluginInstance = {
@@ -135,7 +135,7 @@ export function getWebpackPlugin<UserOptions = Record<string, never>>(
                       // https://github.com/unjs/unplugin/pull/155
                       if (!plugin.__vfsModules!.has(resolved)) {
                         plugin.__vfs!.writeModule(resolved, '')
-                        plugin.__vfsModules!.add(resolved)
+                        plugin.__vfsModules!.set(resolved, Promise.resolve(''))
                       }
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ export interface UnpluginOptions {`
`147`	`147`	`export interface ResolvedUnpluginOptions extends UnpluginOptions {`
`148`	`148`	`// injected internal objects`
`149`	`149`	`__vfs?: VirtualModulesPlugin`
`150`		`- __vfsModules?: Set<string>`
	`150`	`+ __vfsModules?: Map<string, Promise<string>>`
`151`	`151`	`__virtualModulePrefix: string`
`152`	`152`	`}`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ export function getWebpackPlugin<UserOptions = Record<string, never>>(`
`54`	`54`	`vfs = new VirtualModulesPlugin()`
`55`	`55`	`compiler.options.plugins.push(vfs)`
`56`	`56`	`}`
`57`		`- plugin.__vfsModules = new Set()`
	`57`	`+ plugin.__vfsModules = new Map()`
`58`	`58`	`plugin.__vfs = vfs`
`59`	`59`
`60`	`60`	`const resolverPlugin: ResolvePluginInstance = {`
`@@ -135,7 +135,7 @@ export function getWebpackPlugin<UserOptions = Record<string, never>>(`
`135`	`135`	`// https://github.com/unjs/unplugin/pull/155`
`136`	`136`	`if (!plugin.__vfsModules!.has(resolved)) {`
`137`	`137`	`plugin.__vfs!.writeModule(resolved, '')`
`138`		`- plugin.__vfsModules!.add(resolved)`
	`138`	`+ plugin.__vfsModules!.set(resolved, Promise.resolve(''))`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`