Skip to content

fix(rspack): prevent vfs concurrency issues #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahabhgk merged 2 commits into from
May 6, 2025
Merged

fix(rspack): prevent vfs concurrency issues #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c212122
fix(rspack): prevent vfs concurrency issues
elbywan May 5, 2025
0bd1252
chore: typecheck
elbywan May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/rspack/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => {
Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions src/webpack/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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(''))
}
}

Expand Down