fix(@angular/cli): fix issues in google3

angular · Sep 13, 2018 · e36a259 · e36a259
1 parent 437cd62
commit e36a259
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
@@ -28,6 +28,8 @@ ts_library(
         "//packages/angular_devkit/schematics:tools",
         "@rxjs",
         "@rxjs//operators",
+        # @typings: es2017.object
+        # @typings: inquirer
         # @typings: node
         # @typings: semver
     ],

diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -342,7 +342,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
 
           let result = of(data);
           if (validationOptions.applyPreTransforms) {
-            result = result.pipe(
+            // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
+            result = (result as any).pipe(
               ...[...this._pre].map(visitor => concatMap((data: JsonValue) => {
                 return visitJson(data, visitor, schema, this._resolver, validate);
               })),
@@ -392,7 +393,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
                 let result = of(data);
 
                 if (validationOptions.applyPostTransforms) {
-                  result = result.pipe(
+                  // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
+                  result = (result as any).pipe(
                     ...[...this._post].map(visitor => concatMap((data: JsonValue) => {
                       return visitJson(data, visitor, schema, this._resolver, validate);
                     })),
@@ -686,7 +688,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     data: T,
     smartDefaults: Map<string, JsonObject>,
   ): Observable<T> {
-    return of(data).pipe(
+    // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
+    return (of(data) as any).pipe(
       ...[...smartDefaults.entries()].map(([pointer, schema]) => {
         return concatMap<T, T>(data => {
           const fragments = JSON.parse(pointer);

diff --git a/packages/angular_devkit/schematics/tools/fallback-engine-host.ts b/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
@@ -91,7 +91,8 @@ export class FallbackEngineHost implements EngineHost<{}, {}> {
     options: OptionT,
     context?: FallbackContext,
   ): Observable<ResultT> {
-    return (observableOf(options)
+    // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
+    return ((observableOf(options) as any)
       .pipe(...this._hosts
         .map(host => mergeMap(opt => host.transformOptions(schematic, opt, context))),
       )

diff --git a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
@@ -287,7 +287,8 @@ export abstract class FileSystemEngineHostBase implements
     options: OptionT,
     context?: FileSystemSchematicContext,
   ): Observable<ResultT> {
-    return (observableOf(options)
+    // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
+    return ((observableOf(options) as any)
       .pipe(
         ...this._transforms.map(tFn => mergeMap(opt => {
           const newOptions = tFn(schematic, opt, context);