Skip to content

Commit 2c5d54d

Browse files
authored
Skip resource route flow in dev mode when SPA mode is enabled (#13113)
* Skip resource route flow in dev mode when SPA mode is enabled * Update tests to include proper ssr value on mocked builds
1 parent 77b730c commit 2c5d54d

File tree

5 files changed

+9
-0
lines changed

5 files changed

+9
-0
lines changed

.changeset/cool-pillows-sing.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
Skip resource route flow in dev server in SPA mode

packages/react-router/__tests__/server-runtime/handler-test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { createRequestHandler } from "../../lib/server-runtime/server";
33
describe("createRequestHandler", () => {
44
it("retains request headers when stripping body off for loaders", async () => {
55
let handler = createRequestHandler({
6+
ssr: true,
67
routes: {
78
root: {
89
id: "routes/test",

packages/react-router/__tests__/server-runtime/server-test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ function spyConsole() {
2727
describe.skip("server", () => {
2828
let routeId = "root";
2929
let build: ServerBuild = {
30+
ssr: true,
3031
entry: {
3132
module: {
3233
default: async (request) => {

packages/react-router/__tests__/server-runtime/utils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export function mockServerBuild(
3333
} = {}
3434
) {
3535
return {
36+
ssr: true,
3637
future: {
3738
...opts.future,
3839
},

packages/react-router/lib/server-runtime/server.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
250250
}
251251
}
252252
} else if (
253+
!request.headers.has("X-React-Router-SPA-Mode") &&
253254
matches &&
254255
matches[matches.length - 1].route.module.default == null &&
255256
matches[matches.length - 1].route.module.ErrorBoundary == null

0 commit comments

Comments
 (0)