File tree 4 files changed +26
-24
lines changed
vite-plugin-svelte/src/utils
4 files changed +26
-24
lines changed Original file line number Diff line number Diff line change 14
14
"devDependencies" : {
15
15
"@sveltejs/adapter-node" : " ^1.0.0-next.79" ,
16
16
"@sveltejs/kit" : " ^1.0.0-next.370" ,
17
- "e2e-test-dep-svelte-api-only" : " workspace:* " ,
18
- "e2e-test-dep-vite-plugins" : " workspace:* " ,
17
+ "e2e-test-dep-svelte-api-only" : " file:../_test_dependencies/svelte-api-only " ,
18
+ "e2e-test-dep-vite-plugins" : " file:../_test_dependencies/vite-plugins " ,
19
19
"svelte" : " ^3.49.0" ,
20
20
"svelte-check" : " ^2.8.0" ,
21
21
"svelte-i18n" : " ^3.4.0" ,
Original file line number Diff line number Diff line change @@ -12,10 +12,6 @@ const config = {
12
12
interval : 100
13
13
}
14
14
} ,
15
- ssr : {
16
- // TODO this is needed otherwise tests fail. investigate
17
- noExternal : [ 'e2e-test-dep-svelte-api-only' ]
18
- } ,
19
15
plugins : [ transformValidation ( ) , sveltekit ( ) ]
20
16
} ;
21
17
Original file line number Diff line number Diff line change @@ -407,23 +407,15 @@ function buildSSROptionsForSvelte(
407
407
408
408
// add svelte to ssr.noExternal unless it is present in ssr.external
409
409
// so we can resolve it with svelte/ssr
410
- if ( options . isBuild && config . build ?. ssr ) {
411
- if ( ! config . ssr ?. external ?. includes ( 'svelte' ) ) {
412
- noExternal . push ( 'svelte' , / ^ s v e l t e \/ / ) ;
413
- }
414
- } else {
415
- // for non-ssr build, we exclude svelte js library deps to make development faster
416
- // and also because vite doesn't handle them properly.
417
- // see https://github.com/sveltejs/vite-plugin-svelte/issues/168
418
- // see https://github.com/vitejs/vite/issues/2579
419
- svelteDeps = svelteDeps . filter ( ( dep ) => dep . type === 'component-library' ) ;
410
+ if ( ! config . ssr ?. external ?. includes ( 'svelte' ) ) {
411
+ noExternal . push ( 'svelte' , / ^ s v e l t e \/ / ) ;
420
412
}
421
413
422
- // add svelte dependencies to ssr.noExternal unless present in ssr.external or optimizeDeps.include
414
+ // add svelte dependencies to ssr.noExternal unless present in ssr.external
423
415
noExternal . push (
424
- ...Array . from ( new Set ( svelteDeps . map ( ( s ) => s . name ) ) ) . filter ( ( x ) => {
425
- return ! config . ssr ?. external ?. includes ( x ) && ! config . optimizeDeps ?. include ?. includes ( x ) ;
426
- } )
416
+ ...Array . from ( new Set ( svelteDeps . map ( ( s ) => s . name ) ) ) . filter (
417
+ ( x ) => ! config . ssr ?. external ?. includes ( x )
418
+ )
427
419
) ;
428
420
const ssr = {
429
421
noExternal,
You can’t perform that action at this time.
0 commit comments