refactor(@angular/cli): remove unneeded production webpack config partial

Author: clydin

packages/@angular/cli/commands/build.ts

@@ -158,7 +158,6 @@ export const baseBuildCommandOptions: any = [
   {
     name: 'extract-licenses',
     type: Boolean,
-    default: true,
     description: 'Extract all licenses in a separate file, in the case of production builds only.'
   },
   {

packages/@angular/cli/models/webpack-config.ts

@@ -9,7 +9,6 @@ import { BuildOptions } from './build-options';
 import {
   getBrowserConfig,
   getCommonConfig,
-  getProdConfig,
   getStylesConfig,
   getServerConfig,
   getNonAotConfig,
@@ -58,7 +57,6 @@ export class NgCliWebpackConfig<T extends BuildOptions = BuildOptions> {
       getCommonConfig(this.wco),
       platformConfig,
       getStylesConfig(this.wco),
-      this.getTargetConfig(this.wco)
     ];
 
     if (this.wco.appConfig.main || this.wco.appConfig.polyfills) {
@@ -72,13 +70,6 @@ export class NgCliWebpackConfig<T extends BuildOptions = BuildOptions> {
     return this.config;
   }
 
-  public getTargetConfig(webpackConfigOptions: WebpackConfigOptions<T>): any {
-    switch (webpackConfigOptions.buildOptions.target) {
-      case 'production':
-        return getProdConfig(webpackConfigOptions);
-    }
-  }
-
   // Validate build options
   public validateBuildOptions(buildOptions: BuildOptions) {
     buildOptions.target = buildOptions.target || 'development';
@@ -110,7 +101,8 @@ export class NgCliWebpackConfig<T extends BuildOptions = BuildOptions> {
         sourcemaps: false,
         extractCss: true,
         namedChunks: false,
-        aot: true
+        aot: true,
+        extractLicenses: true,
       }
     };
 

packages/@angular/cli/models/webpack-configs/browser.ts

@@ -2,13 +2,19 @@ import * as webpack from 'webpack';
 import * as path from 'path';
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const SubresourceIntegrityPlugin = require('webpack-subresource-integrity');
-
+import { LicenseWebpackPlugin } from 'license-webpack-plugin';
 import { generateEntryPoints, packageChunkSort } from '../../utilities/package-chunk-sort';
 import { BaseHrefWebpackPlugin } from '../../lib/base-href-webpack';
 import { IndexHtmlWebpackPlugin } from '../../plugins/index-html-webpack-plugin';
 import { extraEntryParser, lazyChunksFilter } from './utils';
 import { WebpackConfigOptions } from '../webpack-config';
 
+/**
+ * license-webpack-plugin has a peer dependency on webpack-sources, list it in a comment to
+ * let the dependency validator know it is used.
+ *
+ * require('webpack-sources')
+ */
 
 export function getBrowserConfig(wco: WebpackConfigOptions) {
   const { projectRoot, buildOptions, appConfig } = wco;
@@ -68,6 +74,15 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
     }));
   }
 
+  if (buildOptions.extractLicenses) {
+    extraPlugins.push(new LicenseWebpackPlugin({
+      pattern: /^(MIT|ISC|BSD.*)$/,
+      suppressErrors: true,
+      perChunkOutput: false,
+      outputFilename: `3rdpartylicenses.txt`
+    }));
+  }
+
   const globalStylesEntries = extraEntryParser(appConfig.styles, appRoot, 'styles')
     .map(style => style.entry);
 

packages/@angular/cli/models/webpack-configs/common.ts

@@ -5,6 +5,7 @@ import { extraEntryParser, getOutputHashFormat, AssetPattern } from './utils';
 import { isDirectory } from '../../utilities/is-directory';
 import { requireProjectModule } from '../../utilities/require-project-module';
 import { WebpackConfigOptions } from '../webpack-config';
+import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
 import { ScriptsWebpackPlugin } from '../../plugins/scripts-webpack-plugin';
 
@@ -252,6 +253,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       noEmitOnErrors: true,
       minimizer: [
         new HashedModuleIdsPlugin(),
+        new BundleBudgetPlugin({ budgets: appConfig.budgets }),
         new CleanCssWebpackPlugin({
           sourceMap: buildOptions.sourcemaps,
           // component styles retain their original file name

packages/@angular/cli/models/webpack-configs/index.ts

@@ -1,6 +1,5 @@
 export * from './browser';
 export * from './common';
-export * from './production';
 export * from './server';
 export * from './styles';
 export * from './test';

packages/@angular/cli/models/webpack-configs/production.ts

@@ -21,7 +21,6 @@ export class WebpackTestConfig extends NgCliWebpackConfig<WebpackTestOptions> {
     const webpackConfigs = [
       getCommonConfig(this.wco),
       getStylesConfig(this.wco),
-      this.getTargetConfig(this.wco),
       getNonAotTestConfig(this.wco),
       getTestConfig(this.wco)
     ];

packages/@angular/cli/models/webpack-test-config.ts

@@ -1,5 +1,5 @@
 import { Filesystem } from '@angular/service-worker/config';
-import { oneLine } from 'common-tags';
+import { oneLine, stripIndent } from 'common-tags';
 import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -57,13 +57,25 @@ export function usesServiceWorker(projectRoot: string): boolean {
     swPackageJsonPath = resolveProjectModule(projectRoot, '@angular/service-worker/package.json');
   } catch (_) {
     // @angular/service-worker is not installed
-    return false;
+    throw new Error(stripIndent`
+    Your project is configured with serviceWorker = true, but @angular/service-worker
+    is not installed. Run \`npm install --save-dev @angular/service-worker\`
+    and try again, or run \`ng set apps.0.serviceWorker=false\` in your .angular-cli.json.
+  `);
   }
 
   const swPackageJson = fs.readFileSync(swPackageJsonPath).toString();
   const swVersion = JSON.parse(swPackageJson)['version'];
 
-  return semver.gte(swVersion, NEW_SW_VERSION);
+  if (!semver.gte(swVersion, NEW_SW_VERSION)) {
+    throw new Error(stripIndent`
+    The installed version of @angular/service-worker is ${swVersion}. This version of the CLI
+    requires the @angular/service-worker version to satisfy ${NEW_SW_VERSION}. Please upgrade
+    your service worker version.
+  `);
+  }
+
+  return true;
 }
 
 export function augmentAppWithServiceWorker(projectRoot: string, appRoot: string,