diff --git a/package.json b/package.json index a8dfcdac9..04927d9ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ionic-native", - "version": "1.3.21", + "version": "1.3.22", "description": "Native plugin wrappers for Cordova and Ionic with TypeScript, ES6+, Promise and Observable support", "main": "dist/es5/index.js", "typings": "dist/es5/index.d.ts", @@ -9,7 +9,7 @@ "dist" ], "dependencies": { - "@reactivex/rxjs": "^5.0.0-beta.11" + "rxjs": "^5.0.0-beta.12" }, "devDependencies": { "browserify": "^13.0.1", diff --git a/src/index.ts b/src/index.ts index 055e91bed..dfa52d1c6 100644 --- a/src/index.ts +++ b/src/index.ts @@ -156,14 +156,14 @@ AppVersion, Badge, BarcodeScanner, Base64ToGallery, -BatteryStatus, +// BatteryStatus, Brightness, BLE, BluetoothSerial, CallNumber, CameraPreview, Clipboard, -CodePush, +// CodePush, Crop, DBMeter, Deeplinks, @@ -172,7 +172,7 @@ Dialogs, Diagnostic, EmailComposer, EstimoteBeacons, -File, +// File, FileChooser, FileOpener, Flashlight, @@ -204,7 +204,7 @@ Splashscreen, SQLite, StatusBar, TouchID, -Transfer, +// Transfer, TextToSpeech, Vibration, WebIntent, diff --git a/src/plugins/3dtouch.ts b/src/plugins/3dtouch.ts index 3147d1809..0288a28df 100644 --- a/src/plugins/3dtouch.ts +++ b/src/plugins/3dtouch.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; declare var window: any; diff --git a/src/plugins/admob.ts b/src/plugins/admob.ts index a8c748d84..1c825b305 100644 --- a/src/plugins/admob.ts +++ b/src/plugins/admob.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** * @name AdMob diff --git a/src/plugins/batterystatus.ts b/src/plugins/batterystatus.ts index caaf8467c..c70beae60 100644 --- a/src/plugins/batterystatus.ts +++ b/src/plugins/batterystatus.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** * @name Battery Status diff --git a/src/plugins/ble.ts b/src/plugins/ble.ts index 641dc6965..6df9f2f6d 100644 --- a/src/plugins/ble.ts +++ b/src/plugins/ble.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** * @name BLE diff --git a/src/plugins/bluetoothserial.ts b/src/plugins/bluetoothserial.ts index 475437571..069fed3f3 100644 --- a/src/plugins/bluetoothserial.ts +++ b/src/plugins/bluetoothserial.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** * @name Bluetooth Serial diff --git a/src/plugins/camera-preview.ts b/src/plugins/camera-preview.ts index 1f06c991a..a9edfc5bc 100644 --- a/src/plugins/camera-preview.ts +++ b/src/plugins/camera-preview.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; export interface CameraPreviewRect { diff --git a/src/plugins/code-push.ts b/src/plugins/code-push.ts index d656581cb..29f253d26 100644 --- a/src/plugins/code-push.ts +++ b/src/plugins/code-push.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; // below are taken from // https://raw.githubusercontent.com/Microsoft/cordova-plugin-code-push/master/typings/codePush.d.ts diff --git a/src/plugins/dbmeter.ts b/src/plugins/dbmeter.ts index fa3e9659d..138ee643a 100644 --- a/src/plugins/dbmeter.ts +++ b/src/plugins/dbmeter.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** diff --git a/src/plugins/deeplinks.ts b/src/plugins/deeplinks.ts index 8b581e285..9cc043016 100644 --- a/src/plugins/deeplinks.ts +++ b/src/plugins/deeplinks.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; export interface DeeplinkMatch { diff --git a/src/plugins/devicemotion.ts b/src/plugins/devicemotion.ts index 14f90f277..b3a67bcfd 100644 --- a/src/plugins/devicemotion.ts +++ b/src/plugins/devicemotion.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; export interface AccelerationData { diff --git a/src/plugins/deviceorientation.ts b/src/plugins/deviceorientation.ts index f9f987dc9..431b9aa20 100644 --- a/src/plugins/deviceorientation.ts +++ b/src/plugins/deviceorientation.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; export interface CompassHeading { diff --git a/src/plugins/estimote-beacons.ts b/src/plugins/estimote-beacons.ts index 58b7fd496..2896120c1 100644 --- a/src/plugins/estimote-beacons.ts +++ b/src/plugins/estimote-beacons.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** * @name EstimoteBeacons diff --git a/src/plugins/geofence.ts b/src/plugins/geofence.ts index 605166fa8..e7f2fa15e 100644 --- a/src/plugins/geofence.ts +++ b/src/plugins/geofence.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** * @name Geofence * @description Monitors circular geofences around latitude/longitude coordinates, and sends a notification to the user when the boundary of a geofence is crossed. Notifications can be sent when the user enters and/or exits a geofence. diff --git a/src/plugins/geolocation.ts b/src/plugins/geolocation.ts index fd4136eb4..289a1caec 100644 --- a/src/plugins/geolocation.ts +++ b/src/plugins/geolocation.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; declare var navigator: any; diff --git a/src/plugins/googlemaps.ts b/src/plugins/googlemaps.ts index f6058527c..08048f89b 100644 --- a/src/plugins/googlemaps.ts +++ b/src/plugins/googlemaps.ts @@ -1,5 +1,5 @@ import { Cordova, CordovaInstance, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** diff --git a/src/plugins/httpd.ts b/src/plugins/httpd.ts index 8716de391..5d11b3941 100644 --- a/src/plugins/httpd.ts +++ b/src/plugins/httpd.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** diff --git a/src/plugins/ibeacon.ts b/src/plugins/ibeacon.ts index d37d9aa02..c310f603e 100644 --- a/src/plugins/ibeacon.ts +++ b/src/plugins/ibeacon.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; declare var cordova: any; diff --git a/src/plugins/inappbrowser.ts b/src/plugins/inappbrowser.ts index a7f0590cd..b088c9b58 100644 --- a/src/plugins/inappbrowser.ts +++ b/src/plugins/inappbrowser.ts @@ -1,5 +1,5 @@ import { Plugin, CordovaInstance } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; declare var cordova: any; diff --git a/src/plugins/keyboard.ts b/src/plugins/keyboard.ts index afa07a0a7..07ecad051 100644 --- a/src/plugins/keyboard.ts +++ b/src/plugins/keyboard.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** diff --git a/src/plugins/media-capture.ts b/src/plugins/media-capture.ts index 2b1ddcd49..1bd838a08 100644 --- a/src/plugins/media-capture.ts +++ b/src/plugins/media-capture.ts @@ -1,5 +1,5 @@ import { Cordova, CordovaProperty, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; declare var navigator: any; diff --git a/src/plugins/media.ts b/src/plugins/media.ts index b662f4d6a..5ef39307d 100644 --- a/src/plugins/media.ts +++ b/src/plugins/media.ts @@ -1,5 +1,5 @@ import { CordovaInstance, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; declare var Media: any; diff --git a/src/plugins/music-controls.ts b/src/plugins/music-controls.ts index 0564fea62..c091af332 100644 --- a/src/plugins/music-controls.ts +++ b/src/plugins/music-controls.ts @@ -1,5 +1,5 @@ import { Plugin, Cordova } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** * @name MusicControls * @description diff --git a/src/plugins/network.ts b/src/plugins/network.ts index d1903a119..4b238ca11 100644 --- a/src/plugins/network.ts +++ b/src/plugins/network.ts @@ -1,5 +1,5 @@ import { Cordova, CordovaProperty, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; declare var navigator: any; diff --git a/src/plugins/nfc.ts b/src/plugins/nfc.ts index f7ad96c11..1159b97a9 100644 --- a/src/plugins/nfc.ts +++ b/src/plugins/nfc.ts @@ -1,5 +1,5 @@ import { Plugin, Cordova } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** * @name NFC * @description diff --git a/src/plugins/onesignal.ts b/src/plugins/onesignal.ts index 4ad724098..cf6f14674 100644 --- a/src/plugins/onesignal.ts +++ b/src/plugins/onesignal.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** diff --git a/src/plugins/plugin.ts b/src/plugins/plugin.ts index f0460fbce..55b3ff0c1 100644 --- a/src/plugins/plugin.ts +++ b/src/plugins/plugin.ts @@ -1,5 +1,5 @@ import { get } from '../util'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; declare var window; declare var Promise; diff --git a/src/plugins/shake.ts b/src/plugins/shake.ts index 26a5e0fac..4e5208f03 100644 --- a/src/plugins/shake.ts +++ b/src/plugins/shake.ts @@ -1,5 +1,5 @@ import { Plugin, Cordova } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; /** * @name Shake * @description Handles shake gesture diff --git a/src/plugins/toast.ts b/src/plugins/toast.ts index d5b279a58..0b0ccc16c 100644 --- a/src/plugins/toast.ts +++ b/src/plugins/toast.ts @@ -1,5 +1,5 @@ import { Cordova, Plugin } from './plugin'; -import { Observable } from '@reactivex/rxjs'; +import { Observable } from 'rxjs/Observable'; export interface ToastOptions {