From 81bea3f790af6befc1f3b9f5d3543ff4714e5560 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Fri, 2 Dec 2022 18:36:17 -0500
Subject: [PATCH] fix(remix-testing): fix deps (#4757)

* Fix deps for new remix-testing package

* fix lint
---
 packages/remix-server-runtime/index.ts       | 18 ------------------
 packages/remix-testing/create-remix-stub.tsx | 13 +++++++++----
 packages/remix-testing/package.json          |  1 +
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/packages/remix-server-runtime/index.ts b/packages/remix-server-runtime/index.ts
index b3bc9206e30..ab11dc4f6f8 100644
--- a/packages/remix-server-runtime/index.ts
+++ b/packages/remix-server-runtime/index.ts
@@ -74,21 +74,3 @@ export type {
   UploadHandler,
   UploadHandlerPart,
 } from "./reexport";
-
-export type {
-  AgnosticDataRouteObject,
-  AgnosticIndexRouteObject,
-  AgnosticNonIndexRouteObject,
-  AgnosticRouteObject,
-  InitialEntry,
-  Location,
-  MemoryHistory,
-  StaticHandler,
-} from "./router";
-export {
-  createMemoryHistory,
-  matchRoutes,
-  unstable_createStaticHandler,
-} from "./router";
-export type { Update } from "./router/history";
-export type { AgnosticRouteMatch } from "./router/utils";
diff --git a/packages/remix-testing/create-remix-stub.tsx b/packages/remix-testing/create-remix-stub.tsx
index cd65ff9e22b..7a99d26d59f 100644
--- a/packages/remix-testing/create-remix-stub.tsx
+++ b/packages/remix-testing/create-remix-stub.tsx
@@ -9,6 +9,7 @@ import type {
 } from "@remix-run/react";
 import { RemixEntry } from "@remix-run/react";
 import type {
+  Action,
   AgnosticDataRouteObject,
   AgnosticIndexRouteObject,
   AgnosticNonIndexRouteObject,
@@ -17,14 +18,18 @@ import type {
   Location,
   MemoryHistory,
   StaticHandler,
-  Update,
-} from "@remix-run/server-runtime";
+} from "@remix-run/router";
 import {
   createMemoryHistory,
-  json,
   matchRoutes,
   unstable_createStaticHandler as createStaticHandler,
-} from "@remix-run/server-runtime";
+} from "@remix-run/router";
+import { json } from "@remix-run/server-runtime";
+
+type Update = {
+  action: Action;
+  location: Location;
+};
 
 type RemixStubOptions = {
   /**
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index 09db357bf00..215e6f18606 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -18,6 +18,7 @@
   "dependencies": {
     "@remix-run/node": "1.8.0",
     "@remix-run/react": "1.8.0",
+    "@remix-run/router": "1.0.4",
     "@remix-run/server-runtime": "1.8.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"