Skip to content

Commit 7c7a21d

Browse files
cloudflare-d1: Inline code and remove unused dependencies (#122)
* Move AppLoadContext definition to app.ts and remove load-context.ts * Remove unused dependencies * Clean up tsconfig.node.json include paths * Update pnpm-lock.yaml * Remove tailwind.config.ts references in other tsconfig files --------- Co-authored-by: Brooks Lybrand <[email protected]>
1 parent 812cb2c commit 7c7a21d

File tree

9 files changed

+24
-59
lines changed

9 files changed

+24
-59
lines changed

cloudflare-d1/load-context.ts

Lines changed: 0 additions & 32 deletions
This file was deleted.

cloudflare-d1/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
"typecheck": "npm run cf-typegen && react-router typegen && tsc -b"
1414
},
1515
"dependencies": {
16-
"@react-router/node": "^7.5.3",
17-
"@react-router/serve": "^7.5.3",
1816
"drizzle-orm": "~0.36.3",
1917
"isbot": "^5.1.27",
2018
"react": "^19.1.0",

cloudflare-d1/tsconfig.cloudflare.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"app/**/.client/**/*",
88
"database/**/*",
99
"workers/**/*",
10-
"load-context.ts",
1110
"worker-configuration.d.ts"
1211
],
1312
"compilerOptions": {

cloudflare-d1/tsconfig.node.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
{
22
"extends": "./tsconfig.json",
3-
"include": [
4-
"tailwind.config.ts",
5-
"vite.config.ts",
6-
"database/**/*",
7-
"load-context.ts",
8-
"worker-configuration.d.ts"
9-
],
3+
"include": ["vite.config.ts"],
104
"compilerOptions": {
115
"composite": true,
126
"strict": true,

cloudflare-d1/workers/app.ts

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,29 @@
1-
import { getLoadContext } from "load-context";
1+
import { drizzle, type DrizzleD1Database } from "drizzle-orm/d1";
22
import { createRequestHandler } from "react-router";
3+
import * as schema from "../database/schema";
4+
5+
declare module "react-router" {
6+
export interface AppLoadContext {
7+
cloudflare: {
8+
env: Env;
9+
ctx: ExecutionContext;
10+
};
11+
db: DrizzleD1Database<typeof schema>;
12+
}
13+
}
314

415
const requestHandler = createRequestHandler(
516
() => import("virtual:react-router/server-build"),
6-
import.meta.env.MODE,
17+
import.meta.env.MODE
718
);
819

920
export default {
10-
fetch(request, env, ctx) {
11-
const loadContext = getLoadContext({
12-
request,
13-
context: { cloudflare: { env, ctx } },
21+
async fetch(request, env, ctx) {
22+
const db = drizzle(env.DB, { schema });
23+
24+
return requestHandler(request, {
25+
cloudflare: { env, ctx },
26+
db,
1427
});
15-
return requestHandler(request, loadContext);
1628
},
17-
} satisfies ExportedHandler<CloudflareEnvironment>;
29+
} satisfies ExportedHandler<Env>;

cloudflare/tsconfig.node.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": "./tsconfig.json",
3-
"include": ["tailwind.config.ts", "vite.config.ts"],
3+
"include": ["vite.config.ts"],
44
"compilerOptions": {
55
"composite": true,
66
"strict": true,

node-custom-server/tsconfig.node.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": "./tsconfig.json",
3-
"include": ["server.js", "tailwind.config.ts", "vite.config.ts"],
3+
"include": ["server.js", "vite.config.ts"],
44
"compilerOptions": {
55
"composite": true,
66
"strict": true,

node-postgres/tsconfig.node.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": "./tsconfig.json",
3-
"include": ["server.js", "tailwind.config.ts", "vite.config.ts"],
3+
"include": ["server.js", "vite.config.ts"],
44
"compilerOptions": {
55
"composite": true,
66
"strict": true,

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)