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

Jump to bottom

fix: infinity refresh on warnings #4006

Merged
merged 5 commits into from Nov 4, 2021
Merged

fix: infinity refresh on warnings #4006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
540409e
fix: infinity refresh on warnings
alexander-akait Nov 4, 2021
356b681
test: fix
alexander-akait Nov 4, 2021
d39dd96
test: added
alexander-akait Nov 4, 2021
c23a69c
test: update
alexander-akait Nov 4, 2021
bf4cc45
test: update
alexander-akait Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions client-src/index.js
View file
Open in desktop
Expand Up @@ -183,8 +183,6 @@ const onSocketMessage = {
if (needShowOverlayForWarnings) {
show("warning", warnings);
}

reloadApp(options, status);
},
errors(errors) {
log.error("Errors while compiling. Reload prevented.");
Expand Down
91 changes: 91 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -74,6 +74,8 @@
"body-parser": "^1.19.0",
"core-js": "^3.12.1",
"css-loader": "^5.2.4",
"css-tree": "^1.1.3",
"csstree": "^0.0.3",
"eslint": "^8.0.1",
"eslint-config-prettier": "^8.3.0",
"eslint-config-webpack": "^1.2.5",
Expand Down
1 change: 0 additions & 1 deletion test/client/index.test.js
View file
Open in desktop
Expand Up @@ -206,7 +206,6 @@ describe("index", () => {
onSocketMessage.warnings([]);

expect(overlay.show).toBeCalled();
expect(reloadApp).toBeCalled();
});

test("should run onSocketMessage.error", () => {
Expand Down
126 changes: 126 additions & 0 deletions test/e2e/__snapshots__/overlay.test.js.snap.webpack4
View file
Open in desktop
Expand Up @@ -342,6 +342,69 @@ exports[`overlay should not show initially, then show on an error, then show oth
"
`;

exports[`overlay should show a warning after invalidation: overlay html 1`] = `
"<body>
<div
id=\\"webpack-dev-server-client-overlay-div\\"
style=\\"
position: fixed;
box-sizing: border-box;
inset: 0px;
width: 100vw;
height: 100vh;
background-color: rgba(0, 0, 0, 0.85);
color: rgb(232, 232, 232);
font-family: Menlo, Consolas, monospace;
font-size: large;
padding: 2rem;
line-height: 1.2;
white-space: pre-wrap;
overflow: auto;
\\"
>
<span>Compiled with problems:</span
><button
style=\\"
background: transparent;
border: none;
font-size: 20px;
font-weight: bold;
color: white;
cursor: pointer;
float: right;
\\"
>
X</button
><br /><br />
<div>
<span style=\\"color: rgb(227, 96, 73)\\">WARNING</span><br /><br />
<div>Warning from compilation</div>
<br /><br />
</div>
</div>
</body>
"
`;

exports[`overlay should show a warning after invalidation: page html 1`] = `
"<body>
<script type=\\"text/javascript\\" charset=\\"utf-8\\" src=\\"/main.js\\"></script>
<iframe
id=\\"webpack-dev-server-client-overlay\\"
src=\\"about:blank\\"
style=\\"
position: fixed;
inset: 0px;
width: 100vw;
height: 100vh;
border: none;
z-index: 2147483647;
\\"
></iframe>
</body>
"
`;

exports[`overlay should show a warning and error for initial compilation and protects against xss: overlay html 1`] = `
"<body>
<div
Expand Down Expand Up @@ -891,6 +954,69 @@ exports[`overlay should show an ansi formatted error for initial compilation: pa
"
`;

exports[`overlay should show an error after invalidation: overlay html 1`] = `
"<body>
<div
id=\\"webpack-dev-server-client-overlay-div\\"
style=\\"
position: fixed;
box-sizing: border-box;
inset: 0px;
width: 100vw;
height: 100vh;
background-color: rgba(0, 0, 0, 0.85);
color: rgb(232, 232, 232);
font-family: Menlo, Consolas, monospace;
font-size: large;
padding: 2rem;
line-height: 1.2;
white-space: pre-wrap;
overflow: auto;
\\"
>
<span>Compiled with problems:</span
><button
style=\\"
background: transparent;
border: none;
font-size: 20px;
font-weight: bold;
color: white;
cursor: pointer;
float: right;
\\"
>
X</button
><br /><br />
<div>
<span style=\\"color: rgb(227, 96, 73)\\">ERROR</span><br /><br />
<div>Error from compilation</div>
<br /><br />
</div>
</div>
</body>
"
`;

exports[`overlay should show an error after invalidation: page html 1`] = `
"<body>
<script type=\\"text/javascript\\" charset=\\"utf-8\\" src=\\"/main.js\\"></script>
<iframe
id=\\"webpack-dev-server-client-overlay\\"
src=\\"about:blank\\"
style=\\"
position: fixed;
inset: 0px;
width: 100vw;
height: 100vh;
border: none;
z-index: 2147483647;
\\"
></iframe>
</body>
"
`;

exports[`overlay should show an error for initial compilation: overlay html 1`] = `
"<body>
<div
Expand Down