From 1e8342b251e163f00bb0e38eafd73111d4c1c8ce Mon Sep 17 00:00:00 2001
From: Tim Reynolds <tim@timothyreynolds.co.uk>
Date: Fri, 28 Feb 2025 18:40:43 +0000
Subject: [PATCH] Updated default templates inline with create-cloudflare

---
 .../cli/build/utils/create-config-files.ts    |  4 +--
 .../templates/defaults/open-next.config.ts    | 32 ++++++++++++++++---
 .../templates/defaults/wrangler.json          | 19 -----------
 .../templates/defaults/wrangler.jsonc         | 12 +++++++
 4 files changed, 41 insertions(+), 26 deletions(-)
 delete mode 100644 packages/cloudflare/templates/defaults/wrangler.json
 create mode 100644 packages/cloudflare/templates/defaults/wrangler.jsonc

diff --git a/packages/cloudflare/src/cli/build/utils/create-config-files.ts b/packages/cloudflare/src/cli/build/utils/create-config-files.ts
index d7a9068f..d11fcfce 100644
--- a/packages/cloudflare/src/cli/build/utils/create-config-files.ts
+++ b/packages/cloudflare/src/cli/build/utils/create-config-files.ts
@@ -41,7 +41,7 @@ export async function createWranglerConfigIfNotExistent(projectOpts: ProjectOpti
     return;
   }
 
-  let wranglerConfig = readFileSync(join(getPackageTemplatesDirPath(), "defaults/wrangler.json"), "utf8");
+  let wranglerConfig = readFileSync(join(getPackageTemplatesDirPath(), "defaults/wrangler.jsonc"), "utf8");
 
   const appName = getAppNameFromPackageJson(projectOpts.sourceDir) ?? "app-name";
   if (appName) {
@@ -56,7 +56,7 @@ export async function createWranglerConfigIfNotExistent(projectOpts: ProjectOpti
     );
   }
 
-  writeFileSync(join(projectOpts.sourceDir, "wrangler.json"), wranglerConfig);
+  writeFileSync(join(projectOpts.sourceDir, "wrangler.jsonc"), wranglerConfig);
 }
 
 function getAppNameFromPackageJson(sourceDir: string): string | undefined {
diff --git a/packages/cloudflare/templates/defaults/open-next.config.ts b/packages/cloudflare/templates/defaults/open-next.config.ts
index 8b5be462..bafad6be 100644
--- a/packages/cloudflare/templates/defaults/open-next.config.ts
+++ b/packages/cloudflare/templates/defaults/open-next.config.ts
@@ -1,7 +1,29 @@
 // default open-next.config.ts file created by @opennextjs/cloudflare
-import { defineCloudflareConfig } from "@opennextjs/cloudflare/dist/api/config";
-import kvIncrementalCache from "@opennextjs/cloudflare/dist/api/kv-cache";
+import cache from "@opennextjs/cloudflare/kvCache";
 
-export default defineCloudflareConfig({
-  incrementalCache: kvIncrementalCache,
-});
+const config = {
+  default: {
+    override: {
+      wrapper: "cloudflare-node",
+      converter: "edge",
+      incrementalCache: async () => cache,
+      tagCache: "dummy",
+      queue: "dummy",
+    },
+  },
+
+  middleware: {
+    external: true,
+    override: {
+      wrapper: "cloudflare-edge",
+      converter: "edge",
+      proxyExternalRequest: "fetch",
+    },
+  },
+
+  dangerous: {
+    enableCacheInterception: false,
+  },
+};
+
+export default config;
diff --git a/packages/cloudflare/templates/defaults/wrangler.json b/packages/cloudflare/templates/defaults/wrangler.json
deleted file mode 100644
index c7036e0e..00000000
--- a/packages/cloudflare/templates/defaults/wrangler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "$schema": "node_modules/wrangler/config-schema.json",
-  "main": ".open-next/worker.js",
-  "name": "app-name",
-  "compatibility_date": "2024-12-30",
-  "compatibility_flags": ["nodejs_compat"],
-  "assets": {
-    "directory": ".open-next/assets",
-    "binding": "ASSETS"
-  },
-  "kv_namespaces": [
-    // Create a KV binding with the binding name "NEXT_CACHE_WORKERS_KV"
-    // to enable the KV based caching:
-    // {
-    //   "binding": "NEXT_CACHE_WORKERS_KV",
-    //   "id": "<BINDING_ID>"
-    // }
-  ]
-}
diff --git a/packages/cloudflare/templates/defaults/wrangler.jsonc b/packages/cloudflare/templates/defaults/wrangler.jsonc
new file mode 100644
index 00000000..26c0f421
--- /dev/null
+++ b/packages/cloudflare/templates/defaults/wrangler.jsonc
@@ -0,0 +1,12 @@
+{
+  "$schema": "node_modules/wrangler/config-schema.json",
+  "name": "app-name",
+  "main": ".open-next/worker.js",
+  "compatibility_date": "2024-12-30",
+  "compatibility_flags": ["nodejs_compat"],
+  "minify": true,
+  "assets": {
+    "binding": "ASSETS",
+    "directory": ".open-next/assets"
+  }
+}