-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
fix: use window.fetch
in load
functions to allow libraries to patch it
#10009
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
b6e1fca
fix: Use `window.fetch` instead of unpatched fetch in `load` functions
Lms24 ae835cf
changeset
Lms24 4500e5b
always use window.fetch, pass flag to patched window.fetch
Lms24 0e1d0e0
add test
Lms24 9dfde88
apply code review suggestions
Lms24 45c93a4
make __sveltekit_fetch__ non-enumerable
Lms24 64e858d
Update .changeset/sharp-birds-invent.md
benmccann b1420c5
DRY
benmccann File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@sveltejs/kit': patch | ||
--- | ||
|
||
fix: Use `window.fetch` instead of unpatched fetch in `load` functions | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,11 @@ if (DEV) { | |
|
||
check_stack_trace(); | ||
|
||
/** | ||
* | ||
Lms24 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
* @param {RequestInfo | URL} input | ||
* @param {RequestInit & Record<string, any> | undefined} init | ||
*/ | ||
window.fetch = (input, init) => { | ||
// Check if fetch was called via load_node. the lock method only checks if it was called at the | ||
// same time, but not necessarily if it was called from `load`. | ||
|
@@ -36,10 +41,14 @@ if (DEV) { | |
const cutoff = stack_array.findIndex((a) => a.includes('load@') || a.includes('at load')); | ||
const stack = stack_array.slice(0, cutoff + 2).join('\n'); | ||
|
||
const heuristic = can_inspect_stack_trace | ||
const inLoadHeuristic = can_inspect_stack_trace | ||
Lms24 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
? stack.includes('src/runtime/client/client.js') | ||
: loading; | ||
if (heuristic) { | ||
|
||
// This flag is set in initial_fetch and subsequent_fetch | ||
const calledViaSvelteKitFetch = init?.__sveltekit_fetch__; | ||
Lms24 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
if (inLoadHeuristic && !calledViaSvelteKitFetch) { | ||
console.warn( | ||
`Loading ${url} using \`window.fetch\`. For best results, use the \`fetch\` that is passed to your \`load\` function: https://kit.svelte.dev/docs/load#making-fetch-requests` | ||
); | ||
|
@@ -86,7 +95,14 @@ export function initial_fetch(resource, opts) { | |
return Promise.resolve(new Response(body, init)); | ||
} | ||
|
||
return native_fetch(resource, opts); | ||
const patchedOpts = DEV | ||
Lms24 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
? { | ||
...opts, | ||
__sveltekit_fetch__: true | ||
} | ||
: opts; | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Arguably, this isn't super nice but it allows us to let the patched |
||
return window.fetch(resource, patchedOpts); | ||
} | ||
|
||
/** | ||
|
@@ -112,7 +128,14 @@ export function subsequent_fetch(resource, resolved, opts) { | |
} | ||
} | ||
|
||
return native_fetch(resolved, opts); | ||
const patchedOpts = DEV | ||
? { | ||
...opts, | ||
__sveltekit_fetch__: true | ||
} | ||
: opts; | ||
|
||
return window.fetch(resolved, patchedOpts); | ||
} | ||
|
||
/** | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.