Skip to content

Commit 1bc174b

Browse files
Charles Lydingfilipesilva
Charles Lyding
authored andcommitted
fix(@angular/cli): ensure only in-memory output is served
1 parent 3598a47 commit 1bc174b

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"url-loader": "^0.5.7",
9797
"walk-sync": "^0.3.1",
9898
"webpack": "~2.2.0",
99-
"webpack-dev-server": "~2.3.0",
99+
"webpack-dev-server": "~2.4.2",
100100
"webpack-merge": "^2.4.0",
101101
"zone.js": "^0.8.4"
102102
},

packages/@angular/cli/custom-typings.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
interface IWebpackDevServerConfigurationOptions {
2-
contentBase?: string;
2+
contentBase?: boolean | string | string[];
33
hot?: boolean;
44
historyApiFallback?: {[key: string]: any} | boolean;
55
compress?: boolean;

packages/@angular/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"url-loader": "^0.5.7",
8282
"walk-sync": "^0.3.1",
8383
"webpack": "~2.2.0",
84-
"webpack-dev-server": "~2.3.0",
84+
"webpack-dev-server": "~2.4.2",
8585
"webpack-merge": "^2.4.0",
8686
"zone.js": "^0.8.4"
8787
},

packages/@angular/cli/tasks/serve.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ export default Task.extend({
148148
poll: serveTaskOptions.poll
149149
},
150150
https: serveTaskOptions.ssl,
151-
overlay: serveTaskOptions.target === 'development'
151+
overlay: serveTaskOptions.target === 'development',
152+
contentBase: false
152153
};
153154

154155
if (sslKey != null && sslCert != null) {

0 commit comments

Comments
 (0)