Skip to content

fix: respect client.logging option for all logs #4572

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

Merged
merged 4 commits into from
Sep 19, 2022
Merged

fix: respect client.logging option for all logs #4572

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1d9d47
fix: respect `client.logging` option
snitin315 Sep 16, 2022
9baea53
test: update webpack 4 snaps
snitin315 Sep 16, 2022
fd420ed
refactor: code
snitin315 Sep 17, 2022
5f1dc66
test: update snaps
snitin315 Sep 17, 2022
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
2 changes: 1 addition & 1 deletion client-src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ if (typeof parsedResourceQuery.reconnect !== "undefined") {
options.reconnect = Number(parsedResourceQuery.reconnect);
}

logEnabledFeatures(enabledFeatures);
logEnabledFeatures(enabledFeatures, options.logging);

/**
* @param {string} level
Expand Down
3 changes: 2 additions & 1 deletion client-src/utils/log.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ setLogLevel(defaultLevel);

const log = logger.getLogger(name);

const logEnabledFeatures = (features) => {
const logEnabledFeatures = (features, logLevel = "info") => {
setLogLevel(logLevel);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's avoid it and just move logEnabledFeatures here

webpack-dev-server/client-src/index.js

Line 113 in 9baea53

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

const enabledFeatures = Object.keys(features);
if (!features || enabledFeatures.length === 0) {
return;
Expand Down
6 changes: 0 additions & 6 deletions test/e2e/__snapshots__/logging.test.js.snap.webpack4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ Array [

exports[`logging should work and log only error (sockjs) 1`] = `
Array [
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
"Hey.",
"[webpack-dev-server] Errors while compiling. Reload prevented.",
"[webpack-dev-server] ERROR
Expand All @@ -126,7 +125,6 @@ Error from compilation",

exports[`logging should work and log only error (ws) 1`] = `
Array [
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
"Hey.",
"[webpack-dev-server] Errors while compiling. Reload prevented.",
"[webpack-dev-server] ERROR
Expand Down Expand Up @@ -160,7 +158,6 @@ Array [

exports[`logging should work and log warning and errors (sockjs) 1`] = `
Array [
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
"Hey.",
"[webpack-dev-server] Warnings while compiling.",
"[webpack-dev-server] WARNING
Expand All @@ -173,7 +170,6 @@ Error from compilation",

exports[`logging should work and log warning and errors (ws) 1`] = `
Array [
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
"Hey.",
"[webpack-dev-server] Warnings while compiling.",
"[webpack-dev-server] WARNING
Expand Down Expand Up @@ -240,14 +236,12 @@ Array [

exports[`logging should work when the "client.logging" is "none" (sockjs) 1`] = `
Array [
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
"Hey.",
]
`;

exports[`logging should work when the "client.logging" is "none" (ws) 1`] = `
Array [
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
"Hey.",
]
`;
Expand Down
6 changes: 0 additions & 6 deletions test/e2e/__snapshots__/logging.test.js.snap.webpack5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ Array [

exports[`logging should work and log only error (sockjs) 1`] = `
Array [
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
"Hey.",
"[webpack-dev-server] Errors while compiling. Reload prevented.",
"[webpack-dev-server] ERROR
Expand All @@ -126,7 +125,6 @@ Error from compilation",

exports[`logging should work and log only error (ws) 1`] = `
Array [
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
"Hey.",
"[webpack-dev-server] Errors while compiling. Reload prevented.",
"[webpack-dev-server] ERROR
Expand Down Expand Up @@ -160,7 +158,6 @@ Array [

exports[`logging should work and log warning and errors (sockjs) 1`] = `
Array [
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
"Hey.",
"[webpack-dev-server] Warnings while compiling.",
"[webpack-dev-server] WARNING
Expand All @@ -173,7 +170,6 @@ Error from compilation",

exports[`logging should work and log warning and errors (ws) 1`] = `
Array [
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
"Hey.",
"[webpack-dev-server] Warnings while compiling.",
"[webpack-dev-server] WARNING
Expand Down Expand Up @@ -240,14 +236,12 @@ Array [

exports[`logging should work when the "client.logging" is "none" (sockjs) 1`] = `
Array [
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
"Hey.",
]
`;

exports[`logging should work when the "client.logging" is "none" (ws) 1`] = `
Array [
"[webpack-dev-server] Server started: Hot Module Replacement enabled, Live Reloading enabled, Progress disabled, Overlay enabled.",
"Hey.",
]
`;
Expand Down