Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(rxjs): update rxjs to 6.3.2 #12357

Closed
wants to merge 1 commit into from
Closed

chore(rxjs): update rxjs to 6.3.2 #12357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/angular/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/pwa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
4 changes: 2 additions & 2 deletions packages/angular_devkit/architect/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"typings": "src/index.d.ts",
"dependencies": {
"@angular-devkit/core": "0.0.0",
"rxjs": "6.2.2"
"rxjs": "6.3.2"
}
}
}
2 changes: 1 addition & 1 deletion packages/angular_devkit/architect/test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"builders": "builders.json",
"dependencies": {
"rxjs": "6.2.2"
"rxjs": "6.3.2"
}
}
6 changes: 3 additions & 3 deletions packages/angular_devkit/architect_cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
6 changes: 3 additions & 3 deletions packages/angular_devkit/benchmark/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
14 changes: 7 additions & 7 deletions packages/angular_devkit/build_angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -87,4 +87,4 @@
"protractor": "~5.4.0",
"zone.js": "^0.8.19"
}
}
}
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_ng_packagr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
1 change: 1 addition & 0 deletions packages/angular_devkit/build_optimizer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -18,4 +18,4 @@
"webpack": "^4.6.0",
"webpack-dev-server": "^3.1.4"
}
}
}
4 changes: 2 additions & 2 deletions packages/angular_devkit/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/angular_devkit/core/src/json/schema/visitor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function _visitJsonRecursive<ContextT>(
? value as Observable<JsonValue>
: observableOf(value as JsonValue)
).pipe(
concatMap((value: JsonValue) => {
concatMap((value): Observable<JsonValue> => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That’s not valid TypeScript is it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's missing the input type, or doesn't it need it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's what Rado recommended in these situations. Unfortunately, TS can't infer the return in these cases where there's branching code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The input type is inferred.

if (Array.isArray(value)) {
return concat(
from(value).pipe(
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/schematics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
],
"dependencies": {
"@angular-devkit/core": "0.0.0",
"rxjs": "6.2.2"
"rxjs": "6.3"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be 6.3.2 for consistence? As this will be resolved to 6.3.x

}
}
3 changes: 2 additions & 1 deletion packages/angular_devkit/schematics/src/workflow/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/schematics_cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/ngtools/webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions packages/schematics/angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
3 changes: 2 additions & 1 deletion packages/schematics/schematics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this need to be added here? AFAIK schematics/schematics do not directly depend on rxjs

}
}
6 changes: 3 additions & 3 deletions packages/schematics/update/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
2 changes: 1 addition & 1 deletion tests/angular_devkit/build_angular/hello-world-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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"

Expand Down