Drop to Wrangler v3 in Cloudflare templates (#99)

Author: markdalgleish

.tests/test.cloudflare-d1.ts

@@ -17,7 +17,19 @@ test("dev", async ({ page, $ }) => {
 
   const url = await matchLine(dev.stdout, urlRegex.viteDev);
   await workflow({ page, url });
-  expect(dev.buffer.stderr).toBe("");
+
+  const ignoredLines = [
+    "The version of Wrangler you are using is now out-of-date",
+    "Please update to the latest version to prevent critical errors",
+    "Run `npm install --save-dev wrangler@4` to update to the latest version",
+    "After installation, run Wrangler with `npx wrangler`"
+  ];
+  const filteredStderr = dev.buffer.stderr
+    .split("\n")
+    .filter(line => !ignoredLines.some(ignoredLine => line.includes(ignoredLine)))
+    .join("\n")
+    .trim();
+  expect(filteredStderr).toBe("");
 });
 
 test("build + start", async ({ page, $ }) => {
@@ -31,7 +43,19 @@ test("build + start", async ({ page, $ }) => {
 
   const url = await matchLine(start.stdout, urlRegex.wrangler);
   await workflow({ page, url });
-  expect(start.buffer.stderr).toBe("");
+
+  const ignoredLines = [
+    "The version of Wrangler you are using is now out-of-date",
+    "Please update to the latest version to prevent critical errors",
+    "Run `npm install --save-dev wrangler@4` to update to the latest version",
+    "After installation, run Wrangler with `npx wrangler`"
+  ];
+  const filteredStderr = start.buffer.stderr
+    .split("\n")
+    .filter(line => !ignoredLines.some(ignoredLine => line.includes(ignoredLine)))
+    .join("\n")
+    .trim();
+  expect(filteredStderr).toBe("");
 });
 
 async function workflow({ page, url }: { page: Page; url: string }) {

.tests/test.cloudflare.ts

@@ -27,7 +27,19 @@ test("build + start", async ({ page, $ }) => {
 
   const url = await matchLine(start.stdout, urlRegex.wrangler);
   await workflow({ page, url });
-  expect(start.buffer.stderr).toBe("");
+
+  const ignoredLines = [
+    "The version of Wrangler you are using is now out-of-date",
+    "Please update to the latest version to prevent critical errors",
+    "Run `npm install --save-dev wrangler@4` to update to the latest version",
+    "After installation, run Wrangler with `npx wrangler`"
+  ];
+  const filteredStderr = start.buffer.stderr
+    .split("\n")
+    .filter(line => !ignoredLines.some(ignoredLine => line.includes(ignoredLine)))
+    .join("\n")
+    .trim();
+  expect(filteredStderr).toBe("");
 });
 
 async function workflow({ page, url }: { page: Page; url: string }) {

cloudflare-d1/load-context.ts

@@ -1,5 +1,6 @@
 import { drizzle, type DrizzleD1Database } from "drizzle-orm/d1";
 import * as schema from "./database/schema";
+import type { ExecutionContext } from "@cloudflare/workers-types";
 import type { AppLoadContext } from "react-router";
 
 declare global {

cloudflare-d1/package.json

@@ -12,16 +12,17 @@
     "typecheck": "wrangler types && react-router typegen && tsc -b"
   },
   "dependencies": {
-    "@react-router/node": "*",
-    "@react-router/serve": "*",
+    "@react-router/node": "^7.3.0",
+    "@react-router/serve": "^7.3.0",
     "drizzle-orm": "~0.36.3",
     "isbot": "^5.1.17",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-router": "*"
+    "react-router": "^7.3.0"
   },
   "devDependencies": {
-    "@react-router/dev": "*",
+    "@cloudflare/workers-types": "^4.20250303.0",
+    "@react-router/dev": "^7.3.0",
     "@tailwindcss/vite": "^4.0.0",
     "@types/node": "^20",
     "@types/react": "^19.0.1",
@@ -32,6 +33,6 @@
     "typescript": "^5.7.2",
     "vite": "^5.4.11",
     "vite-tsconfig-paths": "^5.1.4",
-    "wrangler": "^4.0.0"
+    "wrangler": "^3.114.1"
   }
 }

cloudflare-d1/tsconfig.cloudflare.json

@@ -14,7 +14,7 @@
     "composite": true,
     "strict": true,
     "lib": ["DOM", "DOM.Iterable", "ES2022"],
-    "types": ["node", "vite/client"],
+    "types": ["@cloudflare/workers-types", "node", "vite/client"],
     "target": "ES2022",
     "module": "ES2022",
     "moduleResolution": "bundler",