refactor(@angular-devkit/build-angular): clean up some interfaces and schemas

Remove the manually maintained schema.d.ts from the browser builder, and use
the Schema JSON file to generate it. This had a lot of repercussions around
the whole build-angular code base and the different interfaces that were
manually kept.

Author: hansl

packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts

@@ -11,21 +11,21 @@
 import { logging } from '@angular-devkit/core';
 import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
 import {
-  AssetPatternObject,
+  AssetPatternClass,
   Budget,
-  CurrentFileReplacement,
   ExtraEntryPoint,
-  NormalizedOptimization,
-  NormalizedSourceMaps,
+  OptimizationClass,
+  SourceMapClass,
 } from '../../browser/schema';
+import { NormalizedFileReplacement } from '../../utils/normalize-file-replacements';
 
 export interface BuildOptions {
-  optimization: NormalizedOptimization;
+  optimization: OptimizationClass;
   environment?: string;
   outputPath: string;
   resourcesOutputPath?: string;
   aot?: boolean;
-  sourceMap: NormalizedSourceMaps;
+  sourceMap: SourceMapClass;
   /** @deprecated use sourceMap instead */
   vendorSourceMap?: boolean;
   /** @deprecated  */
@@ -64,13 +64,13 @@ export interface BuildOptions {
   index: string;
   polyfills?: string;
   budgets: Budget[];
-  assets: AssetPatternObject[];
+  assets: AssetPatternClass[];
   scripts: ExtraEntryPoint[];
   styles: ExtraEntryPoint[];
   stylePreprocessorOptions?: { includePaths: string[] };
   lazyModules: string[];
   platform?: 'browser' | 'server';
-  fileReplacements: CurrentFileReplacement[];
+  fileReplacements: NormalizedFileReplacement[];
     /** @deprecated use only for compatibility in 8.x; will be removed in 9.0 */
   rebaseRootRelativeCssUrls?: boolean;
 }

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts

@@ -67,8 +67,8 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
 
   if (!isEval && (scriptsSourceMap || stylesSourceMap)) {
     extraPlugins.push(getSourceMapDevTool(
-      scriptsSourceMap,
-      stylesSourceMap,
+      !!scriptsSourceMap,
+      !!stylesSourceMap,
       hiddenSourceMap,
     ));
   }

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts

@@ -9,7 +9,7 @@ import { tags } from '@angular-devkit/core';
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as path from 'path';
 import { HashedModuleIdsPlugin, debug } from 'webpack';
-import { AssetPatternObject } from '../../../browser/schema';
+import { AssetPatternClass } from '../../../browser/schema';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
 import { ScriptsWebpackPlugin } from '../../plugins/scripts-webpack-plugin';
@@ -103,7 +103,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
           prev.push({
             bundleName,
             paths: [resolvedPath],
-            lazy: curr.lazy,
+            lazy: curr.lazy || false,
           });
         }
 
@@ -129,7 +129,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
 
   // process asset entries
   if (buildOptions.assets) {
-    const copyWebpackPluginPatterns = buildOptions.assets.map((asset: AssetPatternObject) => {
+    const copyWebpackPluginPatterns = buildOptions.assets.map((asset: AssetPatternClass) => {
 
       // Resolve input paths relative to workspace root and add slash at the end.
       asset.input = path.resolve(root, asset.input).replace(/\\/g, '/');

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts

@@ -21,9 +21,9 @@ export function getServerConfig(wco: WebpackConfigOptions) {
     const { scripts, styles, hidden } = wco.buildOptions.sourceMap;
 
     extraPlugins.push(getSourceMapDevTool(
-      scripts,
-      styles,
-      hidden,
+      scripts || false,
+      styles || false,
+      hidden || false,
     ));
   }
 

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts

@@ -60,8 +60,8 @@ export function getTestConfig(
     const { styles, scripts } = wco.buildOptions.sourceMap;
 
     extraPlugins.push(getSourceMapDevTool(
-      styles,
-      scripts,
+      styles || false,
+      scripts || false,
       false,
       true,
     ));

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts

@@ -10,7 +10,7 @@
 
 import * as path from 'path';
 import { basename, normalize } from '@angular-devkit/core';
-import { ExtraEntryPoint, ExtraEntryPointObject } from '../../../browser/schema';
+import { ExtraEntryPoint, ExtraEntryPointClass } from '../../../browser/schema';
 import { SourceMapDevToolPlugin } from 'webpack';
 
 export const ngAppResolve = (resolvePath: string): string => {
@@ -36,7 +36,7 @@ export function getOutputHashFormat(option: string, length = 20): HashFormat {
   return hashFormats[option] || hashFormats['none'];
 }
 
-export type NormalizedEntryPoint = ExtraEntryPointObject & { bundleName: string };
+export type NormalizedEntryPoint = ExtraEntryPointClass & { bundleName: string };
 
 export function normalizeExtraEntryPoints(
   extraEntryPoints: ExtraEntryPoint[],

packages/angular_devkit/build_angular/src/app-shell/index.ts

@@ -16,7 +16,7 @@ import { Observable, forkJoin, from, merge, of, throwError } from 'rxjs';
 import { concatMap, map, switchMap } from 'rxjs/operators';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
-import { BrowserBuilderSchema } from '../browser/schema';
+import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { BuildWebpackServerSchema } from '../server/schema';
 import { BuildWebpackAppShellSchema } from './schema';
 

packages/angular_devkit/build_angular/src/browser/index.ts

@@ -15,7 +15,7 @@ import { LoggingCallback, WebpackBuilder } from '@angular-devkit/build-webpack';
 import { Path, getSystemPath, join, normalize, resolve, virtualFs } from '@angular-devkit/core';
 import * as fs from 'fs';
 import { Observable, concat, of, throwError } from 'rxjs';
-import { concatMap, last, tap } from 'rxjs/operators';
+import { concatMap, last } from 'rxjs/operators';
 import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
 import {
@@ -34,8 +34,8 @@ import {
   statsToString,
   statsWarningsToString,
 } from '../angular-cli-files/utilities/stats';
-import { defaultProgress, normalizeBuilderSchema } from '../utils';
-import { BrowserBuilderSchema, NormalizedBrowserBuilderSchema } from './schema';
+import { NormalizedBrowserBuilderSchema, defaultProgress, normalizeBrowserSchema } from '../utils';
+import { Schema as BrowserBuilderSchema } from './schema';
 const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 const webpackMerge = require('webpack-merge');
 
@@ -58,10 +58,12 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
     const webpackBuilder = this.createWebpackBuilder({ ...this.context, host });
     const getLoggingCb = this.createLoggingFactory();
 
-    const options = normalizeBuilderSchema(
+    const options = normalizeBrowserSchema(
       host,
       root,
-      builderConfig,
+      resolve(root, builderConfig.root),
+      builderConfig.sourceRoot,
+      builderConfig.options,
     );
 
     return of(null).pipe(
@@ -76,7 +78,7 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
           return throwError(e);
         }
 
-        return webpackBuilder.runWebpack(webpackConfig, getLoggingCb(options.verbose));
+        return webpackBuilder.runWebpack(webpackConfig, getLoggingCb(options.verbose || false));
       }),
       concatMap(buildEvent => {
         if (buildEvent.success && !options.watch && options.serviceWorker) {