From d61a333224ff167ef28771ebe156cba065fa64ca Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Fri, 18 Mar 2022 08:29:32 -0500
Subject: [PATCH] refactor(@remix-run/vercel): use `@remix-run/node` instead of
 `@remix-run/server-runtime`

---
 packages/remix-vercel/__tests__/server-test.ts | 8 +++++---
 packages/remix-vercel/package.json             | 7 +++----
 packages/remix-vercel/server.ts                | 4 +---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/remix-vercel/__tests__/server-test.ts b/packages/remix-vercel/__tests__/server-test.ts
index 42b94b91892..38646d5ab80 100644
--- a/packages/remix-vercel/__tests__/server-test.ts
+++ b/packages/remix-vercel/__tests__/server-test.ts
@@ -1,9 +1,11 @@
 import supertest from "supertest";
-import { createRequestHandler as createRemixRequestHandler } from "@remix-run/server-runtime";
 import { createRequest } from "node-mocks-http";
 import { createServerWithHelpers } from "@vercel/node/dist/helpers";
 import type { VercelRequest } from "@vercel/node";
-import { Response as NodeResponse } from "@remix-run/node";
+import {
+  createRequestHandler as createRemixRequestHandler,
+  Response as NodeResponse,
+} from "@remix-run/node";
 import { Readable } from "stream";
 
 import {
@@ -14,7 +16,7 @@ import {
 
 // We don't want to test that the remix server works here (that's what the
 // puppetteer tests do), we just want to test the vercel adapter
-jest.mock("@remix-run/server-runtime");
+jest.mock("@remix-run/node");
 let mockedCreateRequestHandler =
   createRemixRequestHandler as jest.MockedFunction<
     typeof createRemixRequestHandler
diff --git a/packages/remix-vercel/package.json b/packages/remix-vercel/package.json
index 1c8101aedf4..376ced0d535 100644
--- a/packages/remix-vercel/package.json
+++ b/packages/remix-vercel/package.json
@@ -12,8 +12,7 @@
     "url": "https://github.com/remix-run/remix/issues"
   },
   "dependencies": {
-    "@remix-run/node": "1.3.1",
-    "@remix-run/server-runtime": "1.3.1"
+    "@remix-run/node": "1.3.1"
   },
   "peerDependencies": {
     "@vercel/node": "^1.8.3"
@@ -21,7 +20,7 @@
   "devDependencies": {
     "@types/supertest": "^2.0.10",
     "@vercel/node": "^1.8.3",
-    "supertest": "^6.1.5",
-    "node-mocks-http": "^1.10.1"
+    "node-mocks-http": "^1.10.1",
+    "supertest": "^6.1.5"
   }
 }
diff --git a/packages/remix-vercel/server.ts b/packages/remix-vercel/server.ts
index 568707b3c36..5cf5d5826b1 100644
--- a/packages/remix-vercel/server.ts
+++ b/packages/remix-vercel/server.ts
@@ -3,15 +3,13 @@ import type {
   AppLoadContext,
   ServerBuild,
   ServerPlatform,
-} from "@remix-run/server-runtime";
-import { createRequestHandler as createRemixRequestHandler } from "@remix-run/server-runtime";
-import type {
   RequestInit as NodeRequestInit,
   Response as NodeResponse,
 } from "@remix-run/node";
 import {
   // This has been added as a global in node 15+
   AbortController,
+  createRequestHandler as createRemixRequestHandler,
   Headers as NodeHeaders,
   Request as NodeRequest,
 } from "@remix-run/node";