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

integration/abort-signal-test.ts

@@ -15,7 +15,7 @@ test.beforeAll(async () => {
   fixture = await createFixture({
     files: {
       "app/routes/_index.tsx": js`
-        import { json } from "@react-router/node";
+        import { json } from "react-router";
         import { useActionData, useLoaderData, Form } from "react-router";
 
         export async function action ({ request }) {

integration/action-test.ts

@@ -74,7 +74,7 @@ test.describe("actions", () => {
         `,
 
         [`app/routes/${THROWS_REDIRECT}.jsx`]: js`
-          import { redirect } from "@react-router/node";
+          import { redirect } from "react-router";
           import { Form } from "react-router";
 
           export function action() {

integration/bug-report-test.ts

@@ -59,7 +59,7 @@ test.beforeAll(async () => {
     ////////////////////////////////////////////////////////////////////////////
     files: {
       "app/routes/_index.tsx": js`
-        import { json } from "@react-router/node";
+        import { json } from "react-router";
         import { useLoaderData, Link } from "react-router";
 
         export function loader() {

integration/catch-boundary-data-test.ts

@@ -40,7 +40,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
     fixture = await createFixture({
       files: {
         "app/root.tsx": js`
-          import { json } from "@react-router/node";
+          import { json } from "react-router";
           import {
             Links,
             Meta,

integration/catch-boundary-test.ts

@@ -30,7 +30,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
     fixture = await createFixture({
       files: {
         "app/root.tsx": js`
-            import { json } from "@react-router/node";
+            import { json } from "react-router";
             import { Links, Meta, Outlet, Scripts, useMatches } from "react-router";
 
             export function loader() {

integration/defer-loader-test.ts

@@ -28,7 +28,7 @@ test.describe("deferred loaders", () => {
         `,
 
         "app/routes/redirect.tsx": js`
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           export function loader() {
             return defer({food: "pizza"}, { status: 301, headers: { Location: "/?redirected" } });
           }
@@ -37,7 +37,7 @@ test.describe("deferred loaders", () => {
 
         "app/routes/direct-promise-access.tsx": js`
           import * as React from "react";
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { useLoaderData, Link, Await } from "react-router";
           export function loader() {
             return defer({

integration/defer-test.ts

@@ -75,7 +75,7 @@ test.describe("non-aborted", () => {
           }
         `,
         "app/root.tsx": js`
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Links, Meta, Outlet, Scripts, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
           import Interactive from "~/components/interactive";
@@ -116,7 +116,7 @@ test.describe("non-aborted", () => {
         `,
 
         "app/routes/_index.tsx": js`
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Link, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
 
@@ -148,7 +148,7 @@ test.describe("non-aborted", () => {
 
         "app/routes/deferred-noscript-resolved.tsx": js`
           import { Suspense } from "react";
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Await, Link, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
 
@@ -183,7 +183,7 @@ test.describe("non-aborted", () => {
 
         "app/routes/deferred-noscript-unresolved.tsx": js`
           import { Suspense } from "react";
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Await, Link, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
 
@@ -222,7 +222,7 @@ test.describe("non-aborted", () => {
 
         "app/routes/deferred-script-resolved.tsx": js`
           import { Suspense } from "react";
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Await, Link, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
 
@@ -258,7 +258,7 @@ test.describe("non-aborted", () => {
 
         "app/routes/deferred-script-unresolved.tsx": js`
           import { Suspense } from "react";
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Await, Link, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
 
@@ -302,7 +302,7 @@ test.describe("non-aborted", () => {
 
         "app/routes/deferred-script-rejected.tsx": js`
           import { Suspense } from "react";
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Await, Link, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
 
@@ -343,7 +343,7 @@ test.describe("non-aborted", () => {
 
         "app/routes/deferred-script-unrejected.tsx": js`
           import { Suspense } from "react";
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Await, Link, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
 
@@ -409,7 +409,7 @@ test.describe("non-aborted", () => {
 
         "app/routes/deferred-script-rejected-no-error-element.tsx": js`
           import { Suspense } from "react";
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Await, Link, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
 
@@ -453,7 +453,7 @@ test.describe("non-aborted", () => {
 
         "app/routes/deferred-script-unrejected-no-error-element.tsx": js`
           import { Suspense } from "react";
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Await, Link, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
 
@@ -501,7 +501,7 @@ test.describe("non-aborted", () => {
 
         "app/routes/deferred-manual-resolve.tsx": js`
           import { Suspense } from "react";
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Await, Link, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
 
@@ -568,7 +568,7 @@ test.describe("non-aborted", () => {
         `,
 
         "app/routes/headers.tsx": js`
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           export function loader() {
             return defer({}, { headers: { "x-custom-header": "value from loader" } });
           }
@@ -996,8 +996,8 @@ test.describe("aborted", () => {
       files: {
         "app/entry.server.tsx": js`
           import { PassThrough } from "node:stream";
-          import type { AppLoadContext, EntryContext } from "@react-router/node";
-          import { createReadableStreamFromReadable } from "@react-router/node";
+          import type { AppLoadContext, EntryContext } from "react-router";
+          import { createReadableStreamFromReadable } from "react-router";
           import { ServerRouter } from "react-router";
           import { isbot } from "isbot";
           import { renderToPipeableStream } from "react-dom/server";
@@ -1142,7 +1142,7 @@ test.describe("aborted", () => {
           }
         `,
         "app/root.tsx": js`
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Links, Meta, Outlet, Scripts, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
           import Interactive from "~/components/interactive";
@@ -1184,7 +1184,7 @@ test.describe("aborted", () => {
 
         "app/routes/deferred-server-aborted.tsx": js`
           import { Suspense } from "react";
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Await, Link, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
 
@@ -1229,7 +1229,7 @@ test.describe("aborted", () => {
 
         "app/routes/deferred-server-aborted-no-error-element.tsx": js`
           import { Suspense } from "react";
-          import { defer } from "@react-router/node";
+          import { defer } from "react-router";
           import { Await, Link, useLoaderData } from "react-router";
           import Counter from "~/components/counter";
 

integration/error-boundary-test.ts

@@ -1291,7 +1291,7 @@ test("Allows back-button out of an error boundary after a hard reload", async ({
         `,
 
       "app/routes/boom.tsx": js`
-          import { json } from "@react-router/node";
+          import { json } from "react-router";
           export function loader() { return boom(); }
           export default function() { return <b>my page</b>; }
         `,

integration/error-sanitization-test.ts

@@ -493,7 +493,7 @@ test.describe("Error Sanitization", () => {
             "app/entry.server.tsx": js`
               import { PassThrough } from "node:stream";
 
-              import { createReadableStreamFromReadable } from "@react-router/node";
+              import { createReadableStreamFromReadable } from "react-router";
               import { ServerRouter, isRouteErrorResponse } from "react-router";
               import { renderToPipeableStream } from "react-dom/server";
 

integration/fetch-globals-test.ts

@@ -14,7 +14,7 @@ test.beforeAll(async () => {
   fixture = await createFixture({
     files: {
       "app/routes/_index.tsx": js`
-        import { json } from "@react-router/node";
+        import { json } from "react-router";
         import { useLoaderData } from "react-router";
         export async function loader() {
           const resp = await fetch('https://reqres.in/api/users?page=2');

integration/fetcher-layout-test.ts

@@ -15,7 +15,7 @@ test.beforeAll(async () => {
   fixture = await createFixture({
     files: {
       "app/routes/layout-action.tsx": js`
-        import { json } from "@react-router/node";
+        import { json } from "react-router";
         import { Outlet, useFetcher, useFormAction } from "react-router";
 
         export let action = ({ params }) => json("layout action data");
@@ -40,7 +40,7 @@ test.beforeAll(async () => {
       `,
 
       "app/routes/layout-action._index.tsx": js`
-        import { json } from "@react-router/node";
+        import { json } from "react-router";
         import {
           useFetcher,
           useFormAction,
@@ -71,7 +71,7 @@ test.beforeAll(async () => {
       `,
 
       "app/routes/layout-action.$param.tsx": js`
-        import { json } from "@react-router/node";
+        import { json } from "react-router";
         import {
           useFetcher,
           useFormAction,
@@ -102,7 +102,7 @@ test.beforeAll(async () => {
       `,
 
       "app/routes/layout-loader.tsx": js`
-        import { json } from "@react-router/node";
+        import { json } from "react-router";
         import { Outlet, useFetcher, useFormAction } from "react-router";
 
         export let loader = () => json("layout loader data");
@@ -127,7 +127,7 @@ test.beforeAll(async () => {
       `,
 
       "app/routes/layout-loader._index.tsx": js`
-        import { json } from "@react-router/node";
+        import { json } from "react-router";
         import {
           useFetcher,
           useFormAction,
@@ -154,7 +154,7 @@ test.beforeAll(async () => {
       `,
 
       "app/routes/layout-loader.$param.tsx": js`
-        import { json } from "@react-router/node";
+        import { json } from "react-router";
         import {
           useFetcher,
           useFormAction,

integration/fetcher-test.ts

@@ -23,7 +23,7 @@ test.describe("useFetcher", () => {
     fixture = await createFixture({
       files: {
         "app/routes/resource-route-action-only.ts": js`
-          import { json } from "@react-router/node";
+          import { json } from "react-router";
           export function action() {
             return new Response("${CHEESESTEAK}");
           }
@@ -149,7 +149,7 @@ test.describe("useFetcher", () => {
         `,
 
         "app/routes/fetcher-echo.tsx": js`
-          import { json } from "@react-router/node";
+          import { json } from "react-router";
           import { useFetcher } from "react-router";
 
           export async function action({ request }) {

integration/file-uploads-test.ts

@@ -23,8 +23,10 @@ test.describe("file-uploads", () => {
             import * as url from "node:url";
             import {
               unstable_composeUploadHandlers as composeUploadHandlers,
-              unstable_createFileUploadHandler as createFileUploadHandler,
               unstable_createMemoryUploadHandler as createMemoryUploadHandler,
+            } from "react-router";
+            import {
+              unstable_createFileUploadHandler as createFileUploadHandler,
             } from "@react-router/node";
 
             const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
@@ -44,7 +46,7 @@ test.describe("file-uploads", () => {
         "app/routes/file-upload.tsx": js`
             import {
               unstable_parseMultipartFormData as parseMultipartFormData,
-            } from "@react-router/node";
+            } from "react-router";
             import { Form, useActionData } from "react-router";
             import { uploadHandler } from "~/fileUploadHandler";
 

integration/form-data-test.ts

@@ -9,7 +9,7 @@ test.beforeAll(async () => {
   fixture = await createFixture({
     files: {
       "app/routes/_index.tsx": js`
-          import { json } from "@react-router/node";
+          import { json } from "react-router";
 
           export async function action({ request }) {
             try {

integration/form-test.ts

@@ -298,7 +298,7 @@ test.describe("Forms", () => {
           `,
 
         "app/routes/stop-propagation.tsx": js`
-            import { json } from "@react-router/node";
+            import { json } from "react-router";
             import { Form, useActionData } from "react-router";
 
             export async function action({ request }) {
@@ -321,7 +321,7 @@ test.describe("Forms", () => {
 
         "app/routes/form-method.tsx": js`
             import { Form, useActionData, useLoaderData, useSearchParams } from "react-router";
-            import { json } from "@react-router/node";
+            import { json } from "react-router";
 
             export function action({ request }) {
               return json(request.method)