Skip to content

Commit 9312705

Browse files
committed
More e2e updates
1 parent bb77148 commit 9312705

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

integration/client-data-test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,13 +318,13 @@ 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"
321+
import { json } from "react-router"
322322
import { Await, useLoaderData } from "react-router"
323323
export function loader() {
324-
return defer({
324+
return {
325325
message: 'Child Server Loader',
326326
lazy: new Promise(r => setTimeout(() => r("Child Deferred Data"), 1000)),
327-
});
327+
};
328328
}
329329
export async function clientLoader({ serverLoader }) {
330330
let data = await serverLoader();

integration/error-sanitization-test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ const routeFiles = {
7979

8080
"app/routes/defer.tsx": js`
8181
import * as React from 'react';
82-
import { defer, Await, useAsyncError, useLoaderData, useRouteError } from "react-router";
82+
import { Await, useAsyncError, useLoaderData, useRouteError } from "react-router";
8383
8484
export function loader({ request }) {
8585
if (new URL(request.url).searchParams.has('loader')) {
86-
return defer({
86+
return {
8787
lazy: Promise.reject(new Error("REJECTED")),
88-
})
88+
};
8989
}
90-
return defer({
90+
return {
9191
lazy: Promise.resolve("RESOLVED"),
92-
})
92+
};
9393
}
9494
9595
export default function Component() {

integration/vite-dev-test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,13 @@ test.describe("Vite dev", () => {
5757
`,
5858
"app/routes/_index.tsx": js`
5959
import { Suspense } from "react";
60-
import { defer } from "react-router";
6160
import { Await, useLoaderData } from "react-router";
6261
6362
export function loader() {
6463
let deferred = new Promise((resolve) => {
6564
setTimeout(() => resolve(true), 1000)
6665
});
67-
return defer({ deferred });
66+
return { deferred };
6867
}
6968
7069
export default function IndexRoute() {

packages/react-router/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@ export {
355355
} from "./lib/server-runtime/formData";
356356
// TODO: (v7) Clean up code paths for these exports
357357
// export {
358-
// defer,
359358
// json,
360359
// redirect,
361360
// redirectDocument,

0 commit comments

Comments
 (0)