From 8cd2da1c5bf66fb2dfc0d6a03303fd21a2a3266b Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 21 Apr 2018 15:23:29 +0200 Subject: [PATCH] chore(package): bump rxjs and zone.js --- package-lock.json | 20 ++++++++++---------- package.json | 4 ++-- src/@ionic-native/core/decorators.ts | 4 ++-- src/@ionic-native/core/plugin.ts | 5 ++--- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index a2361b229..ace3d8cc7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6728,12 +6728,12 @@ } }, "rxjs": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz", - "integrity": "sha512-oRYoIKWBU3Ic37fLA5VJu31VqQO4bWubRntcHSJ+cwaDQBwdnZ9x4zmhJfm/nFQ2E82/I4loSioHnACamrKGgA==", + "version": "5.5.10", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz", + "integrity": "sha512-SRjimIDUHJkon+2hFo7xnvNC4ZEHGzCRwh9P7nzX3zPkCGFEg/tuElrNR7L/rZMagnK2JeH2jQwPRpmyXyLB6A==", "dev": true, "requires": { - "symbol-observable": "1.0.4" + "symbol-observable": "1.0.1" } }, "safe-buffer": { @@ -7230,9 +7230,9 @@ } }, "symbol-observable": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz", - "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz", + "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=", "dev": true }, "tempfile": { @@ -7978,9 +7978,9 @@ "dev": true }, "zone.js": { - "version": "0.8.18", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.18.tgz", - "integrity": "sha512-knKOBQM0oea3/x9pdyDuDi7RhxDlJhOIkeixXSiTKWLgs4LpK37iBc+1HaHwzlciHUKT172CymJFKo8Xgh+44Q==", + "version": "0.8.26", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.26.tgz", + "integrity": "sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==", "dev": true } } diff --git a/package.json b/package.json index bdc0ceda6..ad06ba7ad 100644 --- a/package.json +++ b/package.json @@ -39,12 +39,12 @@ "q": "1.5.0", "queue": "4.2.1", "rimraf": "2.6.1", - "rxjs": "5.5.2", + "rxjs": "^5.5.10", "semver": "5.3.0", "tslint": "3.15.1", "tslint-ionic-rules": "0.0.8", "typescript": "~2.4.2", - "zone.js": "0.8.18" + "zone.js": "^0.8.26" }, "scripts": { "start": "npm run test:watch", diff --git a/src/@ionic-native/core/decorators.ts b/src/@ionic-native/core/decorators.ts index d283aa3a3..444783bd7 100644 --- a/src/@ionic-native/core/decorators.ts +++ b/src/@ionic-native/core/decorators.ts @@ -1,4 +1,4 @@ -import 'rxjs/observable/throw'; +import { _throw } from 'rxjs/observable/throw'; import { Observable } from 'rxjs/Observable'; @@ -160,7 +160,7 @@ export function CordovaCheck(opts: CordovaCheckOptions = {}) { if (opts.sync) { return null; } else if (opts.observable) { - return Observable.throw(new Error(check && check.error)); + return _throw(new Error(check && check.error)); } return Promise.reject(check && check.error); } diff --git a/src/@ionic-native/core/plugin.ts b/src/@ionic-native/core/plugin.ts index a86429100..d2d0b89f8 100644 --- a/src/@ionic-native/core/plugin.ts +++ b/src/@ionic-native/core/plugin.ts @@ -1,6 +1,5 @@ -import 'rxjs/add/observable/fromEvent'; - import { Observable } from 'rxjs/Observable'; +import { fromEvent } from 'rxjs/observable/fromEvent'; import { checkReady } from './bootstrap'; import { CordovaOptions } from './decorators'; @@ -318,7 +317,7 @@ export function wrapEventObservable( event: string, element: any = window ): Observable { - return Observable.fromEvent(element, event); + return fromEvent(element, event); } /**