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 · Aug 25, 2016 · 350b667 · 350b667
1 parent e9ea554
commit 350b667
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/addon/ng2/tasks/serve-webpack.ts b/addon/ng2/tasks/serve-webpack.ts
@@ -54,7 +54,10 @@ module.exports = Task.extend({
       historyApiFallback: true,
       stats: webpackDevServerOutputOptions,
       inline: true,
-      proxy: proxyConfig
+      proxy: proxyConfig,
+      watchOptions: {
+        poll: CliConfig.fromProject().config.defaults.poll
+      }
     };
 
     ui.writeLine(chalk.green(oneLine`
@@ -76,7 +79,3 @@ module.exports = Task.extend({
     });
   }
 });
-
-
-
-
diff --git a/lib/config/schema.d.ts b/lib/config/schema.d.ts
@@ -60,5 +60,6 @@ export interface CliConfig {
         styleExt?: string;
         prefixInterfaces?: boolean;
         lazyRoutePrefix?: string;
+        poll?: boolean | number;
     };
 }
diff --git a/lib/config/schema.json b/lib/config/schema.json
@@ -138,6 +138,9 @@
         },
         "lazyRoutePrefix": {
           "type": "string"
+        },
+        "poll": {
+          "type": [ "boolean", "number" ]
         }
       },
       "additionalProperties": false