8000 feat: upgrade to rxjs 6 · ui-router/rx@46b8158 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 46b8158

Browse files
author
Matt Lewis
committed
feat: upgrade to rxjs 6
BREAKING CHANGE: rxjs 6.0.0 or higher is now required to use this module
1 parent 4788290 commit 46b8158

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"homepage": "https://github.com/ui-router/rx#readme",
3535
"peerDependencies": {
3636
"@uirouter/core": ">=5.0.0",
37-
"rxjs": "^5.0.3"
37+
"rxjs": "^6.0.0"
3838
},
3939
"devDependencies": {
4040
"@uirouter/core": "^5.0.17",
@@ -58,7 +58,7 @@
5858
"rollup-plugin-sourcemaps": "^0.4.2",
5959
"rollup-plugin-uglify": "^3.0.0",
6060
"rollup-plugin-visualizer": "^0.6.0",
61-
"rxjs": "^5.5.10",
61+
"rxjs": "^6.1.0",
6262
"typescript": "^2.8.3"
6363
}
6464
}

‎src/ui-router-rx.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
/** @module rx */
22
/** */
3-
import 'rxjs/add/operator/mergeMap';
4-
import 'rxjs/add/operator/map';
5-
import { Observable } from 'rxjs/Observable';
6-
import { ReplaySubject } from 'rxjs/ReplaySubject';
3+
import { Observable, ReplaySubject } from 'rxjs';
4+
import { map, mergeMap } from 'rxjs/operators';
75
import { Transition, UIRouter, StateDeclaration, UIRouterPlugin } from '@uirouter/core';
86

97
export interface StatesChangedEvent {
@@ -28,8 +26,8 @@ export class UIRouterRx implements UIRouterPlugin {
2826

2927
constructor(router: UIRouter) {
3028
let start$ = new ReplaySubject<Transition>(1);
31-
let success$ = <Observable<Transition>>start$.mergeMap((t: Transition) => t.promise.then(() => t));
32-
let params$ = success$.map((transition: Transition) => transition.params());
29+
let success$ = <Observable<Transition>>start$.pipe(mergeMap((t: Transition) => t.promise.then(() => t)));
30+
let params$ = success$.pipe(map((transition: Transition) => transition.params()));
3331

3432
let states$ = new ReplaySubject<StatesChangedEvent>(1);
3533

‎yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3860,11 +3860,11 @@ rollup@^0.58.1:
38603860
"@types/estree" "0.0.38"
38613861
"@types/node" "*"
38623862

3863-
rxjs@^5.5.10:
3864-
version "5.5.10"
3865-
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045"
3863+
rxjs@^6.1.0:
3864+
version "6.1.0"
3865+
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.1.0.tgz#833447de4e4f6427b9cec3e5eb9f56415cd28315"
38663866
dependencies:
3867-
symbol-observable "1.0.1"
3867+
tslib "^1.9.0"
38683868

38693869
safe-buffer@^5.0.1, safe-buffer@^5.1.1:
38703870
version "5.1.1"
@@ -4310,10 +4310,6 @@ supports-color@^5.3.0:
43104310
dependencies:
43114311
has-flag "^3.0.0"
43124312

4313-
symbol-observable@1.0.1:
4314-
version "1.0.1"
4315-
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
4316-
43174313
tar-pack@^3.4.0:
43184314
version "3.4.1"
43194315
resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
@@ -4408,6 +4404,10 @@ trim-off-newlines@^1.0.0:
44084404
version "1.0.1"
44094405
resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
44104406

4407+
tslib@^1.9.0:
4408+
version "1.9.0"
4409+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
4410+
44114411
tsscmp@~1.0.0:
44124412
version "1.0.5"
44134413
resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.5.tgz#7dc4a33af71581ab4337da91d85ca5427ebd9a97"

0 commit comments

Comments
 (0)
0