1fcb744 fix(@schematics/angular): use string assets when updating

Author: Angular Builds

package.json

@@ -6,10 +6,10 @@
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#27cecc6",
-    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#27cecc6",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#27cecc6",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#27cecc6",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#1fcb744",
+    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#1fcb744",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1fcb744",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#1fcb744",
     "ajv": "~6.4.0",
     "autoprefixer": "^8.1.0",
     "cache-loader": "^1.2.2",

src/angular-cli-files/models/build-options.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as ts from 'typescript';
-import { AssetPattern, Budget, ExtraEntryPoint } from '../../browser/schema';
+import { AssetPatternObject, Budget, ExtraEntryPoint } from '../../browser/schema';
 export interface BuildOptions {
     optimization: boolean;
     environment?: string;
@@ -45,7 +45,7 @@ export interface BuildOptions {
     index: string;
     polyfills?: string;
     budgets: Budget[];
-    assets: AssetPattern[];
+    assets: AssetPatternObject[];
     scripts: ExtraEntryPoint[];
     styles: ExtraEntryPoint[];
     stylePreprocessorOptions?: {

src/angular-cli-files/models/build-options.js

@@ -10,21 +10,16 @@ import { BuildEvent, Builder, BuilderConfiguration, BuilderContext } from '@angu
 import { Path, virtualFs } from '@angular-devkit/core';
 import * as fs from 'fs';
 import { Observable } from 'rxjs';
-import * as ts from 'typescript';
-import { BrowserBuilderSchema } from './schema';
-export interface WebpackConfigOptions {
-    root: string;
-    projectRoot: string;
-    buildOptions: BrowserBuilderSchema;
-    tsConfig: ts.ParsedCommandLine;
-    tsConfigPath: string;
-    supportES2015: boolean;
+import { AssetPatternObject, BrowserBuilderSchema, CurrentFileReplacement } from './schema';
+export interface NormalizedBrowserBuilderSchema extends BrowserBuilderSchema {
+    assets: AssetPatternObject[];
+    fileReplacements: CurrentFileReplacement[];
 }
 export declare class BrowserBuilder implements Builder<BrowserBuilderSchema> {
     context: BuilderContext;
     constructor(context: BuilderContext);
     run(builderConfig: BuilderConfiguration<BrowserBuilderSchema>): Observable<BuildEvent>;
-    buildWebpackConfig(root: Path, projectRoot: Path, host: virtualFs.Host<fs.Stats>, options: BrowserBuilderSchema): any;
+    buildWebpackConfig(root: Path, projectRoot: Path, host: virtualFs.Host<fs.Stats>, options: NormalizedBrowserBuilderSchema): any;
     private _deleteOutputDir(root, outputPath, host);
 }
 export default BrowserBuilder;

src/angular-cli-files/models/webpack-configs/common.js

@@ -219,7 +219,9 @@ export interface BrowserBuilderSchema {
   budgets: Budget[];
 }
 
-export interface AssetPattern {
+export type AssetPattern = string | AssetPatternObject;
+
+export interface AssetPatternObject {
   /**
    * The pattern to match.
    */

src/browser/index.d.ts

@@ -243,26 +243,33 @@
   ],
   "definitions": {
     "assetPattern": {
-      "type": "object",
-      "properties": {
-        "glob": {
-          "type": "string",
-          "description": "The pattern to match."
-        },
-        "input": {
-          "type": "string",
-          "description": "The input path dir in which to apply 'glob'. Defaults to the project root."
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "glob": {
+              "type": "string",
+              "description": "The pattern to match."
+            },
+            "input": {
+              "type": "string",
+              "description": "The input path dir in which to apply 'glob'. Defaults to the project root."
+            },
+            "output": {
+              "type": "string",
+              "description": "Absolute path within the output."
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "glob",
+            "input",
+            "output"
+          ]
         },
-        "output": {
-          "type": "string",
-          "description": "Absolute path within the output."
+        {
+          "type": "string"
         }
-      },
-      "additionalProperties": false,
-      "required": [
-        "glob",
-        "input",
-        "output"
       ]
     },
     "fileReplacement": {

src/browser/index.js

@@ -8,7 +8,7 @@
 import { BuildEvent, Builder, BuilderConfiguration, BuilderContext } from '@angular-devkit/architect';
 import { Path } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
-import { BrowserBuilderSchema } from '../browser/schema';
+import { NormalizedBrowserBuilderSchema } from '../browser';
 export interface ExtractI18nBuilderOptions {
     browserTarget: string;
     i18nFormat: string;
@@ -20,6 +20,6 @@ export declare class ExtractI18nBuilder implements Builder<ExtractI18nBuilderOpt
     context: BuilderContext;
     constructor(context: BuilderContext);
     run(builderConfig: BuilderConfiguration<ExtractI18nBuilderOptions>): Observable<BuildEvent>;
-    buildWebpackConfig(root: Path, projectRoot: Path, options: BrowserBuilderSchema): any;
+    buildWebpackConfig(root: Path, projectRoot: Path, options: NormalizedBrowserBuilderSchema): any;
 }
 export default ExtractI18nBuilder;