Skip to content

Commit 350e638

Browse files
feat: allow signal for Nitro composables
1 parent 79eb099 commit 350e638

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/runtime/composables/$kirby.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export function $kirby<T = any>(
7676
if (promiseMap.has(_key))
7777
return promiseMap.get(_key)!
7878

79-
const baseHeaders = headersToObject(headers)
79+
const sharedHeaders = headersToObject(headers)
8080

8181
const _serverFetchOptions: NitroFetchOptions<string> = {
8282
method: 'POST',
@@ -85,7 +85,7 @@ export function $kirby<T = any>(
8585
method,
8686
query,
8787
body,
88-
headers: Object.keys(baseHeaders).length ? baseHeaders : undefined,
88+
headers: sharedHeaders,
8989
cache,
9090
} satisfies ServerFetchOptions,
9191
}
@@ -94,11 +94,11 @@ export function $kirby<T = any>(
9494
baseURL: kql.url,
9595
query,
9696
method,
97-
body,
9897
headers: {
99-
...baseHeaders,
98+
...sharedHeaders,
10099
...createAuthHeader(kql),
101100
},
101+
body,
102102
}
103103

104104
const request = useRequestFetch()(kql.client ? path : buildApiProxyPath(_key), {

src/runtime/composables/$kql.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,28 +62,28 @@ export function $kql<T extends KirbyQueryResponse<any, boolean> = KirbyQueryResp
6262
if (promiseMap.has(_key))
6363
return promiseMap.get(_key)!
6464

65-
const baseHeaders = {
65+
const sharedHeaders = {
6666
...headersToObject(headers),
6767
...(language && { 'X-Language': language }),
6868
}
6969

7070
const _serverFetchOptions: NitroFetchOptions<string> = {
7171
method: 'POST',
7272
body: {
73-
headers: Object.keys(baseHeaders).length ? baseHeaders : undefined,
7473
query,
74+
headers: sharedHeaders,
7575
cache,
7676
} satisfies ServerFetchOptions,
7777
}
7878

7979
const _clientFetchOptions: NitroFetchOptions<string> = {
8080
baseURL: kql.url,
8181
method: 'POST',
82-
body: query,
8382
headers: {
84-
...baseHeaders,
83+
...sharedHeaders,
8584
...createAuthHeader(kql),
8685
},
86+
body: query,
8787
}
8888

8989
const request = useRequestFetch()(kql.client ? kql.prefix : buildApiProxyPath(_key), {

src/runtime/server/imports.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export type KqlFetchOptions = Pick<
2626
| 'retryDelay'
2727
| 'retryStatusCodes'
2828
| 'timeout'
29+
| 'signal'
2930
> & {
3031
/**
3132
* Language code to fetch data for in multi-language Kirby setups.

0 commit comments

Comments
 (0)