Skip to content

Commit 7c6aa33

Browse files
ryanflorenceryanflorence
committed
no react-router re-exports from node
1 parent 647338c commit 7c6aa33

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+148
-186
lines changed

Diff for: ‎.changeset/nine-ravens-work.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"react-router-dom": major
3+
"@react-router/express": major
4+
"react-router": major
5+
"@react-router/serve": major
6+
"@react-router/node": major
7+
"@react-router/dev": major
8+
---
9+
10+
node package no longer re-exports from react-router

Diff for: ‎integration/abort-signal-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test.beforeAll(async () => {
1515
fixture = await createFixture({
1616
files: {
1717
"app/routes/_index.tsx": js`
18-
import { json } from "@react-router/node";
18+
import { json } from "react-router";
1919
import { useActionData, useLoaderData, Form } from "react-router";
2020
2121
export async function action ({ request }) {

Diff for: ‎integration/action-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ test.describe("actions", () => {
7474
`,
7575

7676
[`app/routes/${THROWS_REDIRECT}.jsx`]: js`
77-
import { redirect } from "@react-router/node";
77+
import { redirect } from "react-router";
7878
import { Form } from "react-router";
7979
8080
export function action() {

Diff for: ‎integration/bug-report-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ test.beforeAll(async () => {
5959
////////////////////////////////////////////////////////////////////////////
6060
files: {
6161
"app/routes/_index.tsx": js`
62-
import { json } from "@react-router/node";
62+
import { json } from "react-router";
6363
import { useLoaderData, Link } from "react-router";
6464
6565
export function loader() {

Diff for: ‎integration/catch-boundary-data-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
4040
fixture = await createFixture({
4141
files: {
4242
"app/root.tsx": js`
43-
import { json } from "@react-router/node";
43+
import { json } from "react-router";
4444
import {
4545
Links,
4646
Meta,

Diff for: ‎integration/catch-boundary-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ test.describe("ErrorBoundary (thrown responses)", () => {
3030
fixture = await createFixture({
3131
files: {
3232
"app/root.tsx": js`
33-
import { json } from "@react-router/node";
33+
import { json } from "react-router";
3434
import { Links, Meta, Outlet, Scripts, useMatches } from "react-router";
3535
3636
export function loader() {

Diff for: ‎integration/defer-loader-test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ test.describe("deferred loaders", () => {
2828
`,
2929

3030
"app/routes/redirect.tsx": js`
31-
import { defer } from "@react-router/node";
31+
import { defer } from "react-router";
3232
export function loader() {
3333
return defer({food: "pizza"}, { status: 301, headers: { Location: "/?redirected" } });
3434
}
@@ -37,7 +37,7 @@ test.describe("deferred loaders", () => {
3737

3838
"app/routes/direct-promise-access.tsx": js`
3939
import * as React from "react";
40-
import { defer } from "@react-router/node";
40+
import { defer } from "react-router";
4141
import { useLoaderData, Link, Await } from "react-router";
4242
export function loader() {
4343
return defer({

Diff for: ‎integration/defer-test.ts

+17-17
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ test.describe("non-aborted", () => {
7575
}
7676
`,
7777
"app/root.tsx": js`
78-
import { defer } from "@react-router/node";
78+
import { defer } from "react-router";
7979
import { Links, Meta, Outlet, Scripts, useLoaderData } from "react-router";
8080
import Counter from "~/components/counter";
8181
import Interactive from "~/components/interactive";
@@ -116,7 +116,7 @@ test.describe("non-aborted", () => {
116116
`,
117117

118118
"app/routes/_index.tsx": js`
119-
import { defer } from "@react-router/node";
119+
import { defer } from "react-router";
120120
import { Link, useLoaderData } from "react-router";
121121
import Counter from "~/components/counter";
122122
@@ -148,7 +148,7 @@ test.describe("non-aborted", () => {
148148

149149
"app/routes/deferred-noscript-resolved.tsx": js`
150150
import { Suspense } from "react";
151-
import { defer } from "@react-router/node";
151+
import { defer } from "react-router";
152152
import { Await, Link, useLoaderData } from "react-router";
153153
import Counter from "~/components/counter";
154154
@@ -183,7 +183,7 @@ test.describe("non-aborted", () => {
183183

184184
"app/routes/deferred-noscript-unresolved.tsx": js`
185185
import { Suspense } from "react";
186-
import { defer } from "@react-router/node";
186+
import { defer } from "react-router";
187187
import { Await, Link, useLoaderData } from "react-router";
188188
import Counter from "~/components/counter";
189189
@@ -222,7 +222,7 @@ test.describe("non-aborted", () => {
222222

223223
"app/routes/deferred-script-resolved.tsx": js`
224224
import { Suspense } from "react";
225-
import { defer } from "@react-router/node";
225+
import { defer } from "react-router";
226226
import { Await, Link, useLoaderData } from "react-router";
227227
import Counter from "~/components/counter";
228228
@@ -258,7 +258,7 @@ test.describe("non-aborted", () => {
258258

259259
"app/routes/deferred-script-unresolved.tsx": js`
260260
import { Suspense } from "react";
261-
import { defer } from "@react-router/node";
261+
import { defer } from "react-router";
262262
import { Await, Link, useLoaderData } from "react-router";
263263
import Counter from "~/components/counter";
264264
@@ -302,7 +302,7 @@ test.describe("non-aborted", () => {
302302

303303
"app/routes/deferred-script-rejected.tsx": js`
304304
import { Suspense } from "react";
305-
import { defer } from "@react-router/node";
305+
import { defer } from "react-router";
306306
import { Await, Link, useLoaderData } from "react-router";
307307
import Counter from "~/components/counter";
308308
@@ -343,7 +343,7 @@ test.describe("non-aborted", () => {
343343

344344
"app/routes/deferred-script-unrejected.tsx": js`
345345
import { Suspense } from "react";
346-
import { defer } from "@react-router/node";
346+
import { defer } from "react-router";
347347
import { Await, Link, useLoaderData } from "react-router";
348348
import Counter from "~/components/counter";
349349
@@ -409,7 +409,7 @@ test.describe("non-aborted", () => {
409409

410410
"app/routes/deferred-script-rejected-no-error-element.tsx": js`
411411
import { Suspense } from "react";
412-
import { defer } from "@react-router/node";
412+
import { defer } from "react-router";
413413
import { Await, Link, useLoaderData } from "react-router";
414414
import Counter from "~/components/counter";
415415
@@ -453,7 +453,7 @@ test.describe("non-aborted", () => {
453453

454454
"app/routes/deferred-script-unrejected-no-error-element.tsx": js`
455455
import { Suspense } from "react";
456-
import { defer } from "@react-router/node";
456+
import { defer } from "react-router";
457457
import { Await, Link, useLoaderData } from "react-router";
458458
import Counter from "~/components/counter";
459459
@@ -501,7 +501,7 @@ test.describe("non-aborted", () => {
501501

502502
"app/routes/deferred-manual-resolve.tsx": js`
503503
import { Suspense } from "react";
504-
import { defer } from "@react-router/node";
504+
import { defer } from "react-router";
505505
import { Await, Link, useLoaderData } from "react-router";
506506
import Counter from "~/components/counter";
507507
@@ -568,7 +568,7 @@ test.describe("non-aborted", () => {
568568
`,
569569

570570
"app/routes/headers.tsx": js`
571-
import { defer } from "@react-router/node";
571+
import { defer } from "react-router";
572572
export function loader() {
573573
return defer({}, { headers: { "x-custom-header": "value from loader" } });
574574
}
@@ -996,8 +996,8 @@ test.describe("aborted", () => {
996996
files: {
997997
"app/entry.server.tsx": js`
998998
import { PassThrough } from "node:stream";
999-
import type { AppLoadContext, EntryContext } from "@react-router/node";
1000-
import { createReadableStreamFromReadable } from "@react-router/node";
999+
import type { AppLoadContext, EntryContext } from "react-router";
1000+
import { createReadableStreamFromReadable } from "react-router";
10011001
import { ServerRouter } from "react-router";
10021002
import { isbot } from "isbot";
10031003
import { renderToPipeableStream } from "react-dom/server";
@@ -1142,7 +1142,7 @@ test.describe("aborted", () => {
11421142
}
11431143
`,
11441144
"app/root.tsx": js`
1145-
import { defer } from "@react-router/node";
1145+
import { defer } from "react-router";
11461146
import { Links, Meta, Outlet, Scripts, useLoaderData } from "react-router";
11471147
import Counter from "~/components/counter";
11481148
import Interactive from "~/components/interactive";
@@ -1184,7 +1184,7 @@ test.describe("aborted", () => {
11841184

11851185
"app/routes/deferred-server-aborted.tsx": js`
11861186
import { Suspense } from "react";
1187-
import { defer } from "@react-router/node";
1187+
import { defer } from "react-router";
11881188
import { Await, Link, useLoaderData } from "react-router";
11891189
import Counter from "~/components/counter";
11901190
@@ -1229,7 +1229,7 @@ test.describe("aborted", () => {
12291229

12301230
"app/routes/deferred-server-aborted-no-error-element.tsx": js`
12311231
import { Suspense } from "react";
1232-
import { defer } from "@react-router/node";
1232+
import { defer } from "react-router";
12331233
import { Await, Link, useLoaderData } from "react-router";
12341234
import Counter from "~/components/counter";
12351235

Diff for: ‎integration/error-boundary-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1291,7 +1291,7 @@ test("Allows back-button out of an error boundary after a hard reload", async ({
12911291
`,
12921292

12931293
"app/routes/boom.tsx": js`
1294-
import { json } from "@react-router/node";
1294+
import { json } from "react-router";
12951295
export function loader() { return boom(); }
12961296
export default function() { return <b>my page</b>; }
12971297
`,

Diff for: ‎integration/error-sanitization-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ test.describe("Error Sanitization", () => {
493493
"app/entry.server.tsx": js`
494494
import { PassThrough } from "node:stream";
495495
496-
import { createReadableStreamFromReadable } from "@react-router/node";
496+
import { createReadableStreamFromReadable } from "react-router";
497497
import { ServerRouter, isRouteErrorResponse } from "react-router";
498498
import { renderToPipeableStream } from "react-dom/server";
499499

Diff for: ‎integration/fetch-globals-test.ts

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

Diff for: ‎integration/fetcher-layout-test.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test.beforeAll(async () => {
1515
fixture = await createFixture({
1616
files: {
1717
"app/routes/layout-action.tsx": js`
18-
import { json } from "@react-router/node";
18+
import { json } from "react-router";
1919
import { Outlet, useFetcher, useFormAction } from "react-router";
2020
2121
export let action = ({ params }) => json("layout action data");
@@ -40,7 +40,7 @@ test.beforeAll(async () => {
4040
`,
4141

4242
"app/routes/layout-action._index.tsx": js`
43-
import { json } from "@react-router/node";
43+
import { json } from "react-router";
4444
import {
4545
useFetcher,
4646
useFormAction,
@@ -71,7 +71,7 @@ test.beforeAll(async () => {
7171
`,
7272

7373
"app/routes/layout-action.$param.tsx": js`
74-
import { json } from "@react-router/node";
74+
import { json } from "react-router";
7575
import {
7676
useFetcher,
7777
useFormAction,
@@ -102,7 +102,7 @@ test.beforeAll(async () => {
102102
`,
103103

104104
"app/routes/layout-loader.tsx": js`
105-
import { json } from "@react-router/node";
105+
import { json } from "react-router";
106106
import { Outlet, useFetcher, useFormAction } from "react-router";
107107
108108
export let loader = () => json("layout loader data");
@@ -127,7 +127,7 @@ test.beforeAll(async () => {
127127
`,
128128

129129
"app/routes/layout-loader._index.tsx": js`
130-
import { json } from "@react-router/node";
130+
import { json } from "react-router";
131131
import {
132132
useFetcher,
133133
useFormAction,
@@ -154,7 +154,7 @@ test.beforeAll(async () => {
154154
`,
155155

156156
"app/routes/layout-loader.$param.tsx": js`
157-
import { json } from "@react-router/node";
157+
import { json } from "react-router";
158158
import {
159159
useFetcher,
160160
useFormAction,

Diff for: ‎integration/fetcher-test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ test.describe("useFetcher", () => {
2323
fixture = await createFixture({
2424
files: {
2525
"app/routes/resource-route-action-only.ts": js`
26-
import { json } from "@react-router/node";
26+
import { json } from "react-router";
2727
export function action() {
2828
return new Response("${CHEESESTEAK}");
2929
}
@@ -149,7 +149,7 @@ test.describe("useFetcher", () => {
149149
`,
150150

151151
"app/routes/fetcher-echo.tsx": js`
152-
import { json } from "@react-router/node";
152+
import { json } from "react-router";
153153
import { useFetcher } from "react-router";
154154
155155
export async function action({ request }) {

Diff for: ‎integration/file-uploads-test.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ test.describe("file-uploads", () => {
2323
import * as url from "node:url";
2424
import {
2525
unstable_composeUploadHandlers as composeUploadHandlers,
26-
unstable_createFileUploadHandler as createFileUploadHandler,
2726
unstable_createMemoryUploadHandler as createMemoryUploadHandler,
27+
} from "react-router";
28+
import {
29+
unstable_createFileUploadHandler as createFileUploadHandler,
2830
} from "@react-router/node";
2931
3032
const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
@@ -44,7 +46,7 @@ test.describe("file-uploads", () => {
4446
"app/routes/file-upload.tsx": js`
4547
import {
4648
unstable_parseMultipartFormData as parseMultipartFormData,
47-
} from "@react-router/node";
49+
} from "react-router";
4850
import { Form, useActionData } from "react-router";
4951
import { uploadHandler } from "~/fileUploadHandler";
5052

Diff for: ‎integration/form-data-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test.beforeAll(async () => {
99
fixture = await createFixture({
1010
files: {
1111
"app/routes/_index.tsx": js`
12-
import { json } from "@react-router/node";
12+
import { json } from "react-router";
1313
1414
export async function action({ request }) {
1515
try {

Diff for: ‎integration/form-test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ test.describe("Forms", () => {
298298
`,
299299

300300
"app/routes/stop-propagation.tsx": js`
301-
import { json } from "@react-router/node";
301+
import { json } from "react-router";
302302
import { Form, useActionData } from "react-router";
303303
304304
export async function action({ request }) {
@@ -321,7 +321,7 @@ test.describe("Forms", () => {
321321

322322
"app/routes/form-method.tsx": js`
323323
import { Form, useActionData, useLoaderData, useSearchParams } from "react-router";
324-
import { json } from "@react-router/node";
324+
import { json } from "react-router";
325325
326326
export function action({ request }) {
327327
return json(request.method)

0 commit comments

Comments
 (0)