refactor stats merging logic

Author: filipesilva

packages/angular-cli/models/webpack-build-utils.ts

@@ -4,7 +4,7 @@ export const ngAppResolve = (resolvePath: string): string => {
   return path.resolve(process.cwd(), resolvePath);
 };
 
-export const webpackOutputOptions = {
+const webpackOutputOptions = {
   colors: true,
   hash: true,
   timings: true,
@@ -18,10 +18,16 @@ export const webpackOutputOptions = {
   version: false
 };
 
-export const verboseWebpackOutputOptions = {
+const verboseWebpackOutputOptions = {
   children: true,
   assets: true,
   version: true,
   reasons: true,
   chunkModules: false // TODO: set to true when console to file output is fixed
 };
+
+export function getWebpackStatsConfig(verbose = false){
+    return verbose
+           ? Object.assign(webpackOutputOptions, verboseWebpackOutputOptions)
+           : webpackOutputOptions;
+}

packages/angular-cli/tasks/build-webpack-watch.ts

@@ -4,7 +4,7 @@ const Task = require('../ember-cli/lib/models/task');
 import * as webpack from 'webpack';
 const ProgressPlugin = require('webpack/lib/ProgressPlugin');
 import { NgCliWebpackConfig } from '../models/webpack-config';
-import { webpackOutputOptions, verboseWebpackOutputOptions } from '../models/';
+import { getWebpackStatsConfig } from '../models/';
 import { BuildOptions } from '../commands/build';
 import { CliConfig } from '../models/config';
 
@@ -31,9 +31,7 @@ export default Task.extend({
     ).config;
     const webpackCompiler: any = webpack(config);
 
-    const statsOptions = runTaskOptions.verbose
-                        ? Object.assign(webpackOutputOptions, verboseWebpackOutputOptions)
-                        : webpackOutputOptions;
+    const statsConfig = getWebpackStatsConfig(runTaskOptions.verbose);
 
     if (runTaskOptions.progress) {
       webpackCompiler.apply(new ProgressPlugin({
@@ -53,7 +51,7 @@ export default Task.extend({
 
         if (stats.hash !== lastHash) {
           lastHash = stats.hash;
-          process.stdout.write(stats.toString(statsOptions) + '\n');
+          process.stdout.write(stats.toString(statsConfig) + '\n');
         }
       });
     });

packages/angular-cli/tasks/build-webpack.ts

@@ -5,7 +5,7 @@ import * as webpack from 'webpack';
 const ProgressPlugin  = require('webpack/lib/ProgressPlugin');
 import { BuildOptions } from '../commands/build';
 import { NgCliWebpackConfig } from '../models/webpack-config';
-import { webpackOutputOptions, verboseWebpackOutputOptions } from '../models/';
+import { getWebpackStatsConfig } from '../models/';
 import { CliConfig } from '../models/config';
 
 // Configure build and output;
@@ -32,9 +32,7 @@ export default <any>Task.extend({
 
     const webpackCompiler: any = webpack(config);
 
-    const statsOptions = runTaskOptions.verbose
-                        ? Object.assign(webpackOutputOptions, verboseWebpackOutputOptions)
-                        : webpackOutputOptions;
+    const statsConfig = getWebpackStatsConfig(runTaskOptions.verbose);
 
     if (runTaskOptions.progress) {
       webpackCompiler.apply(new ProgressPlugin({
@@ -53,7 +51,7 @@ export default <any>Task.extend({
 
         if (stats.hash !== lastHash) {
           lastHash = stats.hash;
-          process.stdout.write(stats.toString(statsOptions) + '\n');
+          process.stdout.write(stats.toString(statsConfig) + '\n');
         }
 
         return stats.hasErrors() ? reject() : resolve();

packages/angular-cli/tasks/serve-webpack.ts

@@ -6,7 +6,7 @@ const Task = require('../ember-cli/lib/models/task');
 import * as webpack from 'webpack';
 const WebpackDevServer = require('webpack-dev-server');
 const ProgressPlugin = require('webpack/lib/ProgressPlugin');
-import { webpackOutputOptions, verboseWebpackOutputOptions } from '../models/';
+import { getWebpackStatsConfig } from '../models/';
 import { NgCliWebpackConfig } from '../models/webpack-config';
 import { ServeTaskOptions } from '../commands/serve';
 import { CliConfig } from '../models/config';
@@ -39,9 +39,7 @@ export default Task.extend({
     );
     webpackCompiler = webpack(config);
 
-    const statsOptions = serveTaskOptions.verbose
-                        ? Object.assign(webpackOutputOptions, verboseWebpackOutputOptions)
-                        : webpackOutputOptions;
+    const statsConfig = getWebpackStatsConfig(serveTaskOptions.verbose);
 
     if (serveTaskOptions.progress) {
       webpackCompiler.apply(new ProgressPlugin({
@@ -84,7 +82,7 @@ export default Task.extend({
         disableDotRule: true,
         htmlAcceptHeaders: ['text/html', 'application/xhtml+xml']
       },
-      stats: statsOptions,
+      stats: statsConfig,
       inline: true,
       proxy: proxyConfig,
       compress: serveTaskOptions.target === 'production',