From 4014972feb68e0b5abdb622f906ab97ef286b7e5 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 21 Sep 2016 15:04:46 -0500
Subject: [PATCH] feat(build): Support ES2015 modules

---
 package.json                     | 4 ++--
 src/index.ts                     | 8 ++++----
 src/plugins/3dtouch.ts           | 2 +-
 src/plugins/admob.ts             | 2 +-
 src/plugins/batterystatus.ts     | 2 +-
 src/plugins/ble.ts               | 2 +-
 src/plugins/bluetoothserial.ts   | 2 +-
 src/plugins/camera-preview.ts    | 2 +-
 src/plugins/code-push.ts         | 2 +-
 src/plugins/dbmeter.ts           | 2 +-
 src/plugins/deeplinks.ts         | 2 +-
 src/plugins/devicemotion.ts      | 2 +-
 src/plugins/deviceorientation.ts | 2 +-
 src/plugins/estimote-beacons.ts  | 2 +-
 src/plugins/geofence.ts          | 2 +-
 src/plugins/geolocation.ts       | 2 +-
 src/plugins/googlemaps.ts        | 2 +-
 src/plugins/httpd.ts             | 2 +-
 src/plugins/ibeacon.ts           | 2 +-
 src/plugins/inappbrowser.ts      | 2 +-
 src/plugins/keyboard.ts          | 2 +-
 src/plugins/media-capture.ts     | 2 +-
 src/plugins/media.ts             | 2 +-
 src/plugins/music-controls.ts    | 2 +-
 src/plugins/network.ts           | 2 +-
 src/plugins/nfc.ts               | 2 +-
 src/plugins/onesignal.ts         | 2 +-
 src/plugins/plugin.ts            | 2 +-
 src/plugins/shake.ts             | 2 +-
 src/plugins/toast.ts             | 2 +-
 30 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index a8dfcdac..04927d9e 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 055e91be..dfa52d1c 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 3147d180..0288a28d 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 a8c748d8..1c825b30 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 caaf8467..c70beae6 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 641dc696..6df9f2f6 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 47543757..069fed3f 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 1f06c991..a9edfc5b 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 d656581c..29f253d2 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 fa3e9659..138ee643 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 8b581e28..9cc04301 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 14f90f27..b3a67bcf 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 f9f987dc..431b9aa2 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 58b7fd49..2896120c 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 605166fa..e7f2fa15 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 fd4136eb..289a1cae 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 f6058527..08048f89 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 8716de39..5d11b394 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 d37d9aa0..c310f603 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 a7f0590c..b088c9b5 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 afa07a0a..07ecad05 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 2b1ddcd4..1bd838a0 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 b662f4d6..5ef39307 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 0564fea6..c091af33 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 d1903a11..4b238ca1 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 f7ad96c1..1159b97a 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 4ad72409..cf6f1467 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 f0460fbc..55b3ff0c 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 26a5e0fa..4e5208f0 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 d5b279a5..0b0ccc16 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 {