chore: modify format

vitejs · Jan 16, 2024 · 659e82e · 659e82e
1 parent 95ea358
commit 659e82e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/vite/src/node/__tests__/plugins/import.spec.ts b/packages/vite/src/node/__tests__/plugins/import.spec.ts
@@ -74,7 +74,7 @@ describe('transformCjsImport', () => {
       ),
     ).toBe(
       'import __vite__cjsImport0_react from "./node_modules/.vite/deps/react.js"; ' +
-        `const react = (m => m?.__esModule ? m : { ...(typeof m === 'object' && !Array.isArray(m) ? m : {}), default: m })(__vite__cjsImport0_react)`,
+        `const react = ((m) => m?.__esModule ? m : { ...typeof m === "object" && !Array.isArray(m) ? m : {}, default: m })(__vite__cjsImport0_react)`,
     )
   })
 

diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -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,
@@ -870,7 +872,7 @@ export function interopNamedImports(
     str.overwrite(
       expStart,
       expEnd,
-      `import('${rewrittenUrl}').then(m => (m => m?.__esModule ? m : { ...(typeof m === 'object' && !Array.isArray(m) ? m : {}), default: m })(m.default))` +
+      `import('${rewrittenUrl}').then(m => (${interopHelper.toString()})(m.default))` +
         getLineBreaks(exp),
       { contentOnly: true },
     )
@@ -1007,7 +1009,7 @@ export function transformCjsImport(
     importNames.forEach(({ importedName, localName }) => {
       if (importedName === '*') {
         lines.push(
-          `const ${localName} = (m => m?.__esModule ? m : { ...(typeof m === 'object' && !Array.isArray(m) ? m : {}), default: m })(${cjsModuleName})`,
+          `const ${localName} = (${interopHelper.toString()})(${cjsModuleName})`,
         )
       } else if (importedName === 'default') {
         lines.push(