fixup: builders

Author: hansl

packages/angular_devkit/architect/builders/all-of.ts

@@ -7,14 +7,14 @@
  */
 import { json } from '@angular-devkit/core';
 import { EMPTY, from, of } from 'rxjs';
-import { map, mergeMap, tap } from 'rxjs/operators';
+import { map, mergeMap } from 'rxjs/operators';
 import { BuilderOutput, BuilderRun, createBuilder } from '../src/index2';
 import { Schema as OperatorSchema } from './operator-schema';
 
 export default createBuilder<json.JsonObject & OperatorSchema>((options, context) => {
   const allRuns: Promise<[number, BuilderRun]>[] = [];
 
-  context.progress(0,
+  context.reportProgress(0,
     (options.targets ? options.targets.length : 0)
     + (options.builders ? options.builders.length : 0),
   );
@@ -37,14 +37,14 @@ export default createBuilder<json.JsonObject & OperatorSchema>((options, context
 
   const allResults: (BuilderOutput | null)[] = allRuns.map(() => null);
   let n = 0;
-  context.progress(n++, allRuns.length);
+  context.reportProgress(n++, allRuns.length);
 
   return from(allRuns).pipe(
     mergeMap(runPromise => from(runPromise)),
     mergeMap(([i, run]: [number, BuilderRun]) => run.output.pipe(map(output => [i, output]))),
     mergeMap<[number, BuilderOutput], BuilderOutput>(([i, output]) => {
       allResults[i] = output;
-      context.progress(n++, allRuns.length);
+      context.reportProgress(n++, allRuns.length);
 
       if (allResults.some(x => x === null)) {
         // Some builders aren't done running yet.

packages/angular_devkit/architect/builders/concat.ts

@@ -14,7 +14,7 @@ import { Schema as OperatorSchema } from './operator-schema';
 export default createBuilder<json.JsonObject & OperatorSchema>((options, context) => {
   const allRuns: (() => Promise<BuilderRun>)[] = [];
 
-  context.progress(0,
+  context.reportProgress(0,
     (options.targets ? options.targets.length : 0)
     + (options.builders ? options.builders.length : 0),
   );
@@ -35,14 +35,14 @@ export default createBuilder<json.JsonObject & OperatorSchema>((options, context
 
   let stop: BuilderOutput | null = null;
   let i = 0;
-  context.progress(i++, allRuns.length);
+  context.reportProgress(i++, allRuns.length);
 
   return from(allRuns).pipe(
     concatMap(fn => stop ? of(null) : from(fn()).pipe(
       switchMap(run => run === null ? of(null) : run.output.pipe(first())),
     )),
     map(output => {
-      context.progress(i++, allRuns.length);
+      context.reportProgress(i++, allRuns.length);
       if (output === null || stop !== null) {
         return stop || { success: false };
       } else if (output.success === false) {