@@ -94,7 +94,7 @@ async function ssrTransformScript(
9494 function defineImport ( node : Node , source : string ) {
9595 deps . add ( source )
9696 const importId = `__vite_ssr_import_${ uid ++ } __`
97- s . appendLeft (
97+ s . appendRight (
9898 node . start ,
9999 `const ${ importId } = await ${ ssrImportKey } (${ JSON . stringify ( source ) } );\n`
100100 )
@@ -115,6 +115,7 @@ async function ssrTransformScript(
115115 // import { baz } from 'foo' --> baz -> __import_foo__.baz
116116 // import * as ok from 'foo' --> ok -> __import_foo__
117117 if ( node . type === 'ImportDeclaration' ) {
118+ s . remove ( node . start , node . end )
118119 const importId = defineImport ( node , node . source . value as string )
119120 for ( const spec of node . specifiers ) {
120121 if ( spec . type === 'ImportSpecifier' ) {
@@ -129,7 +130,6 @@ async function ssrTransformScript(
129130 idToImportMap . set ( spec . local . name , importId )
130131 }
131132 }
132- s . remove ( node . start , node . end )
133133 }
134134 }
135135
@@ -207,13 +207,11 @@ async function ssrTransformScript(
207207
208208 // export * from './foo'
209209 if ( node . type === 'ExportAllDeclaration' ) {
210+ s . remove ( node . start , node . end )
211+ const importId = defineImport ( node , node . source . value as string )
210212 if ( node . exported ) {
211- const importId = defineImport ( node , node . source . value as string )
212- s . remove ( node . start , node . end )
213213 defineExport ( node . end , node . exported . name , `${ importId } ` )
214214 } else {
215- const importId = defineImport ( node , node . source . value as string )
216- s . remove ( node . start , node . end )
217215 s . appendLeft ( node . end , `${ ssrExportAllKey } (${ importId } );` )
218216 }
219217 }
0 commit comments