From f087948bc31e3bf471f0ed5c8ab362fc01d13a25 Mon Sep 17 00:00:00 2001
From: Matthias Gaudin <gatthias@gmail.com>
Date: Sat, 12 Jan 2019 17:32:37 +0100
Subject: [PATCH] fix(@angular-devkit/build-angular): add missing declaration
 types in build_angular schemas.

Fixes issue #13388
---
 .../src/angular-cli-files/models/build-options.ts   |  3 ++-
 .../build_angular/src/browser/schema.d.ts           | 13 +++++++++++++
 .../build_angular/src/karma/schema.d.ts             |  7 ++++++-
 .../build_angular/src/server/schema.d.ts            |  3 +++
 .../src/utils/normalize-optimization.ts             | 11 +++++------
 .../src/utils/normalize-source-maps.ts              |  9 +--------
 6 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 552b515b53cd..80a9a17a515b 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -15,8 +15,9 @@ import {
   Budget,
   CurrentFileReplacement,
   ExtraEntryPoint,
+  NormalizedOptimization,
+  NormalizedSourceMaps,
 } from '../../browser/schema';
-import { NormalizedOptimization, NormalizedSourceMaps } from '../../utils/index';
 
 export interface BuildOptions {
   optimization: NormalizedOptimization;
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index 243c8f84fc96..1a2bd717ea52 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 export interface BrowserBuilderSchema {
   /**
    * List of static application assets.
@@ -409,6 +410,18 @@ export enum BudgetType {
 // Right now this normalization has to be done in all other builders that make use of the
 // BrowserBuildSchema and BrowserBuilder.buildWebpackConfig.
 // It would really help if it happens during architect.validateBuilderOptions, or similar.
+export interface NormalizedOptimization {
+  scripts: boolean;
+  styles: boolean;
+}
+
+export interface NormalizedSourceMaps {
+  scripts: boolean;
+  styles: boolean;
+  hidden: boolean;
+  vendor: boolean;
+}
+
 export interface NormalizedBrowserBuilderSchema extends
   Pick<
   BrowserBuilderSchema,
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.d.ts b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
index f2fbc1ca9342..809a735925b7 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
@@ -5,7 +5,12 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BrowserBuilderSchema } from '../browser/schema';
+import {
+  AssetPatternObject,
+  BrowserBuilderSchema,
+  CurrentFileReplacement,
+  NormalizedSourceMaps,
+} from '../browser/schema';
 
 export interface KarmaBuilderSchema extends Pick<BrowserBuilderSchema,
   'assets' | 'main' | 'polyfills' | 'tsConfig' | 'scripts' | 'styles' | 'stylePreprocessorOptions'
diff --git a/packages/angular_devkit/build_angular/src/server/schema.d.ts b/packages/angular_devkit/build_angular/src/server/schema.d.ts
index 76fee12790a5..b4741afec2f6 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/server/schema.d.ts
@@ -8,7 +8,10 @@
 
 import {
   BrowserBuilderSchema,
+  CurrentFileReplacement,
   FileReplacement,
+  NormalizedOptimization,
+  NormalizedSourceMaps,
   OptimizationObject,
   SourceMapOptions,
 } from '../browser/schema';
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts b/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
index 36aa1e00420a..f7f9d58cd576 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
@@ -6,12 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { OptimizationOptions, SourceMapOptions } from '../browser/schema';
-
-export interface NormalizedOptimization {
-  scripts: boolean;
-  styles: boolean;
-}
+import {
+  NormalizedOptimization,
+  OptimizationOptions,
+  SourceMapOptions,
+} from '../browser/schema';
 
 export function normalizeOptimization(optimization: OptimizationOptions): NormalizedOptimization {
   const scripts = !!(typeof optimization === 'object' ? optimization.scripts : optimization);
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts b/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
index 69d403219792..1689e7da9997 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
@@ -6,14 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { SourceMapOptions } from '../browser/schema';
-
-export interface NormalizedSourceMaps {
-  scripts: boolean;
-  styles: boolean;
-  hidden: boolean;
-  vendor: boolean;
-}
+import { NormalizedSourceMaps, SourceMapOptions } from '../browser/schema';
 
 export function normalizeSourceMaps(sourceMap: SourceMapOptions): NormalizedSourceMaps {
   const scripts = !!(typeof sourceMap === 'object' ? sourceMap.scripts : sourceMap);