Skip to content

Commit 516deec

Browse files
Drop to Wrangler v3 in Cloudflare templates (#99)
1 parent 8ed9f3c commit 516deec

10 files changed

+341
-11503
lines changed

.tests/test.cloudflare-d1.ts

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,19 @@ test("dev", async ({ page, $ }) => {
1717

1818
const url = await matchLine(dev.stdout, urlRegex.viteDev);
1919
await workflow({ page, url });
20-
expect(dev.buffer.stderr).toBe("");
20+
21+
const ignoredLines = [
22+
"The version of Wrangler you are using is now out-of-date",
23+
"Please update to the latest version to prevent critical errors",
24+
"Run `npm install --save-dev wrangler@4` to update to the latest version",
25+
"After installation, run Wrangler with `npx wrangler`"
26+
];
27+
const filteredStderr = dev.buffer.stderr
28+
.split("\n")
29+
.filter(line => !ignoredLines.some(ignoredLine => line.includes(ignoredLine)))
30+
.join("\n")
31+
.trim();
32+
expect(filteredStderr).toBe("");
2133
});
2234

2335
test("build + start", async ({ page, $ }) => {
@@ -31,7 +43,19 @@ test("build + start", async ({ page, $ }) => {
3143

3244
const url = await matchLine(start.stdout, urlRegex.wrangler);
3345
await workflow({ page, url });
34-
expect(start.buffer.stderr).toBe("");
46+
47+
const ignoredLines = [
48+
"The version of Wrangler you are using is now out-of-date",
49+
"Please update to the latest version to prevent critical errors",
50+
"Run `npm install --save-dev wrangler@4` to update to the latest version",
51+
"After installation, run Wrangler with `npx wrangler`"
52+
];
53+
const filteredStderr = start.buffer.stderr
54+
.split("\n")
55+
.filter(line => !ignoredLines.some(ignoredLine => line.includes(ignoredLine)))
56+
.join("\n")
57+
.trim();
58+
expect(filteredStderr).toBe("");
3559
});
3660

3761
async function workflow({ page, url }: { page: Page; url: string }) {

.tests/test.cloudflare.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,19 @@ test("build + start", async ({ page, $ }) => {
2727

2828
const url = await matchLine(start.stdout, urlRegex.wrangler);
2929
await workflow({ page, url });
30-
expect(start.buffer.stderr).toBe("");
30+
31+
const ignoredLines = [
32+
"The version of Wrangler you are using is now out-of-date",
33+
"Please update to the latest version to prevent critical errors",
34+
"Run `npm install --save-dev wrangler@4` to update to the latest version",
35+
"After installation, run Wrangler with `npx wrangler`"
36+
];
37+
const filteredStderr = start.buffer.stderr
38+
.split("\n")
39+
.filter(line => !ignoredLines.some(ignoredLine => line.includes(ignoredLine)))
40+
.join("\n")
41+
.trim();
42+
expect(filteredStderr).toBe("");
3143
});
3244

3345
async function workflow({ page, url }: { page: Page; url: string }) {

cloudflare-d1/load-context.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { drizzle, type DrizzleD1Database } from "drizzle-orm/d1";
22
import * as schema from "./database/schema";
3+
import type { ExecutionContext } from "@cloudflare/workers-types";
34
import type { AppLoadContext } from "react-router";
45

56
declare global {

cloudflare-d1/package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@
1212
"typecheck": "wrangler types && react-router typegen && tsc -b"
1313
},
1414
"dependencies": {
15-
"@react-router/node": "*",
16-
"@react-router/serve": "*",
15+
"@react-router/node": "^7.3.0",
16+
"@react-router/serve": "^7.3.0",
1717
"drizzle-orm": "~0.36.3",
1818
"isbot": "^5.1.17",
1919
"react": "^19.0.0",
2020
"react-dom": "^19.0.0",
21-
"react-router": "*"
21+
"react-router": "^7.3.0"
2222
},
2323
"devDependencies": {
24-
"@react-router/dev": "*",
24+
"@cloudflare/workers-types": "^4.20250303.0",
25+
"@react-router/dev": "^7.3.0",
2526
"@tailwindcss/vite": "^4.0.0",
2627
"@types/node": "^20",
2728
"@types/react": "^19.0.1",
@@ -32,6 +33,6 @@
3233
"typescript": "^5.7.2",
3334
"vite": "^5.4.11",
3435
"vite-tsconfig-paths": "^5.1.4",
35-
"wrangler": "^4.0.0"
36+
"wrangler": "^3.114.1"
3637
}
3738
}

cloudflare-d1/tsconfig.cloudflare.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"composite": true,
1515
"strict": true,
1616
"lib": ["DOM", "DOM.Iterable", "ES2022"],
17-
"types": ["node", "vite/client"],
17+
"types": ["@cloudflare/workers-types", "node", "vite/client"],
1818
"target": "ES2022",
1919
"module": "ES2022",
2020
"moduleResolution": "bundler",

0 commit comments

Comments
 (0)