Skip to content

Commit c40624b

Browse files
committed
feat(@angular/cli): update webpack to latest version
We dont want this in 1.3.x, so marking as a feature.
1 parent 9fa4ab0 commit c40624b

File tree

4 files changed

+51
-44
lines changed

4 files changed

+51
-44
lines changed

Diff for: package-lock.json

+35-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@
9292
"stylus-loader": "^3.0.1",
9393
"typescript": "~2.4.2",
9494
"url-loader": "^0.5.7",
95-
"webpack": "~3.4.1",
95+
"webpack": "~3.5.5",
9696
"webpack-concat-plugin": "1.4.0",
97-
"webpack-dev-middleware": "^1.11.0",
98-
"webpack-dev-server": "~2.5.1",
97+
"webpack-dev-middleware": "~1.12.0",
98+
"webpack-dev-server": "~2.7.1",
9999
"webpack-merge": "^4.1.0",
100100
"zone.js": "^0.8.14"
101101
},

Diff for: packages/@angular/cli/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@
7676
"stylus-loader": "^3.0.1",
7777
"typescript": ">=2.0.0 <2.5.0",
7878
"url-loader": "^0.5.7",
79-
"webpack": "~3.4.1",
79+
"webpack": "~3.5.5",
8080
"webpack-concat-plugin": "1.4.0",
81-
"webpack-dev-middleware": "^1.11.0",
82-
"webpack-dev-server": "~2.5.1",
81+
"webpack-dev-middleware": "~1.12.0",
82+
"webpack-dev-server": "~2.7.1",
8383
"webpack-merge": "^4.1.0",
8484
"zone.js": "^0.8.14"
8585
},

Diff for: tests/e2e/tests/misc/public-host.ts

+10-8
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ export default function () {
1616
const localAddress = `http://${publicHost}`;
1717

1818
return Promise.resolve()
19-
.then(() => ngServe('--host=0.0.0.0'))
20-
.then(() => request(localAddress))
21-
.then(body => {
22-
if (!body.match(/Invalid Host header/)) {
23-
throw new Error('Response does not match expected value.');
24-
}
25-
})
26-
.then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
19+
// Disabling this test. Webpack Dev Server does not check the hots anymore when binding to
20+
// numeric IP addresses.
21+
// .then(() => ngServe('--host=0.0.0.0'))
22+
// .then(() => request(localAddress))
23+
// .then(body => {
24+
// if (!body.match(/Invalid Host header/)) {
25+
// throw new Error('Response does not match expected value.');
26+
// }
27+
// })
28+
// .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
2729
.then(() => ngServe('--host=0.0.0.0', `--public-host=${publicHost}`))
2830
.then(() => request(localAddress))
2931
.then(body => {

0 commit comments

Comments
 (0)