Skip to content

Commit 91564f4

Browse files
committed
fix(dev-server): fix dev client requesting build results
1 parent 207ce44 commit 91564f4

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/dev-server/dev-server-client/client-web-socket.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export const initClientWebSocket = (win: d.DevClientWindow, config: d.DevClientC
77
let reconnectAttempts = 0;
88
let requestBuildResultsTmrId: any;
99
let hasGottenBuildResults = false;
10+
let buildResultsRequests = 0;
1011

1112
function onOpen(this: WebSocket) {
1213
if (reconnectAttempts > 0) {
@@ -17,7 +18,8 @@ export const initClientWebSocket = (win: d.DevClientWindow, config: d.DevClientC
1718

1819
if (!hasGottenBuildResults) {
1920
requestBuildResultsTmrId = setInterval(() => {
20-
if (!hasGottenBuildResults && this.readyState === WebSocket.OPEN) {
21+
buildResultsRequests++;
22+
if (!hasGottenBuildResults && this.readyState === WebSocket.OPEN && buildResultsRequests < 500) {
2123
const msg: d.DevServerMessage = {
2224
requestBuildResults: true,
2325
};
@@ -70,6 +72,7 @@ export const initClientWebSocket = (win: d.DevClientWindow, config: d.DevClientC
7072
// so it's probably best if we do a full page refresh
7173
logReload(`Reconnected to dev server`);
7274
hasGottenBuildResults = true;
75+
buildResultsRequests = 0;
7376
clearInterval(requestBuildResultsTmrId);
7477
win.location.reload(true);
7578
return;
@@ -89,6 +92,7 @@ export const initClientWebSocket = (win: d.DevClientWindow, config: d.DevClientC
8992
// we just got build results from the server
9093
// let's update our app with the data received
9194
hasGottenBuildResults = true;
95+
buildResultsRequests = 0;
9296
clearInterval(requestBuildResultsTmrId);
9397

9498
emitBuildStatus(win, 'default');

src/dev-server/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ function emitMessageToClient(serverProcess: ChildProcess, devServerContext: DevS
213213
// a compiler build has finished
214214
// send the build results to the child server process
215215
devServerContext.isActivelyBuilding = false;
216+
devServerContext.lastBuildResults = { ...data };
216217
const msg: DevServerMessage = {
217218
buildResults: { ...data },
218219
};

0 commit comments

Comments
 (0)