Skip to content

Commit

Permalink
Use @mjackson/node-fetch-server for viteDevServer
Browse files Browse the repository at this point in the history
  • Loading branch information
acusti committed Feb 7, 2025
1 parent 27900ea commit 1314eda
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 141 deletions.
6 changes: 3 additions & 3 deletions packages/superflare-remix/dev.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { createRequest, sendResponse } from "@mjackson/node-fetch-server";
import { cloudflareDevProxy } from "@react-router/dev/vite/cloudflare";
import { createRequestHandler, type ServerBuild } from "react-router";
import { type Plugin, type ViteDevServer } from "vite";
import { type GetPlatformProxyOptions } from "wrangler";
import { type Cloudflare, getLoadContext } from "./load-context";
import { fromNodeRequest, toNodeRequest } from "./node-adapter";

/**
* This is copied from the workers-sdk repo (used for wrangler’s getPlatformProxy).
Expand Down Expand Up @@ -59,7 +59,7 @@ export function superflareDevProxyVitePlugin<Env extends { APP_KEY: string }>(
)) as ServerBuild;

const handler = createRequestHandler(build, "development");
const request = fromNodeRequest(nodeReq, nodeRes);
const request = createRequest(nodeReq, nodeRes);
const loadContext = await getLoadContext<Env>({
context,
request,
Expand All @@ -80,7 +80,7 @@ export function superflareDevProxyVitePlugin<Env extends { APP_KEY: string }>(
await loadContext.getSessionCookie()
);
}
await toNodeRequest(response, nodeRes);
await sendResponse(nodeRes, response);
} catch (error) {
next(error);
}
Expand Down
106 changes: 0 additions & 106 deletions packages/superflare-remix/node-adapter.ts

This file was deleted.

5 changes: 1 addition & 4 deletions packages/superflare-remix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
"devDependencies": {
"@cloudflare/workers-types": "^4.20250109.0",
"@react-router/dev": "^7",
"@react-router/node": "^7",
"@types/set-cookie-parser": "^2.4.10",
"react-router": "^7",
"tsconfig": "workspace:*",
"tsup": "^8.3.5",
Expand All @@ -50,12 +48,11 @@
},
"peerDependencies": {
"@react-router/dev": "^7",
"@react-router/node": "^7",
"react-router": "^7",
"wrangler": "^3.91.0"
},
"dependencies": {
"set-cookie-parser": "^2.7.1",
"@mjackson/node-fetch-server": "^0.6.1",
"superflare": "workspace:*"
}
}
52 changes: 24 additions & 28 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1314eda

Please sign in to comment.