use vercel preset (#82)

* use vercel preset * fixup pnpm-lock.yaml and remove package-lock.json * Fix test * cleanup dependencies --------- Co-authored-by: Brooks Lybrand <[email protected]>
remix-run · Feb 7, 2025 · 4c84712 · 4c84712
1 parent 4c029a7
commit 4c84712
Show file tree

Hide file tree

Showing 12 changed files with 328 additions and 177 deletions.
diff --git a/.tests/test.vercel.ts b/.tests/test.vercel.ts
@@ -18,7 +18,7 @@ test("dev", async ({ page, $ }) => {
   const port = await getPort();
   const dev = $(`pnpm dev`, { env: { PORT: String(port) } });
 
-  const url = await matchLine(dev.stdout, urlRegex.custom);
+  const url = await matchLine(dev.stdout, urlRegex.viteDev);
   await workflow({ page, url });
   expect(withoutHmrPortError(dev.buffer.stderr)).toBe("");
 });

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/vercel/app/routes/home.tsx b/vercel/app/routes/home.tsx
@@ -9,7 +9,7 @@ export function meta({}: Route.MetaArgs) {
 }
 
 export function loader({ context }: Route.LoaderArgs) {
-  return { message: context.VALUE_FROM_VERCEL };
+  return { message: "Hello from Vercel" };
 }
 
 export default function Home({ loaderData }: Route.ComponentProps) {

diff --git a/vercel/dev-server.js b/vercel/dev-server.js
diff --git a/vercel/package.json b/vercel/package.json
@@ -2,28 +2,26 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "react-router build && node vercel/prepare.js",
-    "dev": "cross-env NODE_ENV=development node ./dev-server.js",
+    "build": "react-router build",
+    "dev": "react-router dev",
+    "start": "react-router-serve ./build/server/index.js",
     "typecheck": "react-router typegen && tsc"
   },
   "dependencies": {
-    "@react-router/express": "*",
-    "@react-router/node": "*",
-    "@vercel/node": "^3.2.25",
-    "express": "^4.21.1",
+    "@react-router/node": "^7.1.5",
     "isbot": "^5.1.17",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-router": "*"
+    "react-router": "^7.1.5"
   },
   "devDependencies": {
-    "@react-router/dev": "*",
+    "@react-router/dev": "^7.1.5",
     "@tailwindcss/vite": "^4.0.0",
-    "@types/express": "^5.0.0",
     "@types/node": "^20",
     "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.1",
-    "cross-env": "^7.0.3",
+    "@vercel/node": "^5.1.2",
+    "@vercel/react-router": "^1.0.2",
     "tailwindcss": "^4.0.0",
     "typescript": "^5.7.2",
     "vite": "^5.4.11",

diff --git a/vercel/react-router.config.ts b/vercel/react-router.config.ts
@@ -1,7 +1,9 @@
 import type { Config } from "@react-router/dev/config";
+import { vercelPreset } from "@vercel/react-router/vite";
 
 export default {
   // Config options...
   // Server-side render by default, to enable SPA mode set this to `false`
   ssr: true,
+  presets: [vercelPreset()],
 } satisfies Config;
diff --git a/vercel/server/app.ts b/vercel/server/app.ts
diff --git a/vercel/vercel/output/config.json b/vercel/vercel/output/config.json
diff --git a/vercel/vercel/output/functions/index.func/.vc-config.json b/vercel/vercel/output/functions/index.func/.vc-config.json
diff --git a/vercel/vercel/output/functions/index.func/package.json b/vercel/vercel/output/functions/index.func/package.json
diff --git a/vercel/vercel/prepare.js b/vercel/vercel/prepare.js
diff --git a/vercel/vite.config.ts b/vercel/vite.config.ts
@@ -3,14 +3,7 @@ import tailwindcss from "@tailwindcss/vite";
 import { defineConfig } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
 
-export default defineConfig(({ isSsrBuild, command }) => ({
-  build: {
-    rollupOptions: isSsrBuild
-      ? {
-          input: "./server/app.ts",
-        }
-      : undefined,
-  },
+export default defineConfig(({ command }) => ({
   ssr: {
     noExternal: command === "build" ? true : undefined,
   },