File tree Expand file tree Collapse file tree 2 files changed +23
-4
lines changed Expand file tree Collapse file tree 2 files changed +23
-4
lines changed Original file line number Diff line number Diff line change
1
+ ---
2
+ " svelte " : patch
3
+ ---
4
+
5
+ fix: run ` onDestroy ` callbacks during SSR
Original file line number Diff line number Diff line change @@ -10,25 +10,39 @@ export default defineConfig({
10
10
alias : [
11
11
{
12
12
find : / ^ s v e l t e \/ ? / ,
13
- customResolver : ( id ) => {
13
+ customResolver : ( id , importer ) => {
14
14
// For some reason this turns up as "undefined" instead of "svelte"
15
15
const exported = pkg . exports [ id . replace ( 'undefined' , '.' ) ] ;
16
16
if ( ! exported ) return ;
17
17
18
- return path . resolve ( 'packages/svelte' , exported . browser ?? exported . default ) ;
18
+ // When running the server version of the Svelte files,
19
+ // we also want to use the server export of the Svelte package
20
+ return path . resolve (
21
+ 'packages/svelte' ,
22
+ importer ?. includes ( '_output/server' )
23
+ ? exported . default
24
+ : exported . browser ?? exported . default
25
+ ) ;
19
26
}
20
27
}
21
28
]
22
29
} ,
23
30
plugins : [
24
31
{
25
32
name : 'resolve-svelte' ,
26
- resolveId ( id ) {
33
+ resolveId ( id , importer ) {
27
34
if ( / ^ s v e l t e \/ ? / . test ( id ) ) {
28
35
const exported = pkg . exports [ id . replace ( 'svelte' , '.' ) ] ;
29
36
if ( ! exported ) return ;
30
37
31
- return path . resolve ( 'packages/svelte' , exported . browser ?? exported . default ) ;
38
+ // When running the server version of the Svelte files,
39
+ // we also want to use the server export of the Svelte package
40
+ return path . resolve (
41
+ 'packages/svelte' ,
42
+ importer ?. includes ( '_output/server' )
43
+ ? exported . default
44
+ : exported . browser ?? exported . default
45
+ ) ;
32
46
}
33
47
}
34
48
}
You can’t perform that action at this time.
0 commit comments