From 5a87336377ce35145463c9d85bea71a596546758 Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Mon, 24 Sep 2018 11:19:48 -0700 Subject: [PATCH] build: update rxjs to 6.3.2 --- package.json | 4 ++-- packages/angular/cli/package.json | 2 +- packages/angular/pwa/package.json | 4 ++-- packages/angular_devkit/architect/package.json | 4 ++-- .../angular_devkit/architect/test/package.json | 2 +- packages/angular_devkit/architect_cli/package.json | 6 +++--- packages/angular_devkit/benchmark/package.json | 6 +++--- packages/angular_devkit/build_angular/package.json | 14 +++++++------- .../angular_devkit/build_ng_packagr/package.json | 2 +- .../angular_devkit/build_optimizer/package.json | 1 + packages/angular_devkit/build_webpack/package.json | 4 ++-- packages/angular_devkit/core/package.json | 4 ++-- .../angular_devkit/core/src/json/schema/visitor.ts | 2 +- packages/angular_devkit/schematics/package.json | 2 +- .../angular_devkit/schematics/src/workflow/base.ts | 3 ++- .../angular_devkit/schematics_cli/package.json | 4 ++-- packages/ngtools/webpack/package.json | 2 +- packages/schematics/angular/package.json | 1 + packages/schematics/schematics/package.json | 3 ++- packages/schematics/update/package.json | 6 +++--- .../build_angular/hello-world-app/package.json | 2 +- yarn.lock | 10 +++++----- 22 files changed, 46 insertions(+), 42 deletions(-) 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..4e5f2e3fa1d2 100644 --- a/packages/angular_devkit/architect_cli/package.json +++ b/packages/angular_devkit/architect_cli/package.json @@ -12,10 +12,10 @@ "tooling" ], "dependencies": { - "@angular-devkit/core": "0.0.0", "@angular-devkit/architect": "0.0.0", + "@angular-devkit/core": "0.0.0", "minimist": "1.2.0", - "symbol-observable": "1.2.0", - "rxjs": "6.2.2" + "rxjs": "6.3.2", + "symbol-observable": "1.2.0" } } diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json index 0763f807fd36..1dfa5858eb64 100644 --- a/packages/angular_devkit/benchmark/package.json +++ b/packages/angular_devkit/benchmark/package.json @@ -16,9 +16,9 @@ "dependencies": { "@angular-devkit/core": "0.0.0", "minimist": "^1.2.0", - "pidusage": "^2.0.17", "pidtree": "^0.3.0", - "rxjs": "~6.2.0", + "pidusage": "^2.0.17", + "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..3ea2cb609da0 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -28,24 +28,24 @@ "loader-utils": "1.1.0", "mini-css-extract-plugin": "0.4.3", "minimatch": "3.0.4", - "parse5": "4.0.0", "opn": "5.3.0", + "parse5": "4.0.0", "portfinder": "1.0.17", "postcss": "6.0.23", "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", "source-map-loader": "0.2.4", + "source-map-support": "0.5.9", "stats-webpack-plugin": "0.7.0", "style-loader": "0.23.0", "stylus": "0.54.5", "stylus-loader": "3.0.2", - "tree-kill": "1.2.0", "terser-webpack-plugin": "1.1.0", + "tree-kill": "1.2.0", "webpack": "4.19.1", "webpack-dev-middleware": "3.3.0", "webpack-dev-server": "3.1.8", @@ -70,13 +70,13 @@ "@angular/platform-server": "^7.0.0-beta.4", "@angular/router": "^7.0.0-beta.4", "@angular/service-worker": "^7.0.0-beta.4", + "bootstrap": "^4.0.0", "codelyzer": "^4.2.1", "core-js": "^2.4.1", - "bootstrap": "^4.0.0", "font-awesome": "^4.7.0", - "jquery": "^3.3.1", "jasmine-core": "~2.8.0", "jasmine-spec-reporter": "~4.2.1", + "jquery": "^3.3.1", "karma": "~3.0.0", "karma-chrome-launcher": "~2.2.0", "karma-coverage-istanbul-reporter": "~2.0.0", @@ -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_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json index 5c3487381dba..7f09d1d83917 100644 --- a/packages/angular_devkit/build_optimizer/package.json +++ b/packages/angular_devkit/build_optimizer/package.json @@ -9,6 +9,7 @@ }, "dependencies": { "loader-utils": "1.1.0", + "rxjs": "6.3.2", "source-map": "0.5.6", "typescript": "3.0.1", "webpack-sources": "1.2.0" 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..e0e143748150 100644 --- a/packages/angular_devkit/core/package.json +++ b/packages/angular_devkit/core/package.json @@ -11,7 +11,7 @@ "ajv": "6.5.3", "chokidar": "2.0.4", "fast-json-stable-stringify": "2.0.0", - "source-map": "0.7.3", - "rxjs": "6.2.2" + "rxjs": "6.3.2", + "source-map": "0.7.3" } } 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..ef9143f3034a 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" } } diff --git a/packages/angular_devkit/schematics/src/workflow/base.ts b/packages/angular_devkit/schematics/src/workflow/base.ts index 61238b0fe28b..2efb792b39ce 100644 --- a/packages/angular_devkit/schematics/src/workflow/base.ts +++ b/packages/angular_devkit/schematics/src/workflow/base.ts @@ -162,7 +162,8 @@ export abstract class BaseWorkflow implements Workflow { map(tree => optimize(tree)), concatMap((tree: Tree) => { // Process all sinks. - return of(tree).pipe( + // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/4177 + 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..7282792bc9d1 100644 --- a/packages/angular_devkit/schematics_cli/package.json +++ b/packages/angular_devkit/schematics_cli/package.json @@ -18,7 +18,7 @@ "@angular-devkit/schematics": "0.0.0", "@schematics/schematics": "0.0.0", "minimist": "1.2.0", - "symbol-observable": "1.2.0", - "rxjs": "6.2.2" + "rxjs": "6.3.2", + "symbol-observable": "1.2.0" } } 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/angular/package.json b/packages/schematics/angular/package.json index 2aa67c7156e6..b0707360aeae 100644 --- a/packages/schematics/angular/package.json +++ b/packages/schematics/angular/package.json @@ -11,6 +11,7 @@ "dependencies": { "@angular-devkit/core": "0.0.0", "@angular-devkit/schematics": "0.0.0", + "rxjs": "6.3.2", "typescript": "3.0.1" } } diff --git a/packages/schematics/schematics/package.json b/packages/schematics/schematics/package.json index 0406dcfae810..47e84372a2c8 100644 --- a/packages/schematics/schematics/package.json +++ b/packages/schematics/schematics/package.json @@ -11,6 +11,7 @@ "schematics": "./collection.json", "dependencies": { "@angular-devkit/core": "0.0.0", - "@angular-devkit/schematics": "0.0.0" + "@angular-devkit/schematics": "0.0.0", + "rxjs": "6.3.2" } } diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json index f761db4c43a4..0c16df375da9 100644 --- a/packages/schematics/update/package.json +++ b/packages/schematics/update/package.json @@ -13,8 +13,8 @@ "@angular-devkit/core": "0.0.0", "@angular-devkit/schematics": "0.0.0", "npm-registry-client": "8.6.0", + "rxjs": "6.3.2", "semver": "5.5.1", - "semver-intersect": "1.4.0", - "rxjs": "6.2.2" + "semver-intersect": "1.4.0" } -} \ 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..37e7ce7f80c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -465,7 +465,7 @@ version "1.0.1" resolved "https://codeload.github.com/quicktype/types-urijs/tar.gz/a23603a04e31e883a92244bff8515e3d841a8b98" -"@types/webpack-dev-server@2.9.4", "@types/webpack-dev-server@^2.9.4": +"@types/webpack-dev-server@^2.9.4": version "2.9.4" resolved "http://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#cc3c398330ba87c0f1c7bfd020cfafb7bb895493" dependencies: @@ -483,7 +483,7 @@ "@types/source-list-map" "*" source-map "^0.6.1" -"@types/webpack@*", "@types/webpack@4.4.0", "@types/webpack@^4.4.0": +"@types/webpack@*", "@types/webpack@^4.4.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.0.tgz#c0551b772be241d786c0548812dd75a932f8efb4" dependencies: @@ -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, 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"