fix: patch fetch in the fetch handler instead of global scope (#536)

cloudflare · Nov 11, 2023 · ee237f3 · ee237f3
1 parent 500edef
commit ee237f3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.changeset/twenty-eggs-lick.md b/.changeset/twenty-eggs-lick.md
@@ -0,0 +1,5 @@
+---
+'@cloudflare/next-on-pages': patch
+---
+
+Patch the fetch function inside the fetch handler, instead of in the global scope.
diff --git a/packages/next-on-pages/templates/_worker.js/index.ts b/packages/next-on-pages/templates/_worker.js/index.ts
@@ -15,10 +15,10 @@ declare const __BUILD_OUTPUT__: VercelBuildOutput;
 
 declare const __ENV_ALS_PROMISE__: Promise<null | AsyncLocalStorage<unknown>>;
 
-patchFetch();
-
 export default {
 	async fetch(request, env, ctx) {
+		patchFetch();
+
 		const envAsyncLocalStorage = await __ENV_ALS_PROMISE__;
 		if (!envAsyncLocalStorage) {
 			const reqUrl = new URL(request.url);