From 7e22215bd116696a9735a7a859859bcd459dfd5b Mon Sep 17 00:00:00 2001 From: Sagar Gurtu Date: Sat, 30 Jul 2022 21:09:44 -0700 Subject: [PATCH 1/2] fix(resolve): fix commonjs plugin 'HELPERS_ID' --- packages/vite/src/node/plugins/resolve.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts index 5363e6a4c246eb..d8233ad3fe6db6 100644 --- a/packages/vite/src/node/plugins/resolve.ts +++ b/packages/vite/src/node/plugins/resolve.ts @@ -116,7 +116,7 @@ export function resolvePlugin(resolveOptions: InternalResolveOptions): Plugin { } // fast path for commonjs proxy modules - if (/\?commonjs/.test(id) || id === 'commonjsHelpers.js') { + if (/\?commonjs/.test(id) || id === '\0commonjsHelpers.js') { return } From 6298d2c2b1f16be57904d978993959da4dbe67e9 Mon Sep 17 00:00:00 2001 From: Sagar Gurtu Date: Sat, 6 Aug 2022 14:19:48 -0700 Subject: [PATCH 2/2] refactor(resolve): remove fast path for commonjs proxy modules --- packages/vite/src/node/plugins/resolve.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts index d8233ad3fe6db6..16601297f85dac 100644 --- a/packages/vite/src/node/plugins/resolve.ts +++ b/packages/vite/src/node/plugins/resolve.ts @@ -115,11 +115,6 @@ export function resolvePlugin(resolveOptions: InternalResolveOptions): Plugin { return id } - // fast path for commonjs proxy modules - if (/\?commonjs/.test(id) || id === '\0commonjsHelpers.js') { - return - } - const targetWeb = !ssr || ssrTarget === 'webworker' // this is passed by @rollup/plugin-commonjs