diff --git a/package.json b/package.json index cb99390c3e09..ec569667aec9 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "license-checker": "^20.1.0", "minimatch": "^3.0.4", "minimist": "^1.2.0", - "rxjs": "~6.2.0", + "rxjs": "6.3.2", "semver": "^5.3.0", "source-map": "^0.5.6", "source-map-support": "^0.5.0", @@ -109,6 +109,6 @@ "resolutions": { "@types/webpack": "4.4.0", "@types/webpack-dev-server": "2.9.4", - "rxjs": "~6.2.0" + "rxjs": "6.3.2" } } diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json index 6b3ed6a16143..3d22196789d6 100644 --- a/packages/angular/cli/package.json +++ b/packages/angular/cli/package.json @@ -33,7 +33,7 @@ "@schematics/update": "0.0.0", "inquirer": "6.2.0", "opn": "5.3.0", - "rxjs": "6.2.2", + "rxjs": "6.3.2", "semver": "5.5.1", "symbol-observable": "1.2.0" }, diff --git a/packages/angular/pwa/package.json b/packages/angular/pwa/package.json index 0891d2bf3c32..30b6f686a83e 100644 --- a/packages/angular/pwa/package.json +++ b/packages/angular/pwa/package.json @@ -13,6 +13,6 @@ "@angular-devkit/schematics": "0.0.0", "@schematics/angular": "0.0.0", "parse5-html-rewriting-stream": "5.1.0", - "rxjs": "6.2.2" + "rxjs": "6.3.2" } -} \ No newline at end of file +} diff --git a/packages/angular_devkit/architect/package.json b/packages/angular_devkit/architect/package.json index 4ff19b1fdf7d..b4f63db0f886 100644 --- a/packages/angular_devkit/architect/package.json +++ b/packages/angular_devkit/architect/package.json @@ -6,6 +6,6 @@ "typings": "src/index.d.ts", "dependencies": { "@angular-devkit/core": "0.0.0", - "rxjs": "6.2.2" + "rxjs": "6.3.2" } -} \ No newline at end of file +} diff --git a/packages/angular_devkit/architect/test/package.json b/packages/angular_devkit/architect/test/package.json index ddd3d69106d0..74808bcc9932 100644 --- a/packages/angular_devkit/architect/test/package.json +++ b/packages/angular_devkit/architect/test/package.json @@ -1,6 +1,6 @@ { "builders": "builders.json", "dependencies": { - "rxjs": "6.2.2" + "rxjs": "6.3.2" } } diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json index 10a3e56681e2..e12e848d15e7 100644 --- a/packages/angular_devkit/architect_cli/package.json +++ b/packages/angular_devkit/architect_cli/package.json @@ -16,6 +16,6 @@ "@angular-devkit/architect": "0.0.0", "minimist": "1.2.0", "symbol-observable": "1.2.0", - "rxjs": "6.2.2" + "rxjs": "6.3.2" } } diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json index 0763f807fd36..9f90e44708ef 100644 --- a/packages/angular_devkit/benchmark/package.json +++ b/packages/angular_devkit/benchmark/package.json @@ -18,7 +18,7 @@ "minimist": "^1.2.0", "pidusage": "^2.0.17", "pidtree": "^0.3.0", - "rxjs": "~6.2.0", + "rxjs": "6.3.2", "tree-kill": "^1.2.0" } -} \ No newline at end of file +} diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 3f1b61dba346..aff1bc736fbc 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -35,7 +35,7 @@ "postcss-import": "11.1.0", "postcss-loader": "2.1.6", "raw-loader": "0.5.1", - "rxjs": "6.2.2", + "rxjs": "6.3.2", "sass-loader": "7.1.0", "semver": "5.5.1", "source-map-support": "0.5.9", @@ -87,4 +87,4 @@ "protractor": "~5.4.0", "zone.js": "^0.8.19" } -} \ No newline at end of file +} diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json index 22bc16756914..1529095525f1 100644 --- a/packages/angular_devkit/build_ng_packagr/package.json +++ b/packages/angular_devkit/build_ng_packagr/package.json @@ -8,7 +8,7 @@ "dependencies": { "@angular-devkit/architect": "0.0.0", "@angular-devkit/core": "0.0.0", - "rxjs": "6.2.2", + "rxjs": "6.3.2", "semver": "5.5.1" }, "peerDependencies": { diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json index 47600f049507..eabb07db4975 100644 --- a/packages/angular_devkit/build_webpack/package.json +++ b/packages/angular_devkit/build_webpack/package.json @@ -8,7 +8,7 @@ "dependencies": { "@angular-devkit/architect": "0.0.0", "@angular-devkit/core": "0.0.0", - "rxjs": "6.2.2" + "rxjs": "6.3.2" }, "peerDependencies": { "webpack": "^4.6.0", @@ -18,4 +18,4 @@ "webpack": "^4.6.0", "webpack-dev-server": "^3.1.4" } -} \ No newline at end of file +} diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json index d8967cd6022b..11a3d33a88fd 100644 --- a/packages/angular_devkit/core/package.json +++ b/packages/angular_devkit/core/package.json @@ -12,6 +12,6 @@ "chokidar": "2.0.4", "fast-json-stable-stringify": "2.0.0", "source-map": "0.7.3", - "rxjs": "6.2.2" + "rxjs": "6.3.2" } } diff --git a/packages/angular_devkit/core/src/json/schema/visitor.ts b/packages/angular_devkit/core/src/json/schema/visitor.ts index 0708c3564c51..e0618a39f934 100644 --- a/packages/angular_devkit/core/src/json/schema/visitor.ts +++ b/packages/angular_devkit/core/src/json/schema/visitor.ts @@ -69,7 +69,7 @@ function _visitJsonRecursive( ? value as Observable : observableOf(value as JsonValue) ).pipe( - concatMap((value: JsonValue) => { + concatMap((value): Observable => { if (Array.isArray(value)) { return concat( from(value).pipe( diff --git a/packages/angular_devkit/schematics/package.json b/packages/angular_devkit/schematics/package.json index 9eff901c231e..ecface1ddda9 100644 --- a/packages/angular_devkit/schematics/package.json +++ b/packages/angular_devkit/schematics/package.json @@ -14,6 +14,6 @@ ], "dependencies": { "@angular-devkit/core": "0.0.0", - "rxjs": "6.2.2" + "rxjs": "6.3.2" } } diff --git a/packages/angular_devkit/schematics/src/workflow/base.ts b/packages/angular_devkit/schematics/src/workflow/base.ts index 61238b0fe28b..b6dbed7496a5 100644 --- a/packages/angular_devkit/schematics/src/workflow/base.ts +++ b/packages/angular_devkit/schematics/src/workflow/base.ts @@ -162,7 +162,7 @@ export abstract class BaseWorkflow implements Workflow { map(tree => optimize(tree)), concatMap((tree: Tree) => { // Process all sinks. - return of(tree).pipe( + return (of(tree) as any).pipe( ...sinks.map(sink => { return concatMap((tree: Tree) => { return concat( diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json index 8a27cb589f3b..19194edf3d06 100644 --- a/packages/angular_devkit/schematics_cli/package.json +++ b/packages/angular_devkit/schematics_cli/package.json @@ -19,6 +19,6 @@ "@schematics/schematics": "0.0.0", "minimist": "1.2.0", "symbol-observable": "1.2.0", - "rxjs": "6.2.2" + "rxjs": "6.3.2" } } diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json index 2d0ddfed3aec..4ede73045038 100644 --- a/packages/ngtools/webpack/package.json +++ b/packages/ngtools/webpack/package.json @@ -22,7 +22,7 @@ "homepage": "https://github.com/angular/angular-cli/tree/master/packages/@ngtools/webpack", "dependencies": { "@angular-devkit/core": "0.0.0", - "rxjs": "6.2.2", + "rxjs": "6.3.2", "tree-kill": "1.2.0", "webpack-sources": "1.2.0" }, diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json index f761db4c43a4..c6b2d935f297 100644 --- a/packages/schematics/update/package.json +++ b/packages/schematics/update/package.json @@ -15,6 +15,6 @@ "npm-registry-client": "8.6.0", "semver": "5.5.1", "semver-intersect": "1.4.0", - "rxjs": "6.2.2" + "rxjs": "6.3.2" } -} \ No newline at end of file +} diff --git a/tests/angular_devkit/build_angular/hello-world-app/package.json b/tests/angular_devkit/build_angular/hello-world-app/package.json index e45a8c5b0c7c..75e568853b77 100644 --- a/tests/angular_devkit/build_angular/hello-world-app/package.json +++ b/tests/angular_devkit/build_angular/hello-world-app/package.json @@ -22,7 +22,7 @@ "@angular/platform-browser-dynamic": "^6.0.0-rc.0", "@angular/router": "^6.0.0-rc.0", "core-js": "^2.4.1", - "rxjs": "~6.2.0", + "rxjs": "6.3.2", "zone.js": "^0.8.19" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 0fbf50f4cfbc..7e1166b01638 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6574,9 +6574,9 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rxjs@6.2.2, rxjs@^6.0.0, rxjs@^6.1.0, rxjs@~6.2.0: - version "6.2.2" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9" +rxjs@6.3.2, rxjs@^6.0.0, rxjs@^6.1.0: + version "6.3.2" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.2.tgz#6a688b16c4e6e980e62ea805ec30648e1c60907f" dependencies: tslib "^1.9.0"