no react-router re-exports from node

.changeset/nine-ravens-work.md

@@ -0,0 +1,10 @@
+---
+"react-router-dom": major
+"@react-router/express": major
+"react-router": major
+"@react-router/serve": major
+"@react-router/node": major
+"@react-router/dev": major
+---
+
+node package no longer re-exports from react-router

packages/remix-dev/__tests__/fixtures/node/app/routes/_index.tsx

@@ -1,4 +1,4 @@
-import type { MetaFunction } from "@react-router/node";
+import type { MetaFunction } from "react-router";
 
 export const meta: MetaFunction = () => {
   return [

packages/remix-dev/__tests__/fixtures/node/package.json

@@ -9,8 +9,8 @@
     "typecheck": "tsc"
   },
   "dependencies": {
+    "react-router": "*",
     "@react-router/node": "*",
-    "@react-router/react": "*",
     "@react-router/serve": "*",
     "isbot": "^4.1.0",
     "react": "^18.2.0",

packages/remix-dev/config/defaults/entry.server.node.tsx

@@ -1,6 +1,6 @@
 import { PassThrough } from "node:stream";
 
-import type { AppLoadContext, EntryContext } from "@react-router/node";
+import type { AppLoadContext, EntryContext } from "react-router";
 import { createReadableStreamFromReadable } from "@react-router/node";
 import { ServerRouter } from "react-router";
 import * as isbotModule from "isbot";

packages/remix-dev/vite/plugin.ts

@@ -1658,9 +1658,7 @@ async function getPrerenderBuildAndHandler(
     reactRouterConfig.serverBuildFile
   );
   let build = await import(url.pathToFileURL(serverBuildPath).toString());
-  let { createRequestHandler: createHandler } = await import(
-    "@react-router/node"
-  );
+  let { createRequestHandler: createHandler } = await import("react-router");
   return {
     build,
     handler: createHandler(build, viteConfig.mode),

packages/remix-express/__tests__/server-test.ts

@@ -1,8 +1,6 @@
 import { Readable } from "node:stream";
-import {
-  createReadableStreamFromReadable,
-  createRequestHandler as createRemixRequestHandler,
-} from "@react-router/node";
+import { createRequestHandler as createRemixRequestHandler } from "react-router";
+import { createReadableStreamFromReadable } from "@react-router/node";
 import express from "express";
 import { createRequest, createResponse } from "node-mocks-http";
 import supertest from "supertest";
@@ -15,8 +13,8 @@ import {
 
 // We don't want to test that the remix server works here (that's what the
 // playwright tests do), we just want to test the express adapter
-jest.mock("@react-router/node", () => {
-  let original = jest.requireActual("@react-router/node");
+jest.mock("react-router", () => {
+  let original = jest.requireActual("react-router");
   return {
     ...original,
     createRequestHandler: jest.fn(),

packages/remix-express/package.json

@@ -30,6 +30,7 @@
   },
   "peerDependencies": {
     "express": "^4.17.1",
+    "react-router": "workspace:*",
     "typescript": "^5.1.0"
   },
   "peerDependenciesMeta": {

packages/remix-express/server.ts

@@ -3,9 +3,9 @@
 /// <reference lib="DOM.Iterable" />
 
 import type * as express from "express";
-import type { AppLoadContext, ServerBuild } from "@react-router/node";
+import type { AppLoadContext, ServerBuild } from "react-router";
+import { createRequestHandler as createRemixRequestHandler } from "react-router";
 import {
-  createRequestHandler as createRemixRequestHandler,
   createReadableStreamFromReadable,
   writeReadableStreamToWritable,
 } from "@react-router/node";

packages/remix-node/index.ts

@@ -20,62 +20,3 @@ export {
   writeAsyncIterableToWritable,
   writeReadableStreamToWritable,
 } from "./stream";
-
-export {
-  createRequestHandler,
-  createSession,
-  defer,
-  isCookie,
-  isSession,
-  json,
-  MaxPartSizeExceededError,
-  redirect,
-  redirectDocument,
-  unstable_composeUploadHandlers,
-  unstable_createMemoryUploadHandler,
-  unstable_parseMultipartFormData,
-} from "react-router";
-
-export type {
-  ActionFunction,
-  ActionFunctionArgs,
-  AppLoadContext,
-  Cookie,
-  CookieOptions,
-  CookieParseOptions,
-  CookieSerializeOptions,
-  CookieSignatureOptions,
-  DataFunctionArgs,
-  EntryContext,
-  ErrorResponse,
-  HandleDataRequestFunction,
-  HandleDocumentRequestFunction,
-  HeadersArgs,
-  HeadersFunction,
-  HtmlLinkDescriptor,
-  JsonFunction,
-  LinkDescriptor,
-  LinksFunction,
-  LoaderFunction,
-  LoaderFunctionArgs,
-  MemoryUploadHandlerFilterArgs,
-  MemoryUploadHandlerOptions,
-  HandleErrorFunction,
-  PageLinkDescriptor,
-  RequestHandler,
-  ServerBuild,
-  ServerEntryModule,
-  MetaArgs,
-  MetaDescriptor,
-  MetaFunction,
-  Session,
-  SessionData,
-  SessionIdStorageStrategy,
-  SessionStorage,
-  SignFunction,
-  TypedDeferredData,
-  TypedResponse,
-  UnsignFunction,
-  UploadHandler,
-  UploadHandlerPart,
-} from "react-router";

packages/remix-serve/cli.ts

@@ -3,7 +3,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import url from "node:url";
-import type { ServerBuild } from "@react-router/node";
+import type { ServerBuild } from "react-router";
 import { installGlobals } from "@react-router/node";
 import { createRequestHandler } from "@react-router/express";
 import compression from "compression";

packages/remix-serve/package.json

@@ -26,6 +26,9 @@
     "morgan": "^1.10.0",
     "source-map-support": "^0.5.21"
   },
+  "peerDependencies": {
+    "react-router": "workspace:*"
+  },
   "devDependencies": {
     "@types/compression": "^1.7.0",
     "@types/express": "^4.17.9",