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: show correct url in output status #3013

Merged
merged 8 commits into from
Feb 15, 2021
Merged

fix: show correct url in output status #3013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f4d01dd
fix: show correct url in output status
snitin315 Feb 14, 2021
2d8c586
test: fix
snitin315 Feb 14, 2021
c736cd1
fix: lint
snitin315 Feb 14, 2021
c44f2ad
fix: ci
snitin315 Feb 15, 2021
2542b95
fix: ci
snitin315 Feb 15, 2021
2f853d4
fix: ci
snitin315 Feb 15, 2021
ef5bc80
fix: ci
snitin315 Feb 15, 2021
f8f6bef
refactor: logic
snitin315 Feb 15, 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
4 changes: 2 additions & 2 deletions lib/Server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,14 +588,14 @@ class Server {
const useColor = getColorsOption(getCompilerConfigArray(this.compiler));

const protocol = this.options.https ? 'https' : 'http';
const { hostname, port } = this;
const { address: hostname, port } = this.server.address();
const prettyPrintUrl = (newHostname) =>
url.format({ protocol, hostname: newHostname, port, pathname: '/' });

let prettyHostname;
let lanUrlForTerminal;

if (hostname === '0.0.0.0' || hostname === '::') {
if (hostname === '0.0.0.0' || ip.isLoopback(hostname)) {
prettyHostname = 'localhost';

const localIP =
Expand Down
39 changes: 0 additions & 39 deletions test/cli/__snapshots__/cli.test.js.snap
View file
Open in desktop

This file was deleted.

52 changes: 7 additions & 45 deletions test/cli/cli.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,7 @@ const internalIp = require('internal-ip');
const testBin = require('../helpers/test-bin');
const isWebpack5 = require('../helpers/isWebpack5');

// skip if webpack-dev-server is not linked
let runCLITest = describe;
let basePath;

try {
basePath = path.join(require.resolve('webpack-dev-server'), '..', '..');
} catch {
runCLITest = describe.skip;
}
Comment on lines -9 to -17
Copy link
Contributor

Choose a reason for hiding this comment

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

This'd make tests fail where webpack-dev-server is not npm linked.

Copy link
Member Author

Choose a reason for hiding this comment

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

We link it on CI before running tests.

Copy link
Contributor

Choose a reason for hiding this comment

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

But for developers testing locally, it may be a hurdle.


runCLITest('CLI', () => {
/* Based on webpack/test/StatsTestCases.test.js */
/**
* Escapes regular expression metacharacters
* @param {string} str String to quote
* @returns {string} Escaped string
*/
const quotemeta = (str) => str.replace(/[-[\]\\/{}()*+?.^$|]/g, '\\$&');

const normalizeOutput = (output) =>
output
// eslint-disable-next-line no-control-regex
.replace(/\u001b\[[0-9;]*m/g, '')
.replace(/[.0-9]+(\s?)(ms|KiB|bytes)/g, 'X$1$2')
.replace(
/(Built at:) (.*)$/gm,
'$1 Thu Jan 01 1970 <CLR=BOLD>00:00:00</CLR> GMT'
)
.replace(/webpack [^ )]+/g, 'webpack x.x.x')
.replace(new RegExp(quotemeta(basePath.replace(/\\/g, '/')), 'g'), 'Xdir')
.replace(new RegExp(quotemeta(basePath), 'g'), 'Xdir')
.replace(/[\\/]public/, '/public')
.replace(/(Hash:) [a-z0-9]+/g, '$1 X')
.replace(/ dependencies:Xms/g, '')
.replace(/, additional resolving: X ms/g, '');

describe('CLI', () => {
const webpack4Test = isWebpack5 ? it.skip : it;
const webpack5Test = isWebpack5 ? it : it.skip;

Expand All @@ -66,22 +31,21 @@ runCLITest('CLI', () => {
});

webpack5Test('--hot webpack 5', (done) => {
// host doesn't default to `localhost`
testBin('--hot --host localhost')
// need detailed stats to check for 'dev-server.js'
testBin('--hot --stats=detailed')
.then((output) => {
expect(output.exitCode).toEqual(0);
expect(normalizeOutput(output.stderr)).toMatchSnapshot();
expect(output.stderr).toContain('webpack/hot/dev-server.js');
done();
})
.catch(done);
});

webpack5Test('--no-hot webpack 5', (done) => {
// host doesn't default to `localhost`
testBin('--no-hot --host localhost')
testBin('--no-hot --stats=detailed')
.then((output) => {
expect(output.exitCode).toEqual(0);
expect(normalizeOutput(output.stderr)).toMatchSnapshot();
expect(output.stderr).not.toContain('webpack/hot/dev-server.js');
done();
})
.catch(done);
Expand Down Expand Up @@ -119,9 +83,7 @@ runCLITest('CLI', () => {
.catch(done);
});

// TODO: enable after fixing url bug with undefined host
// https://github.com/webpack/webpack-dev-server/pull/2992#discussion_r571360196
it.skip('unspecified host and port', (done) => {
it('unspecified host and port', (done) => {
testBin('')
.then((output) => {
expect(/http:\/\/localhost:[0-9]+/.test(output.stderr)).toEqual(true);
Expand Down