Skip to content
This repository was archived by the owner on Mar 19, 2026. It is now read-only.

fix: resolve default export consistently #444

Merged
sapphi-red merged 3 commits into from
Oct 20, 2025
Merged

fix: resolve default export consistently #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0253d59
fix: resolve default export consistently
sapphi-red Oct 7, 2025
9c73946
test: update unit test
sapphi-red Oct 17, 2025
633a633
fix: return package json from js resolver
sapphi-red Oct 17, 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
168 changes: 111 additions & 57 deletions 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 @@ -9,21 +9,22 @@ describe('runTransform', () => {
},
}

function runTransformCjsImport(importExp: string) {
function runTransformCjsImport(importExp: string, isNodeMode: boolean) {
const result = transformCjsImport(
importExp,
'./node_modules/.vite/deps/react.js',
'react',
0,
'modA',
isNodeMode,
config,
)
if (result !== undefined) {
expect(result.split('\n').length, 'result line count').toBe(
importExp.split('\n').length,
)
}
return result
return result?.replaceAll(';', ';\n')
}

beforeEach(() => {
Expand All @@ -34,97 +35,150 @@ describe('runTransform', () => {
expect(
runTransformCjsImport(
'import { useState, Component, "👋" as fake } from "react"',
false,
),
).toBe(
'import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js"; ' +
'const useState = __vite__cjsImport0_react["useState"]; ' +
'const Component = __vite__cjsImport0_react["Component"]; ' +
'const fake = __vite__cjsImport0_react["👋"]',
)
).toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const useState = __vite__cjsImport0_react["useState"];
const Component = __vite__cjsImport0_react["Component"];
const fake = __vite__cjsImport0_react["👋"]"
`)
expect(
runTransformCjsImport(
'import { useState, Component, "👋" as fake } from "react"',
true,
),
).toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const useState = __vite__cjsImport0_react["useState"];
const Component = __vite__cjsImport0_react["Component"];
const fake = __vite__cjsImport0_react["👋"]"
`)
})

test('import default specifier', () => {
expect(runTransformCjsImport('import React from "react"')).toBe(
'import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js"; ' +
'const React = __vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react.default : __vite__cjsImport0_react',
)
expect(runTransformCjsImport('import React from "react"', false))
.toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const React = !__vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react : __vite__cjsImport0_react.default"
`)
expect(runTransformCjsImport('import React from "react"', true))
.toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const React = __vite__cjsImport0_react"
`)

expect(
runTransformCjsImport('import { default as React } from "react"'),
).toBe(
'import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js"; ' +
'const React = __vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react.default : __vite__cjsImport0_react',
)
runTransformCjsImport('import { default as React } from "react"', false),
).toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const React = !__vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react : __vite__cjsImport0_react.default"
`)
})

test('import all specifier', () => {
expect(runTransformCjsImport('import * as react from "react"')).toBe(
'import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js"; ' +
`const react = ((m) => m?.__esModule ? m : {\t...typeof m === "object" && !Array.isArray(m) || typeof m === "function" ? m : {},\tdefault: m})(__vite__cjsImport0_react)`,
)
expect(runTransformCjsImport('import * as react from "react"', false))
.toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const react = ((m, n) => n || !m?.__esModule ? { ...typeof m === "object" && !Array.isArray(m) || typeof m === "function" ? m : {}, default: m} : m)(__vite__cjsImport0_react, 0)"
`)
expect(runTransformCjsImport('import * as react from "react"', true))
.toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const react = ((m, n) => n || !m?.__esModule ? { ...typeof m === "object" && !Array.isArray(m) || typeof m === "function" ? m : {}, default: m} : m)(__vite__cjsImport0_react, 1)"
`)
})

test('export all specifier', () => {
expect(runTransformCjsImport('export * from "react"')).toBe(undefined)
expect(
runTransformCjsImport('export * from "react"', false),
).toMatchInlineSnapshot(`undefined`)
expect(
runTransformCjsImport('export * from "react"', true),
).toMatchInlineSnapshot(`undefined`)

expect(config.logger.warn).toBeCalledWith(
expect.stringContaining(`export * from "react"\` in modA`),
)

expect(runTransformCjsImport('export * as react from "react"')).toBe(
undefined,
)
expect(
runTransformCjsImport('export * as react from "react"', false),
).toMatchInlineSnapshot(`undefined`)

expect(config.logger.warn).toBeCalledTimes(1)
expect(config.logger.warn).toBeCalledTimes(2)
})

test('export name specifier', () => {
expect(
runTransformCjsImport(
'export { useState, Component, "👋" } from "react"',
false,
),
).toBe(
'import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js"; ' +
'const __vite__cjsExportI_useState = __vite__cjsImport0_react["useState"]; ' +
'const __vite__cjsExportI_Component = __vite__cjsImport0_react["Component"]; ' +
'const __vite__cjsExportL_1d0452e3 = __vite__cjsImport0_react["👋"]; ' +
'export { __vite__cjsExportI_useState as useState, __vite__cjsExportI_Component as Component, __vite__cjsExportL_1d0452e3 as "👋" }',
)
).toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const __vite__cjsExportI_useState = __vite__cjsImport0_react["useState"];
const __vite__cjsExportI_Component = __vite__cjsImport0_react["Component"];
const __vite__cjsExportL_1d0452e3 = __vite__cjsImport0_react["👋"];
export { __vite__cjsExportI_useState as useState, __vite__cjsExportI_Component as Component, __vite__cjsExportL_1d0452e3 as "👋" }"
`)
expect(
runTransformCjsImport(
'export { useState, Component, "👋" } from "react"',
true,
),
).toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const __vite__cjsExportI_useState = __vite__cjsImport0_react["useState"];
const __vite__cjsExportI_Component = __vite__cjsImport0_react["Component"];
const __vite__cjsExportL_1d0452e3 = __vite__cjsImport0_react["👋"];
export { __vite__cjsExportI_useState as useState, __vite__cjsExportI_Component as Component, __vite__cjsExportL_1d0452e3 as "👋" }"
`)

expect(
runTransformCjsImport(
'export { useState as useStateAlias, Component as ComponentAlias, "👋" as "👍" } from "react"',
false,
),
).toBe(
'import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js"; ' +
'const __vite__cjsExportI_useStateAlias = __vite__cjsImport0_react["useState"]; ' +
'const __vite__cjsExportI_ComponentAlias = __vite__cjsImport0_react["Component"]; ' +
'const __vite__cjsExportL_5d57d39e = __vite__cjsImport0_react["👋"]; ' +
'export { __vite__cjsExportI_useStateAlias as useStateAlias, __vite__cjsExportI_ComponentAlias as ComponentAlias, __vite__cjsExportL_5d57d39e as "👍" }',
)
).toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const __vite__cjsExportI_useStateAlias = __vite__cjsImport0_react["useState"];
const __vite__cjsExportI_ComponentAlias = __vite__cjsImport0_react["Component"];
const __vite__cjsExportL_5d57d39e = __vite__cjsImport0_react["👋"];
export { __vite__cjsExportI_useStateAlias as useStateAlias, __vite__cjsExportI_ComponentAlias as ComponentAlias, __vite__cjsExportL_5d57d39e as "👍" }"
`)
})

test('export default specifier', () => {
expect(runTransformCjsImport('export { default } from "react"')).toBe(
'import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js"; ' +
'const __vite__cjsExportDefault_0 = __vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react.default : __vite__cjsImport0_react; ' +
'export default __vite__cjsExportDefault_0',
)
expect(runTransformCjsImport('export { default } from "react"', false))
.toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const __vite__cjsExportDefault_0 = !__vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react : __vite__cjsImport0_react.default;
export default __vite__cjsExportDefault_0"
`)
expect(runTransformCjsImport('export { default } from "react"', true))
.toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const __vite__cjsExportDefault_0 = __vite__cjsImport0_react;
export default __vite__cjsExportDefault_0"
`)

expect(
runTransformCjsImport('export { default as React} from "react"'),
).toBe(
'import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js"; ' +
'const __vite__cjsExportI_React = __vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react.default : __vite__cjsImport0_react; ' +
'export { __vite__cjsExportI_React as React }',
)
runTransformCjsImport('export { default as React} from "react"', false),
).toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const __vite__cjsExportI_React = !__vite__cjsImport0_react.__esModule ? __vite__cjsImport0_react : __vite__cjsImport0_react.default;
export { __vite__cjsExportI_React as React }"
`)

expect(
runTransformCjsImport('export { Component as default } from "react"'),
).toBe(
'import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js"; ' +
'const __vite__cjsExportDefault_0 = __vite__cjsImport0_react["Component"]; ' +
'export default __vite__cjsExportDefault_0',
)
runTransformCjsImport(
'export { Component as default } from "react"',
false,
),
).toMatchInlineSnapshot(`
"import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js";
const __vite__cjsExportDefault_0 = __vite__cjsImport0_react["Component"];
export default __vite__cjsExportDefault_0"
`)
})
})
34 changes: 25 additions & 9 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 @@ -40,6 +40,7 @@ import {
isDataUrl,
isDefined,
isExternalUrl,
isFilePathESM,
isInNodeModules,
isJSRequest,
joinUrlSegments,
Expand Down Expand Up @@ -440,6 +441,12 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
imports.length,
)

let _isNodeModeResult: boolean | undefined
const isNodeMode = () => {
_isNodeModeResult ??= isFilePathESM(importer, config.packageCache)
return _isNodeModeResult
}

await Promise.all(
imports.map(async (importSpecifier, index) => {
const {
Expand Down Expand Up @@ -605,6 +612,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
url,
index,
importer,
isNodeMode(),
config,
)
rewriteDone = true
Expand All @@ -623,6 +631,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
url,
index,
importer,
isNodeMode(),
config,
)
rewriteDone = true
Expand Down Expand Up @@ -906,16 +915,16 @@ export function createParseErrorInfo(
}
}

const interopHelper = (m: any) =>
m?.__esModule
? m
: {
const interopHelper = (m: any, n: boolean) =>
n || !m?.__esModule
? {
...((typeof m === 'object' && !Array.isArray(m)) ||
typeof m === 'function'
? m
: {}),
default: m,
}
: m
const interopHelperStr = interopHelper.toString().replaceAll('\n', '')

export function interopNamedImports(
Expand All @@ -924,6 +933,7 @@ export function interopNamedImports(
rewrittenUrl: string,
importIndex: number,
importer: string,
isNodeMode: boolean,
config: ResolvedConfig,
): void {
const source = str.original
Expand All @@ -940,7 +950,7 @@ export function interopNamedImports(
str.overwrite(
expStart,
expEnd,
`import('${rewrittenUrl}').then(m => (${interopHelperStr})(m.default))` +
`import('${rewrittenUrl}').then(m => (${interopHelperStr})(m.default, 1))` +
getLineBreaks(exp),
{ contentOnly: true },
)
Expand All @@ -952,6 +962,7 @@ export function interopNamedImports(
rawUrl,
importIndex,
importer,
isNodeMode,
config,
)
if (rewritten) {
Expand Down Expand Up @@ -998,6 +1009,7 @@ export function transformCjsImport(
rawUrl: string,
importIndex: number,
importer: string,
isNodeMode: boolean,
config: ResolvedConfig,
): string | undefined {
const node = (parseAst(importExp) as Program).body[0]
Expand Down Expand Up @@ -1076,12 +1088,16 @@ export function transformCjsImport(
importNames.forEach(({ importedName, localName }) => {
if (importedName === '*') {
lines.push(
`const ${localName} = (${interopHelperStr})(${cjsModuleName})`,
`const ${localName} = (${interopHelperStr})(${cjsModuleName}, ${+isNodeMode})`,
)
} else if (importedName === 'default') {
lines.push(
`const ${localName} = ${cjsModuleName}.__esModule ? ${cjsModuleName}.default : ${cjsModuleName}`,
)
if (isNodeMode) {
lines.push(`const ${localName} = ${cjsModuleName}`)
} else {
lines.push(
`const ${localName} = !${cjsModuleName}.__esModule ? ${cjsModuleName} : ${cjsModuleName}.default`,
)
}
} else {
lines.push(`const ${localName} = ${cjsModuleName}["${importedName}"]`)
}
Expand Down
Loading
Loading