Skip to content

fix: handle namespace import and dynamic import interop consistently #15619

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
merged 7 commits into from
Jan 18, 2024
Merged

fix: handle namespace import and dynamic import interop consistently #15619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6f0bee
fix: the abnormal behavior of namespace import and dynamic import whe…
XiSenao Jan 16, 2024
e955082
chore: convert to single-line execution
XiSenao Jan 16, 2024
76190e5
chore: update namespace import test
XiSenao Jan 16, 2024
e1228d7
chore: simplify the expression
XiSenao Jan 16, 2024
95ea358
chore: update namespace import test
XiSenao Jan 16, 2024
659e82e
chore: modify format
XiSenao Jan 16, 2024
0c75563
chore: merge main
patak-dev Jan 18, 2024
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
2 changes: 1 addition & 1 deletion packages/vite/src/node/__tests__/plugins/import.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe('transformCjsImport', () => {
),
).toBe(
'import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js"; ' +
'const react = __vite__cjsImport0_react',
`const react = ((m) => m?.__esModule ? m : { ...typeof m === "object" && !Array.isArray(m) ? m : {}, default: m })(__vite__cjsImport0_react)`,
)
})

Expand Down
8 changes: 6 additions & 2 deletions packages/vite/src/node/plugins/importAnalysis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,8 @@ export function createParseErrorInfo(
showCodeFrame: !probablyBinary,
}
}
// prettier-ignore
const interopHelper = (m: any) => m?.__esModule ? m : { ...(typeof m === 'object' && !Array.isArray(m) ? m : {}), default: m }

export function interopNamedImports(
str: MagicString,
Expand All @@ -870,7 +872,7 @@ export function interopNamedImports(
str.overwrite(
expStart,
expEnd,
`import('${rewrittenUrl}').then(m => m.default && m.default.__esModule ? m.default : ({ ...m.default, default: m.default }))` +
`import('${rewrittenUrl}').then(m => (${interopHelper.toString()})(m.default))` +
getLineBreaks(exp),
{ contentOnly: true },
)
Expand Down Expand Up @@ -1006,7 +1008,9 @@ export function transformCjsImport(
const lines: string[] = [`import ${cjsModuleName} from "${url}"`]
importNames.forEach(({ importedName, localName }) => {
if (importedName === '*') {
lines.push(`const ${localName} = ${cjsModuleName}`)
lines.push(
`const ${localName} = (${interopHelper.toString()})(${cjsModuleName})`,
)
} else if (importedName === 'default') {
lines.push(
`const ${localName} = ${cjsModuleName}.__esModule ? ${cjsModuleName}.default : ${cjsModuleName}`,
Expand Down