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

BREAKING CHANGE: remove CLI default flag values for webpack-cli serve #2659

Merged
merged 11 commits into from
Aug 22, 2020
Merged

BREAKING CHANGE: remove CLI default flag values for webpack-cli serve #2659

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
aaae04f
fix(cli): remove default values for webpack cli flags
knagaitsev Jun 24, 2020
f0cf5cc
fix(cli): open page can be an array of strings
knagaitsev Jun 24, 2020
7d17e45
chore(client): change default logging setting and add comment
knagaitsev Jun 25, 2020
af38f7f
chore(options): remove duplicate default setting
knagaitsev Jun 25, 2020
1be0c2f
test(options): add serve index tests
knagaitsev Jun 25, 2020
50763e6
chore(server): remove console log
knagaitsev Jun 25, 2020
45fb947
chore(cli): add name flag
knagaitsev Jul 6, 2020
996c7cf
chore(cli): change description of name flag
knagaitsev Jul 7, 2020
987439e
chore(options): remove serveIndex tests in normalizeOptions
knagaitsev Aug 20, 2020
11832a0
chore(cli): remove default values for actual cli flags
knagaitsev Aug 20, 2020
accce0f
chore(cli): remove name cli flag
knagaitsev Aug 21, 2020
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
8 changes: 6 additions & 2 deletions bin/cli-flags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module.exports = {
{
name: 'live-reload',
type: Boolean,
defaultValue: true,
describe: 'Enables/Disables live reloading on changing files',
},
{
Expand Down Expand Up @@ -57,12 +56,12 @@ module.exports = {
name: 'open-page',
type: String,
describe: 'Open default browser with the specified page',
multiple: true,
},
{
name: 'client-logging',
type: String,
group: DISPLAY_GROUP,
defaultValue: 'info',
describe:
'Log level in the browser (none, error, warn, info, log, verbose)',
},
Expand Down Expand Up @@ -132,5 +131,10 @@ module.exports = {
group: CONNECTION_GROUP,
multiple: true,
},
{
name: 'name',
type: String,
describe: 'Name of webpack config to get devServer config from',
},
Copy link
Member

Choose a reason for hiding this comment

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

Why we have it here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Why we have it here?

@evilebottnawi We need it for this: webpack/webpack-cli#1649 (comment). Unless we want to add this flag on the webpack-cli side, but I think it is easiest to keep it uniform with other CLI flags

Copy link
Member

Choose a reason for hiding this comment

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

It is already added on webpack-cli side

Copy link
Collaborator Author

@knagaitsev knagaitsev Aug 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

It is already added on webpack-cli side

Do you know where to find it on webpack-cli side? I can't seem to find it

Edit: never mind, I think I found the PR

Copy link
Member

Choose a reason for hiding this comment

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

webpack/webpack-cli@ad0779f

Copy link
Member

Choose a reason for hiding this comment

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

Yes 👍

],
};
2 changes: 0 additions & 2 deletions bin/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const options = {
'live-reload': {
type: 'boolean',
describe: 'Enables/Disables live reloading on changing files',
default: true,
},
profile: {
type: 'boolean',
Expand Down Expand Up @@ -56,7 +55,6 @@ const options = {
'client-logging': {
type: 'string',
group: DISPLAY_GROUP,
default: 'info',
describe:
'Log level in the browser (none, error, warn, info, log, verbose)',
},
Expand Down
2 changes: 2 additions & 0 deletions client-src/default/utils/log.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
const log = require('webpack/lib/logging/runtime');

const name = 'webpack-dev-server';
// default level is set on the client side, so it does not need
// to be set by the CLI or API
const defaultLevel = 'info';

function setLogLevel(level) {
Expand Down
8 changes: 7 additions & 1 deletion lib/utils/createConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,16 @@ function createConfig(config, argv, { port }) {
options.bonjour = true;
}

if (argv.host && (argv.host !== 'localhost' || !options.host)) {
// CLI args host takes precedence over devServer host
if (argv.host) {
options.host = argv.host;
}

// host defaults to localhost for CLI if none is provided
if (!options.host) {
options.host = 'localhost';
}

if (argv.allowedHosts) {
options.allowedHosts = argv.allowedHosts.split(',');
}
Expand Down
Loading