Skip to content
This repository was archived by the owner on Feb 23, 2025. It is now read-only.

chore: replace deprecated vercel entrypoint #337

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions app/misc/vercel-entrypoint.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import type { IncomingMessage, ServerResponse } from "node:http";
import { tinyassert, typedBoolean } from "@hiogawa/utils";
import * as build from "@remix-run/dev/server-build";
import { createRequestHandler } from "@remix-run/express";

// borrow "@remix-run/express" adapter for vercel serverless deployment
// since "@remix-run/vercel" is going to deprecate (https://github.com/remix-run/remix/pull/5964)
// in favor of vercel's official integration (https://github.com/vercel/vercel/blob/da046d85de8121e6c851af8e51aff81984646e0b/packages/remix/defaults/server-node.mjs)

const handleRequest = createRequestHandler({ build });

export default async function vercelEntrypoint(
req: IncomingMessage,
res: ServerResponse
): Promise<void> {
// a few patches to fake express style Request/Response
// https://github.com/remix-run/remix/blob/71e94aa8a84cd9b63669dc9d826cbcbb0d2195a1/packages/remix-express/server.ts
// https://github.com/remix-run/remix/blob/71e94aa8a84cd9b63669dc9d826cbcbb0d2195a1/packages/remix-vercel/server.ts

const req2 = req as any;
const res2 = res as any;

req2.get = (arg: unknown) => {
tinyassert(arg === "host");
return req.headers["x-forwarded-host"] || req.headers["host"];
};

req2.protocol = req.headers["x-forwarded-proto"] || "https";

res2.status = (arg: unknown) => {
tinyassert(typeof arg === "number");
res.statusCode = arg;
};

res2.append = (k: unknown, v: unknown) => {
tinyassert(typeof k === "string");
tinyassert(typeof v === "string");
const vs = [res.getHeader(k), v].flat().filter(typedBoolean).map(String);
res.setHeader(k, vs);
};

let error: unknown;
await handleRequest(req2, res2, (e) => (error = e));
if (error) {
throw error;
}
}
6 changes: 0 additions & 6 deletions app/misc/vercel.ts

This file was deleted.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,16 @@
"@hiogawa/utils": "1.4.2-pre.9",
"@hiogawa/utils-react": "1.2.1-pre.4",
"@js-temporal/polyfill": "^0.4.3",
"@remix-run/express": "1.15.0",
"@remix-run/node": "1.15.0",
"@remix-run/react": "1.15.0",
"@remix-run/server-runtime": "1.15.0",
"@remix-run/v1-route-convention": "^0.1.1",
"@remix-run/vercel": "1.15.0",
"@tanstack/react-query": "^4.28.0",
"@tanstack/react-query-devtools": "^4.28.0",
"@tanstack/react-virtual": "3.0.0-beta.54",
"@trpc/client": "^10.19.1",
"@trpc/server": "^10.19.1",
"@vercel/node": "^1.15.3",
"bcryptjs": "^2.4.3",
"drizzle-orm": "^0.22.0",
"echarts": "^5.4.1",
Expand All @@ -82,6 +81,7 @@
"@remix-run/serve": "1.15.0",
"@tsconfig/strictest": "^1.0.2",
"@types/bcryptjs": "^2.4.2",
"@types/express": "^4.17.17",
"@types/fs-extra": "^9.0.13",
"@types/node": "^16",
"@types/qs": "^6.9.7",
Expand Down
132 changes: 64 additions & 68 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion remix.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
serverBuildPath: `build/remix/${env}/server/index.js`,
assetsBuildDirectory: `build/remix/${env}/public/build`,
publicPath: process.env.BUILD_VERCEL ? undefined : `/build/remix/${env}/public/build`,
server: process.env.BUILD_VERCEL ? "./app/misc/vercel.ts" : undefined,
server: process.env.BUILD_VERCEL ? "./app/misc/vercel-entrypoint.ts" : undefined,
future: {
v2_meta: true,
v2_errorBoundary: true,
Expand Down