Skip to content

Commit d231b61

Browse files
committed
refactor: sync with new cloudflare wrapper names
See opennextjs/opennextjs-aws#645
1 parent dfb3dff commit d231b61

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

examples/middleware/open-next.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { OpenNextConfig } from "@opennextjs/aws/types/open-next";
33
const config: OpenNextConfig = {
44
default: {
55
override: {
6-
wrapper: "cloudflare-streaming",
6+
wrapper: "cloudflare-node",
77
converter: "edge",
88
// Unused implementation
99
incrementalCache: "dummy",
@@ -15,7 +15,7 @@ const config: OpenNextConfig = {
1515
middleware: {
1616
external: true,
1717
override: {
18-
wrapper: "cloudflare",
18+
wrapper: "cloudflare-edge",
1919
converter: "edge",
2020
proxyExternalRequest: "fetch",
2121
},

packages/cloudflare/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import type { OpenNextConfig } from "open-next/types/open-next";
4444
const config: OpenNextConfig = {
4545
default: {
4646
override: {
47-
wrapper: "cloudflare-streaming",
47+
wrapper: "cloudflare-node",
4848
converter: "edge",
4949
// Unused implementation
5050
incrementalCache: "dummy",
@@ -56,7 +56,7 @@ const config: OpenNextConfig = {
5656
middleware: {
5757
external: true,
5858
override: {
59-
wrapper: "cloudflare",
59+
wrapper: "cloudflare-edge",
6060
converter: "edge",
6161
proxyExternalRequest: "fetch",
6262
},

packages/cloudflare/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"vitest": "catalog:"
6161
},
6262
"dependencies": {
63-
"@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@0ac604e",
63+
"@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@2202f36",
6464
"ts-morph": "catalog:"
6565
},
6666
"peerDependencies": {

packages/cloudflare/src/cli/build/index.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,24 +93,25 @@ export async function build(projectOpts: ProjectOptions): Promise<void> {
9393
*/
9494
function ensureCloudflareConfig(config: OpenNextConfig) {
9595
const requirements = {
96-
dftUseCloudflareWrapper: config.default?.override?.wrapper === "cloudflare-streaming",
96+
dftUseCloudflareWrapper: config.default?.override?.wrapper === "cloudflare-node",
9797
dftUseEdgeConverter: config.default?.override?.converter === "edge",
9898
dftUseDummyCache:
9999
config.default?.override?.incrementalCache === "dummy" &&
100100
config.default?.override?.tagCache === "dummy" &&
101101
config.default?.override?.queue === "dummy",
102102
disableCacheInterception: config.dangerous?.enableCacheInterception !== true,
103103
mwIsMiddlewareExternal: config.middleware?.external == true,
104-
mwUseCloudflareWrapper: config.middleware?.override?.wrapper === "cloudflare",
104+
mwUseCloudflareWrapper: config.middleware?.override?.wrapper === "cloudflare-edge",
105105
mwUseEdgeConverter: config.middleware?.override?.converter === "edge",
106+
mwUseFetchProxy: config.middleware?.override?.proxyExternalRequest === "fetch",
106107
};
107108

108109
if (Object.values(requirements).some((satisfied) => !satisfied)) {
109110
throw new Error(`open-next.config.ts should contain:
110111
{
111112
default: {
112113
override: {
113-
wrapper: "cloudflare-streaming",
114+
wrapper: "cloudflare-node",
114115
converter: "edge",
115116
incrementalCache: "dummy",
116117
tagCache: "dummy",
@@ -121,7 +122,7 @@ function ensureCloudflareConfig(config: OpenNextConfig) {
121122
middleware: {
122123
external: true,
123124
override: {
124-
wrapper: "cloudflare",
125+
wrapper: "cloudflare-edge",
125126
converter: "edge",
126127
proxyExternalRequest: "fetch",
127128
},

pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)