fix(optimizer): rewrite ?commonjs-require, since `rollup-plugin-com…

…monjs` will inject require suffix for require call fix vitejs#1566
rolldown · Jan 17, 2021 · 8feec8c · 8feec8c
1 parent 571545d
commit 8feec8c
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/packages/vite/src/node/optimizer/depAssetPlugin.ts b/packages/vite/src/node/optimizer/depAssetPlugin.ts
@@ -7,6 +7,8 @@ import { normalizePath } from '../utils'
 import { ResolvedConfig } from '../config'
 import { idToPkgMap } from '../plugins/resolve'
 
+export const REQUIRE_SUFFIX = '?commonjs-require'
+
 export const depAssetExternalPlugin = (config: ResolvedConfig): Plugin => ({
   name: 'vite:dep-assets-external',
   resolveId(id) {
@@ -48,6 +50,15 @@ export const depAssetRewritePlugin = (config: ResolvedConfig): Plugin => {
                   s.remove(statementStart, statementEnd)
                   continue
                 }
+                // rollup-plugin-commonjs will inject require suffix for require call
+                if (importee.endsWith(REQUIRE_SUFFIX)) {
+                  s.overwrite(
+                    start,
+                    end,
+                    importee.slice(1, -REQUIRE_SUFFIX.length)
+                  )
+                  continue
+                }
                 if (importee.startsWith('.')) {
                   const pkg = idToPkgMap.get(id)
                   if (pkg) {