Skip to content

Commit e36a259

Browse files
qiyiggKeen Yee Liau
authored and
Keen Yee Liau
committedSep 13, 2018
fix(@angular/cli): fix issues in google3
1 parent 437cd62 commit e36a259

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed
 

‎packages/angular/cli/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ ts_library(
2828
"//packages/angular_devkit/schematics:tools",
2929
"@rxjs",
3030
"@rxjs//operators",
31+
# @typings: es2017.object
32+
# @typings: inquirer
3133
# @typings: node
3234
# @typings: semver
3335
],

‎packages/angular_devkit/core/src/json/schema/registry.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
342342

343343
let result = of(data);
344344
if (validationOptions.applyPreTransforms) {
345-
result = result.pipe(
345+
// tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
346+
result = (result as any).pipe(
346347
...[...this._pre].map(visitor => concatMap((data: JsonValue) => {
347348
return visitJson(data, visitor, schema, this._resolver, validate);
348349
})),
@@ -392,7 +393,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
392393
let result = of(data);
393394

394395
if (validationOptions.applyPostTransforms) {
395-
result = result.pipe(
396+
// tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
397+
result = (result as any).pipe(
396398
...[...this._post].map(visitor => concatMap((data: JsonValue) => {
397399
return visitJson(data, visitor, schema, this._resolver, validate);
398400
})),
@@ -686,7 +688,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
686688
data: T,
687689
smartDefaults: Map<string, JsonObject>,
688690
): Observable<T> {
689-
return of(data).pipe(
691+
// tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
692+
return (of(data) as any).pipe(
690693
...[...smartDefaults.entries()].map(([pointer, schema]) => {
691694
return concatMap<T, T>(data => {
692695
const fragments = JSON.parse(pointer);

‎packages/angular_devkit/schematics/tools/fallback-engine-host.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ export class FallbackEngineHost implements EngineHost<{}, {}> {
9191
options: OptionT,
9292
context?: FallbackContext,
9393
): Observable<ResultT> {
94-
return (observableOf(options)
94+
// tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
95+
return ((observableOf(options) as any)
9596
.pipe(...this._hosts
9697
.map(host => mergeMap(opt => host.transformOptions(schematic, opt, context))),
9798
)

‎packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@ export abstract class FileSystemEngineHostBase implements
287287
options: OptionT,
288288
context?: FileSystemSchematicContext,
289289
): Observable<ResultT> {
290-
return (observableOf(options)
290+
// tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
291+
return ((observableOf(options) as any)
291292
.pipe(
292293
...this._transforms.map(tFn => mergeMap(opt => {
293294
const newOptions = tFn(schematic, opt, context);

0 commit comments

Comments
 (0)