fix: rollback webpack __vfsModules to use a Set (#507)

elbywan · web-flow · commit 25b5205d747c · 2025-05-13T23:26:50.000+08:00
diff --git a/src/rspack/index.ts b/src/rspack/index.ts
@@ -56,7 +56,8 @@ export function getRspackPlugin<UserOptions = Record<string, never>>(
           if (plugin.resolveId) {
             const vfs = new FakeVirtualModulesPlugin(plugin)
             vfs.apply(compiler)
-            plugin.__vfsModules = new Map()
+            const vfsModules = new Map<string, Promise<string>>()
+            plugin.__vfsModules = vfsModules
             plugin.__vfs = vfs as any
 
             compiler.hooks.compilation.tap(plugin.name, (compilation, { normalModuleFactory }) => {
@@ -104,15 +105,15 @@ export function getRspackPlugin<UserOptions = Record<string, never>>(
                 // If the resolved module does not exist,
                 // we treat it as a virtual module
                 if (!fs.existsSync(resolved)) {
-                  if (!plugin.__vfsModules!.has(resolved)) {
+                  if (!vfsModules.has(resolved)) {
                     const fsPromise = vfs.writeModule(resolved)
-                    plugin.__vfsModules!.set(resolved, fsPromise)
+                    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)
+                    await 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?: Map<string, Promise<string>>
+  __vfsModules?: Map<string, Promise<string>> | Set<string>
   __virtualModulePrefix: string
 }
 
diff --git a/src/webpack/index.ts b/src/webpack/index.ts
@@ -54,7 +54,8 @@ export function getWebpackPlugin<UserOptions = Record<string, never>>(
               vfs = new VirtualModulesPlugin()
               compiler.options.plugins.push(vfs)
             }
-            plugin.__vfsModules = new Map()
+            const vfsModules = new Set<string>()
+            plugin.__vfsModules = vfsModules
             plugin.__vfs = vfs
 
             const resolverPlugin: ResolvePluginInstance = {
@@ -133,9 +134,9 @@ export function getWebpackPlugin<UserOptions = Record<string, never>>(
 
                       // webpack virtual module should pass in the correct path
                       // https://github.com/unjs/unplugin/pull/155
-                      if (!plugin.__vfsModules!.has(resolved)) {
+                      if (!vfsModules.has(resolved)) {
                         plugin.__vfs!.writeModule(resolved, '')
-                        plugin.__vfsModules!.set(resolved, Promise.resolve(''))
+                        vfsModules.add(resolved)
                       }
                     }
 

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?: Map<string, Promise<string>>`
	`150`	`+ __vfsModules?: Map<string, Promise<string>> \| Set<string>`
`151`	`151`	`__virtualModulePrefix: string`
`152`	`152`	`}`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ 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 Map()`
	`57`	`+ const vfsModules = new Set<string>()`
	`58`	`+ plugin.__vfsModules = vfsModules`
`58`	`59`	`plugin.__vfs = vfs`
`59`	`60`
`60`	`61`	`const resolverPlugin: ResolvePluginInstance = {`
`@@ -133,9 +134,9 @@ export function getWebpackPlugin<UserOptions = Record<string, never>>(`
`133`	`134`
`134`	`135`	`// webpack virtual module should pass in the correct path`
`135`	`136`	`// https://github.com/unjs/unplugin/pull/155`
`136`		`- if (!plugin.__vfsModules!.has(resolved)) {`
	`137`	`+ if (!vfsModules.has(resolved)) {`
`137`	`138`	`plugin.__vfs!.writeModule(resolved, '')`
`138`		`- plugin.__vfsModules!.set(resolved, Promise.resolve(''))`
	`139`	`+ vfsModules.add(resolved)`
`139`	`140`	`}`
`140`	`141`	`}`
`141`	`142`