fix: remove commonjs-entry query from moduleFacadeId

vitejs · May 18, 2022 · 8b43995 · 8b43995
1 parent 105168e
commit 8b43995
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts
@@ -27,6 +27,7 @@ import {
   isRelativeBase,
   normalizePath,
   processSrcSet,
+  removeCommonJsEntryQuery,
   slash
 } from '../utils'
 import type { ResolvedConfig } from '../config'
@@ -604,7 +605,8 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
           (chunk) =>
             chunk.type === 'chunk' &&
             chunk.isEntry &&
-            chunk.facadeModuleId === id
+            chunk.facadeModuleId &&
+            removeCommonJsEntryQuery(chunk.facadeModuleId) === id
         ) as OutputChunk | undefined
 
         let canInlineEntry = false

diff --git a/packages/vite/src/node/plugins/manifest.ts b/packages/vite/src/node/plugins/manifest.ts
@@ -2,7 +2,7 @@ import path from 'path'
 import type { OutputChunk } from 'rollup'
 import type { ResolvedConfig } from '..'
 import type { Plugin } from '../plugin'
-import { normalizePath } from '../utils'
+import { normalizePath, removeCommonJsEntryQuery } from '../utils'
 
 export type Manifest = Record<string, ManifestChunk>
 
@@ -33,7 +33,10 @@ export function manifestPlugin(config: ResolvedConfig): Plugin {
       function getChunkName(chunk: OutputChunk) {
         if (chunk.facadeModuleId) {
           let name = normalizePath(
-            path.relative(config.root, chunk.facadeModuleId)
+            path.relative(
+              config.root,
+              removeCommonJsEntryQuery(chunk.facadeModuleId)
+            )
           )
           if (format === 'system' && !chunk.name.includes('-legacy')) {
             const ext = path.extname(name)

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
@@ -280,6 +280,11 @@ export function removeTimestampQuery(url: string): string {
   return url.replace(timestampRE, '').replace(trailingSeparatorRE, '')
 }
 
+const commonJsEntryQueryRE = /(\?|&)commonjs-entry(?:&|$)/
+export function removeCommonJsEntryQuery(url: string): string {
+  return url.replace(commonJsEntryQueryRE, '').replace(trailingSeparatorRE, '')
+}
+
 export function isRelativeBase(base: string): boolean {
   return base === '' || base.startsWith('.')
 }