Skip to content

Commit 2441c01

Browse files
fix(dev/vite): properly handle https protocol in dev mode (#13746)
Co-authored-by: Bogdan Chadkin <[email protected]>
1 parent 938a1b9 commit 2441c01

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.changeset/calm-swans-tap.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
Properly handle `https` protocol in dev mode

packages/react-router-dev/vite/node-adapter.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import type { IncomingMessage, ServerResponse } from "node:http";
21
import { once } from "node:events";
2+
import type { IncomingMessage, ServerResponse } from "node:http";
3+
import { TLSSocket } from "node:tls";
34
import { Readable } from "node:stream";
45
import { splitCookiesString } from "set-cookie-parser";
56
import { createReadableStreamFromReadable } from "@react-router/node";
@@ -48,10 +49,14 @@ export function fromNodeRequest(
4849
nodeReq: Vite.Connect.IncomingMessage,
4950
nodeRes: ServerResponse<Vite.Connect.IncomingMessage>
5051
): Request {
52+
let protocol =
53+
nodeReq.socket instanceof TLSSocket && nodeReq.socket.encrypted
54+
? "https"
55+
: "http";
5156
let origin =
5257
nodeReq.headers.origin && "null" !== nodeReq.headers.origin
5358
? nodeReq.headers.origin
54-
: `http://${nodeReq.headers.host}`;
59+
: `${protocol}://${nodeReq.headers.host}`;
5560
// Use `req.originalUrl` so React Router is aware of the full path
5661
invariant(
5762
nodeReq.originalUrl,

0 commit comments

Comments
 (0)