Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

no react-router re-exports from node #11702

Merged
merged 1 commit into from
Jun 21, 2024
Merged

no react-router re-exports from node #11702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .changeset/nine-ravens-work.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion integration/abort-signal-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) {
Expand Down
2 changes: 1 addition & 1 deletion integration/action-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion integration/bug-report-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion integration/catch-boundary-data-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion integration/catch-boundary-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
16 changes: 8 additions & 8 deletions integration/client-data-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function getFiles({
}
`,
"app/routes/parent.tsx": js`
import { json } from '@react-router/node'
import { json } from "react-router"
import { Outlet, useLoaderData } from "react-router"
export function loader() {
return json({ message: 'Parent Server Loader'});
Expand Down Expand Up @@ -89,7 +89,7 @@ function getFiles({
}
`,
"app/routes/parent.child.tsx": js`
import { json } from '@react-router/node'
import { json } from "react-router"
import { Form, Outlet, useActionData, useLoaderData } from "react-router"
export function loader() {
return json({ message: 'Child Server Loader'});
Expand Down Expand Up @@ -318,7 +318,7 @@ test.describe("Client Data", () => {
}),
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { defer, json } from '@react-router/node'
import { defer, json } from "react-router"
import { Await, useLoaderData } from "react-router"
export function loader() {
return defer({
Expand Down Expand Up @@ -417,7 +417,7 @@ test.describe("Client Data", () => {
}),
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { json } from '@react-router/node';
import { json } from "react-router";
import { useLoaderData } from "react-router";
export function loader() {
return json({
Expand Down Expand Up @@ -600,7 +600,7 @@ test.describe("Client Data", () => {
}),
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { json } from '@react-router/node';
import { json } from "react-router";
import { useLoaderData, useRevalidator } from "react-router";
let isFirstCall = true;
export async function loader({ serverLoader }) {
Expand Down Expand Up @@ -665,7 +665,7 @@ test.describe("Client Data", () => {
}),
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { json } from '@react-router/node';
import { json } from "react-router";
import { useLoaderData, useRevalidator } from "react-router";
let isFirstCall = true;
export async function loader({ serverLoader }) {
Expand Down Expand Up @@ -1094,7 +1094,7 @@ test.describe("Client Data", () => {
}),
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { json } from '@react-router/node';
import { json } from "react-router";
import { Form, useRouteError } from "react-router";
export async function clientAction({ serverAction }) {
return await serverAction();
Expand Down Expand Up @@ -1311,7 +1311,7 @@ test.describe("Client Data", () => {
}),
"app/routes/parent.child.tsx": js`
import * as React from 'react';
import { json } from '@react-router/node';
import { json } from "react-router";
import { Form, useRouteError } from "react-router";
export async function clientAction({ serverAction }) {
return await serverAction();
Expand Down
4 changes: 2 additions & 2 deletions integration/defer-loader-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" } });
}
Expand All @@ -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({
Expand Down
32 changes: 16 additions & 16 deletions integration/defer-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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" } });
}
Expand Down Expand Up @@ -996,7 +996,7 @@ test.describe("aborted", () => {
files: {
"app/entry.server.tsx": js`
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 { isbot } from "isbot";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion integration/error-boundary-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>; }
`,
Expand Down
2 changes: 1 addition & 1 deletion integration/fetch-globals-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
12 changes: 6 additions & 6 deletions integration/fetcher-layout-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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");
Expand All @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions integration/fetcher-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}");
}
Expand Down Expand Up @@ -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 }) {
Expand Down
Loading
Loading