chore: import from server-runtime/router

Signed-off-by: Logan McAnsh <logan@mcan.sh>
remix-run · Nov 8, 2022 · 043833b · 043833b
1 parent 7b892ae
commit 043833b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/remix-server-runtime/index.ts b/packages/remix-server-runtime/index.ts
@@ -74,3 +74,6 @@ export type {
   UploadHandlerPart,
   UploadHandler,
 } from "./reexport";
+
+export type { MemoryHistory } from "./router";
+export { createMemoryHistory } from "./router";
diff --git a/packages/remix-testing/create-remix-stub.tsx b/packages/remix-testing/create-remix-stub.tsx
@@ -3,7 +3,6 @@ import {
   unstable_createStaticHandler as createStaticHandler,
   matchRoutes,
 } from "@remix-run/router";
-import { createMemoryHistory } from "history";
 import { RemixEntry } from "@remix-run/react";
 import type {
   AssetsManifest,
@@ -15,13 +14,13 @@ import type {
   RouteModules,
   ShouldReloadFunction,
 } from "@remix-run/react";
-import type { MemoryHistory, Update } from "history";
 import type {
   ErrorBoundaryComponent,
   LinksFunction,
   MetaFunction,
+  MemoryHistory,
 } from "@remix-run/server-runtime";
-import { json } from "@remix-run/server-runtime";
+import { json, createMemoryHistory } from "@remix-run/server-runtime";
 import type {
   InitialEntry,
   StaticHandler,
@@ -30,6 +29,7 @@ import type {
   Location,
 } from "@remix-run/router";
 import type { AgnosticRouteMatch } from "@remix-run/router/dist/utils";
+import type { Update } from "@remix-run/router/dist/history";
 
 /**
  * Base RouteObject with common props shared by all types of mock routes

diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
@@ -19,7 +19,6 @@
     "@remix-run/react": "1.7.4",
     "@remix-run/router": "1.0.3",
     "@remix-run/server-runtime": "1.7.4",
-    "history": "^5.3.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },