feat(webpackDevServer): Add watchOptions for webpackDevServer

Add watchOptions to webpackDevServerConfiguration to conditionally enable polling option in watchpack Remove additional blank lines from end of serve-watchpack.ts so that only one is remaining
angular · Sep 1, 2016 · 369f016 · 369f016
1 parent 440d767
commit 369f016
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/addon/ng2/custom-typings.d.ts b/addon/ng2/custom-typings.d.ts
@@ -11,7 +11,7 @@ interface IWebpackDevServerConfigurationOptions {
   filename?: string;
   watchOptions?: {
     aggregateTimeout?: number;
-    poll?: number;
+    poll?: number | boolean;
   };
   publicPath?: string;
   headers?: { [key: string]: string };

diff --git a/addon/ng2/tasks/serve-webpack.ts b/addon/ng2/tasks/serve-webpack.ts
@@ -54,7 +54,10 @@ export default Task.extend({
       historyApiFallback: true,
       stats: webpackDevServerOutputOptions,
       inline: true,
-      proxy: proxyConfig
+      proxy: proxyConfig,
+      watchOptions: {
+        poll: CliConfig.fromProject().config.defaults.poll
+      }
     };
 
     ui.writeLine(chalk.green(oneLine`

diff --git a/lib/config/schema.d.ts b/lib/config/schema.d.ts
@@ -59,5 +59,6 @@ export interface CliConfig {
     defaults?: {
         styleExt?: string;
         prefixInterfaces?: boolean;
+        poll?: number;
     };
 }
diff --git a/lib/config/schema.json b/lib/config/schema.json
@@ -135,10 +135,13 @@
         },
         "prefixInterfaces": {
           "type": "boolean"
+        },
+        "poll": {
+          "type": "number"
         }
       },
       "additionalProperties": false
     }
   },
   "additionalProperties": false
-}
+}