Skip to content

Commit 7bccb14

Browse files
lachlancollinslachlancollins
committed
chore(svelte-5-adapter): tidy-up functions (#7809)
* chore(svelte-5-adapter): tidy-up functions * Fix types * Update svelte
1 parent 2c82fd6 commit 7bccb14

File tree

16 files changed

+158
-150
lines changed

16 files changed

+158
-150
lines changed

‎examples/svelte/auto-refetching/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"devDependencies": {
1616
"@sveltejs/adapter-auto": "^3.2.2",
1717
"@sveltejs/kit": "^2.5.18",
18-
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
19-
"svelte": "5.0.0-next.192",
18+
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
19+
"svelte": "^5.0.0-next.200",
2020
"svelte-check": "^3.8.4",
2121
"typescript": "5.3.3",
2222
"vite": "^5.3.5"

‎examples/svelte/basic/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"devDependencies": {
1818
"@sveltejs/adapter-auto": "^3.2.2",
1919
"@sveltejs/kit": "^2.5.18",
20-
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
21-
"svelte": "5.0.0-next.192",
20+
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
21+
"svelte": "^5.0.0-next.200",
2222
"svelte-check": "^3.8.4",
2323
"typescript": "5.3.3",
2424
"vite": "^5.3.5"

‎examples/svelte/load-more-infinite-scroll/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"devDependencies": {
1616
"@sveltejs/adapter-auto": "^3.2.2",
1717
"@sveltejs/kit": "^2.5.18",
18-
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
19-
"svelte": "5.0.0-next.192",
18+
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
19+
"svelte": "^5.0.0-next.200",
2020
"svelte-check": "^3.8.4",
2121
"typescript": "5.3.3",
2222
"vite": "^5.3.5"

‎examples/svelte/optimistic-updates/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"devDependencies": {
1616
"@sveltejs/adapter-auto": "^3.2.2",
1717
"@sveltejs/kit": "^2.5.18",
18-
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
19-
"svelte": "5.0.0-next.192",
18+
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
19+
"svelte": "^5.0.0-next.200",
2020
"svelte-check": "^3.8.4",
2121
"typescript": "5.3.3",
2222
"vite": "^5.3.5"

‎examples/svelte/playground/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"devDependencies": {
1616
"@sveltejs/adapter-auto": "^3.2.2",
1717
"@sveltejs/kit": "^2.5.18",
18-
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
19-
"svelte": "5.0.0-next.192",
18+
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
19+
"svelte": "^5.0.0-next.200",
2020
"svelte-check": "^3.8.4",
2121
"typescript": "5.3.3",
2222
"vite": "^5.3.5"

‎examples/svelte/simple/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"@tanstack/svelte-query-devtools": "^5.51.15"
1414
},
1515
"devDependencies": {
16-
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
16+
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
1717
"@tsconfig/svelte": "^5.0.4",
18-
"svelte": "5.0.0-next.192",
18+
"svelte": "^5.0.0-next.200",
1919
"svelte-check": "^3.8.4",
2020
"typescript": "5.3.3",
2121
"vite": "^5.3.5"

‎examples/svelte/ssr/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"devDependencies": {
1616
"@sveltejs/adapter-auto": "^3.2.2",
1717
"@sveltejs/kit": "^2.5.18",
18-
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
19-
"svelte": "5.0.0-next.192",
18+
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
19+
"svelte": "^5.0.0-next.200",
2020
"svelte-check": "^3.8.4",
2121
"typescript": "5.3.3",
2222
"vite": "^5.3.5"

‎examples/svelte/star-wars/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"devDependencies": {
1616
"@sveltejs/adapter-auto": "^3.2.2",
1717
"@sveltejs/kit": "^2.5.18",
18-
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
18+
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
1919
"autoprefixer": "^10.4.19",
2020
"postcss": "^8.4.40",
21-
"svelte": "5.0.0-next.192",
21+
"svelte": "^5.0.0-next.200",
2222
"svelte-check": "^3.8.4",
2323
"tailwindcss": "^3.4.7",
2424
"typescript": "5.3.3",

‎integrations/svelte-vite/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"build": "vite build"
77
},
88
"devDependencies": {
9-
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
9+
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
1010
"@tanstack/svelte-query": "workspace:*",
1111
"@tanstack/svelte-query-devtools": "workspace:*",
12-
"svelte": "5.0.0-next.192",
12+
"svelte": "^5.0.0-next.200",
1313
"vite": "^5.3.5"
1414
}
1515
}

‎packages/svelte-query-devtools/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
},
4444
"devDependencies": {
4545
"@sveltejs/package": "^2.3.2",
46-
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
46+
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
4747
"@tanstack/svelte-query": "workspace:*",
4848
"eslint-plugin-svelte": "^2.43.0",
49-
"svelte": "5.0.0-next.192",
49+
"svelte": "^5.0.0-next.200",
5050
"svelte-check": "^3.8.4"
5151
},
5252
"peerDependencies": {

‎packages/svelte-query-persist-client/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
},
4646
"devDependencies": {
4747
"@sveltejs/package": "^2.3.2",
48-
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
48+
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
4949
"@tanstack/svelte-query": "workspace:*",
5050
"@testing-library/svelte": "^5.2.1",
5151
"eslint-plugin-svelte": "^2.43.0",
52-
"svelte": "5.0.0-next.192",
52+
"svelte": "^5.0.0-next.200",
5353
"svelte-check": "^3.8.4"
5454
},
5555
"peerDependencies": {

‎packages/svelte-query-persist-client/src/PersistQueryClientProvider.svelte

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
persistOptions: OmitKeyof<PersistQueryClientOptions, 'queryClient'>
1818
onSuccess?: () => void
1919
}
20+
2021
let {
2122
client,
2223
children,
@@ -25,15 +26,18 @@
2526
}: PersistQueryClientProviderProps = $props()
2627
2728
let isRestoring = $state(true)
29+
2830
setIsRestoringContext(() => isRestoring)
31+
2932
const options = $derived({
3033
...persistOptions,
3134
queryClient: client,
3235
})
3336
3437
$effect(() => {
35-
return isRestoring ? () => 1 : persistQueryClientSubscribe(options)
38+
return isRestoring ? () => {} : persistQueryClientSubscribe(options)
3639
})
40+
3741
$effect(() => {
3842
isRestoring = true
3943
persistQueryClientRestore(options).then(async () => {

‎packages/svelte-query/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
},
4646
"devDependencies": {
4747
"@sveltejs/package": "^2.3.2",
48-
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.4",
48+
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.5",
4949
"@testing-library/svelte": "^5.2.1",
5050
"eslint-plugin-svelte": "^2.43.0",
51-
"svelte": "5.0.0-next.192",
51+
"svelte": "^5.0.0-next.200",
5252
"svelte-check": "^3.8.4"
5353
},
5454
"peerDependencies": {

‎packages/svelte-query/src/createMutation.svelte.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export function createMutation<
3030
options(),
3131
),
3232
)
33+
3334
const mutate = $state<
3435
CreateMutateFunction<TData, TError, TVariables, TContext>
3536
>((variables, mutateOptions) => {
@@ -42,16 +43,16 @@ export function createMutation<
4243

4344
const result = $state(observer.getCurrentResult())
4445

45-
const un = observer.subscribe((val) => {
46+
const unsubscribe = observer.subscribe((val) => {
4647
notifyManager.batchCalls(() => {
4748
Object.assign(result, val)
48-
49-
// result = val
5049
})()
5150
})
51+
5252
onDestroy(() => {
53-
un()
53+
unsubscribe()
5454
})
55+
5556
// @ts-expect-error
5657
return new Proxy(result, {
5758
get: (_, prop) => {

‎packages/svelte-query/src/createQueries.svelte.ts

+9-6
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ type GetCreateQueryResult<T> =
119119
unknown extends TError ? DefaultError : TError
120120
>
121121
: // Fallback
122-
never
122+
QueryObserverResult
123123

124124
/**
125125
* QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
@@ -216,7 +216,7 @@ export function createQueries<
216216
const client = useQueryClient(queryClient)
217217
const isRestoring = useIsRestoring()
218218

219-
const defaultedQueriesStore = $derived(() => {
219+
const defaultedQueries = $derived(() => {
220220
return queries().map((opts) => {
221221
const defaultedOptions = client.defaultQueryOptions(opts)
222222
// Make sure the results are already in fetching state before subscribing or updating options
@@ -226,22 +226,25 @@ export function createQueries<
226226
return defaultedOptions as QueryObserverOptions
227227
})
228228
})
229+
229230
const observer = new QueriesObserver<TCombinedResult>(
230231
client,
231-
defaultedQueriesStore(),
232+
defaultedQueries(),
232233
options as QueriesObserverOptions<TCombinedResult>,
233234
)
235+
234236
const [_, getCombinedResult, trackResult] = $derived(
235237
observer.getOptimisticResult(
236-
defaultedQueriesStore(),
238+
defaultedQueries(),
237239
(options as QueriesObserverOptions<TCombinedResult>).combine,
238240
),
239241
)
242+
240243
$effect(() => {
241244
// Do not notify on updates because of changes in the options because
242245
// these changes should already be reflected in the optimistic result.
243246
observer.setQueries(
244-
defaultedQueriesStore(),
247+
defaultedQueries(),
245248
options as QueriesObserverOptions<TCombinedResult>,
246249
{ listeners: false },
247250
)
@@ -261,7 +264,7 @@ export function createQueries<
261264
return observer.subscribe((_result) => {
262265
notifyManager.batchCalls(() => {
263266
const res = observer.getOptimisticResult(
264-
defaultedQueriesStore(),
267+
defaultedQueries(),
265268
(options as QueriesObserverOptions<TCombinedResult>).combine,
266269
)
267270
// @ts-expect-error

0 commit comments

Comments
 (0)