Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-16 02:24:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yi Qi 2018-09-10 14:00:52 -07:00 committed by Keen Yee Liau
parent 437cd6234d
commit e36a259a45
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/angular/cli/BUILD
View File

@ -28,6 +28,8 @@ ts_library(
"//packages/angular_devkit/schematics:tools", "//packages/angular_devkit/schematics:tools",
"@rxjs", "@rxjs",
"@rxjs//operators", "@rxjs//operators",
# @typings: es2017.object
# @typings: inquirer
# @typings: node # @typings: node
# @typings: semver # @typings: semver
], ],

9
packages/angular_devkit/core/src/json/schema/registry.ts
View File

@ -342,7 +342,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
let result = of(data); let result = of(data);
if (validationOptions.applyPreTransforms) { 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) => { ...[...this._pre].map(visitor => concatMap((data: JsonValue) => {
return visitJson(data, visitor, schema, this._resolver, validate); return visitJson(data, visitor, schema, this._resolver, validate);
})), })),
@ -392,7 +393,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
let result = of(data); let result = of(data);
if (validationOptions.applyPostTransforms) { 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) => { ...[...this._post].map(visitor => concatMap((data: JsonValue) => {
return visitJson(data, visitor, schema, this._resolver, validate); return visitJson(data, visitor, schema, this._resolver, validate);
})), })),
@ -686,7 +688,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
data: T, data: T,
smartDefaults: Map<string, JsonObject>, smartDefaults: Map<string, JsonObject>,
): Observable<T> { ): 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]) => { ...[...smartDefaults.entries()].map(([pointer, schema]) => {
return concatMap<T, T>(data => { return concatMap<T, T>(data => {
const fragments = JSON.parse(pointer); const fragments = JSON.parse(pointer);

3
packages/angular_devkit/schematics/tools/fallback-engine-host.ts
View File

@ -91,7 +91,8 @@ export class FallbackEngineHost implements EngineHost<{}, {}> {
options: OptionT, options: OptionT,
context?: FallbackContext, context?: FallbackContext,
): Observable<ResultT> { ): 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 .pipe(...this._hosts
.map(host => mergeMap(opt => host.transformOptions(schematic, opt, context))), .map(host => mergeMap(opt => host.transformOptions(schematic, opt, context))),
) )

3
packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
View File

@ -287,7 +287,8 @@ export abstract class FileSystemEngineHostBase implements
options: OptionT, options: OptionT,
context?: FileSystemSchematicContext, context?: FileSystemSchematicContext,
): Observable<ResultT> { ): Observable<ResultT> {
return (observableOf(options) // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
return ((observableOf(options) as any)
.pipe( .pipe(
...this._transforms.map(tFn => mergeMap(opt => { ...this._transforms.map(tFn => mergeMap(opt => {
const newOptions = tFn(schematic, opt, context); const newOptions = tFn(schematic, opt, context);