From 77e31d5800b47657c791a957e478c6e860755bea Mon Sep 17 00:00:00 2001 From: Dario Piotrowicz Date: Wed, 8 Jan 2025 12:15:53 +0100 Subject: [PATCH] update the `patchExceptionBubbling` patch (#232) * update the `patchExceptionBubbling` patch --------- Co-authored-by: Victor Berchet --- .changeset/cold-plants-deliver.md | 5 +++++ .../to-investigate/patch-exception-bubbling.ts | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .changeset/cold-plants-deliver.md diff --git a/.changeset/cold-plants-deliver.md b/.changeset/cold-plants-deliver.md new file mode 100644 index 00000000..e860e3f7 --- /dev/null +++ b/.changeset/cold-plants-deliver.md @@ -0,0 +1,5 @@ +--- +"@opennextjs/cloudflare": patch +--- + +update the `patchExceptionBubbling` patch diff --git a/packages/cloudflare/src/cli/build/patches/to-investigate/patch-exception-bubbling.ts b/packages/cloudflare/src/cli/build/patches/to-investigate/patch-exception-bubbling.ts index 9dba8092..8a1dd0a0 100644 --- a/packages/cloudflare/src/cli/build/patches/to-investigate/patch-exception-bubbling.ts +++ b/packages/cloudflare/src/cli/build/patches/to-investigate/patch-exception-bubbling.ts @@ -5,5 +5,14 @@ * promises. */ export function patchExceptionBubbling(code: string) { - return code.replace('_nextBubbleNoFallback = "1"', "_nextBubbleNoFallback = undefined"); + // The code before had: `query._nextBubbleNoFallback = '1'`, that has ben refactored to + // `addRequestMeta(req, 'bubbleNoFallback', true)` in https://github.com/vercel/next.js/pull/74100 + // we need to support both for backward compatibility, that's why we have the following if statement + if (code.includes("_nextBubbleNoFallback")) { + return code.replace('_nextBubbleNoFallback = "1"', "_nextBubbleNoFallback = undefined"); + } + + // The Next.js transpiled code contains something like `(0, _requestmeta.addRequestMeta)(req, "bubbleNoFallback", true);` + // and we want to update it to `(0, _requestmeta.addRequestMeta)(req, "bubbleNoFallback", false);` + return code.replace(/\((.*?.addRequestMeta\)\(.*?,\s+"bubbleNoFallback"),\s+true\)/, "($1, false)"); }