fix(@angular/cli): ensure only in-memory output is served

angular · Mar 30, 2017 · 1bc174b · 1bc174b · yoooee · May 11, 2017
1 parent 3598a47
commit 1bc174b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -96,7 +96,7 @@
     "url-loader": "^0.5.7",
     "walk-sync": "^0.3.1",
     "webpack": "~2.2.0",
-    "webpack-dev-server": "~2.3.0",
+    "webpack-dev-server": "~2.4.2",
     "webpack-merge": "^2.4.0",
     "zone.js": "^0.8.4"
   },

diff --git a/packages/@angular/cli/custom-typings.d.ts b/packages/@angular/cli/custom-typings.d.ts
@@ -1,5 +1,5 @@
 interface IWebpackDevServerConfigurationOptions {
-  contentBase?: string;
+  contentBase?: boolean | string | string[];
   hot?: boolean;
   historyApiFallback?: {[key: string]: any} | boolean;
   compress?: boolean;

diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json
@@ -81,7 +81,7 @@
     "url-loader": "^0.5.7",
     "walk-sync": "^0.3.1",
     "webpack": "~2.2.0",
-    "webpack-dev-server": "~2.3.0",
+    "webpack-dev-server": "~2.4.2",
     "webpack-merge": "^2.4.0",
     "zone.js": "^0.8.4"
   },

diff --git a/packages/@angular/cli/tasks/serve.ts b/packages/@angular/cli/tasks/serve.ts
@@ -148,7 +148,8 @@ export default Task.extend({
         poll: serveTaskOptions.poll
       },
       https: serveTaskOptions.ssl,
-      overlay: serveTaskOptions.target === 'development'
+      overlay: serveTaskOptions.target === 'development',
+      contentBase: false
     };
 
     if (sslKey != null && sslCert != null) {