Skip to content

feature(edge): add a way for convertTo to return a Request #612

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.

Sign up for GitHub

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 2 commits into from
Oct 30, 2024
Merged

feature(edge): add a way for convertTo to return a Request #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddebff9
feature(edge): add a way for convertTo to return a Request
vicb Oct 30, 2024
00b47c9
fixup! changeset
vicb Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fluffy-peas-live.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@opennextjs/aws": patch
---

feature(edge): add a way for convertTo to return a Request
13 changes: 11 additions & 2 deletions packages/open-next/src/overrides/converters/edge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ import type { Converter, InternalEvent, InternalResult } from "types/open-next";

import type { MiddlewareOutputEvent } from "../../core/routingHandler";

declare global {
// Makes convertTo returns the request instead of fetching it.
var __dangerous_ON_edge_converter_returns_request: boolean | undefined;
}

const converter: Converter<
InternalEvent,
InternalResult | ({ type: "middleware" } & MiddlewareOutputEvent)
Expand Down Expand Up @@ -63,7 +68,7 @@ const converter: Converter<
}
}

const req = new Request(url, {
const request = new Request(url, {
body: result.internalEvent.body,
method: result.internalEvent.method,
headers: {
Expand All @@ -72,14 +77,18 @@ const converter: Converter<
},
});

if (globalThis.__dangerous_ON_edge_converter_returns_request === true) {
return request;
}

const cfCache =
(result.isISR ||
result.internalEvent.rawPath.startsWith("/_next/image")) &&
process.env.DISABLE_CACHE !== "true"
? { cacheEverything: true }
: {};

return fetch(req, {
return fetch(request, {
// This is a hack to make sure that the response is cached by Cloudflare
// See https://developers.cloudflare.com/workers/examples/cache-using-fetch/#caching-html-resources
// @ts-expect-error - This is a Cloudflare specific option
Expand Down