@@ -50,27 +50,25 @@ export async function dev(vite, vite_config, svelte_config) {
5050 /** @type {Error | null } */
5151 let manifest_error = null ;
5252
53- /** @param {any } err */
54- function outputModuleLoadError ( err ) {
55- const msg = buildErrorMessage ( err , [ colors . red ( `Internal server error: ${ err . message } ` ) ] ) ;
53+ /** @param {string } url */
54+ async function loud_ssr_load_module ( url ) {
55+ try {
56+ return await vite . ssrLoadModule ( url ) ;
57+ } catch ( /** @type {any } */ err ) {
58+ const msg = buildErrorMessage ( err , [ colors . red ( `Internal server error: ${ err . message } ` ) ] ) ;
5659
57- vite . config . logger . error ( msg , {
58- error : err
59- } ) ;
60- vite . ws . send ( {
61- type : 'error' ,
62- err : err
63- } ) ;
60+ vite . config . logger . error ( msg , { error : err } ) ;
61+ vite . ws . send ( { type : 'error' , err : err } ) ;
62+
63+ throw err ;
64+ }
6465 }
6566
6667 /** @param {string } id */
6768 async function resolve ( id ) {
6869 const url = id . startsWith ( '..' ) ? `/@fs${ path . posix . resolve ( id ) } ` : `/${ id } ` ;
6970
70- let module = await vite . ssrLoadModule ( url ) . catch ( ( error ) => {
71- outputModuleLoadError ( error ) ;
72- throw error ;
73- } ) ;
71+ let module = await loud_ssr_load_module ( url ) ;
7472
7573 const module_node = await vite . moduleGraph . getModuleByUrl ( url ) ;
7674 if ( ! module_node ) throw new Error ( `Could not find node for ${ url } ` ) ;
@@ -177,7 +175,7 @@ export async function dev(vite, vite_config, svelte_config) {
177175 ( query . has ( 'svelte' ) && query . get ( 'type' ) === 'style' )
178176 ) {
179177 try {
180- const mod = await vite . ssrLoadModule ( dep . url ) ;
178+ const mod = await loud_ssr_load_module ( dep . url ) ;
181179 styles [ dep . url ] = mod . default ;
182180 } catch {
183181 // this can happen with dynamically imported modules, I think
@@ -207,7 +205,7 @@ export async function dev(vite, vite_config, svelte_config) {
207205 endpoint : endpoint
208206 ? async ( ) => {
209207 const url = path . resolve ( cwd , endpoint . file ) ;
210- return await vite . ssrLoadModule ( url ) ;
208+ return await loud_ssr_load_module ( url ) ;
211209 }
212210 : null ,
213211 endpoint_id : endpoint ?. file
0 commit comments