Skip to content

Commit

Permalink
chore: Upgrade to RxJS v7.
Browse files Browse the repository at this point in the history
  • Loading branch information
cartant committed May 8, 2021
1 parent 8ca10ac commit fc98cde
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 9 deletions.
4 changes: 1 addition & 3 deletions fixtures/mocha/issues-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ describe("issues", () => {
m.expect(actual).toBeObservable("--|");
m.autoFlush = false;
m.flush();
}).to.throw(
/\{"frame":0,"notification":\{"kind":"N","value":"\[\s*undefined\s*\]","hasValue":true\}\}/
);
}).to.throw(/"value":"\[\s*undefined\s*\]"/);
})
);
});
Expand Down
2 changes: 1 addition & 1 deletion fixtures/mocha/passing-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ describe("marbles", () => {

const source = m.hot(" --^-a-b-c-|".trim());
const subs = " ^-------!".trim();
const expected = " ---a-b-c-|".trim();
const expected = " ---a-b-c|".trim();

const destination = source.pipe(delay(m.time("-|")));

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"mocha": "^8.0.0",
"prettier": "^2.0.0",
"rimraf": "^3.0.0",
"rxjs": "^6.0.0",
"rxjs": "^7.0.0",
"rxjs-tslint-rules": "^4.0.0",
"sinon": "^10.0.0",
"tape": "^5.0.0",
Expand Down Expand Up @@ -78,7 +78,7 @@
"name": "rxjs-marbles",
"optionalDependencies": {},
"peerDependencies": {
"rxjs": "^6.0.0"
"rxjs": "^7.0.0"
},
"private": true,
"publishConfig": {
Expand Down
8 changes: 6 additions & 2 deletions source/done-subscriber.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
*/
/*tslint:disable:rxjs-no-subclass*/

import { Subscriber } from "rxjs";
import { noop, Subscriber } from "rxjs";

export class DoneSubscriber<T> extends Subscriber<T> {
constructor(private onError: (error: any) => void, onComplete: () => void) {
super(undefined, onError, onComplete);
super({
complete: onComplete,
error: onError,
next: noop,
});
}

unsubscribe(): void {
Expand Down
1 change: 1 addition & 0 deletions tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
],
"rules": {
"no-implicit-any-catch": { "severity": "off" },
"rxjs-no-create": { "severity": "off" },
"rxjs-no-ignored-subscription": { "severity": "off" },
"rxjs-no-unsafe-scope": { "severity": "off" },
"trailing-comma": { "severity": "off" },
Expand Down
14 changes: 13 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6771,13 +6771,20 @@ rxjs-tslint-rules@^4.0.0:
tsutils "^3.0.0"
tsutils-etc "^1.2.2"

rxjs@^6.0.0, rxjs@^6.6.7:
rxjs@^6.6.7:
version "6.6.7"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
dependencies:
tslib "^1.9.0"

rxjs@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.0.0.tgz#c55d67c52aee8804d32ab60965e335bd41e2dc2d"
integrity sha512-I1V/ArAtGJg4kmCfms8fULm0SwYgEsAf2d5WPCBGzTYm2qTjO3Tx4EDFaGjbOox8CeEsC69jQK22mnmfyA26sw==
dependencies:
tslib "~2.1.0"

safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
version "5.2.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
Expand Down Expand Up @@ -7629,6 +7636,11 @@ tslib@^2.0.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==

tslib@~2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==

tslint-etc@^1.5.2:
version "1.13.9"
resolved "https://registry.yarnpkg.com/tslint-etc/-/tslint-etc-1.13.9.tgz#46464af0f03efb6d4b2c71b9b4adce41a2b2ed71"
Expand Down

0 comments on commit fc98cde

Please sign in to comment.