Skip to content

Commit 3c5c242

Browse files
ryanflorenceryanflorence
authored
no react-router re-exports from node (#11702)
1 parent 647338c commit 3c5c242

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

+164
-202
lines changed

‎.changeset/nine-ravens-work.md‎

Lines changed: 10 additions & 0 deletions
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

‎integration/abort-signal-test.ts‎

Lines changed: 1 addition & 1 deletion
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 }) {

‎integration/action-test.ts‎

Lines changed: 1 addition & 1 deletion
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() {

‎integration/bug-report-test.ts‎

Lines changed: 1 addition & 1 deletion
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() {

‎integration/catch-boundary-data-test.ts‎

Lines changed: 1 addition & 1 deletion
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,

‎integration/catch-boundary-test.ts‎

Lines changed: 1 addition & 1 deletion
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() {

‎integration/client-data-test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function getFiles({
4949
}
5050
`,
5151
"app/routes/parent.tsx": js`
52-
import { json } from '@react-router/node'
52+
import { json } from "react-router"
5353
import { Outlet, useLoaderData } from "react-router"
5454
export function loader() {
5555
return json({ message: 'Parent Server Loader'});
@@ -89,7 +89,7 @@ function getFiles({
8989
}
9090
`,
9191
"app/routes/parent.child.tsx": js`
92-
import { json } from '@react-router/node'
92+
import { json } from "react-router"
9393
import { Form, Outlet, useActionData, useLoaderData } from "react-router"
9494
export function loader() {
9595
return json({ message: 'Child Server Loader'});
@@ -318,7 +318,7 @@ test.describe("Client Data", () => {
318318
}),
319319
"app/routes/parent.child.tsx": js`
320320
import * as React from 'react';
321-
import { defer, json } from '@react-router/node'
321+
import { defer, json } from "react-router"
322322
import { Await, useLoaderData } from "react-router"
323323
export function loader() {
324324
return defer({
@@ -417,7 +417,7 @@ test.describe("Client Data", () => {
417417
}),
418418
"app/routes/parent.child.tsx": js`
419419
import * as React from 'react';
420-
import { json } from '@react-router/node';
420+
import { json } from "react-router";
421421
import { useLoaderData } from "react-router";
422422
export function loader() {
423423
return json({
@@ -600,7 +600,7 @@ test.describe("Client Data", () => {
600600
}),
601601
"app/routes/parent.child.tsx": js`
602602
import * as React from 'react';
603-
import { json } from '@react-router/node';
603+
import { json } from "react-router";
604604
import { useLoaderData, useRevalidator } from "react-router";
605605
let isFirstCall = true;
606606
export async function loader({ serverLoader }) {
@@ -665,7 +665,7 @@ test.describe("Client Data", () => {
665665
}),
666666
"app/routes/parent.child.tsx": js`
667667
import * as React from 'react';
668-
import { json } from '@react-router/node';
668+
import { json } from "react-router";
669669
import { useLoaderData, useRevalidator } from "react-router";
670670
let isFirstCall = true;
671671
export async function loader({ serverLoader }) {
@@ -1094,7 +1094,7 @@ test.describe("Client Data", () => {
10941094
}),
10951095
"app/routes/parent.child.tsx": js`
10961096
import * as React from 'react';
1097-
import { json } from '@react-router/node';
1097+
import { json } from "react-router";
10981098
import { Form, useRouteError } from "react-router";
10991099
export async function clientAction({ serverAction }) {
11001100
return await serverAction();
@@ -1311,7 +1311,7 @@ test.describe("Client Data", () => {
13111311
}),
13121312
"app/routes/parent.child.tsx": js`
13131313
import * as React from 'react';
1314-
import { json } from '@react-router/node';
1314+
import { json } from "react-router";
13151315
import { Form, useRouteError } from "react-router";
13161316
export async function clientAction({ serverAction }) {
13171317
return await serverAction();

‎integration/defer-loader-test.ts‎

Lines changed: 2 additions & 2 deletions
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({

‎integration/defer-test.ts‎

Lines changed: 16 additions & 16 deletions
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,7 +996,7 @@ 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";
999+
import type { AppLoadContext, EntryContext } from "react-router";
10001000
import { createReadableStreamFromReadable } from "@react-router/node";
10011001
import { ServerRouter } from "react-router";
10021002
import { isbot } from "isbot";
@@ -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

‎integration/error-boundary-test.ts‎

Lines changed: 1 addition & 1 deletion
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
`,

0 commit comments

Comments
 (0)