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

fix(react): live reload works without scripts #5339

Merged
merged 2 commits into from
Feb 1, 2023
Merged

fix(react): live reload works without scripts #5339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b841116
fix(react): live reload works without scripts
pcattori Feb 1, 2023
d467dba
Create olive-jokes-invent.md
pcattori Feb 1, 2023
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
6 changes: 6 additions & 0 deletions .changeset/olive-jokes-invent.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"remix": patch
"@remix-run/react": patch
---

fix(react): live reload works without `<Scripts />`
6 changes: 3 additions & 3 deletions packages/remix-react/__tests__/components-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,22 @@ describe("<LiveReload />", () => {
LiveReload = require("../components").LiveReload;
let { container } = render(<LiveReload />);
expect(container.querySelector("script")).toHaveTextContent(
"let port = (window.__remixContext.dev && window.__remixContext.dev.liveReloadPort) || 8002;"
"let port = (window.__remixContext && window.__remixContext.dev && window.__remixContext.dev.liveReloadPort) || 8002;"
);
});

it("can set the port explicitly", () => {
let { container } = render(<LiveReload port={4321} />);
expect(container.querySelector("script")).toHaveTextContent(
"let port = (window.__remixContext.dev && window.__remixContext.dev.liveReloadPort) || 4321;"
"let port = (window.__remixContext && window.__remixContext.dev && window.__remixContext.dev.liveReloadPort) || 4321;"
);
});

it("determines the right port based on REMIX_DEV_SERVER_WS_PORT env variable", () => {
process.env.REMIX_DEV_SERVER_WS_PORT = "1234";
let { container } = render(<LiveReload />);
expect(container.querySelector("script")).toHaveTextContent(
"let port = (window.__remixContext.dev && window.__remixContext.dev.liveReloadPort) || 1234;"
"let port = (window.__remixContext && window.__remixContext.dev && window.__remixContext.dev.liveReloadPort) || 1234;"
);
});

Expand Down
2 changes: 1 addition & 1 deletion packages/remix-react/components.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1570,7 +1570,7 @@ export const LiveReload =
function remixLiveReloadConnect(config) {
let protocol = location.protocol === "https:" ? "wss:" : "ws:";
let host = location.hostname;
let port = (window.__remixContext.dev && window.__remixContext.dev.liveReloadPort) || ${String(
let port = (window.__remixContext && window.__remixContext.dev && window.__remixContext.dev.liveReloadPort) || ${String(
port
)};
let socketPath = protocol + "//" + host + ":" + port + "/socket";
Expand Down