Skip to content

Commit f699194

Browse files
authored
fix: handle function property extension in namespace import (#16113)
1 parent 4ccfa05 commit f699194

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

packages/vite/src/node/__tests__/plugins/import.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ describe('transformCjsImport', () => {
7474
),
7575
).toBe(
7676
'import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js"; ' +
77-
`const react = ((m) => m?.__esModule ? m : { ...typeof m === "object" && !Array.isArray(m) ? m : {}, default: m })(__vite__cjsImport0_react)`,
77+
`const react = ((m) => m?.__esModule ? m : { ...typeof m === "object" && !Array.isArray(m) || typeof m === "function" ? m : {}, default: m })(__vite__cjsImport0_react)`,
7878
)
7979
})
8080

packages/vite/src/node/plugins/importAnalysis.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ export function createParseErrorInfo(
842842
}
843843
}
844844
// prettier-ignore
845-
const interopHelper = (m: any) => m?.__esModule ? m : { ...(typeof m === 'object' && !Array.isArray(m) ? m : {}), default: m }
845+
const interopHelper = (m: any) => m?.__esModule ? m : { ...(typeof m === 'object' && !Array.isArray(m) || typeof m === 'function' ? m : {}), default: m }
846846

847847
export function interopNamedImports(
848848
str: MagicString,

0 commit comments

Comments
 (0)