@@ -94,7 +94,7 @@ async function ssrTransformScript(
94
94
function defineImport ( node : Node , source : string ) {
95
95
deps . add ( source )
96
96
const importId = `__vite_ssr_import_${ uid ++ } __`
97
- s . appendLeft (
97
+ s . appendRight (
98
98
node . start ,
99
99
`const ${ importId } = await ${ ssrImportKey } (${ JSON . stringify ( source ) } );\n`
100
100
)
@@ -115,6 +115,7 @@ async function ssrTransformScript(
115
115
// import { baz } from 'foo' --> baz -> __import_foo__.baz
116
116
// import * as ok from 'foo' --> ok -> __import_foo__
117
117
if ( node . type === 'ImportDeclaration' ) {
118
+ s . remove ( node . start , node . end )
118
119
const importId = defineImport ( node , node . source . value as string )
119
120
for ( const spec of node . specifiers ) {
120
121
if ( spec . type === 'ImportSpecifier' ) {
@@ -129,7 +130,6 @@ async function ssrTransformScript(
129
130
idToImportMap . set ( spec . local . name , importId )
130
131
}
131
132
}
132
- s . remove ( node . start , node . end )
133
133
}
134
134
}
135
135
@@ -207,13 +207,11 @@ async function ssrTransformScript(
207
207
208
208
// export * from './foo'
209
209
if ( node . type === 'ExportAllDeclaration' ) {
210
+ s . remove ( node . start , node . end )
211
+ const importId = defineImport ( node , node . source . value as string )
210
212
if ( node . exported ) {
211
- const importId = defineImport ( node , node . source . value as string )
212
- s . remove ( node . start , node . end )
213
213
defineExport ( node . end , node . exported . name , `${ importId } ` )
214
214
} else {
215
- const importId = defineImport ( node , node . source . value as string )
216
- s . remove ( node . start , node . end )
217
215
s . appendLeft ( node . end , `${ ssrExportAllKey } (${ importId } );` )
218
216
}
219
217
}
0 commit comments