refactor: sync with new cloudflare wrapper names

See opennextjs/opennextjs-aws#645
opennextjs · Nov 25, 2024 · 89c54f1 · 89c54f1
1 parent 2efdc83
commit 89c54f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/examples/middleware/open-next.config.ts b/examples/middleware/open-next.config.ts
@@ -3,7 +3,7 @@ import type { OpenNextConfig } from "@opennextjs/aws/types/open-next";
 const config: OpenNextConfig = {
   default: {
     override: {
-      wrapper: "cloudflare-streaming",
+      wrapper: "cloudflare-node",
       converter: "edge",
       // Unused implementation
       incrementalCache: "dummy",
@@ -15,7 +15,7 @@ const config: OpenNextConfig = {
   middleware: {
     external: true,
     override: {
-      wrapper: "cloudflare",
+      wrapper: "cloudflare-edge",
       converter: "edge",
       proxyExternalRequest: "fetch",
     },

diff --git a/packages/cloudflare/README.md b/packages/cloudflare/README.md
@@ -44,7 +44,7 @@ import type { OpenNextConfig } from "open-next/types/open-next";
 const config: OpenNextConfig = {
   default: {
     override: {
-      wrapper: "cloudflare-streaming",
+      wrapper: "cloudflare-node",
       converter: "edge",
       // Unused implementation
       incrementalCache: "dummy",
@@ -56,7 +56,7 @@ const config: OpenNextConfig = {
   middleware: {
     external: true,
     override: {
-      wrapper: "cloudflare",
+      wrapper: "cloudflare-edge",
       converter: "edge",
       proxyExternalRequest: "fetch",
     },

diff --git a/packages/cloudflare/src/cli/build/index.ts b/packages/cloudflare/src/cli/build/index.ts
@@ -93,24 +93,25 @@ export async function build(projectOpts: ProjectOptions): Promise<void> {
  */
 function ensureCloudflareConfig(config: OpenNextConfig) {
   const requirements = {
-    dftUseCloudflareWrapper: config.default?.override?.wrapper === "cloudflare-streaming",
+    dftUseCloudflareWrapper: config.default?.override?.wrapper === "cloudflare-node",
     dftUseEdgeConverter: config.default?.override?.converter === "edge",
     dftUseDummyCache:
       config.default?.override?.incrementalCache === "dummy" &&
       config.default?.override?.tagCache === "dummy" &&
       config.default?.override?.queue === "dummy",
     disableCacheInterception: config.dangerous?.enableCacheInterception !== true,
     mwIsMiddlewareExternal: config.middleware?.external == true,
-    mwUseCloudflareWrapper: config.middleware?.override?.wrapper === "cloudflare",
+    mwUseCloudflareWrapper: config.middleware?.override?.wrapper === "cloudflare-edge",
     mwUseEdgeConverter: config.middleware?.override?.converter === "edge",
+    mwUseFetchProxy: config.middleware?.override?.proxyExternalRequest === "fetch",
   };
 
   if (Object.values(requirements).some((satisfied) => !satisfied)) {
     throw new Error(`open-next.config.ts should contain:
 {
   default: {
     override: {
-      wrapper: "cloudflare-streaming",
+      wrapper: "cloudflare-node",
       converter: "edge",
       incrementalCache: "dummy",
       tagCache: "dummy",
@@ -121,7 +122,7 @@ function ensureCloudflareConfig(config: OpenNextConfig) {
   middleware: {
     external: true,
     override: {
-      wrapper: "cloudflare",
+      wrapper: "cloudflare-edge",
       converter: "edge",
       proxyExternalRequest: "fetch",
     },