Message: {data.message};
+ },
+ loader() {
+ return { message: "hello" };
+ },
+ },
+ ]);
+
+ render({error.message}
+ }
+ `,
+ "app/routes/a.b.tsx": js`
+ import { Link, Outlet } from 'react-router'
+ export function loader() {
+ return { message: "DATA" };
+ }
+ export default function Component({ loaderData }) {
+ return (
+ <>
+ {error.message}
+ }
+ `,
+ "app/routes/a.b.c.d.tsx": js`
+ import { Outlet } from 'react-router'
+ export const unstable_middleware = [() => { throw new Error("broken!") }]
+ export const loader = () => null;
+ export default function Component() {
+ return Other
; + } + `, + "app/routes/fetch.tsx": js` + export async function loader() { + await new Promise((r) => setTimeout(r, 10000)); + return 'nope'; + } + `, + }, + }); + let appFixture = await createAppFixture(fixture); + let app = new PlaywrightFixture(appFixture, page); + + // Capture console logs and uncaught errors + let msgs: string[] = []; + page.on("console", (msg) => msgs.push(msg.text())); + page.on("pageerror", (error) => msgs.push(error.message)); + + await app.goto("/", true); + app.clickElement("#fetch"); + await app.clickSubmitButton("/?index"); + await page.waitForSelector("#other"); + expect(msgs).toEqual([]); + }); }); test.describe("prefetching", () => { diff --git a/integration/vite-presets-test.ts b/integration/vite-presets-test.ts index 6128229996..bc3b9cfab9 100644 --- a/integration/vite-presets-test.ts +++ b/integration/vite-presets-test.ts @@ -29,7 +29,7 @@ const files = { export default { // Ensure user config takes precedence over preset config appDirectory: "app", - + presets: [ // Ensure user config is passed to reactRouterConfig hook { @@ -221,6 +221,7 @@ test.describe("Vite / presets", async () => { "future", "prerender", "routes", + "routeDiscovery", "serverBuildFile", "serverBundles", "serverModuleFormat", diff --git a/packages/create-react-router/CHANGELOG.md b/packages/create-react-router/CHANGELOG.md index f60efec0a6..85040a474a 100644 --- a/packages/create-react-router/CHANGELOG.md +++ b/packages/create-react-router/CHANGELOG.md @@ -1,5 +1,9 @@ # `create-react-router` +## 7.6.0 + +_No changes_ + ## 7.5.3 _No changes_ diff --git a/packages/create-react-router/__tests__/github-mocks.ts b/packages/create-react-router/__tests__/github-mocks.ts index 607e2ded8a..7662317518 100644 --- a/packages/create-react-router/__tests__/github-mocks.ts +++ b/packages/create-react-router/__tests__/github-mocks.ts @@ -1,6 +1,6 @@ import fsp from "node:fs/promises"; import * as path from "node:path"; -import { rest } from "msw"; +import { http } from "msw"; import type { setupServer } from "msw/node"; import invariant from "tiny-invariant"; @@ -47,10 +47,8 @@ type GHContent = { encoding: "base64"; }; -type ResponseResolver = ParametersMessage: {data.message};
+ },
+ loader() {
+ return { message: "hello" };
+ },
+ },
+ ]);
+
+ render({JSON.stringify(useParams())};
+ }
+
+ describe("Does not bundle react-router causing duplicate context issues", () => {
+ it("with route provider shows the url params", async () => {
+ const router = createMemoryRouter(
+ [
+ {
+ path: "/blog/:slug",
+ element:
+ {"slug":"react-router"}
+
+ `);
+ });
+ });
+});
diff --git a/packages/react-router/__tests__/dom/scroll-restoration-test.tsx b/packages/react-router/__tests__/dom/scroll-restoration-test.tsx
index 8576f535e1..9686a49b25 100644
--- a/packages/react-router/__tests__/dom/scroll-restoration-test.tsx
+++ b/packages/react-router/__tests__/dom/scroll-restoration-test.tsx
@@ -11,10 +11,10 @@ import {
ScrollRestoration,
createBrowserRouter,
} from "../../index";
-import type { FrameworkContextObject } from "../../lib/dom/ssr/entry";
import { createMemoryRouter, redirect } from "react-router";
import { FrameworkContext, Scripts } from "../../lib/dom/ssr/components";
import "@testing-library/jest-dom/extend-expect";
+import { mockFrameworkContext } from "../utils/framework";
describe(`ScrollRestoration`, () => {
it("restores the scroll position for a page when re-visited", () => {
@@ -207,23 +207,7 @@ describe(`ScrollRestoration`, () => {
window.scrollTo = scrollTo;
});
- let context: FrameworkContextObject = {
- routeModules: { root: { default: () => null } },
- manifest: {
- routes: {
- root: {
- hasLoader: false,
- hasAction: false,
- hasErrorBoundary: false,
- id: "root",
- module: "root.js",
- },
- },
- entry: { imports: [], module: "" },
- url: "",
- version: "",
- },
- };
+ let context = mockFrameworkContext();
it("should render a