fix(themeable-browser):update option type (#4306 )

change ThemeableBrowserOptions.fullscreen type https://github.com/initialxy/cordova-plugin-themeablebrowser/blob/master/src/android/ThemeableBrowser.java#L1406
feat(camera-preview): add storeToFile option (#4294 )
2026-03-10 00:00:07 +08:00 · 2022-10-09 16:41:12 +02:00 · 2022-09-05 19:00:12 +02:00
323 changed files with 10514 additions and 19293 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,15 +1,15 @@
-# http://editorconfig.org
-
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.md]
-insert_final_newline = false
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
 trim_trailing_whitespace = false
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,4 @@ node_modules/
 aot/
 scripts/ionic-native-bower
 dist/
-src/@ionic-native/plugins/**/ngx
-*.d.ts
-injectable-classes.json

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,75 +1,9 @@
-# [5.2.0](https://github.com/ionic-team/ionic-native/compare/v5.1.0...v5.2.0) (2019-02-20)
-
-
-### Code Refactoring
-
-* optimize plugins for angular treeshaking ([8b53c04](https://github.com/ionic-team/ionic-native/commit/8b53c04))
-
-
-### Features
-
-* **apple-wallet:** update wrapper to release 2.0 ([#2935](https://github.com/ionic-team/ionic-native/issues/2935)) ([7ae2ad4](https://github.com/ionic-team/ionic-native/commit/7ae2ad4))
-* **linkedin:** delete plugin ([6423031](https://github.com/ionic-team/ionic-native/commit/6423031)), closes [#2925](https://github.com/ionic-team/ionic-native/issues/2925)
-
-
-### BREAKING CHANGES
-
-* You can remove the plugin import from the app.module.ts because of the changed Inject decorator
-
-
-
-# [5.1.0](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.24...v5.1.0) (2019-02-14)
-
-
-### Bug Fixes
-
-* **bluetooth-le:** Fix typo in InitializeResult interface definition ([#2891](https://github.com/ionic-team/ionic-native/issues/2891)) ([b6f340a](https://github.com/ionic-team/ionic-native/commit/b6f340a))
-* **build:** fixed duplicate import identifiers ([3aedde5](https://github.com/ionic-team/ionic-native/commit/3aedde5))
-* **build:** remove wrong jsdoc ([63124f3](https://github.com/ionic-team/ionic-native/commit/63124f3))
-* **google-play-games-services:** correct Cordova plugin name typo ([#2920](https://github.com/ionic-team/ionic-native/issues/2920)) ([fc0a238](https://github.com/ionic-team/ionic-native/commit/fc0a238)), closes [ionic-team/ionic-docs#424](https://github.com/ionic-team/ionic-docs/issues/424)
-* **http:** add 'legacy' as valid option to setSSLCertMode ([#2913](https://github.com/ionic-team/ionic-native/issues/2913)) ([e1a4903](https://github.com/ionic-team/ionic-native/commit/e1a4903)), closes [#2912](https://github.com/ionic-team/ionic-native/issues/2912)
-
-
-### Features
-
-* **abbyy-rtr:** add new options ([#2915](https://github.com/ionic-team/ionic-native/issues/2915)) ([959a913](https://github.com/ionic-team/ionic-native/commit/959a913))
-* **app-launcher:** add plugin ([9bdb2fa](https://github.com/ionic-team/ionic-native/commit/9bdb2fa)), closes [#2889](https://github.com/ionic-team/ionic-native/issues/2889)
-* **clevertap:** update for latest CleverTap Cordova plugin ([#2931](https://github.com/ionic-team/ionic-native/issues/2931)) ([aed25a6](https://github.com/ionic-team/ionic-native/commit/aed25a6))
-* **firebase-crashlytics:** add plugin ([41c6bca](https://github.com/ionic-team/ionic-native/commit/41c6bca)), closes [#2889](https://github.com/ionic-team/ionic-native/issues/2889)
-* **http:** add sendRequest function ([#2910](https://github.com/ionic-team/ionic-native/issues/2910)) ([daf0456](https://github.com/ionic-team/ionic-native/commit/daf0456)), closes [#2824](https://github.com/ionic-team/ionic-native/issues/2824)
-* **luxand:** add plugin ([#2883](https://github.com/ionic-team/ionic-native/issues/2883)) ([632dec2](https://github.com/ionic-team/ionic-native/commit/632dec2))
-* **magnetometer:** add plugin ([#2917](https://github.com/ionic-team/ionic-native/issues/2917)) ([fd27136](https://github.com/ionic-team/ionic-native/commit/fd27136))
-* **photo-viewer:** add new params ([#2895](https://github.com/ionic-team/ionic-native/issues/2895)) ([c5ceba1](https://github.com/ionic-team/ionic-native/commit/c5ceba1))
-* **quikkly:** add plugin([#2923](https://github.com/ionic-team/ionic-native/issues/2923)) ([2833da4](https://github.com/ionic-team/ionic-native/commit/2833da4))
-* **zoom:** add plugin ([#2916](https://github.com/ionic-team/ionic-native/issues/2916)) ([50e0534](https://github.com/ionic-team/ionic-native/commit/50e0534))
-
-
-
-# [5.0.0-beta.24](https://github.com/ionic-team/ionic-native/compare/v4.20.0...v5.0.0-beta.24) (2019-01-20)
-
-
-
-# [4.20.0](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.23...v4.20.0) (2019-01-20)
+# [4.20.0](https://github.com/ionic-team/ionic-native/compare/v4.18.0...v4.20.0) (2019-01-20)


 ### Bug Fixes

 * **bluetooth-le:** Fix typo in interface definition ([#2881](https://github.com/ionic-team/ionic-native/issues/2881)) ([c2f4561](https://github.com/ionic-team/ionic-native/commit/c2f4561))
-
-
-### Features
-
-* **background-geolocation:** add v3 functions and interfaces ([#2393](https://github.com/ionic-team/ionic-native/issues/2393)) ([1ba6f97](https://github.com/ionic-team/ionic-native/commit/1ba6f97))
-* **lottie-splash-screen:** add new plugin ([#2880](https://github.com/ionic-team/ionic-native/issues/2880)) ([603d694](https://github.com/ionic-team/ionic-native/commit/603d694))
-* **web-intent:** Add missing type info ([#2878](https://github.com/ionic-team/ionic-native/issues/2878)) ([3226f76](https://github.com/ionic-team/ionic-native/commit/3226f76))
-
-
-
-# [5.0.0-beta.23](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.22...v5.0.0-beta.23) (2019-01-19)
-
-
-### Bug Fixes
-
 * **health:** fix typos ([#2831](https://github.com/ionic-team/ionic-native/issues/2831)) ([ea3150e](https://github.com/ionic-team/ionic-native/commit/ea3150e))


@@ -78,27 +12,13 @@
 * **adjust:** add adjust sdk plugin ([#2872](https://github.com/ionic-team/ionic-native/issues/2872)) ([9e6705d](https://github.com/ionic-team/ionic-native/commit/9e6705d))
 * **admob:** add plugin ([#2864](https://github.com/ionic-team/ionic-native/issues/2864)) ([707ce1c](https://github.com/ionic-team/ionic-native/commit/707ce1c))
 * **analytics-firebase:** add plugin ([#2862](https://github.com/ionic-team/ionic-native/issues/2862)) ([5df3de7](https://github.com/ionic-team/ionic-native/commit/5df3de7))
-* **audio-management:** add plugin for audio streams ([#2877](https://github.com/ionic-team/ionic-native/issues/2877)) ([34ecd29](https://github.com/ionic-team/ionic-native/commit/34ecd29))
+* **background-geolocation:** add v3 functions and interfaces ([#2393](https://github.com/ionic-team/ionic-native/issues/2393)) ([1ba6f97](https://github.com/ionic-team/ionic-native/commit/1ba6f97))
 * **baidu-push:** add plugin ([#2838](https://github.com/ionic-team/ionic-native/issues/2838)) ([c3de8df](https://github.com/ionic-team/ionic-native/commit/c3de8df))
 * **firebase:** add clearAllNotifications method ([#2867](https://github.com/ionic-team/ionic-native/issues/2867)) ([7c46d8c](https://github.com/ionic-team/ionic-native/commit/7c46d8c))
-* add analytics-firebase plugin ([e374b52](https://github.com/ionic-team/ionic-native/commit/e374b52))
-* **blinkid:** add plugin ([#2833](https://github.com/ionic-team/ionic-native/issues/2833)) ([8e405cc](https://github.com/ionic-team/ionic-native/commit/8e405cc))
 * **gao-de-location:** add plugin ([#2857](https://github.com/ionic-team/ionic-native/issues/2857)) ([e2b25de](https://github.com/ionic-team/ionic-native/commit/e2b25de))
 * **in-app-browser:** add 'beforeload' as option ([#2863](https://github.com/ionic-team/ionic-native/issues/2863)) ([d33bcb0](https://github.com/ionic-team/ionic-native/commit/d33bcb0))
-
-
-
-# [5.0.0-beta.22](https://github.com/ionic-team/ionic-native/compare/v4.18.0...v5.0.0-beta.22) (2018-12-01)
-
-
-### chore
-
-* update deps ([649dca1](https://github.com/ionic-team/ionic-native/commit/649dca1))
-
-
-### BREAKING CHANGES
-
-* Requires Angular 7.1 and TypeScript 3.1
+* **lottie-splash-screen:** add new plugin ([#2880](https://github.com/ionic-team/ionic-native/issues/2880)) ([603d694](https://github.com/ionic-team/ionic-native/commit/603d694))
+* **web-intent:** Add missing type info ([#2878](https://github.com/ionic-team/ionic-native/issues/2878)) ([3226f76](https://github.com/ionic-team/ionic-native/commit/3226f76))



@@ -108,13 +28,11 @@
 ### Bug Fixes

 * **local-notifications:** update type of the every property ([#2825](https://github.com/ionic-team/ionic-native/issues/2825)) ([b166cc5](https://github.com/ionic-team/ionic-native/commit/b166cc5))
-* **local-notifications:** update type of the every property ([#2825](https://github.com/ionic-team/ionic-native/issues/2825)) ([31e4058](https://github.com/ionic-team/ionic-native/commit/31e4058))


 ### Features

 * **downloader:** add plugin ([#2820](https://github.com/ionic-team/ionic-native/issues/2820)) ([0065704](https://github.com/ionic-team/ionic-native/commit/0065704))
-* **downloader:** add plugin ([#2820](https://github.com/ionic-team/ionic-native/issues/2820)) ([b9e9aa1](https://github.com/ionic-team/ionic-native/commit/b9e9aa1))
 * **line-login:** add loginWeb function ([#2810](https://github.com/ionic-team/ionic-native/issues/2810)) ([7145afa](https://github.com/ionic-team/ionic-native/commit/7145afa))


@@ -135,11 +53,12 @@



-# [4.16.0](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.21...v4.16.0) (2018-10-17)
+# [4.16.0](https://github.com/ionic-team/ionic-native/compare/v4.15.0...v4.16.0) (2018-10-17)


 ### Bug Fixes

+* **keyboard:** add missing property ([fcd6d26](https://github.com/ionic-team/ionic-native/commit/fcd6d26))
 * **local-notifications:** add missing functions ([#2779](https://github.com/ionic-team/ionic-native/issues/2779)) ([336b3ff](https://github.com/ionic-team/ionic-native/commit/336b3ff)), closes [#2778](https://github.com/ionic-team/ionic-native/issues/2778)


@@ -153,30 +72,12 @@



-# [5.0.0-beta.21](https://github.com/ionic-team/ionic-native/compare/v4.15.0...v5.0.0-beta.21) (2018-09-25)
+# [4.15.0](https://github.com/ionic-team/ionic-native/compare/v4.14.0...v4.15.0) (2018-09-25)


 ### Bug Fixes

-* **keyboard:** add missing property ([fcd6d26](https://github.com/ionic-team/ionic-native/commit/fcd6d26))
-* **keyboard:** include the mode parameter in setResizeMode() ([8d57df3](https://github.com/ionic-team/ionic-native/commit/8d57df3))
-
-
-
-# [4.15.0](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.20...v4.15.0) (2018-09-25)
-
-
-### Bug Fixes
-
-* **admob-free:** fix duplicated class ([95b9262](https://github.com/ionic-team/ionic-native/commit/95b9262))
-* **bluetooth-le:** Removed a wrong cordova decorator param ([#2733](https://github.com/ionic-team/ionic-native/issues/2733)) ([cbeb413](https://github.com/ionic-team/ionic-native/commit/cbeb413))
-* **build:** fix macos mojave build errors ([358474d](https://github.com/ionic-team/ionic-native/commit/358474d))
 * **keyboard:** use cordova-plugin-ionic-keyboard ([#2743](https://github.com/ionic-team/ionic-native/issues/2743)) ([1457a16](https://github.com/ionic-team/ionic-native/commit/1457a16)), closes [#2306](https://github.com/ionic-team/ionic-native/issues/2306)
-* **keyboard:** use cordova-plugin-ionic-keyboard ([#2743](https://github.com/ionic-team/ionic-native/issues/2743)) ([fbf7463](https://github.com/ionic-team/ionic-native/commit/fbf7463)), closes [#2306](https://github.com/ionic-team/ionic-native/issues/2306)
-* **printer:** import getPromise ([15cd285](https://github.com/ionic-team/ionic-native/commit/15cd285))
-* **screenshot:** import getPromise ([e661f2e](https://github.com/ionic-team/ionic-native/commit/e661f2e))
-* **secure-storage:** add missing "getPromise" import ([#2727](https://github.com/ionic-team/ionic-native/issues/2727)) ([457d47c](https://github.com/ionic-team/ionic-native/commit/457d47c))
-* **secure-storage:** import getPromise ([653f5a2](https://github.com/ionic-team/ionic-native/commit/653f5a2))


 ### Features
@@ -188,31 +89,15 @@



-# [5.0.0-beta.20](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.19...v5.0.0-beta.20) (2018-09-18)
+# [4.14.0](https://github.com/ionic-team/ionic-native/compare/v4.13.0...v4.14.0) (2018-09-18)


 ### Bug Fixes

-* **build:** Fix TypeScript bug, wrong type exported for wrap fn ([c433317](https://github.com/ionic-team/ionic-native/commit/c433317))
-
-
-
-# [5.0.0-beta.19](https://github.com/ionic-team/ionic-native/compare/v4.14.0...v5.0.0-beta.19) (2018-09-18)
-
-
-
-# [4.14.0](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.18...v4.14.0) (2018-09-18)
-
-
-### Bug Fixes
-
-* **index-app-content:** fix lint ([2611061](https://github.com/ionic-team/ionic-native/commit/2611061))
 * **mobile-accessibility:** add correct pluginRef ([3699fa9](https://github.com/ionic-team/ionic-native/commit/3699fa9)), closes [#1860](https://github.com/ionic-team/ionic-native/issues/1860)
-* **ms-adal:** remove duplicate imports ([4803912](https://github.com/ionic-team/ionic-native/commit/4803912))
 * **onesignal:** add missing setLocationShared method ([#2723](https://github.com/ionic-team/ionic-native/issues/2723)) ([8bab321](https://github.com/ionic-team/ionic-native/commit/8bab321))
 * **push:** add missing Chanel options ([3ef9593](https://github.com/ionic-team/ionic-native/commit/3ef9593)), closes [#2712](https://github.com/ionic-team/ionic-native/issues/2712)
 * **web-intent:** add missing properties ([d077c48](https://github.com/ionic-team/ionic-native/commit/d077c48)), closes [#2701](https://github.com/ionic-team/ionic-native/issues/2701)
-* **web-intent:** fix lint ([9feefe8](https://github.com/ionic-team/ionic-native/commit/9feefe8))


 ### Features
@@ -223,10 +108,6 @@



-# [5.0.0-beta.18](https://github.com/ionic-team/ionic-native/compare/v4.13.0...v5.0.0-beta.18) (2018-09-15)
-
-
-
 # [4.13.0](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.17...v4.13.0) (2018-09-15)


@@ -263,8 +144,6 @@

 ### Bug Fixes

-* **camera:** fixing builds ([c8d25a1](https://github.com/ionic-team/ionic-native/commit/c8d25a1))
-* **core:** wrapEventObservable ([#2660](https://github.com/ionic-team/ionic-native/issues/2660)) ([bd34581](https://github.com/ionic-team/ionic-native/commit/bd34581))
 * **open-native-settings:** allow supported input ([#2666](https://github.com/ionic-team/ionic-native/issues/2666)) ([be0dc3d](https://github.com/ionic-team/ionic-native/commit/be0dc3d))


@@ -279,12 +158,6 @@
 # [5.0.0-beta.15](https://github.com/ionic-team/ionic-native/compare/v4.12.0...v5.0.0-beta.15) (2018-08-25)


-### Bug Fixes
-
-* **contacts:** remove double import of checkAvailability ([#2659](https://github.com/ionic-team/ionic-native/issues/2659)) ([1ad4cc1](https://github.com/ionic-team/ionic-native/commit/1ad4cc1))
-* **extended-device-information:** fix wrong decorator ([5e9c92a](https://github.com/ionic-team/ionic-native/commit/5e9c92a))
-
-
 ### Features

 * **bluetooth-le:** add bluetooth-le plugin ([#2651](https://github.com/ionic-team/ionic-native/issues/2651)) ([591ee87](https://github.com/ionic-team/ionic-native/commit/591ee87))
@@ -297,7 +170,6 @@

 ### Bug Fixes

-* **clevertap:** fix jsdoc ([e47a3e1](https://github.com/ionic-team/ionic-native/commit/e47a3e1))
 * **extended-device-information:** Fixed Memory Display Bug ([#2641](https://github.com/ionic-team/ionic-native/issues/2641)) ([2ac5282](https://github.com/ionic-team/ionic-native/commit/2ac5282))
 * **network:** bind listener to document instead of window ([#2622](https://github.com/ionic-team/ionic-native/issues/2622)) ([d10777a](https://github.com/ionic-team/ionic-native/commit/d10777a))
 * **photo-library:** interface missing includeVideos ([3f415f9](https://github.com/ionic-team/ionic-native/commit/3f415f9)), closes [#2624](https://github.com/ionic-team/ionic-native/issues/2624)
@@ -384,55 +256,31 @@
 # [5.0.0-beta.13](https://github.com/ionic-team/ionic-native/compare/v4.9.0...v5.0.0-beta.13) (2018-06-28)


-### Bug Fixes
-
-* **appodeal:** removed bad imports ([7d5e7aa](https://github.com/ionic-team/ionic-native/commit/7d5e7aa))
-* **file-tramsfer:** fix v5 imports for file-transfer plugin ([#2537](https://github.com/ionic-team/ionic-native/issues/2537)) ([406ad12](https://github.com/ionic-team/ionic-native/commit/406ad12))
-* **healt:** add correct return type for query function ([#2565](https://github.com/ionic-team/ionic-native/issues/2565)) ([98d44e6](https://github.com/ionic-team/ionic-native/commit/98d44e6))
-* **index-app-content:** add missing function ([8d57198](https://github.com/ionic-team/ionic-native/commit/8d57198))
-* **index-app-content:** fix imports ([189d66c](https://github.com/ionic-team/ionic-native/commit/189d66c))
-
-
-### Features
-
-* **aes-256:** AES256 encryption and decryption plugin added ([#2562](https://github.com/ionic-team/ionic-native/issues/2562)) ([fdd6315](https://github.com/ionic-team/ionic-native/commit/fdd6315))
-* **image-picker:** add DATA_URL as an option to ImagePicker ([#2325](https://github.com/ionic-team/ionic-native/issues/2325)) ([dd9ba0a](https://github.com/ionic-team/ionic-native/commit/dd9ba0a))
-* **plugin:** add Sensors plugin ([#2268](https://github.com/ionic-team/ionic-native/issues/2268)) ([e61d574](https://github.com/ionic-team/ionic-native/commit/e61d574))
-
-
-
-# [5.0.0-beta.12](https://github.com/ionic-team/ionic-native/compare/v4.8.0...v5.0.0-beta.12) (2018-06-23)
-
-
 ### Bug Fixes

 * **android-fingerprint-auth:** ensure ERRORS array is defined ([#2508](https://github.com/ionic-team/ionic-native/issues/2508)) ([714114d](https://github.com/ionic-team/ionic-native/commit/714114d))
 * **background-geolocation:** watchLocationMode returns observable ([#2547](https://github.com/ionic-team/ionic-native/issues/2547)) ([3f8a6f2](https://github.com/ionic-team/ionic-native/commit/3f8a6f2))
 * **calendar:** Fixes createCalendar parameter typing ([84e0aa1](https://github.com/ionic-team/ionic-native/commit/84e0aa1))
 * **call-number:** fix isCallSupported function ([f49d2a9](https://github.com/ionic-team/ionic-native/commit/f49d2a9)), closes [#2428](https://github.com/ionic-team/ionic-native/issues/2428)
+* **healt:** add correct return type for query function ([#2565](https://github.com/ionic-team/ionic-native/issues/2565)) ([98d44e6](https://github.com/ionic-team/ionic-native/commit/98d44e6))
 * **healths:** add missing attribute on HealthQueryOptionsAggregated ([#2550](https://github.com/ionic-team/ionic-native/issues/2550)) ([be370a4](https://github.com/ionic-team/ionic-native/commit/be370a4))
 * **ibeacon:** correct Type {Region} in some params ([#2453](https://github.com/ionic-team/ionic-native/issues/2453)) ([300db62](https://github.com/ionic-team/ionic-native/commit/300db62))
 * **in-app-purchase-2:** fix ready method signature ([#2043](https://github.com/ionic-team/ionic-native/issues/2043)) ([a018381](https://github.com/ionic-team/ionic-native/commit/a018381))
-* **linting:** Fixing misc linting errors that typedoc complains about ([#2476](https://github.com/ionic-team/ionic-native/issues/2476)) ([d3c2859](https://github.com/ionic-team/ionic-native/commit/d3c2859))
+* **index-app-content:** add missing function ([8d57198](https://github.com/ionic-team/ionic-native/commit/8d57198))
+* **index-app-content:** fix imports ([189d66c](https://github.com/ionic-team/ionic-native/commit/189d66c))
 * **native-geocoder:** set response type to an array ([#2505](https://github.com/ionic-team/ionic-native/issues/2505)) ([defb276](https://github.com/ionic-team/ionic-native/commit/defb276))
 * **onesignal:** make params optional ([#2507](https://github.com/ionic-team/ionic-native/issues/2507)) ([e6db281](https://github.com/ionic-team/ionic-native/commit/e6db281))
 * **onesignal:** update OSPermissionState interface ([#2561](https://github.com/ionic-team/ionic-native/issues/2561)) ([fc088f8](https://github.com/ionic-team/ionic-native/commit/fc088f8))
 * **site:** no prepended slash ([cea1dc1](https://github.com/ionic-team/ionic-native/commit/cea1dc1))
-* **str-prnt:** rxjs 6 import ([48714d7](https://github.com/ionic-team/ionic-native/commit/48714d7))
 * **stripe:** fixed casing of postal code param ([#2520](https://github.com/ionic-team/ionic-native/issues/2520)) ([d6a9ed1](https://github.com/ionic-team/ionic-native/commit/d6a9ed1))
 * **themeable-browser:** allow hidden and clear cache ([a4cc7f7](https://github.com/ionic-team/ionic-native/commit/a4cc7f7))
-* **v5-builder:** stop transforming "declare" classes ([#2503](https://github.com/ionic-team/ionic-native/issues/2503)) ([6662234](https://github.com/ionic-team/ionic-native/commit/6662234))
-* build errors ([f70eaea](https://github.com/ionic-team/ionic-native/commit/f70eaea))
-* fix lint ([b36a1f9](https://github.com/ionic-team/ionic-native/commit/b36a1f9))
-* fix more lint errors ([0b3d299](https://github.com/ionic-team/ionic-native/commit/0b3d299))
-* fix rxjs 6 imports ([e0b0687](https://github.com/ionic-team/ionic-native/commit/e0b0687))
-* fix tealium jsdoc ([f34b6e6](https://github.com/ionic-team/ionic-native/commit/f34b6e6))
 * **web-intent:** fix options param ([#2450](https://github.com/ionic-team/ionic-native/issues/2450)) ([23b760b](https://github.com/ionic-team/ionic-native/commit/23b760b))
 * **web-intent:** registerBroadcastReceiver as Observable ([#2491](https://github.com/ionic-team/ionic-native/issues/2491)) ([47f7397](https://github.com/ionic-team/ionic-native/commit/47f7397))


 ### Features

+* **aes-256:** AES256 encryption and decryption plugin added ([#2562](https://github.com/ionic-team/ionic-native/issues/2562)) ([fdd6315](https://github.com/ionic-team/ionic-native/commit/fdd6315))
 * **ble:** update wrapper to match latest plugin release ([#2548](https://github.com/ionic-team/ionic-native/issues/2548)) ([03e6afb](https://github.com/ionic-team/ionic-native/commit/03e6afb))
 * **calldirectory:** add call directory plugin ([#2473](https://github.com/ionic-team/ionic-native/issues/2473)) ([1bfe829](https://github.com/ionic-team/ionic-native/commit/1bfe829))
 * **cloud-settings:** add support for cordova-plugin-cloud-settings ([#2494](https://github.com/ionic-team/ionic-native/issues/2494)) ([400dbcb](https://github.com/ionic-team/ionic-native/commit/400dbcb))
@@ -442,11 +290,12 @@
 * **firebase-config:** add firebase-config wrapper ([#2517](https://github.com/ionic-team/ionic-native/issues/2517)) ([05423ce](https://github.com/ionic-team/ionic-native/commit/05423ce))
 * **firebase-messaging:** add firebase-messaging ([#2518](https://github.com/ionic-team/ionic-native/issues/2518)) ([c03b73f](https://github.com/ionic-team/ionic-native/commit/c03b73f))
 * **hce:** add hce plugin wrapper ([#2534](https://github.com/ionic-team/ionic-native/issues/2534)) ([8460e68](https://github.com/ionic-team/ionic-native/commit/8460e68))
+* **image-picker:** add DATA_URL as an option to ImagePicker ([#2325](https://github.com/ionic-team/ionic-native/issues/2325)) ([dd9ba0a](https://github.com/ionic-team/ionic-native/commit/dd9ba0a))
 * **InAppReview:** add InAppReview plugin ([#2483](https://github.com/ionic-team/ionic-native/issues/2483)) ([bfe5ae9](https://github.com/ionic-team/ionic-native/commit/bfe5ae9))
-* **ionic-webview:** plugin for cordova-plugin-ionic-webview 2.0 ([8beb177](https://github.com/ionic-team/ionic-native/commit/8beb177))
 * **local-notifications:** added support for foreground option in version 0.9.0-beta.3 of cordova-plugin-local-notifications ([#2506](https://github.com/ionic-team/ionic-native/issues/2506)) ([ae6e28d](https://github.com/ionic-team/ionic-native/commit/ae6e28d))
 * **onesignal:** Added notification stacking ([#2512](https://github.com/ionic-team/ionic-native/issues/2512)) ([7c35535](https://github.com/ionic-team/ionic-native/commit/7c35535))
 * **photo-library:** add maxItems to limit items-iOS ([#2554](https://github.com/ionic-team/ionic-native/issues/2554)) ([31fc892](https://github.com/ionic-team/ionic-native/commit/31fc892))
+* **plugin:** add Sensors plugin ([#2268](https://github.com/ionic-team/ionic-native/issues/2268)) ([e61d574](https://github.com/ionic-team/ionic-native/commit/e61d574))
 * **send-result:** add sendResult method for WebIntent plugin ([#2495](https://github.com/ionic-team/ionic-native/issues/2495)) ([34aeb19](https://github.com/ionic-team/ionic-native/commit/34aeb19))
 * **SiriShortcuts:** implement Siri Shortcuts plugin in Ionic ([#2542](https://github.com/ionic-team/ionic-native/issues/2542)) ([df254de](https://github.com/ionic-team/ionic-native/commit/df254de))
 * **star-prnt:** add StarPRNT plugin ([a1e6bef](https://github.com/ionic-team/ionic-native/commit/a1e6bef))
@@ -462,11 +311,9 @@
 ### Bug Fixes

 * **badge:** add correct requestPermission function ([586c7e5](https://github.com/ionic-team/ionic-native/commit/586c7e5)), closes [#105](https://github.com/ionic-team/ionic-native/issues/105) [#1856](https://github.com/ionic-team/ionic-native/issues/1856)
-* **build:** fix ngx build errors ([cc9a980](https://github.com/ionic-team/ionic-native/commit/cc9a980))
 * **call-log:** comments erratum ([4b9cf17](https://github.com/ionic-team/ionic-native/commit/4b9cf17))
 * **call-log:** update getCallLog signature ([61c0ecf](https://github.com/ionic-team/ionic-native/commit/61c0ecf))
 * **contacts:** refactor wrong ContactFieldTypes ([f607a03](https://github.com/ionic-team/ionic-native/commit/f607a03))
-* **core:** fix rxjs 6 build errors ([48b0f16](https://github.com/ionic-team/ionic-native/commit/48b0f16)), closes [#2439](https://github.com/ionic-team/ionic-native/issues/2439)
 * **email-composer:** add missing options ([4399600](https://github.com/ionic-team/ionic-native/commit/4399600)), closes [#175](https://github.com/ionic-team/ionic-native/issues/175)
 * **facebook:** remove browserInit function ([f718432](https://github.com/ionic-team/ionic-native/commit/f718432)), closes [#1901](https://github.com/ionic-team/ionic-native/issues/1901)
 * **firebase-analytics:** add `sync` option for all methods ([42fd1f2](https://github.com/ionic-team/ionic-native/commit/42fd1f2))
@@ -475,7 +322,6 @@
 * **image-resizer:** add missing option ([859cbfc](https://github.com/ionic-team/ionic-native/commit/859cbfc))
 * **index-app-content:** remove onItemPressed function ([270678f](https://github.com/ionic-team/ionic-native/commit/270678f))
 * **local-notifications:** fixed linting errors ([8a26377](https://github.com/ionic-team/ionic-native/commit/8a26377))
-* **plugins:** fix rxjs 6 build errors ([3ced31e](https://github.com/ionic-team/ionic-native/commit/3ced31e)), closes [#2439](https://github.com/ionic-team/ionic-native/issues/2439)
 * **printer:** add correct npm repository ([4bf55d3](https://github.com/ionic-team/ionic-native/commit/4bf55d3))
 * **pro:** proper callback type and guard for plugin instantiate. [#2136](https://github.com/ionic-team/ionic-native/issues/2136) [#2127](https://github.com/ionic-team/ionic-native/issues/2127) ([61293c3](https://github.com/ionic-team/ionic-native/commit/61293c3))
 * **pro:** Tweak to pro plugin. [#2136](https://github.com/ionic-team/ionic-native/issues/2136) [#2127](https://github.com/ionic-team/ionic-native/issues/2127) ([c8ecee0](https://github.com/ionic-team/ionic-native/commit/c8ecee0))
@@ -515,9 +361,9 @@
 * **one-signal:** add clearOneSignalNotifications function ([fc0338a](https://github.com/ionic-team/ionic-native/commit/fc0338a))
 * **plugin:** Add google nearby plugin ([eb1bcdd](https://github.com/ionic-team/ionic-native/commit/eb1bcdd))
 * **plugin:** add iOS File Picker ([571df3a](https://github.com/ionic-team/ionic-native/commit/571df3a))
-* **plugin:** add Microdoft App Center Analytics plugin ([b65946b](https://github.com/ionic-team/ionic-native/commit/b65946b))
 * **plugin:** add Microdoft App Center Analytics plugin ([7a5bee9](https://github.com/ionic-team/ionic-native/commit/7a5bee9))
 * **plugin:** add Microdoft App Center Analytics plugin ([84c9bfb](https://github.com/ionic-team/ionic-native/commit/84c9bfb))
+* **plugin:** add Microdoft App Center Analytics plugin ([b65946b](https://github.com/ionic-team/ionic-native/commit/b65946b))
 * **plugin:** add Microsoft App Center Crashes plugin ([44e0e24](https://github.com/ionic-team/ionic-native/commit/44e0e24))
 * **plugin:** add Microsoft App Center Push plugin ([cdabebd](https://github.com/ionic-team/ionic-native/commit/cdabebd))
 * **plugin:** add OpenALPR plugin ([e27fbf4](https://github.com/ionic-team/ionic-native/commit/e27fbf4))
@@ -530,10 +376,6 @@



-# [5.0.0-beta.4](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.3...v5.0.0-beta.4) (2017-12-29)
-
-
-
 # [5.0.0-beta.3](https://github.com/ionic-team/ionic-native/compare/v4.5.1...v5.0.0-beta.3) (2017-12-29)


@@ -1039,8 +881,8 @@ renamed to `FileTransfer`. Also, `TransferObject` class has been renamed to `Fil

 ### Features

-* add IonicNativePlugin base class ([#1425](https://github.com/ionic-team/ionic-native/issues/1425)) ([17366a2](https://github.com/ionic-team/ionic-native/commit/17366a2))
 * **keychain:** add Keychain plugin ([#1420](https://github.com/ionic-team/ionic-native/issues/1420)) ([16dc71a](https://github.com/ionic-team/ionic-native/commit/16dc71a))
+* add IonicNativePlugin base class ([#1425](https://github.com/ionic-team/ionic-native/issues/1425)) ([17366a2](https://github.com/ionic-team/ionic-native/commit/17366a2))



@@ -1409,12 +1251,12 @@ renamed to `FileTransfer`. Also, `TransferObject` class has been renamed to `Fil

 ### Bug Fixes

+* add clearAllNotifications() ([8c021bc](https://github.com/ionic-team/ionic-native/commit/8c021bc))
 * **battery-status:** add missing pluginRef ([3da0efe](https://github.com/ionic-team/ionic-native/commit/3da0efe))
 * **core:** fix exception in CordovaProperty ([#998](https://github.com/ionic-team/ionic-native/issues/998)) ([cb29363](https://github.com/ionic-team/ionic-native/commit/cb29363)), closes [#992](https://github.com/ionic-team/ionic-native/issues/992)
 * **core:** fix plugin check ([da7a370](https://github.com/ionic-team/ionic-native/commit/da7a370))
 * **googlemaps:** fix GoogleMapsLaLngBounds ([c3127d3](https://github.com/ionic-team/ionic-native/commit/c3127d3)), closes [#972](https://github.com/ionic-team/ionic-native/issues/972)
 * **plugin:** adds subscribe() and unsubscribe() ([94025a7](https://github.com/ionic-team/ionic-native/commit/94025a7))
-* add clearAllNotifications() ([8c021bc](https://github.com/ionic-team/ionic-native/commit/8c021bc))


 ### Features
@@ -1572,8 +1414,8 @@ renamed to `FileTransfer`. Also, `TransferObject` class has been renamed to `Fil

 ### Bug Fixes

-* **card-io:** fix typo in options ([e6700a3](https://github.com/ionic-team/ionic-native/commit/e6700a3))
 * add return ([3fdc4a8](https://github.com/ionic-team/ionic-native/commit/3fdc4a8))
+* **card-io:** fix typo in options ([e6700a3](https://github.com/ionic-team/ionic-native/commit/e6700a3))
 * **globalization:** add missing parameter to numberToString function ([1072ab1](https://github.com/ionic-team/ionic-native/commit/1072ab1)), closes [#835](https://github.com/ionic-team/ionic-native/issues/835)
 * **headercolor:** solve typo in usage and chore ([bab2971](https://github.com/ionic-team/ionic-native/commit/bab2971))

@@ -1826,7 +1668,6 @@ renamed to `FileTransfer`. Also, `TransferObject` class has been renamed to `Fil

 ### Bug Fixes

-* remove CanvasCamera plugin ([c75f898](https://github.com/ionic-team/ionic-native/commit/c75f898))
 * **base64togallery:** fixes callbacks ([#513](https://github.com/ionic-team/ionic-native/issues/513)) ([1db1374](https://github.com/ionic-team/ionic-native/commit/1db1374))
 * **diagnostic:** Add DENIED_ALWAYS to permissionStatus, also some code formatting ([9d573a9](https://github.com/ionic-team/ionic-native/commit/9d573a9))
 * **diagnostic:** Fix diagnostic objects ([cb176aa](https://github.com/ionic-team/ionic-native/commit/cb176aa))
@@ -1840,6 +1681,7 @@ renamed to `FileTransfer`. Also, `TransferObject` class has been renamed to `Fil
 * **mixpanel:** Make eventProperties optional ([#501](https://github.com/ionic-team/ionic-native/issues/501)) ([51364f8](https://github.com/ionic-team/ionic-native/commit/51364f8))
 * **ng1:** fail gracefully when angular 1 promises can't be retrieved ([d135dc2](https://github.com/ionic-team/ionic-native/commit/d135dc2))
 * **ng1:** grab injector from app. [#451](https://github.com/ionic-team/ionic-native/issues/451) ([2dc68a4](https://github.com/ionic-team/ionic-native/commit/2dc68a4))
+* remove CanvasCamera plugin ([c75f898](https://github.com/ionic-team/ionic-native/commit/c75f898))
 * **social-sharing:** shareViaEmail now resolves/rejects when not providing optional args ([c76de34](https://github.com/ionic-team/ionic-native/commit/c76de34))
 * **social-sharing:** various fixes ([#520](https://github.com/ionic-team/ionic-native/issues/520)) ([4f97164](https://github.com/ionic-team/ionic-native/commit/4f97164))

@@ -1916,11 +1758,11 @@ renamed to `FileTransfer`. Also, `TransferObject` class has been renamed to `Fil

 ### Bug Fixes

+* add the reject function at the expected errorIndex position in the args array ([#436](https://github.com/ionic-team/ionic-native/issues/436)) ([4e87ac7](https://github.com/ionic-team/ionic-native/commit/4e87ac7))
 * **camera-preview:** changes implementation to match Cordova plugin ([#441](https://github.com/ionic-team/ionic-native/issues/441)) ([55ba65a](https://github.com/ionic-team/ionic-native/commit/55ba65a))
 * **file:** fixes exclusive option ([#459](https://github.com/ionic-team/ionic-native/issues/459)) ([14e41a3](https://github.com/ionic-team/ionic-native/commit/14e41a3))
 * **file:** initialize writeFile options ([#468](https://github.com/ionic-team/ionic-native/issues/468)) ([16628a4](https://github.com/ionic-team/ionic-native/commit/16628a4))
 * **nativeaudio:** fix plugin reference ([2510c5f](https://github.com/ionic-team/ionic-native/commit/2510c5f))
-* add the reject function at the expected errorIndex position in the args array ([#436](https://github.com/ionic-team/ionic-native/issues/436)) ([4e87ac7](https://github.com/ionic-team/ionic-native/commit/4e87ac7))


 ### Features
@@ -2119,12 +1961,12 @@ renamed to `FileTransfer`. Also, `TransferObject` class has been renamed to `Fil

 ### Bug Fixes

+* remove unnecessary decorator ([#257](https://github.com/ionic-team/ionic-native/issues/257)) ([25fab64](https://github.com/ionic-team/ionic-native/commit/25fab64))
 * **actionsheet:** add missing optional parameter for hide function ([#262](https://github.com/ionic-team/ionic-native/issues/262)) ([644e999](https://github.com/ionic-team/ionic-native/commit/644e999))
 * **background-geolocation:** fix pluginref again ([b8a5133](https://github.com/ionic-team/ionic-native/commit/b8a5133))
 * **geolocation:** fix plugin reference ([4f0cd24](https://github.com/ionic-team/ionic-native/commit/4f0cd24)), closes [#258](https://github.com/ionic-team/ionic-native/issues/258)
 * **googlemaps:** use correct methods for addGroundOverlay and addKmlOverlay ([#268](https://github.com/ionic-team/ionic-native/issues/268)) ([b8be1de](https://github.com/ionic-team/ionic-native/commit/b8be1de))
 * **socialsharing:** all methods return Promises now ([e150224](https://github.com/ionic-team/ionic-native/commit/e150224)), closes [#275](https://github.com/ionic-team/ionic-native/issues/275)
-* remove unnecessary decorator ([#257](https://github.com/ionic-team/ionic-native/issues/257)) ([25fab64](https://github.com/ionic-team/ionic-native/commit/25fab64))


 ### Features
@@ -2260,8 +2102,8 @@ renamed to `FileTransfer`. Also, `TransferObject` class has been renamed to `Fil

 * **datepicker:** datepicker options are optional ([c3cfd14](https://github.com/ionic-team/ionic-native/commit/c3cfd14))
 * **datepicker:** dates are Dates ([ce6adcc](https://github.com/ionic-team/ionic-native/commit/ce6adcc))
-* **datepicker:** fix plugin functionality ([1a778e7](https://github.com/ionic-team/ionic-native/commit/1a778e7))
 * **datepicker:** fix plugin functionality ([91de971](https://github.com/ionic-team/ionic-native/commit/91de971))
+* **datepicker:** fix plugin functionality ([1a778e7](https://github.com/ionic-team/ionic-native/commit/1a778e7))
 * **devicemotion:** combine watch and clear into one function ([d17f62d](https://github.com/ionic-team/ionic-native/commit/d17f62d))
 * **geolocation:** set callback order to reverse on getCurrentPosition ([1fac387](https://github.com/ionic-team/ionic-native/commit/1fac387))
 * **imagepicker:** pluginRef ([01d7972](https://github.com/ionic-team/ionic-native/commit/01d7972))
@@ -2319,15 +2161,18 @@ renamed to `FileTransfer`. Also, `TransferObject` class has been renamed to `Fil

 ### Bug Fixes

-* datepicker plugin, pluginref, and @Cordova wrapper ([499ead3](https://github.com/ionic-team/ionic-native/commit/499ead3))
 * **calendar:** make getCalendarOptions sync ([78c5408](https://github.com/ionic-team/ionic-native/commit/78c5408))
 * **geolocation:** call correct clearFunction ([9e86a40](https://github.com/ionic-team/ionic-native/commit/9e86a40))
 * **plugin:** return originalMethod return value ([240f0f8](https://github.com/ionic-team/ionic-native/commit/240f0f8))
 * **plugin:** use call for id based clearFunction ([c2fdf39](https://github.com/ionic-team/ionic-native/commit/c2fdf39))
+* datepicker plugin, pluginref, and @Cordova wrapper ([499ead3](https://github.com/ionic-team/ionic-native/commit/499ead3))


 ### Features

+* **DatePicker:** Added DatePicker ([5afa58f](https://github.com/ionic-team/ionic-native/commit/5afa58f))
+* **plugin:** add sync option to @Cordova for sync functions ([17e3827](https://github.com/ionic-team/ionic-native/commit/17e3827))
+* **plugin:** call clearFunction with original fn args ([8f27fc9](https://github.com/ionic-team/ionic-native/commit/8f27fc9))
 * add app version plugin ([20cb01f](https://github.com/ionic-team/ionic-native/commit/20cb01f))
 * add app version plugin ([8b78521](https://github.com/ionic-team/ionic-native/commit/8b78521))
 * add apprate ([0dd4fec](https://github.com/ionic-team/ionic-native/commit/0dd4fec))
@@ -2335,9 +2180,6 @@ renamed to `FileTransfer`. Also, `TransferObject` class has been renamed to `Fil
 * add badge plugin ([3088df4](https://github.com/ionic-team/ionic-native/commit/3088df4))
 * add clipboard plugin ([0b6cca7](https://github.com/ionic-team/ionic-native/commit/0b6cca7))
 * add clipboard plugin ([fa4c266](https://github.com/ionic-team/ionic-native/commit/fa4c266))
-* **DatePicker:** Added DatePicker ([5afa58f](https://github.com/ionic-team/ionic-native/commit/5afa58f))
-* **plugin:** add sync option to @Cordova for sync functions ([17e3827](https://github.com/ionic-team/ionic-native/commit/17e3827))
-* **plugin:** call clearFunction with original fn args ([8f27fc9](https://github.com/ionic-team/ionic-native/commit/8f27fc9))



--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -194,7 +194,7 @@ Checks if the plugin and property exist before getting/setting the property's va

 Example:
 ```ts
-@CordovaProperty()
+@CordovaProperty
 someProperty: string;
 ```

--- a/46
+++ b/46
@@ -1,23 +1,23 @@
-Copyright 2015-present Drifty Co.
-http://drifty.com/
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2015-present Drifty Co.
+http://drifty.com/
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Ionic Native wraps plugin callbacks in a Promise or Observable, providing a comm
 Run following command to install Ionic Native in your project.

 ```bash
-npm install @ionic-native/core --save
+npm install @ionic-native/core
 ```

 You also need to install the Ionic Native package for each plugin you want to add. Please see the [Ionic Native documentation](https://ionicframework.com/docs/native/) for complete instructions on how to add and use the plugins.
@@ -22,13 +22,11 @@ For the full Ionic Native documentation, please visit [https://ionicframework.co

 ### Basic Usage

-#### Ionic/Angular apps
-To use a plugin, import and add the plugin provider to your `@NgModule`, and then inject it where you wish to use it. 
-Make sure to import the injectable class from the `/ngx` directory as shown in the following examples:
+To use a plugin, import and add the plugin provider to your `@NgModule`, and then inject it where you wish to use it.

 ```typescript
 // app.module.ts
-import { Camera } from '@ionic-native/camera/ngx';
+import { Camera } from '@ionic-native/camera';

 ...

@@ -46,7 +44,7 @@ export class AppModule { }
 ```

 ```typescript
-import { Geolocation } from '@ionic-native/geolocation/ngx';
+import { Geolocation } from '@ionic-native/geolocation';
 import { Platform } from 'ionic-angular';

@Component({ ... })
@@ -76,71 +74,16 @@ export class MyComponent {
 }
 ```

-#### ES2015+/TypeScript
-These modules can work in any ES2015+/TypeScript app (including Angular/Ionic apps). To use any plugin, import the class from the appropriate package, and use it's static methods.
-```js
-import { Camera } from '@ionic-native/camera';
+### Mocking and Browser Development

-document.addEventListener('deviceready', () => {
-  Camera.getPicture()
-    .then((data) => console.log('Took a picture!',  data))
-    .catch((e) => console.log('Error occurred while taking a picture', e));
-});
-```
-
-#### AngularJS
-Ionic Native generates an AngularJS module in runtime and prepares a service for each plugin. To use the plugins in your AngularJS app:
-1. Download the latest bundle from the [Github releases](https://github.com/ionic-team/ionic-native/releases) page.
-2. Include it in `index.html` before your app's code.
-3. Inject `ionic.native` module in your app.
-4. Inject any plugin you would like to use with a `$cordova` prefix.
-
-```js
-angular.module('myApp', ['ionic.native'])
-  .controller('MyPageController', function($cordovaCamera) {
-    $cordovaCamera.getPicture()
-      .then(
-        function(data) {
-          console.log('Took a picture!', data);
-        },
-        function(err) {
-          console.log('Error occurred while taking a picture', err);
-        }
-      );
-  });
-```
-
-#### Vanilla JS
-To use Ionic Native in any other setup:
-1. Download the latest bundle from the [Github releases](https://github.com/ionic-team/ionic-native/releases) page.
-2. Include it in `index.html` before your app's code.
-3. Access any plugin using the global `IonicNative` variable.
-
-```js
-document.addEventListener('deviceready', function() {
-  IonicNative.Camera.getPicture()
-    .then(
-      function(data) {
-        console.log('Took a picture!', data);
-      },
-      function(err) {
-        console.log('Error occurred while taking a picture', err);
-      }
-    );
-});
-```
-
-
-### Mocking and Browser Development (Ionic/Angular apps only)
-
-Ionic Native makes it possible to mock plugins and develop nearly the entirety of your app in the browser or in `ionic serve`.
+Ionic Native 3.x makes it possible to mock plugins and develop nearly the entirety of your app in the browser or in `ionic serve`.

 To do this, you need to provide a mock implementation of the plugins you wish to use. Here's an example of mocking the `Camera` plugin to return a stock image while in development:

 First import the `Camera` class in your `src/app/app.module.ts` file:

 ```typescript
-import { Camera } from '@ionic-native/camera/ngx';
+import { Camera } from '@ionic-native/camera';
 ```

 Then create a new class that extends the `Camera` class with a mock implementation:
@@ -166,11 +109,8 @@ Here's the full example:
 ```typescript
 import { ErrorHandler, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
-import { MyApp } from './app.component';
-import { HomePage } from '../pages/home/home';
-
-import { Camera } from '@ionic-native/camera/ngx';
+import { Camera } from '@ionic-native/camera';
+import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular';

 import { HomePage } from '../pages/home/home';
 import { MyApp } from './app.component';
@@ -206,6 +146,9 @@ Spent way too long diagnosing an issue only to realize a plugin wasn't firing or

 Let us know or submit a PR! Take a look at [the Developer Guide](https://github.com/ionic-team/ionic-native/blob/master/DEVELOPER.md) for more on how to contribute. :heart:

+## Ionic v1 (AngularJS, Angular 1.x) support
+
+For Ionic v1 (AngularJS, Angular 1.x) support, please use version 2 of Ionic Native. See the [2.x README](https://github.com/ionic-team/ionic-native/blob/v2.x/README.md) for usage information.

 # Credits

--- a/circle.yml
+++ b/circle.yml
@@ -3,7 +3,7 @@ jobs:
  build:
    working_directory: ~/ionic-native/
    docker:
-      - image: node:10
+      - image: node:8
    steps:
      - checkout
      - restore_cache:
@@ -33,7 +33,7 @@ jobs:
      - run: bash ./scripts/git/config.sh
      - run:
          name: Build Ionic Native
-          command: npm run build
+          command: npm run build:core && ./node_modules/.bin/tsc
      - run:
          name: Generate README files to ensure docs are valid
          command: npm run readmes
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -32,7 +32,9 @@ gulp.task('lint', () => {

 gulp.task('plugin:create', () => {
  if (flags.n && flags.n !== '') {
-    const src = flags.m ? './scripts/templates/wrap-min.tmpl' : './scripts/templates/wrap.tmpl',
+    const src = flags.m
+        ? './scripts/templates/wrap-min.tmpl'
+        : './scripts/templates/wrap.tmpl',
      pluginName = flags.n,
      spaced = pluginName.replace(/(?!^)([A-Z])/g, ' $1'),
      kebabCase = _.kebabCase(pluginName);
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -0,0 +1,40 @@
+'use strict';
+
+module.exports = config => {
+  const conf = {
+    frameworks: ['jasmine', 'karma-typescript'],
+
+    plugins: ['karma-typescript', 'karma-jasmine', 'karma-phantomjs-launcher'],
+
+    preprocessors: {
+      'src/**/*.ts': ['karma-typescript']
+    },
+
+    karmaTypescriptConfig: {
+      bundlerOptions: {
+        entrypoints: /\.spec\.ts$/,
+        transforms: [require('karma-typescript-es6-transform')()]
+      },
+      compilerOptions: {
+        lib: ['es2015', 'dom'],
+        paths: {
+          '@ionic-native/core': ['./src/@ionic-native/core']
+        },
+        baseUrl: '.'
+      }
+    },
+
+    files: [{ pattern: 'src/**/*.ts', included: true, watched: true }],
+
+    reporters: ['progress'],
+
+    port: 9876,
+    colors: true,
+    logLevel: config.INFO,
+    autoWatch: true,
+    browsers: ['PhantomJS'],
+    singleRun: false
+  };
+
+  config.set(conf);
+};
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,41 +1,19 @@
 {
  "name": "ionic-native",
-  "version": "5.2.0",
+  "version": "4.20.0",
  "description": "Native plugin wrappers for Cordova and Ionic with TypeScript, ES6+, Promise and Observable support",
  "homepage": "https://ionicframework.com/",
  "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
  "license": "MIT",
-  "scripts": {
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "build:core": "tsc -p tsconfig.core.json",
-    "build:esm": "ts-node -P scripts/tsconfig.json scripts/tasks/build-esm",
-    "build:es5": "ts-node -P scripts/tsconfig.json scripts/tasks/build-es5",
-    "build:ngx": "ts-node -P scripts/tsconfig.json scripts/tasks/build-ngx",
-    "build": "npm run build:core && npm run build:esm && npm run build:ngx && npm run build:es5",
-    "prebuild": "rimraf -rf dist",
-    "npmpub": "ts-node -P scripts/tsconfig.json scripts/tasks/publish",
-    "lint": "gulp lint",
-    "readmes": "gulp readmes",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
-    "postchangelog": "git commit -am \"chore(): update changelog\"",
-    "shipit": "npm run build && npm run readmes && npm run npmpub"
-  },
  "devDependencies": {
-    "@angular/common": "^7.2.5",
-    "@angular/compiler": "^7.2.5",
-    "@angular/compiler-cli": "^7.2.5",
-    "@angular/core": "^7.2.5",
+    "@angular/compiler": "^5.2.11",
+    "@angular/compiler-cli": "^5.2.11",
+    "@angular/core": "^5.2.11",
    "@types/cordova": "0.0.34",
-    "@types/fs-extra": "^5.0.5",
-    "@types/jest": "^24.0.6",
-    "@types/lodash": "^4.14.121",
-    "@types/node": "^10.12.26",
-    "@types/rimraf": "^2.0.2",
-    "@types/webpack": "^4.4.24",
-    "ajv": "^6.9.1",
-    "async-promise-queue": "^1.0.4",
-    "conventional-changelog-cli": "^2.0.12",
+    "@types/jasmine": "2.8.9",
+    "@types/node": "8.10.20",
+    "child-process-promise": "2.2.1",
+    "conventional-changelog-cli": "^2.0.11",
    "cz-conventional-changelog": "^2.1.0",
    "dgeni": "^0.4.11",
    "dgeni-packages": "0.16.10",
@@ -44,35 +22,40 @@
    "gulp-rename": "^1.4.0",
    "gulp-replace": "^1.0.0",
    "gulp-tslint": "^8.1.3",
-    "jest": "^24.1.0",
+    "jasmine-core": "2.99.1",
+    "karma": "^2.0.5",
+    "karma-cli": "^1.0.1",
+    "karma-jasmine": "^1.1.2",
+    "karma-phantomjs-launcher": "^1.0.4",
+    "karma-typescript": "^3.0.13",
+    "karma-typescript-es6-transform": "^1.0.4",
    "lodash": "^4.17.11",
    "minimist": "1.2.0",
-    "natives": "^1.1.6",
+    "node-html-encoder": "0.0.2",
+    "q": "^1.5.1",
+    "queue": "^4.5.1",
    "rimraf": "^2.6.3",
-    "rxjs": "^6.4.0",
-    "ts-jest": "^24.0.0",
-    "ts-node": "^8.0.2",
+    "rxjs": "^5.5.12",
+    "semver": "^5.6.0",
    "tslint": "^5.12.1",
    "tslint-ionic-rules": "0.0.21",
-    "typescript": "3.2.4",
-    "uglifyjs-webpack-plugin": "^2.1.1",
-    "unminified-webpack-plugin": "^2.0.0",
-    "webpack": "^4.29.5",
-    "winston": "^3.2.1",
-    "zone.js": "^0.8.29"
+    "typescript": "~2.4.2",
+    "zone.js": "^0.8.28"
  },
-  "jest": {
-    "transform": {
-      "^.+\\.tsx?$": "ts-jest"
-    },
-    "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(js?|ts?)$",
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js",
-      "jsx",
-      "json"
-    ]
+  "scripts": {
+    "start": "npm run test:watch",
+    "lint": "gulp lint",
+    "build": "npm run clean && npm run lint && npm run build:core && npm run build:modules",
+    "build:core": "ngc -p scripts/build/tsconfig-core.json",
+    "build:modules": "node scripts/build/build.js",
+    "clean": "rimraf dist .tmp",
+    "shipit": "npm run build && gulp readmes && npm run npmpub",
+    "npmpub": "node scripts/build/publish.js",
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
+    "postchangelog": "git commit -am \"chore(): update changelog\"",
+    "test": "karma start karma.conf.js --single-run",
+    "test:watch": "karma start karma.conf.js",
+    "readmes": "gulp readmes"
  },
  "repository": {
    "type": "git",
--- a/scripts/build/build.js
+++ b/scripts/build/build.js
@@ -0,0 +1,154 @@
+'use strict';
+// Node module dependencies
+const fs = require('fs-extra'),
+  queue = require('queue'),
+  path = require('path'),
+  exec = require('child_process').exec;
+
+// Constants for the build process. Paths and JSON files templates
+const ROOT = path.resolve(path.join(__dirname, '../../')), // root ionic-native directory
+  PLUGINS_PATH = path.resolve(ROOT, 'src/@ionic-native/plugins'), // path to plugins source files
+  CORE_PACKAGE_JSON = require(path.resolve(__dirname, 'core-package.json')), // core package.json
+  PLUGIN_PACKAGE_JSON = require(path.resolve(__dirname, 'plugin-package.json')), // plugin package.json template
+  PLUGIN_TS_CONFIG = require(path.resolve(__dirname, 'tsconfig-plugin.json')), // plugin tsconfig template
+  BUILD_TMP = path.resolve(ROOT, '.tmp'), // tmp directory path
+  BUILD_DIST_ROOT = path.resolve(ROOT, 'dist/@ionic-native'), // dist directory root path
+  BUILD_CORE_DIST = path.resolve(BUILD_DIST_ROOT, 'core'); // core dist directory path
+
+// dependency versions
+const ANGULAR_VERSION = '*',
+  RXJS_VERSION = '^5.5.11',
+  MIN_CORE_VERSION = '^4.11.0',
+  IONIC_NATIVE_VERSION = require(path.resolve(ROOT, 'package.json')).version;
+
+// package dependencies
+const CORE_PEER_DEPS = {
+  rxjs: RXJS_VERSION
+};
+
+const PLUGIN_PEER_DEPS = {
+  '@ionic-native/core': MIN_CORE_VERSION,
+  '@angular/core': ANGULAR_VERSION,
+  rxjs: RXJS_VERSION
+};
+
+// set peer dependencies for all plugins
+PLUGIN_PACKAGE_JSON.peerDependencies = PLUGIN_PEER_DEPS;
+
+// Create tmp/dist directories
+console.log('Making new TMP directory');
+fs.mkdirpSync(BUILD_TMP);
+
+// Prepare and copy the core module's package.json
+console.log('Preparing core module package.json');
+CORE_PACKAGE_JSON.version = IONIC_NATIVE_VERSION;
+CORE_PACKAGE_JSON.peerDependencies = CORE_PEER_DEPS;
+fs.writeJsonSync(
+  path.resolve(BUILD_CORE_DIST, 'package.json'),
+  CORE_PACKAGE_JSON
+);
+
+// Fetch a list of the plugins
+const PLUGINS = fs.readdirSync(PLUGINS_PATH);
+
+// Build specific list of plugins to build from arguments, if any
+let pluginsToBuild = process.argv.slice(2);
+let ignoreErrors = false;
+let errors = [];
+
+const index = pluginsToBuild.indexOf('ignore-errors');
+if (index > -1) {
+  ignoreErrors = true;
+  pluginsToBuild.splice(index, 1);
+  console.log(
+    'Build will continue even if errors were thrown. Errors will be printed when build finishes.'
+  );
+}
+
+if (!pluginsToBuild.length) {
+  pluginsToBuild = PLUGINS;
+}
+
+// Create a queue to process tasks
+const QUEUE = queue({
+  concurrency: require('os').cpus().length
+});
+
+// Function to process a single plugin
+const addPluginToQueue = pluginName => {
+  QUEUE.push(callback => {
+    console.log(`Building plugin: ${pluginName}`);
+
+    const PLUGIN_BUILD_DIR = path.resolve(BUILD_TMP, 'plugins', pluginName),
+      PLUGIN_SRC_PATH = path.resolve(PLUGINS_PATH, pluginName, 'index.ts');
+
+    let tsConfigPath;
+
+    fs.mkdirp(PLUGIN_BUILD_DIR) // create tmp build dir
+      .then(() => fs.mkdirp(path.resolve(BUILD_DIST_ROOT, pluginName))) // create dist dir
+      .then(() => {
+        // Write tsconfig.json
+        const tsConfig = JSON.parse(JSON.stringify(PLUGIN_TS_CONFIG));
+        tsConfig.files = [PLUGIN_SRC_PATH];
+        // tsConfig.compilerOptions.paths['@ionic-native/core'] = [BUILD_CORE_DIST];
+
+        tsConfigPath = path.resolve(PLUGIN_BUILD_DIR, 'tsconfig.json');
+
+        return fs.writeJson(tsConfigPath, tsConfig);
+      })
+      .then(() => {
+        // clone package.json
+        const packageJson = JSON.parse(JSON.stringify(PLUGIN_PACKAGE_JSON));
+
+        packageJson.name = `@ionic-native/${pluginName}`;
+        packageJson.version = IONIC_NATIVE_VERSION;
+
+        return fs.writeJson(
+          path.resolve(BUILD_DIST_ROOT, pluginName, 'package.json'),
+          packageJson
+        );
+      })
+      .then(() => {
+        // compile the plugin
+        exec(
+          `${ROOT}/node_modules/.bin/ngc -p ${tsConfigPath}`,
+          (err, stdout, stderr) => {
+            if (err) {
+              if (!ignoreErrors) {
+                // oops! something went wrong.
+                console.log(err);
+                callback(`\n\nBuilding ${pluginName} failed.`);
+                return;
+              } else {
+                errors.push(err);
+              }
+            }
+
+            // we're done with this plugin!
+            callback();
+          }
+        );
+      })
+      .catch(callback);
+  }); // QUEUE.push end
+};
+
+pluginsToBuild.forEach(addPluginToQueue);
+
+QUEUE.start(err => {
+  if (err) {
+    console.log('Error building plugins.');
+    console.log(err);
+    process.stderr.write(err);
+    process.exit(1);
+  } else if (errors.length) {
+    errors.forEach(e => {
+      console.log(e.message) && console.log('\n');
+      process.stderr.write(err);
+    });
+    console.log('Build complete with errors');
+    process.exit(1);
+  } else {
+    console.log('Done processing plugins!');
+  }
+});
--- a/scripts/build/core-package.json
+++ b/scripts/build/core-package.json
@@ -0,0 +1,14 @@
+{
+  "name": "@ionic-native/core",
+  "version": "{{VERSION}}",
+  "description": "Ionic Native - Native plugins for ionic apps",
+  "module": "index.js",
+  "typings": "index.d.ts",
+  "author": "ionic",
+  "license": "MIT",
+  "peerDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ionic-team/ionic-native.git"
+  }
+}
--- a/scripts/build/helpers.ts
+++ b/scripts/build/helpers.ts
@@ -1,126 +0,0 @@
-import * as ts from 'typescript';
-import * as fs from 'fs-extra';
-import * as path from 'path';
-import { camelCase, clone } from 'lodash';
-import { Logger } from '../logger';
-
-export const ROOT = path.resolve(__dirname, '../../');
-// tslint:disable-next-line:no-var-requires
-export const TS_CONFIG = clone(require(path.resolve(ROOT, 'tsconfig.json')));
-export const COMPILER_OPTIONS = TS_CONFIG.compilerOptions;
-export const PLUGINS_ROOT = path.join(ROOT, 'src/@ionic-native/plugins/');
-export const PLUGIN_PATHS = fs.readdirSync(PLUGINS_ROOT).map(d => path.join(PLUGINS_ROOT, d, 'index.ts'));
-
-export function getDecorator(node: ts.Node, index = 0): ts.Decorator {
-  if (node.decorators && node.decorators[index]) {
-    return node.decorators[index];
-  }
-}
-
-export function hasDecorator(decoratorName: string, node: ts.Node): boolean {
-  return node.decorators && node.decorators.length && node.decorators.findIndex(d => getDecoratorName(d) === decoratorName) > -1;
-}
-
-export function getDecoratorName(decorator: any) {
-  return decorator.expression.expression.text;
-}
-
-export function getRawDecoratorArgs(decorator: any): any[] {
-  if (decorator.expression.arguments.length === 0) return [];
-  return decorator.expression.arguments[0].properties;
-}
-
-export function getDecoratorArgs(decorator: any) {
-  const properties: any[] = getRawDecoratorArgs(decorator);
-  const args = {};
-
-  properties.forEach(prop => {
-    let val;
-
-    switch (prop.initializer.kind) {
-      case ts.SyntaxKind.StringLiteral:
-      case ts.SyntaxKind.Identifier:
-        val = prop.initializer.text;
-        break;
-
-      case ts.SyntaxKind.ArrayLiteralExpression:
-        val = prop.initializer.elements.map((e: any) => e.text);
-        break;
-
-      case ts.SyntaxKind.TrueKeyword:
-        val = true;
-        break;
-
-      case ts.SyntaxKind.FalseKeyword:
-        val = false;
-        break;
-
-      case ts.SyntaxKind.NumericLiteral:
-        val = Number(prop.initializer.text);
-        break;
-
-      default:
-        Logger.debug('Unexpected property value type: ' + prop.initializer.kind);
-        throw new Error('Unexpected property value type << helpers.ts >>');
-    }
-
-    args[prop.name.text] = val;
-  });
-
-  return args;
-}
-
-/**
- * FROM STENCIL
- * Convert a js value into typescript AST
- * @param val array, object, string, boolean, or number
- * @returns Typescript Object Literal, Array Literal, String Literal, Boolean Literal, Numeric Literal
- */
-export function convertValueToLiteral(val: any) {
-  if (Array.isArray(val)) {
-    return arrayToArrayLiteral(val);
-  }
-  if (typeof val === 'object') {
-    return objectToObjectLiteral(val);
-  }
-  if (typeof val === 'number') {
-    return ts.createNumericLiteral(String(val));
-  }
-  return ts.createLiteral(val);
-}
-
-/**
- * FROM STENCIL
- * Convert a js object into typescript AST
- * @param obj key value object
- * @returns Typescript Object Literal Expression
- */
-function objectToObjectLiteral(obj: { [key: string]: any }): ts.ObjectLiteralExpression {
-  const newProperties: ts.ObjectLiteralElementLike[] = Object.keys(obj).map((key: string): ts.ObjectLiteralElementLike => {
-    return ts.createPropertyAssignment(ts.createLiteral(key), convertValueToLiteral(obj[key]) as ts.Expression);
-  });
-
-  return ts.createObjectLiteral(newProperties);
-}
-
-/**
- * FROM STENCIL
- * Convert a js array into typescript AST
- * @param list array
- * @returns Typescript Array Literal Expression
- */
-function arrayToArrayLiteral(list: any[]): ts.ArrayLiteralExpression {
-  const newList: any[] = list.map(convertValueToLiteral);
-  return ts.createArrayLiteral(newList);
-}
-
-export function getMethodsForDecorator(decoratorName: string) {
-  switch (decoratorName) {
-    case 'CordovaProperty': return ['cordovaPropertyGet', 'cordovaPropertySet'];
-    case 'InstanceProperty': return ['instancePropertyGet', 'instancePropertySet'];
-    case 'CordovaCheck': return ['checkAvailability'];
-    case 'InstanceCheck': return ['instanceAvailability'];
-  }
-
-  return [camelCase(decoratorName)];
-}
--- a/scripts/build/ngx.ts
+++ b/scripts/build/ngx.ts
@@ -1,105 +0,0 @@
-import * as ts from 'typescript';
-import * as fs from 'fs-extra';
-import * as path from 'path';
-import * as ngc from '@angular/compiler-cli';
-import * as rimraf from 'rimraf';
-import { generateDeclarations } from './transpile';
-import { clone } from 'lodash';
-import { EmitFlags } from '@angular/compiler-cli';
-import { importsTransformer } from './transformers/imports';
-import { pluginClassTransformer } from './transformers/plugin-class';
-import { COMPILER_OPTIONS, PLUGIN_PATHS, ROOT } from './helpers';
-
-export function getProgram(rootNames: string[] = createSourceFiles()) {
-  const options: ngc.CompilerOptions = clone(COMPILER_OPTIONS);
-  options.basePath = ROOT;
-  options.moduleResolution = ts.ModuleResolutionKind.NodeJs;
-  options.module = ts.ModuleKind.ES2015;
-  options.target = ts.ScriptTarget.ES5;
-  options.lib = ['dom', 'es2017'];
-  options.inlineSourceMap = true;
-  options.inlineSources = true;
-  delete options.baseUrl;
-
-  const host: ngc.CompilerHost = ngc.createCompilerHost({ options });
-
-  return ngc.createProgram({
-    rootNames,
-    options,
-    host
-  });
-}
-
-// hacky way to export metadata only for core package
-export function transpileNgxCore() {
-  getProgram([path.resolve(ROOT, 'src/@ionic-native/core/index.ts')]).emit({
-    emitFlags: EmitFlags.Metadata,
-    emitCallback: ({ program, writeFile, customTransformers, cancellationToken, targetSourceFile }) =>
-      program.emit(targetSourceFile, writeFile, cancellationToken, true, customTransformers)
-  });
-}
-
-export function transpileNgx() {
-  getProgram().emit({
-    emitFlags: EmitFlags.Metadata,
-    customTransformers: {
-      beforeTs: [
-        importsTransformer(true),
-        pluginClassTransformer(true)
-      ]
-    }
-  });
-}
-
-export function generateDeclarationFiles() {
-  generateDeclarations(PLUGIN_PATHS.map(p => p.replace('index.ts', 'ngx/index.ts')));
-}
-
-// remove reference to @ionic-native/core decorators
-export function modifyMetadata() {
-  PLUGIN_PATHS.map(p => p.replace(path.join(ROOT, 'src'), path.join(ROOT, 'dist')).replace('index.ts', 'ngx/index.metadata.json'))
-    .forEach(p => {
-      const content = fs.readJSONSync(p);
-      let _prop;
-      for (const prop in content[0].metadata) {
-        _prop = content[0].metadata[prop];
-        removeIonicNativeDecorators(_prop);
-
-        if (_prop.members) {
-          for (const memberProp in _prop.members) {
-            removeIonicNativeDecorators(_prop.members[memberProp][0]);
-          }
-        }
-      }
-
-      fs.writeJSONSync(p, content);
-    });
-}
-
-function removeIonicNativeDecorators(node: any) {
-  if (node.decorators && node.decorators.length) {
-    node.decorators = node.decorators.filter((d, i) => d.expression.module !== '@ionic-native/core');
-  }
-
-  if (node.decorators && !node.decorators.length) delete node.decorators;
-}
-
-function createSourceFiles(): string[] {
-  return PLUGIN_PATHS.map((indexPath: string) => {
-    const ngxPath = path.resolve(indexPath.replace('index.ts', ''), 'ngx'),
-      newPath = path.resolve(ngxPath, 'index.ts');
-
-    // delete directory
-    rimraf.sync(ngxPath);
-    fs.mkdirpSync(ngxPath);
-    fs.copyFileSync(indexPath, newPath);
-
-    return newPath;
-  });
-}
-
-export function cleanupNgx() {
-  PLUGIN_PATHS.forEach((indexPath: string) =>
-    rimraf.sync(indexPath.replace('index.ts', 'ngx'))
-  );
-}
--- a/scripts/build/plugin-package.json
+++ b/scripts/build/plugin-package.json
@@ -0,0 +1,14 @@
+{
+  "name": "@ionic-native/{{PLUGIN}}",
+  "version": "{{VERSION}}",
+  "description": "Ionic Native - Native plugins for ionic apps",
+  "module": "index.js",
+  "typings": "index.d.ts",
+  "author": "ionic",
+  "license": "MIT",
+  "peerDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ionic-team/ionic-native.git"
+  }
+}
--- a/scripts/build/publish.js
+++ b/scripts/build/publish.js
@@ -0,0 +1,51 @@
+'use strict';
+// Node module dependencies
+const fs = require('fs-extra'),
+  queue = require('queue'),
+  path = require('path'),
+  exec = require('child-process-promise').exec;
+
+const ROOT = path.resolve(path.join(__dirname, '../../')),
+  DIST = path.resolve(ROOT, 'dist', '@ionic-native');
+
+const FLAGS = '--access public'; // add any flags here if you want... (example: --tag alpha)
+
+const PACKAGES = fs.readdirSync(DIST);
+
+const failedPackages = [];
+
+const QUEUE = queue({
+  concurrency: 10
+});
+
+PACKAGES.forEach(packageName => {
+  QUEUE.push(done => {
+    console.log(`Publishing @ionic-native/${packageName}`);
+    const packagePath = path.resolve(DIST, packageName);
+    exec(`npm publish ${packagePath} ${FLAGS}`)
+      .then(() => done())
+      .catch(e => {
+        if (
+          e.stderr &&
+          e.stderr.indexOf('previously published version') === -1
+        ) {
+          failedPackages.push({
+            cmd: e.cmd,
+            stderr: e.stderr
+          });
+        }
+        done();
+      });
+  });
+});
+
+QUEUE.start(err => {
+  if (err) {
+    console.log('Error publishing ionic-native. ', err);
+  } else if (failedPackages.length > 0) {
+    console.log(`${failedPackages.length} packages failed to publish.`);
+    console.log(failedPackages);
+  } else {
+    console.log('Done publishing ionic-native!');
+  }
+});
--- a/scripts/build/remove-tslib-helpers.js
+++ b/scripts/build/remove-tslib-helpers.js
@@ -1,2 +0,0 @@
-// removes the __extends method that is added automatically by typescript
-module.exports = source => source.replace(/var\s__extends\s=\s\(this\s&&[\sa-z\._\(\)\|{}=:\[\]&,;?]+}\)\(\);/i, '');
--- a/scripts/build/transformers/extract-injectables.ts
+++ b/scripts/build/transformers/extract-injectables.ts
@@ -1,59 +0,0 @@
-import * as fs from 'fs-extra';
-import * as path from 'path';
-import * as ts from 'typescript';
-
-import { hasDecorator, ROOT } from '../helpers';
-
-export interface InjectableClassEntry {
-  file: string;
-  className: string;
-  dirName: string;
-}
-
-const injectableClasses: InjectableClassEntry[] = [];
-export const EMIT_PATH = path.resolve(ROOT, 'injectable-classes.json');
-
-/**
- * This transformer extracts all the injectable classes
- * so we can use all the names later on when we compile
- * an es5 bundle.
- *
- * Every injectable class will end up in the
- * window['IonicNative'] object.
- */
-export function extractInjectables() {
-  return (ctx: ts.TransformationContext) => {
-    return tsSourceFile => {
-      if (tsSourceFile.fileName.indexOf('src/@ionic-native/plugins') > -1) {
-        ts.visitEachChild(
-          tsSourceFile,
-          node => {
-            if (node.kind !== ts.SyntaxKind.ClassDeclaration) {
-              return node;
-            }
-
-            const isInjectable: boolean = hasDecorator('Injectable', node);
-            if (isInjectable) {
-              injectableClasses.push({
-                file: tsSourceFile.path,
-                className: (node as ts.ClassDeclaration).name.text,
-                dirName: tsSourceFile.path.split(/[\\\/]+/).reverse()[1]
-              });
-            }
-          },
-          ctx
-        );
-      }
-
-      return tsSourceFile;
-    };
-  };
-}
-
-export function emitInjectableClasses() {
-  fs.writeJSONSync(EMIT_PATH, injectableClasses);
-}
-
-export function cleanEmittedData() {
-  fs.unlinkSync(EMIT_PATH);
-}
--- a/scripts/build/transformers/imports.ts
+++ b/scripts/build/transformers/imports.ts
@@ -1,74 +0,0 @@
-import * as ts from 'typescript';
-import { getMethodsForDecorator } from '../helpers';
-
-function transformImports(file: ts.SourceFile, ctx: ts.TransformationContext, ngcBuild?: boolean) {
-  // remove angular imports
-  if (!ngcBuild) {
-    file.statements = (file.statements as any).filter((s: any) => !(s.kind === ts.SyntaxKind.ImportDeclaration && s.moduleSpecifier.text === '@angular/core'));
-  }
-
-  // find the @ionic-native/core import statement
-  const importStatement = (file.statements as any).find((s: any) => {
-    return s.kind === ts.SyntaxKind.ImportDeclaration && s.moduleSpecifier.text === '@ionic-native/core';
-  });
-
-  // we're only interested in files containing @ionic-native/core import statement
-  if (!importStatement) return file;
-
-  const decorators: string[] = [];
-
-  const decoratorRegex: RegExp = /@([a-zA-Z]+)\(/g;
-
-  const ignored: string [] = ['Plugin', 'Component', 'Injectable'];
-
-  const keep: string [] = ['getPromise', 'checkAvailability'];
-
-  let m;
-
-  while ((m = decoratorRegex.exec(file.text)) !== null) {
-    if (m.index === decoratorRegex.lastIndex) {
-      decoratorRegex.lastIndex++;
-    }
-    if (m && m[1] && decorators.indexOf(m[1]) === -1 && ignored.indexOf(m[1]) === -1) decorators.push(m[1]);
-  }
-
-  if (decorators.length) {
-    let methods = [];
-
-    decorators.forEach(d => methods = getMethodsForDecorator(d).concat(methods));
-
-    const methodElements = methods.map(m => ts.createIdentifier(m));
-    const methodNames = methodElements.map((el) => el.escapedText);
-
-    importStatement.importClause.namedBindings.elements = [
-      ts.createIdentifier('IonicNativePlugin'),
-      ...methodElements,
-      ...importStatement.importClause.namedBindings.elements.filter(
-        el => keep.indexOf(el.name.text) !== -1 && methodNames.indexOf(el.name.text) === -1
-      )
-    ];
-
-    if (ngcBuild) {
-      importStatement.importClause.namedBindings.elements = importStatement.importClause.namedBindings.elements.map(
-        binding => {
-          if (binding.escapedText) {
-            binding.name = {
-              text: binding.escapedText
-            };
-          }
-          return binding;
-        }
-      );
-    }
-  }
-
-  return file;
-}
-
-export function importsTransformer(ngcBuild?: boolean) {
-  return (ctx: ts.TransformationContext) => {
-    return tsSourceFile => {
-      return transformImports(tsSourceFile, ctx, ngcBuild);
-    };
-  };
-}
--- a/scripts/build/transformers/members.ts
+++ b/scripts/build/transformers/members.ts
@@ -1,37 +0,0 @@
-import * as ts from 'typescript';
-import { transformMethod } from './methods';
-import { transformProperty } from './properties';
-
-export function transformMembers(cls: ts.ClassDeclaration) {
-  const propertyIndices: number[] = [];
-
-  const members = cls.members.map((member: any, index: number) => {
-    // only process decorated members
-    if (!member.decorators || !member.decorators.length) return member;
-
-    switch (member.kind) {
-      case ts.SyntaxKind.MethodDeclaration:
-        return transformMethod(member);
-      case ts.SyntaxKind.PropertyDeclaration:
-        propertyIndices.push(index);
-        return member;
-      case ts.SyntaxKind.Constructor:
-        return ts.createConstructor(undefined, undefined, member.parameters, member.body);
-      default:
-        return member; // in case anything gets here by accident...
-    }
-  });
-
-  propertyIndices.forEach((i: number) => {
-    const [getter, setter] = transformProperty(members, i) as any;
-    members.push(getter, setter);
-  });
-
-  propertyIndices.reverse().forEach(i => members.splice(i, 1));
-
-  return members;
-}
-
-
-
-
--- a/scripts/build/transformers/methods.ts
+++ b/scripts/build/transformers/methods.ts
@@ -1,49 +0,0 @@
-import * as ts from 'typescript';
-import { Logger } from '../../logger';
-import { convertValueToLiteral, getDecorator, getDecoratorArgs, getDecoratorName, getMethodsForDecorator } from '../helpers';
-
-export function transformMethod(method: ts.MethodDeclaration) {
-  if (!method) return;
-
-  const decorator = getDecorator(method),
-    decoratorName = getDecoratorName(decorator),
-    decoratorArgs = getDecoratorArgs(decorator);
-
-  try {
-    return ts.createMethod(undefined, undefined, undefined, method.name, undefined, method.typeParameters, method.parameters, method.type, ts.createBlock([
-      ts.createReturn(
-        getMethodBlock(method, decoratorName, decoratorArgs)
-      )
-    ]));
-  } catch (e) {
-    Logger.error('Error transforming method: ' + (method.name as any).text);
-    Logger.error(e.message);
-  }
-}
-
-function getMethodBlock(method: ts.MethodDeclaration, decoratorName: string, decoratorArgs: any): ts.Expression {
-  const decoratorMethod = getMethodsForDecorator(decoratorName)[0];
-
-  switch (decoratorName) {
-    case 'CordovaCheck':
-    case 'InstanceCheck':
-      // TODO remove function wrapper
-      return ts.createImmediatelyInvokedArrowFunction([ts.createIf(
-        ts.createBinary(
-          ts.createCall(ts.createIdentifier(decoratorMethod), undefined, [ts.createThis()]),
-          ts.SyntaxKind.EqualsEqualsEqualsToken,
-          ts.createTrue()
-        ),
-        method.body
-      )]);
-
-    default:
-      return ts.createCall(ts.createIdentifier(decoratorMethod), undefined, [
-        ts.createThis(),
-        ts.createLiteral((method.name as any).text),
-        convertValueToLiteral(decoratorArgs),
-        ts.createIdentifier('arguments')
-      ]);
-  }
-
-}
--- a/scripts/build/transformers/plugin-class.ts
+++ b/scripts/build/transformers/plugin-class.ts
@@ -1,80 +0,0 @@
-import * as ts from 'typescript';
-
-import { Logger } from '../../logger';
-import {
-  convertValueToLiteral,
-  getDecorator,
-  getDecoratorArgs,
-  getDecoratorName
-} from '../helpers';
-import { transformMembers } from './members';
-
-function transformClass(cls: any, ngcBuild?: boolean) {
-  Logger.profile('transformClass: ' + cls.name.text);
-
-  const pluginStatics = [];
-  const dec: any = getDecorator(cls);
-
-  if (dec) {
-    const pluginDecoratorArgs = getDecoratorArgs(dec);
-
-    // add plugin decorator args as static properties of the plugin's class
-    for (const prop in pluginDecoratorArgs) {
-      pluginStatics.push(
-        ts.createProperty(
-          undefined,
-          [ts.createToken(ts.SyntaxKind.StaticKeyword)],
-          ts.createIdentifier(prop),
-          undefined,
-          undefined,
-          convertValueToLiteral(pluginDecoratorArgs[prop])
-        )
-      );
-    }
-  }
-
-  cls = ts.createClassDeclaration(
-    ngcBuild && cls.decorators && cls.decorators.length
-      ? cls.decorators.filter(d => getDecoratorName(d) === 'Injectable')
-      : undefined, // remove Plugin and Injectable decorators
-    [ts.createToken(ts.SyntaxKind.ExportKeyword)],
-    cls.name,
-    cls.typeParameters,
-    cls.heritageClauses,
-    [...transformMembers(cls), ...pluginStatics]
-  );
-
-  Logger.profile('transformClass: ' + cls.name.text);
-  return cls;
-}
-
-function transformClasses(
-  file: ts.SourceFile,
-  ctx: ts.TransformationContext,
-  ngcBuild?: boolean
-) {
-  Logger.silly('Transforming file: ' + file.fileName);
-  return ts.visitEachChild(
-    file,
-    node => {
-      if (node.kind !== ts.SyntaxKind.ClassDeclaration
-          || (node.modifiers && node.modifiers.find(v => v.kind === ts.SyntaxKind.DeclareKeyword))) {
-        return node;
-      }
-      return transformClass(node, ngcBuild);
-    },
-    ctx
-  );
-}
-
-export function pluginClassTransformer(
-  ngcBuild?: boolean
-): ts.TransformerFactory<ts.SourceFile> {
-  return (ctx: ts.TransformationContext) => {
-    return tsSourceFile => {
-      if (tsSourceFile.fileName.indexOf('src/@ionic-native/plugins') > -1)
-        return transformClasses(tsSourceFile, ctx, ngcBuild);
-      return tsSourceFile;
-    };
-  };
-}
--- a/scripts/build/transformers/properties.ts
+++ b/scripts/build/transformers/properties.ts
@@ -1,67 +0,0 @@
-import * as ts from 'typescript';
-
-import { getDecorator, getDecoratorName } from '../helpers';
-
-export function transformProperty(members: any[], index: number) {
-  const property = members[index] as ts.PropertyDeclaration,
-    decorator = getDecorator(property),
-    decoratorName = getDecoratorName(decorator);
-
-  let type: 'cordova' | 'instance';
-
-  switch (decoratorName) {
-    case 'CordovaProperty':
-      type = 'cordova';
-      break;
-
-    case 'InstanceProperty':
-      type = 'instance';
-      break;
-
-    default:
-      return property;
-  }
-
-  const getter = ts.createGetAccessor(
-    undefined,
-    undefined,
-    property.name,
-    undefined,
-    property.type,
-    ts.createBlock([
-      ts.createReturn(
-        ts.createCall(ts.createIdentifier(type + 'PropertyGet'), undefined, [
-          ts.createThis(),
-          ts.createLiteral((property.name as any).text)
-        ])
-      )
-    ])
-  );
-
-  const setter = ts.createSetAccessor(
-    undefined,
-    undefined,
-    property.name,
-    [
-      ts.createParameter(
-        undefined,
-        undefined,
-        undefined,
-        'value',
-        undefined,
-        property.type
-      )
-    ],
-    ts.createBlock([
-      ts.createStatement(
-        ts.createCall(ts.createIdentifier(type + 'PropertySet'), undefined, [
-          ts.createThis(),
-          ts.createLiteral((property.name as any).text),
-          ts.createIdentifier('value')
-        ])
-      )
-    ])
-  );
-
-  return [getter, setter];
-}
--- a/scripts/build/transpile.ts
+++ b/scripts/build/transpile.ts
@@ -1,51 +0,0 @@
-import * as ts from 'typescript';
-import { pluginClassTransformer } from './transformers/plugin-class';
-import { importsTransformer } from './transformers/imports';
-import { clone } from 'lodash';
-import { emitInjectableClasses, extractInjectables } from './transformers/extract-injectables';
-import { COMPILER_OPTIONS, PLUGIN_PATHS, TS_CONFIG } from './helpers';
-
-let host: ts.CompilerHost;
-
-export function getCompilerHost() {
-  if (!host) host = ts.createCompilerHost(TS_CONFIG);
-  return host;
-}
-
-export function getProgram(declaration = false, pluginPaths: string[] = PLUGIN_PATHS) {
-    const compilerOptions: ts.CompilerOptions = clone(COMPILER_OPTIONS);
-    compilerOptions.declaration = declaration;
-    compilerOptions.moduleResolution = ts.ModuleResolutionKind.NodeJs;
-    compilerOptions.target = ts.ScriptTarget.ES5;
-    compilerOptions.module = ts.ModuleKind.ES2015;
-    compilerOptions.inlineSourceMap = true;
-    compilerOptions.inlineSources = true;
-    compilerOptions.lib = [
-      'lib.dom.d.ts',
-      'lib.es5.d.ts',
-      'lib.es2015.d.ts',
-      'lib.es2016.d.ts',
-      'lib.es2017.d.ts'
-    ];
-
-    return ts.createProgram(pluginPaths, compilerOptions, getCompilerHost());
-}
-
-export function generateDeclarations(sourceFiles?: string[]) {
-  return getProgram(true, sourceFiles).emit(undefined, getCompilerHost().writeFile, undefined, true);
-}
-
-export function transpile() {
-  const emitResult = getProgram().emit(undefined, getCompilerHost().writeFile, undefined, false, {
-    before: [
-      extractInjectables(),
-      importsTransformer(),
-      pluginClassTransformer(),
-    ]
-  });
-
-  emitInjectableClasses();
-
-  return emitResult;
-}
-
--- a/scripts/build/tsconfig-core.json
+++ b/scripts/build/tsconfig-core.json
@@ -5,22 +5,21 @@
    "stripInternal": true,
    "experimentalDecorators": true,
    "emitDecoratorMetadata": true,
-    "noImplicitAny": true,
    "module": "es2015",
    "moduleResolution": "node",
-    "outDir": "./dist",
-    "rootDir": "src",
+    "outDir": "../../dist/",
+    "rootDir": "../../src/",
    "target": "es5",
    "skipLibCheck": true,
-    "lib": ["es2017", "dom"],
+    "lib": ["es2015", "dom"],
+    "sourceMap": true,
    "inlineSources": true,
-    "sourceMap": true
+    "noImplicitAny": true
  },
-  "include": [
-    "src/@ionic-native/core/**/*.ts"
+  "files": [
+    "../../src/@ionic-native/core/index.ts"
  ],
-  "exclude": [
-    "node_modules",
-    "src/@ionic-native/core/**/*.spec.ts"
-  ]
+  "angularCompilerOptions": {
+    "genDir": "../../.tmp/core-aot"
+  }
 }
--- a/scripts/build/tsconfig-plugin.json
+++ b/scripts/build/tsconfig-plugin.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "declaration": true,
+    "stripInternal": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "../../../dist/@ionic-native/",
+    "paths": {
+      "@ionic-native/core": ["../../../dist/@ionic-native/core"]
+    },
+    "rootDir": "../../../src/@ionic-native/plugins/",
+    "target": "es5",
+    "skipLibCheck": true,
+    "lib": ["es2015", "dom"],
+    "sourceMap": true,
+    "inlineSources": true,
+    "noImplicitAny": true
+  },
+  "files": []
+}
--- a/scripts/ci-tests.js
+++ b/scripts/ci-tests.js
@@ -0,0 +1,71 @@
+const exec = require('child-process-promise').exec;
+let diff;
+exec(`git branch | grep \\* | cut -d ' ' -f2`)
+  .then(output => {
+    if (output.stderr) {
+      return Promise.reject(output.stderr);
+    }
+
+    const branch = output.stdout.trim();
+
+    if (branch !== 'master') {
+      console.log('Merging master branch in ...');
+      // not on master branch
+      // let's test the changes that were made
+      return exec(`git merge origin master`);
+    }
+  })
+  .then(output => {
+    if (output && output.stderr) {
+      return Promise.reject(output.stderr);
+    }
+    console.log('Checking for differences ...');
+    return exec(`git diff --name-status origin master`);
+  })
+  .then(output => {
+    if (output && output.stderr) {
+      return Promise.reject(output.stderr);
+    }
+
+    diff = output.stdout;
+    diff = diff.replace(/A\s+/g, '');
+    diff = diff.match(
+      /src\/@ionic-native\/plugins\/([a-zA-Z0-9\-]+)\/index\.ts/g
+    );
+
+    if (!diff) process.exit();
+
+    console.log(
+      `${
+        diff.length
+      } plugins were modified. We will now build them to verify they still work.`
+    );
+
+    return exec('npm run build:core --silent');
+  })
+  .then(output => {
+    if (output && output.stderr) {
+      return Promise.reject(output.stderr);
+    }
+
+    console.log('Built core library successfully ...');
+    console.log('Building plugins ...');
+
+    diff = diff.map(text =>
+      text.replace('src/@ionic-native/plugins/', '').replace('/index.ts', '')
+    );
+
+    return exec(`npm run build:modules ${diff.join(' ')} --silent`);
+  })
+  .then(output => {
+    if (output && output.stderr) {
+      console.log(output.stderr);
+      process.exit(1);
+    }
+    console.log(output.stdout);
+    process.exit();
+  })
+  .catch(e => {
+    console.log(e.message || e);
+    process.exit(1);
+  });
--- a/scripts/docs/config.json
+++ b/scripts/docs/config.json
@@ -2,5 +2,5 @@
  "sitePath": "../ionic-site",
  "v2DocsDir": "docs/native",
  "docsDest": "../ionic-site/content/docs/native",
-  "pluginDir": "dist/@ionic-native/plugins"
+  "pluginDir": "dist/@ionic-native"
 }
--- a/scripts/docs/dgeni/configs/links.js
+++ b/scripts/docs/dgeni/configs/links.js
--- a/scripts/docs/dgeni/configs/log.js
+++ b/scripts/docs/dgeni/configs/log.js
--- a/scripts/docs/dgeni/configs/tag-defs.js
+++ b/scripts/docs/dgeni/configs/tag-defs.js
--- a/scripts/docs/dgeni/configs/template-filters.js
+++ b/scripts/docs/dgeni/configs/template-filters.js
--- a/scripts/docs/dgeni/configs/template-tags.js
+++ b/scripts/docs/dgeni/configs/template-tags.js
--- a/scripts/docs/dgeni/dgeni-config.js
+++ b/scripts/docs/dgeni/dgeni-config.js
@@ -50,9 +50,9 @@ module.exports = currentVersion => {

      // Don't run unwanted processors since we are not using the normal file reading processor
      readFilesProcessor.$enabled = false;
-      readFilesProcessor.basePath = path.resolve(__dirname, '../../..');
+      readFilesProcessor.basePath = path.resolve(__dirname, '../..');

-      readTypeScriptModules.basePath = path.resolve(__dirname, '../../..');
+      readTypeScriptModules.basePath = path.resolve(__dirname, '../..');
      readTypeScriptModules.sourceFiles = [
        './src/@ionic-native/plugins/**/*.ts'
      ];
--- a/scripts/docs/dgeni/dgeni-readmes-config.js
+++ b/scripts/docs/dgeni/dgeni-readmes-config.js
@@ -40,6 +40,7 @@ module.exports = currentVersion => {
      computePathsProcessor.pathTemplates = [{
        docTypes: ['class'],
        getOutputPath: doc => doc.originalModule.replace(config.pluginDir + '/', '')
+          .replace('/plugins', '')
          .replace(/\/index$/, '/README.md')
      }];

@@ -49,15 +50,15 @@ module.exports = currentVersion => {
    .config(function(readFilesProcessor, readTypeScriptModules) {
      // Don't run unwanted processors since we are not using the normal file reading processor
      readFilesProcessor.$enabled = false;
-      readFilesProcessor.basePath = path.resolve(__dirname, '../../..');
+      readFilesProcessor.basePath = path.resolve(__dirname, '../..');

-      readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../../..'));
+      readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../..'));
      readTypeScriptModules.sourceFiles = ['./src/@ionic-native/plugins/**/*.ts'];
    })

    // Configure file writing
    .config(function(writeFilesProcessor) {
-      writeFilesProcessor.outputFolder  = './dist/@ionic-native/';
+      writeFilesProcessor.outputFolder  = './dist/';
    })

    // Configure rendering
--- a/scripts/docs/dgeni/filters/capital.js
+++ b/scripts/docs/dgeni/filters/capital.js
--- a/scripts/docs/dgeni/filters/code.js
+++ b/scripts/docs/dgeni/filters/code.js
--- a/scripts/docs/dgeni/filters/dashify.js
+++ b/scripts/docs/dgeni/filters/dashify.js
--- a/scripts/docs/dgeni/filters/dump.js
+++ b/scripts/docs/dgeni/filters/dump.js
--- a/scripts/docs/gulp-tasks.js
+++ b/scripts/docs/gulp-tasks.js
@@ -1,5 +1,5 @@
-'use strict';
-const config = require('./config.json'),
+"use strict";
+const config = require('../config.json'),
  projectPackage = require('../../package.json'),
  path = require('path'),
  fs = require('fs-extra'),
@@ -7,36 +7,33 @@ const config = require('./config.json'),

 module.exports = gulp => {
  gulp.task('docs', [], () => {
+
    try {
-      const ionicPackage = require('./dgeni/dgeni-config')(
-          projectPackage.version
-        ),
+
+      const ionicPackage = require('./dgeni-config')(projectPackage.version),
        dgeni = new Dgeni([ionicPackage]);

-      return dgeni
-        .generate()
-        .then(docs => console.log(docs.length + ' docs generated'));
+      return dgeni.generate().then(docs => console.log(docs.length + ' docs generated'));
+
    } catch (err) {
      console.log(err.stack);
    }
+
  });

  gulp.task('readmes', [], function() {
-    fs.copySync(
-      path.resolve(__dirname, '..', '..', 'README.md'),
-      path.resolve(__dirname, '..', '..', config.pluginDir, 'core', 'README.md')
-    );
+
+    fs.copySync(path.resolve(__dirname, '..', '..', 'README.md'), path.resolve(__dirname, '..', '..', config.pluginDir, 'core', 'README.md'));

    try {
-      const ionicPackage = require('./dgeni/dgeni-readmes-config')(
-          projectPackage.version
-        ),
+
+      const ionicPackage = require('./dgeni-readmes-config')(projectPackage.version),
        dgeni = new Dgeni([ionicPackage]);
-      return dgeni
-        .generate()
-        .then(docs => console.log(docs.length + ' README files generated'));
+      return dgeni.generate().then(docs => console.log(docs.length + ' README files generated'));
+
    } catch (err) {
      console.log(err.stack);
    }
+
  });
 };
--- a/scripts/docs/prepare.sh
+++ b/scripts/docs/prepare.sh
@@ -34,4 +34,4 @@ function run {

 }

-source $(dirname $0)/utils.inc.sh
+source $(dirname $0)/../utils.inc.sh
--- a/scripts/docs/dgeni/processors/debug.js
+++ b/scripts/docs/dgeni/processors/debug.js
--- a/scripts/docs/dgeni/processors/hide-private-api.js
+++ b/scripts/docs/dgeni/processors/hide-private-api.js
--- a/scripts/docs/dgeni/processors/jekyll.js
+++ b/scripts/docs/dgeni/processors/jekyll.js
--- a/scripts/docs/dgeni/processors/mark-properties.js
+++ b/scripts/docs/dgeni/processors/mark-properties.js
--- a/scripts/docs/dgeni/processors/npm-id.js
+++ b/scripts/docs/dgeni/processors/npm-id.js
--- a/scripts/docs/dgeni/processors/parse-optional.js
+++ b/scripts/docs/dgeni/processors/parse-optional.js
--- a/scripts/docs/dgeni/processors/readmes.js
+++ b/scripts/docs/dgeni/processors/readmes.js
@@ -10,7 +10,7 @@ module.exports = function readmes(renderDocsProcessor) {
      docs = docs.filter(doc => (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page');

      docs.forEach(doc => {
-        doc.outputPath = doc.outputPath.replace('src/@ionic-native/', '');
+        doc.outputPath = doc.outputPath.replace('src/', '');
      });

      return docs;
--- a/scripts/docs/dgeni/processors/remove-private-members.js
+++ b/scripts/docs/dgeni/processors/remove-private-members.js
--- a/scripts/docs/dgeni/tag-defs/tag-defs.js
+++ b/scripts/docs/dgeni/tag-defs/tag-defs.js
--- a/scripts/docs/dgeni/templates/common.template.html
+++ b/scripts/docs/dgeni/templates/common.template.html
@@ -187,7 +187,7 @@ docType: "<$ doc.docType $>"
 <ol class="installation">
  <li>Install the Cordova and Ionic Native plugins:<br>
    <pre><code class="nohighlight">$ <@ if prop.install @><$ prop.install | replace('<', '&lt;').replace('>', '&gt;') $><@ else @>ionic cordova plugin add <$ prop.plugin $><@ endif @>
-$ npm install @ionic-native/<$ doc.npmId $>
+$ npm install --save @ionic-native/<$ doc.npmId $>
 </code></pre>
  </li>
  <li><a href="https://ionicframework.com/docs/native/#Add_Plugins_to_Your_App_Module">Add this plugin to your app's module</a></li>
--- a/scripts/docs/dgeni/templates/native_menu.template.html
+++ b/scripts/docs/dgeni/templates/native_menu.template.html
--- a/scripts/docs/dgeni/templates/readme.template.md
+++ b/scripts/docs/dgeni/templates/readme.template.md
@@ -17,7 +17,7 @@

 ```
 $ <@ if prop.install @><$ prop.install $><@ else @>ionic cordova plugin add <$ prop.plugin $><@ endif @>
-$ npm install @ionic-native/<$ doc.npmId $>
+$ npm install --save @ionic-native/<$ doc.npmId $>
 ```

 ## [Usage Documentation](https://ionicframework.com/docs/native/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/')|replace('index.ts','')|replace('src/@ionic-native/plugins/','') $>)
--- a/scripts/docs/update_docs.sh
+++ b/scripts/docs/update_docs.sh
@@ -47,4 +47,4 @@ function run {
  fi
 }

-source $(dirname $0)/utils.inc.sh
+source $(dirname $0)/../utils.inc.sh
--- a/scripts/docs/update_readmes.sh
+++ b/scripts/docs/update_readmes.sh
@@ -31,7 +31,7 @@ function run {

    # git push origin master || :

-    echo "-- Updated docs for $VERSION_NAME successfully!"
+    echo "-- Updated docs for $VERSION_NAME succesfully!"
  fi
 }

--- a/scripts/logger.ts
+++ b/scripts/logger.ts
@@ -1,11 +0,0 @@
-import { createLogger, format, transports } from 'winston';
-
-const { combine, colorize, simple } = format;
-
-const LOG_LEVEL = 'verbose';
-
-export const Logger = createLogger({
-  level: LOG_LEVEL,
-  format: combine(colorize(), simple()),
-  transports: [new transports.Console({ level: LOG_LEVEL })]
-});
--- a/scripts/tasks/build-es5.ts
+++ b/scripts/tasks/build-es5.ts
@@ -1,97 +0,0 @@
-import * as fs from 'fs-extra';
-import * as path from 'path';
-import * as uglifyJsPlugin from 'uglifyjs-webpack-plugin';
-import * as unminifiedPlugin from 'unminified-webpack-plugin';
-import * as webpack from 'webpack';
-
-import { ROOT } from '../build/helpers';
-import {
-  cleanEmittedData,
-  EMIT_PATH,
-  InjectableClassEntry
-} from '../build/transformers/extract-injectables';
-import { Logger } from '../logger';
-
-const DIST = path.resolve(ROOT, 'dist');
-const INDEX_PATH = path.resolve(DIST, 'index.js');
-const INJECTABLE_CLASSES = fs
-  .readJSONSync(EMIT_PATH)
-  .map((item: InjectableClassEntry) => {
-    item.file =
-      './' +
-      item.file
-        .split(/[\/\\]+/)
-        .slice(-4, -1)
-        .join('/');
-    return item;
-  });
-
-const webpackConfig: webpack.Configuration = {
-  mode: 'production',
-  entry: INDEX_PATH,
-  devtool: 'source-map',
-  target: 'web',
-  output: {
-    path: DIST,
-    filename: 'ionic-native.min.js'
-  },
-  resolve: {
-    modules: ['node_modules'],
-    extensions: ['.js'],
-    alias: {
-      '@ionic-native/core': path.resolve(DIST, '@ionic-native/core/index.js')
-    }
-  },
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        use: path.resolve(ROOT, 'scripts/build/remove-tslib-helpers.js')
-      }
-    ]
-  },
-  plugins: [
-    new webpack.ProvidePlugin({
-      __extends: ['tslib', '__extends']
-    }),
-    new webpack.optimize.OccurrenceOrderPlugin(true),
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify('production')
-    }),
-    new uglifyJsPlugin({
-      sourceMap: true
-    }),
-    new unminifiedPlugin()
-  ]
-};
-
-function getPluginImport(entry: InjectableClassEntry) {
-  return `import { ${entry.className} } from '${entry.file}';`;
-}
-
-function createIndexFile() {
-  let fileContent = '';
-  fileContent += INJECTABLE_CLASSES.map(getPluginImport).join('\n');
-  fileContent += `\nwindow.IonicNative = {\n`;
-  fileContent += INJECTABLE_CLASSES.map(e => e.className).join(',\n');
-  fileContent += '\n};\n';
-  fileContent += `require('./@ionic-native/core/bootstrap').checkReady();\n`;
-  fileContent += `require('./@ionic-native/core/ng1').initAngular1(window.IonicNative);`;
-
-  fs.writeFileSync(INDEX_PATH, fileContent, { encoding: 'utf-8' });
-}
-
-function compile() {
-  Logger.profile('build-es5');
-  webpack(webpackConfig, (err, stats) => {
-    Logger.profile('build-es5');
-    if (err) Logger.error('Error occurred while compiling with Webpack', err);
-    else {
-      Logger.info('Compiled ES5 file with Webpack successfully.');
-    }
-    cleanEmittedData();
-  });
-}
-
-createIndexFile();
-compile();
--- a/scripts/tasks/build-esm.ts
+++ b/scripts/tasks/build-esm.ts
@@ -1,46 +0,0 @@
-import * as fs from 'fs-extra';
-import * as path from 'path';
-
-import { PLUGIN_PATHS, ROOT } from '../build/helpers';
-import { EMIT_PATH } from '../build/transformers/extract-injectables';
-import { generateDeclarations, transpile } from '../build/transpile';
-
-generateDeclarations();
-transpile();
-
-const outDirs = PLUGIN_PATHS.map(p =>
-  p.replace(path.join(ROOT, 'src'), path.join(ROOT, 'dist')).replace(/[\\/]index.ts/, '')
-);
-const injectableClasses = fs.readJSONSync(EMIT_PATH);
-
-outDirs.forEach(dir => {
-  const classes = injectableClasses.filter(
-    entry => entry.dirName === dir.split(/[\\/]+/).pop()
-  );
-
-  let jsFile: string = fs.readFileSync(path.join(dir, 'index.js'), 'utf-8'),
-    dtsFile: string = fs.readFileSync(path.join(dir, 'index.d.ts'), 'utf-8');
-
-  classes.forEach(entry => {
-    dtsFile = dtsFile.replace(
-      `class ${entry.className} `,
-      'class ' + entry.className + 'Original '
-    );
-    dtsFile += `\nexport declare const ${entry.className}: ${
-      entry.className
-    }Original;`;
-    jsFile = jsFile.replace(
-      new RegExp(`([\\s\\(])${entry.className}([\\s\\.;\\(,])`, 'g'),
-      '$1' + entry.className + 'Original$2'
-    );
-    jsFile = jsFile.replace(
-      `export { ${entry.className}Original }`,
-      `var ${entry.className} = new ${entry.className}Original();\nexport { ${
-        entry.className
-      } }`
-    );
-  });
-
-  fs.writeFileSync(path.join(dir, 'index.js'), jsFile, 'utf-8');
-  fs.writeFileSync(path.join(dir, 'index.d.ts'), dtsFile, 'utf-8');
-});
--- a/scripts/tasks/build-ngx.ts
+++ b/scripts/tasks/build-ngx.ts
@@ -1,13 +0,0 @@
-import {
-  cleanupNgx,
-  generateDeclarationFiles,
-  modifyMetadata,
-  transpileNgx,
-  transpileNgxCore
-} from '../build/ngx';
-
-transpileNgxCore();
-transpileNgx();
-generateDeclarationFiles();
-modifyMetadata();
-cleanupNgx();
--- a/scripts/tasks/publish.ts
+++ b/scripts/tasks/publish.ts
@@ -1,109 +0,0 @@
-import * as Queue from 'async-promise-queue';
-import { exec } from 'child_process';
-import * as fs from 'fs-extra';
-import { merge } from 'lodash';
-import { cpus } from 'os';
-import * as path from 'path';
-
-import { PLUGIN_PATHS, ROOT } from '../build/helpers';
-import { Logger } from '../logger';
-
-// tslint:disable-next-line:no-var-requires
-const MAIN_PACKAGE_JSON = require('../../package.json');
-const VERSION = MAIN_PACKAGE_JSON.version;
-const FLAGS = '--access public';
-
-const PACKAGE_JSON_BASE = {
-  description: 'Ionic Native - Native plugins for ionic apps',
-  module: 'index.js',
-  typings: 'index.d.ts',
-  author: 'ionic',
-  license: 'MIT',
-  repository: {
-    type: 'git',
-    url: 'https://github.com/ionic-team/ionic-native.git'
-  }
-};
-
-const DIST = path.resolve(ROOT, 'dist/@ionic-native');
-
-const PACKAGES = [];
-
-const MIN_CORE_VERSION = '^5.1.0';
-const RXJS_VERSION = '^6.3.0';
-
-const PLUGIN_PEER_DEPENDENCIES = {
-  '@ionic-native/core': MIN_CORE_VERSION,
-  rxjs: RXJS_VERSION
-};
-
-function getPackageJsonContent(name: string, peerDependencies = {}, dependencies = {}) {
-  return merge(PACKAGE_JSON_BASE, {
-    name: '@ionic-native/' + name,
-    dependencies,
-    peerDependencies,
-    version: VERSION
-  });
-}
-
-function writePackageJson(data: any, dir: string) {
-  const filePath = path.resolve(dir, 'package.json');
-  fs.writeJSONSync(filePath, data);
-  PACKAGES.push(dir);
-}
-
-function prepare() {
-  // write @ionic-native/core package.json
-  writePackageJson(
-    getPackageJsonContent('core', { rxjs: RXJS_VERSION }, { '@types/cordova': 'latest' }),
-    path.resolve(DIST, 'core')
-  );
-
-  // write plugin package.json files
-  PLUGIN_PATHS.forEach((pluginPath: string) => {
-    const pluginName = pluginPath.split(/[\/\\]+/).slice(-2)[0];
-    const packageJsonContents = getPackageJsonContent(pluginName, PLUGIN_PEER_DEPENDENCIES);
-    const dir = path.resolve(DIST, 'plugins', pluginName);
-
-    writePackageJson(packageJsonContents, dir);
-  });
-}
-
-async function publish(ignoreErrors = false) {
-  Logger.profile('Publishing');
-  // upload 1 package per CPU thread at a time
-  const worker = Queue.async.asyncify(
-    (pkg: any) =>
-      new Promise<any>((resolve, reject) => {
-        exec(`npm publish ${pkg} ${FLAGS}`, (err, stdout) => {
-          if (stdout) {
-            Logger.verbose(stdout.trim());
-            resolve(stdout);
-          }
-          if (err) {
-            if (!ignoreErrors) {
-              if (
-                err.message.includes('You cannot publish over the previously published version')
-              ) {
-                Logger.verbose('Ignoring duplicate version error.');
-                return resolve();
-              }
-              reject(err);
-            }
-          }
-        });
-      })
-  );
-
-  try {
-    await Queue(worker, PACKAGES, cpus().length);
-    Logger.info('Done publishing!');
-  } catch (e) {
-    Logger.error('Error publishing!');
-    Logger.error(e);
-  }
-  Logger.profile('Publishing');
-}
-
-prepare();
-publish();
--- a/scripts/templates/wrap-min.tmpl
+++ b/scripts/templates/wrap-min.tmpl
@@ -10,8 +10,8 @@
 *
 */
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova, CordovaProperty, CordovaInstance, InstanceProperty, IonicNativePlugin } from '@ionic-native/core';
-import { Observable } from 'rxjs';
+import { Cordova, CordovaInstance, CordovaProperty, InstanceProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Observable } from 'rxjs/Observable';

 /**
 * @name {{ Plugin_Name }}
@@ -43,9 +43,7 @@ import { Observable } from 'rxjs';
  installVariables: [], // OPTIONAL the plugin requires variables
  platforms: [] // Array of platforms supported, example: ['Android', 'iOS']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class {{ PluginName }} extends IonicNativePlugin {

  /**
--- a/scripts/templates/wrap.tmpl
+++ b/scripts/templates/wrap.tmpl
@@ -10,8 +10,8 @@
 *
 */
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova, CordovaProperty, CordovaInstance, InstanceProperty, IonicNativePlugin } from '@ionic-native/core';
-import { Observable } from 'rxjs';
+import { Cordova, CordovaInstance, CordovaProperty, InstanceProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Observable } from 'rxjs/Observable';

 /**
 * @name {{ Plugin_Name }}
@@ -43,9 +43,7 @@ import { Observable } from 'rxjs';
  installVariables: [], // OPTIONAL the plugin requires variables
  platforms: [] // Array of platforms supported, example: ['Android', 'iOS']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class {{ PluginName }} extends IonicNativePlugin {

  /**
--- a/scripts/tsconfig.json
+++ b/scripts/tsconfig.json
@@ -1,12 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "target": "es5",
-    "moduleResolution": "node",
-    "noImplicitAny": false,
-    "lib": ["es6"]
-  },
-  "exclude": [
-    "node_modules"
-  ]
-}
--- a/scripts/docs/utils.inc.sh
+++ b/scripts/docs/utils.inc.sh
@@ -1,4 +1,5 @@
 # bash utils from angularjs
+
 # This file provides:
 # - a default control flow
 #   * initializes the environment
@@ -35,6 +36,7 @@
 # Special arguments that are always available:
 # - "--action=.*": This parameter will be used to dispatch to a function with that name when the
 #   script is started
+
 # - "--verbose=true": This will set the `-x` flag in bash so that all calls will be logged
 #
 # Utility functions:
@@ -44,6 +46,7 @@
 # - getVar
 # - serVar
 # - isFunction
+
 # always stop on errors
 set -e

--- a/src/@ionic-native/core/bootstrap.ts
+++ b/src/@ionic-native/core/bootstrap.ts
@@ -9,12 +9,14 @@ export function checkReady() {

  let didFireReady = false;
  document.addEventListener('deviceready', () => {
-    console.log(`Ionic Native: deviceready event fired after ${Date.now() - before} ms`);
+    console.log(
+      `Ionic Native: deviceready event fired after ${Date.now() - before} ms`
+    );
    didFireReady = true;
  });

  setTimeout(() => {
-    if (!didFireReady && window.cordova) {
+    if (!didFireReady && !!window.cordova) {
      console.warn(
        `Ionic Native: deviceready did not fire within ${DEVICE_READY_TIMEOUT}ms. This can happen when plugins are in an inconsistent state. Try removing plugins from plugins/ and reinstalling them.`
      );
--- a/src/@ionic-native/core/decorators.spec.ts
+++ b/src/@ionic-native/core/decorators.spec.ts
@@ -0,0 +1,251 @@
+import 'core-js';
+
+import { Observable } from 'rxjs/Observable';
+
+import { Cordova, CordovaCheck, CordovaInstance, CordovaProperty, InstanceProperty, Plugin } from './decorators';
+import { IonicNativePlugin } from './ionic-native-plugin';
+import { ERR_CORDOVA_NOT_AVAILABLE, ERR_PLUGIN_NOT_INSTALLED } from './plugin';
+
+declare const window: any;
+
+class TestObject {
+  constructor(public _objectInstance: any) {}
+
+  @InstanceProperty name: string;
+
+  @CordovaInstance({ sync: true })
+  pingSync(): string {
+    return;
+  }
+
+  @CordovaInstance()
+  ping(): Promise<any> {
+    return;
+  }
+}
+
+@Plugin({
+  pluginName: 'TestPlugin',
+  pluginRef: 'testPlugin',
+  repo: '',
+  plugin: 'cordova-plugin-my-plugin',
+  platforms: ['Android', 'iOS']
+})
+class TestPlugin extends IonicNativePlugin {
+  @CordovaProperty name: string;
+
+  @Cordova({ sync: true })
+  pingSync(): string {
+    return;
+  }
+
+  @Cordova()
+  ping(): Promise<string> {
+    return;
+  }
+
+  @CordovaCheck()
+  customPing(): Promise<string> {
+    return Promise.resolve('pong');
+  }
+
+  create(): TestObject {
+    return new TestObject(TestPlugin.getPlugin().create());
+  }
+
+  @Cordova({
+    destruct: true
+  })
+  destructPromise(): Promise<any> {
+    return;
+  }
+
+  @Cordova({
+    destruct: true,
+    observable: true
+  })
+  destructObservable(): Observable<any> {
+    return;
+  }
+}
+
+function definePlugin() {
+  (window as any).testPlugin = {
+    name: 'John Smith',
+    ping: (success: Function, error: Function) => success('pong'),
+    pingSync: () => 'pong',
+    create: function TestObject() {
+      this.pingSync = () => 'pong';
+      this.ping = (success: Function, error: Function) => success('pong');
+      this.name = 'John Smith';
+      return this;
+    },
+    destructPromise: (success: Function) => success('hello', 'world'),
+    destructObservable: (success: Function) => success('hello', 'world')
+  };
+}
+
+describe('Regular Decorators', () => {
+  let plugin: TestPlugin;
+
+  beforeEach(() => {
+    plugin = new TestPlugin();
+    definePlugin();
+  });
+
+  describe('Plugin', () => {
+    it('should set pluginName', () => {
+      expect(TestPlugin.getPluginName()).toEqual('TestPlugin');
+    });
+
+    it('should set pluginRef', () => {
+      expect(TestPlugin.getPluginRef()).toEqual('testPlugin');
+    });
+
+    it('should return original plugin object', () => {
+      expect(TestPlugin.getPlugin()).toEqual(window.testPlugin);
+    });
+
+    it('should return supported platforms', () => {
+      expect(TestPlugin.getSupportedPlatforms()).toEqual(['Android', 'iOS']);
+    });
+  });
+
+  describe('Cordova', () => {
+    it('should do a sync function', () => {
+      expect(plugin.pingSync()).toEqual('pong');
+    });
+
+    it('should do an async function', (done: Function) => {
+      plugin
+        .ping()
+        .then(res => {
+          expect(res).toEqual('pong');
+          done();
+        })
+        .catch(e => {
+          expect(e).toBeUndefined();
+          done('Method should have resolved');
+        });
+    });
+
+    it('should throw plugin_not_installed error', (done: Function) => {
+      delete window.testPlugin;
+      window.cordova = true;
+
+      expect(plugin.pingSync() as any).toEqual(ERR_PLUGIN_NOT_INSTALLED);
+
+      plugin.ping().catch(e => {
+        expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
+        delete window.cordova;
+        done();
+      });
+    });
+
+    xit('should throw cordova_not_available error', (done: Function) => {
+      delete window.testPlugin;
+
+      expect(plugin.pingSync() as any).toEqual(ERR_CORDOVA_NOT_AVAILABLE);
+
+      plugin.ping().catch(e => {
+        expect(e).toEqual(ERR_CORDOVA_NOT_AVAILABLE.error);
+        done();
+      });
+    });
+  });
+
+  describe('CordovaProperty', () => {
+    it('should return property value', () => {
+      expect(plugin.name).toEqual('John Smith');
+    });
+
+    it('should set property value', () => {
+      plugin.name = 'value2';
+      expect(plugin.name).toEqual('value2');
+    });
+  });
+
+  describe('CordovaCheck', () => {
+    it('should run the method when plugin exists', done => {
+      plugin.customPing().then(res => {
+        expect(res).toEqual('pong');
+        done();
+      });
+    });
+
+    it('shouldnt run the method when plugin doesnt exist', done => {
+      delete window.testPlugin;
+      window.cordova = true;
+      plugin.customPing().catch(e => {
+        expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
+        done();
+      });
+    });
+  });
+
+  describe('CordovaOptions', () => {
+    describe('destruct', () => {
+      it('should destruct values returned by a Promise', done => {
+        plugin.destructPromise().then((args: any[]) => {
+          expect(args).toEqual(['hello', 'world']);
+          done();
+        });
+      });
+
+      it('should destruct values returned by an Observable', done => {
+        plugin.destructObservable().subscribe((args: any[]) => {
+          expect(args).toEqual(['hello', 'world']);
+          done();
+        });
+      });
+    });
+  });
+});
+
+describe('Instance Decorators', () => {
+  let instance: TestObject, plugin: TestPlugin;
+
+  beforeEach(() => {
+    definePlugin();
+    plugin = new TestPlugin();
+    instance = plugin.create();
+  });
+
+  describe('Instance plugin', () => {});
+
+  describe('CordovaInstance', () => {
+    it('should call instance async method', done => {
+      instance.ping().then(r => {
+        expect(r).toEqual('pong');
+        done();
+      });
+    });
+
+    it('should call instance sync method', () => {
+      expect(instance.pingSync()).toEqual('pong');
+    });
+
+    it('shouldnt call instance method when _objectInstance is undefined', () => {
+      delete instance._objectInstance;
+      instance
+        .ping()
+        .then(r => {
+          expect(r).toBeUndefined();
+        })
+        .catch(e => {
+          expect(e).toBeUndefined();
+        });
+    });
+  });
+
+  describe('InstanceProperty', () => {
+    it('should return property value', () => {
+      expect(instance.name).toEqual('John Smith');
+    });
+
+    it('should set property value', () => {
+      instance.name = 'John Cena';
+      expect(instance.name).toEqual('John Cena');
+    });
+  });
+});
--- a/src/@ionic-native/core/decorators.ts
+++ b/src/@ionic-native/core/decorators.ts
@@ -0,0 +1,326 @@
+import { Observable } from 'rxjs/Observable';
+import { _throw } from 'rxjs/observable/throw';
+
+import { checkAvailability, instanceAvailability, overrideFunction, wrap, wrapInstance } from './plugin';
+import { getPlugin, getPromise } from './util';
+
+export interface PluginConfig {
+  /**
+   * Plugin name, this should match the class name
+   */
+  pluginName: string;
+  /**
+   * Plugin NPM package name
+   */
+  plugin: string;
+  /**
+   * Plugin object reference
+   */
+  pluginRef?: string;
+  /**
+   * Github repository URL
+   */
+  repo?: string;
+  /**
+   * Custom install command
+   */
+  install?: string;
+  /**
+   * Available installation variables
+   */
+  installVariables?: string[];
+  /**
+   * Supported platforms
+   */
+  platforms?: string[];
+
+  [key: string]: any;
+}
+
+export interface CordovaOptions {
+  destruct?: boolean;
+  /**
+   * Set to true if the wrapped method is a sync function
+   */
+  sync?: boolean;
+  /**
+   * Callback order. Set to reverse if the success/error callbacks are the first 2 arguments that the wrapped method takes.
+   */
+  callbackOrder?: 'reverse';
+  /**
+   * Callback style
+   */
+  callbackStyle?: 'node' | 'object';
+  /**
+   * Set a custom index for the success callback function. This doesn't work if callbackOrder or callbackStyle are set.
+   */
+  successIndex?: number;
+  /**
+   * Set a custom index for the error callback function. This doesn't work if callbackOrder or callbackStyle are set.
+   */
+  errorIndex?: number;
+  /**
+   * Success function property name. This must be set if callbackStyle is set to object.
+   */
+  successName?: string;
+  /**
+   * Error function property name. This must be set if callbackStyle is set to object.
+   */
+  errorName?: string;
+  /**
+   * Set to true to return an observable
+   */
+  observable?: boolean;
+  /**
+   * If observable is set to true, this can be set to a different function name that will cancel the observable.
+   */
+  clearFunction?: string;
+  /**
+   * This can be used if clearFunction is set. Set this to true to call the clearFunction with the same arguments used in the initial function.
+   */
+  clearWithArgs?: boolean;
+  /**
+   * Creates an observable that wraps a global event. Replaces document.addEventListener
+   */
+  eventObservable?: boolean;
+  /**
+   * Event name, this must be set if eventObservable is set to true
+   */
+  event?: string;
+  /**
+   * Element to attach the event listener to, this is optional, defaults to `window`
+   */
+  element?: any;
+  /**
+   * Set to true if the wrapped method returns a promise
+   */
+  otherPromise?: boolean;
+  /**
+   * Supported platforms
+   */
+  platforms?: string[];
+}
+
+export interface CordovaCheckOptions {
+  sync?: boolean;
+  observable?: boolean;
+}
+
+/**
+ * @private
+ */
+export function InstanceCheck(opts: CordovaCheckOptions = {}) {
+  return (
+    pluginObj: Object,
+    methodName: string,
+    descriptor: TypedPropertyDescriptor<any>
+  ): TypedPropertyDescriptor<any> => {
+    return {
+      value(...args: any[]): any {
+        if (instanceAvailability(this)) {
+          return descriptor.value.apply(this, args);
+        } else {
+          if (opts.sync) {
+            return;
+          } else if (opts.observable) {
+            return new Observable<any>(() => {});
+          }
+
+          return getPromise(() => {});
+        }
+      },
+      enumerable: true
+    };
+  };
+}
+
+/**
+ * Executes function only if plugin is available
+ * @private
+ */
+export function CordovaCheck(opts: CordovaCheckOptions = {}) {
+  return (
+    pluginObj: Object,
+    methodName: string,
+    descriptor: TypedPropertyDescriptor<any>
+  ): TypedPropertyDescriptor<any> => {
+    return {
+      value(...args: any[]): any {
+        const check = checkAvailability(pluginObj);
+        if (check === true) {
+          return descriptor.value.apply(this, args);
+        } else {
+          if (opts.sync) {
+            return null;
+          } else if (opts.observable) {
+            return _throw(new Error(check && check.error));
+          }
+          return Promise.reject(check && check.error);
+        }
+      },
+      enumerable: true
+    };
+  };
+}
+
+/**
+ * @private
+ *
+ * Class decorator specifying Plugin metadata. Required for all plugins.
+ *
+ * @usage
+ * ```typescript
+ * @Plugin({
+ *  pluginName: 'MyPlugin',
+ *  plugin: 'cordova-plugin-myplugin',
+ *  pluginRef: 'window.myplugin'
+ *  })
+ *  export class MyPlugin {
+ *
+ *    // Plugin wrappers, properties, and functions go here ...
+ *
+ *  }
+ * ```
+ */
+export function Plugin(config: PluginConfig): ClassDecorator {
+  return (cls: any) => {
+    // Add these fields to the class
+    for (const prop in config) {
+      cls[prop] = config[prop];
+    }
+
+    cls['installed'] = (printWarning?: boolean) => {
+      return !!getPlugin(config.pluginRef);
+    };
+
+    cls['getPlugin'] = () => {
+      return getPlugin(config.pluginRef);
+    };
+
+    cls['checkInstall'] = () => {
+      return checkAvailability(cls) === true;
+    };
+
+    cls['getPluginName'] = () => {
+      return config.pluginName;
+    };
+
+    cls['getPluginRef'] = () => {
+      return config.pluginRef;
+    };
+
+    cls['getPluginInstallName'] = () => {
+      return config.plugin;
+    };
+
+    cls['getPluginRepo'] = () => {
+      return config.repo;
+    };
+
+    cls['getSupportedPlatforms'] = () => {
+      return config.platforms;
+    };
+
+    return cls;
+  };
+}
+
+/**
+ * @private
+ *
+ * Wrap a stub function in a call to a Cordova plugin, checking if both Cordova
+ * and the required plugin are installed.
+ */
+export function Cordova(opts: CordovaOptions = {}) {
+  return (
+    target: Object,
+    methodName: string,
+    descriptor: TypedPropertyDescriptor<any>
+  ) => {
+    return {
+      value(...args: any[]) {
+        return wrap(this, methodName, opts).apply(this, args);
+      },
+      enumerable: true
+    };
+  };
+}
+
+/**
+ * @private
+ *
+ * Wrap an instance method
+ */
+export function CordovaInstance(opts: CordovaOptions = {}) {
+  return (target: Object, methodName: string) => {
+    return {
+      value(...args: any[]) {
+        return wrapInstance(this, methodName, opts).apply(this, args);
+      },
+      enumerable: true
+    };
+  };
+}
+
+/**
+ * @private
+ *
+ *
+ * Before calling the original method, ensure Cordova and the plugin are installed.
+ */
+export function CordovaProperty(target: any, key: string) {
+  Object.defineProperty(target, key, {
+    enumerable: true,
+    get: () => {
+      if (checkAvailability(target, key) === true) {
+        return getPlugin(target.constructor.getPluginRef())[key];
+      } else {
+        return null;
+      }
+    },
+    set: value => {
+      if (checkAvailability(target, key) === true) {
+        getPlugin(target.constructor.getPluginRef())[key] = value;
+      }
+    }
+  });
+}
+
+/**
+ * @private
+ * @param target
+ * @param key
+ * @constructor
+ */
+export function InstanceProperty(target: any, key: string) {
+  Object.defineProperty(target, key, {
+    enumerable: true,
+    get() {
+      return this._objectInstance[key];
+    },
+    set(value) {
+      this._objectInstance[key] = value;
+    }
+  });
+}
+
+/**
+ * @private
+ *
+ * Wrap a stub function in a call to a Cordova plugin, checking if both Cordova
+ * and the required plugin are installed.
+ */
+export function CordovaFunctionOverride(opts: any = {}) {
+  return (
+    target: Object,
+    methodName: string,
+    descriptor: TypedPropertyDescriptor<any>
+  ) => {
+    return {
+      value(...args: any[]) {
+        return overrideFunction(this, methodName, opts);
+      },
+      enumerable: true
+    };
+  };
+}
--- a/src/@ionic-native/core/decorators/common.spec.ts
+++ b/src/@ionic-native/core/decorators/common.spec.ts
@@ -1,100 +0,0 @@
-import { callCordovaPlugin, wrapPromise } from './common';
-
-declare const window: any;
-
-class MockPlugin {
-  static getPluginRef(): string {
-    return 'mockPlugin';
-  }
-
-  static getPluginName(): string {
-    return 'MockPlugin';
-  }
-
-  static getPluginInstallName(): string {
-    return '';
-  }
-
-  create(): MockInstancePluginObject {
-    return new MockInstancePluginObject();
-  }
-}
-
-class MockInstancePluginObject {
-  _pluginInstance: MockCordovaPlugin;
-
-  constructor() {
-    this._pluginInstance = new MockCordovaPlugin();
-  }
-}
-
-class MockCordovaPlugin {
-  static ping = jest.fn((arg: string) => 'pong');
-  static pingAsync = jest.fn((arg: string, success: Function, error: Function) => success('pong'));
-  ping = jest.fn((arg: string) => 'pong');
-  pingAsync = jest.fn((arg: string, success: Function, error: Function) => success('pong'));
-}
-
-describe('Common decorator functions', () => {
-  let plugin: MockPlugin, instancePluginObject: MockInstancePluginObject;
-
-  beforeAll(() => {
-    window.mockPlugin = MockCordovaPlugin;
-    plugin = new MockPlugin();
-    instancePluginObject = plugin.create();
-  });
-
-  describe('callCordovaPlugin', () => {
-    test('should return value from cordova plugin', () => {
-      expect(callCordovaPlugin(plugin, 'ping', ['pingpong'])).toBe('pong');
-    });
-
-    test('original method should have been called', () => {
-      expect(MockCordovaPlugin.ping.mock.calls.length).toBe(1);
-    });
-
-    test('original method should have received args', () => {
-      expect(MockCordovaPlugin.ping.mock.calls[0][0]).toBe('pingpong');
-    });
-  });
-
-  describe('wrapPromise', () => {
-    test('should return a promise that resolves with a value', async () => {
-      expect(await wrapPromise(plugin, 'pingAsync', ['pingpong'])).toBe('pong');
-    });
-
-    test('original method should have been called', () => {
-      expect(MockCordovaPlugin.pingAsync.mock.calls.length).toBe(1);
-    });
-
-    test('original method should have received args', () => {
-      expect(MockCordovaPlugin.pingAsync.mock.calls[0][0]).toBe('pingpong');
-      expect(typeof MockCordovaPlugin.pingAsync.mock.calls[0][1]).toBe('function');
-      expect(typeof MockCordovaPlugin.pingAsync.mock.calls[0][2]).toBe('function');
-    });
-  });
-
-  describe('wrapObservable', () => {
-    test('should return an observable that emits a value', async () => {});
-
-    test('original method should have been called', () => {});
-
-    test('original method should have received args', () => {});
-  });
-
-  describe('wrapEventObservable', () => {
-    test('should return an observable that wraps an event listener', async () => {});
-  });
-
-  describe('callInstance', () => {
-    test('should call an instance method', async () => {});
-
-    test('original method should have been called', () => {
-      // expect(instancePluginObject._pluginInstance.ping.mock.calls.length).toBe(1);
-    });
-
-    test('original method should have received args', () => {
-      // expect(instancePluginObject._pluginInstance.ping.mock.calls[0][0]).toBe('pingpong');
-    });
-  });
-});
--- a/src/@ionic-native/core/decorators/cordova-function-override.ts
+++ b/src/@ionic-native/core/decorators/cordova-function-override.ts
@@ -1,26 +0,0 @@
-import { Observable, Observer } from 'rxjs';
-
-import { checkAvailability, getPlugin } from './common';
-
-function overrideFunction(pluginObj: any, methodName: string): Observable<any> {
-  return new Observable((observer: Observer<any>) => {
-    const availabilityCheck = checkAvailability(pluginObj, methodName);
-
-    if (availabilityCheck === true) {
-      const pluginInstance = getPlugin(pluginObj.constructor.getPluginRef());
-      pluginInstance[methodName] = observer.next.bind(observer);
-      return () => (pluginInstance[methodName] = () => {});
-    } else {
-      observer.error(availabilityCheck);
-      observer.complete();
-    }
-  });
-}
-
-export function cordovaFunctionOverride(
-  pluginObj: any,
-  methodName: string,
-  args: IArguments | any[] = []
-) {
-  return overrideFunction(pluginObj, methodName);
-}
--- a/src/@ionic-native/core/decorators/cordova-instance.ts
+++ b/src/@ionic-native/core/decorators/cordova-instance.ts
@@ -1,12 +0,0 @@
-import { wrapInstance } from './common';
-import { CordovaOptions } from './interfaces';
-
-export function cordovaInstance(
-  pluginObj: any,
-  methodName: string,
-  config: CordovaOptions,
-  args: IArguments | any[]
-) {
-  args = Array.from(args);
-  return wrapInstance(pluginObj, methodName, config).apply(this, args);
-}
--- a/src/@ionic-native/core/decorators/cordova-property.ts
+++ b/src/@ionic-native/core/decorators/cordova-property.ts
@@ -1,14 +0,0 @@
-import { checkAvailability, getPlugin } from './common';
-
-export function cordovaPropertyGet(pluginObj: any, key: string) {
-  if (checkAvailability(pluginObj, key) === true) {
-    return getPlugin(pluginObj.constructor.getPluginRef())[key];
-  }
-  return null;
-}
-
-export function cordovaPropertySet(pluginObj: any, key: string, value: any) {
-  if (checkAvailability(pluginObj, key) === true) {
-    getPlugin(pluginObj.constructor.getPluginRef())[key] = value;
-  }
-}
--- a/src/@ionic-native/core/decorators/cordova.ts
+++ b/src/@ionic-native/core/decorators/cordova.ts
@@ -1,11 +0,0 @@
-import { wrap } from './common';
-import { CordovaOptions } from './interfaces';
-
-export function cordova(
-  pluginObj: any,
-  methodName: string,
-  config: CordovaOptions,
-  args: IArguments | any[]
-) {
-  return wrap(pluginObj, methodName, config).apply(this, args);
-}
--- a/src/@ionic-native/core/decorators/instance-property.ts
+++ b/src/@ionic-native/core/decorators/instance-property.ts
@@ -1,12 +0,0 @@
-export function instancePropertyGet(pluginObj: any, key: string) {
-  if (pluginObj._objectInstance && pluginObj._objectInstance[key]) {
-    return pluginObj._objectInstance[key];
-  }
-  return null;
-}
-
-export function instancePropertySet(pluginObj: any, key: string, value: any) {
-  if (pluginObj._objectInstance) {
-    pluginObj._objectInstance[key] = value;
-  }
-}
--- a/src/@ionic-native/core/decorators/interfaces.ts
+++ b/src/@ionic-native/core/decorators/interfaces.ts
@@ -1,107 +0,0 @@
-export interface PluginConfig {
-  /**
-   * Plugin name, this should match the class name
-   */
-  pluginName: string;
-  /**
-   * Plugin NPM package name
-   */
-  plugin: string;
-  /**
-   * Plugin object reference
-   */
-  pluginRef?: string;
-  /**
-   * Github repository URL
-   */
-  repo?: string;
-  /**
-   * Custom install command
-   */
-  install?: string;
-  /**
-   * Available installation variables
-   */
-  installVariables?: string[];
-  /**
-   * Supported platforms
-   */
-  platforms?: string[];
-
-  [key: string]: any;
-}
-
-export interface CordovaOptions {
-  destruct?: boolean;
-  /**
-   * Set to true if the wrapped method is a sync function
-   */
-  sync?: boolean;
-  /**
-   * Callback order. Set to reverse if the success/error callbacks are the first 2 arguments that the wrapped method
-   * takes.
-   */
-  callbackOrder?: 'reverse';
-  /**
-   * Callback style
-   */
-  callbackStyle?: 'node' | 'object';
-  /**
-   * Set a custom index for the success callback function. This doesn't work if callbackOrder or callbackStyle are set.
-   */
-  successIndex?: number;
-  /**
-   * Set a custom index for the error callback function. This doesn't work if callbackOrder or callbackStyle are set.
-   */
-  errorIndex?: number;
-  /**
-   * Success function property name. This must be set if callbackStyle is set to object.
-   */
-  successName?: string;
-  /**
-   * Error function property name. This must be set if callbackStyle is set to object.
-   */
-  errorName?: string;
-  /**
-   * Set to true to return an observable
-   */
-  observable?: boolean;
-  /**
-   * If observable is set to true, this can be set to a different function name that will cancel the observable.
-   */
-  clearFunction?: string;
-  /**
-   * This can be used if clearFunction is set. Set this to true to call the clearFunction with the same arguments used
-   * in the initial function.
-   */
-  clearWithArgs?: boolean;
-  /**
-   * Creates an observable that wraps a global event. Replaces document.addEventListener
-   */
-  eventObservable?: boolean;
-  /**
-   * Event name, this must be set if eventObservable is set to true
-   */
-  event?: string;
-  /**
-   * Element to attach the event listener to, this is optional, defaults to `window`
-   */
-  element?: any;
-  /**
-   * Set to true if the wrapped method returns a promise
-   */
-  otherPromise?: boolean;
-  /**
-   * Supported platforms
-   */
-  platforms?: string[];
-}
-
-export declare const Plugin: (config: PluginConfig) => ClassDecorator;
-export declare const Cordova: (config?: CordovaOptions) => MethodDecorator;
-export declare const CordovaProperty: () => PropertyDecorator;
-export declare const CordovaInstance: (config?: CordovaOptions) => MethodDecorator;
-export declare const InstanceProperty: () => PropertyDecorator;
-export declare const CordovaCheck: (config?: CordovaOptions) => MethodDecorator;
-export declare const InstanceCheck: (config?: CordovaOptions) => MethodDecorator;
-export declare const CordovaFunctionOverride: () => MethodDecorator;
--- a/src/@ionic-native/core/index.ts
+++ b/src/@ionic-native/core/index.ts
@@ -1,14 +1,4 @@
-import { checkReady } from './bootstrap';
-
-export { IonicNativePlugin } from './ionic-native-plugin';
-
-// Decorators
-export { checkAvailability, instanceAvailability, wrap, getPromise } from './decorators/common';
-export * from './decorators/cordova';
-export * from './decorators/cordova-function-override';
-export * from './decorators/cordova-instance';
-export * from './decorators/cordova-property';
-export * from './decorators/instance-property';
-export * from './decorators/interfaces';
-
-checkReady();
+export * from './plugin';
+export * from './decorators';
+export * from './util';
+export * from './ionic-native-plugin';
--- a/src/@ionic-native/core/ionic-native-plugin.spec.ts
+++ b/src/@ionic-native/core/ionic-native-plugin.spec.ts
@@ -0,0 +1,74 @@
+// This is to verify that new (FileTransfer.getPlugin)() works
+import { CordovaInstance, Plugin } from './decorators';
+import { IonicNativePlugin } from './ionic-native-plugin';
+import { checkAvailability } from './plugin';
+
+class FT {
+  hello(): string {
+    return 'world';
+  }
+}
+
+(window as any).FileTransfer = () => new FT();
+
+@Plugin({
+  plugin: 'cordova-plugin-file-transfer',
+  pluginRef: 'FileTransfer',
+  repo: '',
+  pluginName: 'FileTransfer'
+})
+export class FileTransfer extends IonicNativePlugin {
+  create(): FileTransferObject {
+    let instance: any;
+    if (
+      checkAvailability(
+        FileTransfer.getPluginRef(),
+        null,
+        FileTransfer.getPluginName()
+      ) === true
+    ) {
+      instance = new (FileTransfer.getPlugin())();
+    }
+    return new FileTransferObject(instance);
+  }
+}
+
+export class FileTransferObject {
+  constructor(public _objectInstance: any) {
+    console.info(
+      'Creating a new FileTransferObject with instance: ',
+      _objectInstance
+    );
+  }
+
+  @CordovaInstance({ sync: true })
+  hello(): string {
+    return;
+  }
+}
+
+describe('Mock FileTransfer Plugin', () => {
+  let plugin: FileTransfer, instance: FileTransferObject;
+
+  beforeAll(() => {
+    plugin = new FileTransfer();
+    instance = plugin.create();
+  });
+
+  it('should create a new FileTransfer plugin instance', () => {
+    expect(plugin instanceof FileTransfer).toBeTruthy();
+  });
+
+  it('should create new FileTransferObject instance', () => {
+    expect(instance instanceof FileTransferObject).toBeTruthy();
+  });
+
+  it('FileTransferObject instance should have _objectInstance property', () => {
+    expect(instance._objectInstance).toBeDefined();
+  });
+
+  it('FileTransferObject.hello should return world', () => {
+    console.info('instance hello is', instance.hello());
+    expect(instance.hello()).toEqual('world');
+  });
+});
--- a/src/@ionic-native/core/ionic-native-plugin.ts
+++ b/src/@ionic-native/core/ionic-native-plugin.ts
@@ -1,6 +1,3 @@
-import { checkAvailability } from './decorators/common';
-import { get } from './util';
-
 export class IonicNativePlugin {
  static pluginName: string;

@@ -19,41 +16,39 @@ export class IonicNativePlugin {
   * @return {boolean}
   */
  static installed(): boolean {
-    return checkAvailability(this.pluginRef) === true;
+    return false;
  }

  /**
   * Returns the original plugin object
   */
-  static getPlugin(): any {
-    return get(window, this.pluginRef);
-  }
+  static getPlugin(): any {}

  /**
   * Returns the plugin's name
   */
  static getPluginName(): string {
-    return this.pluginName;
+    return;
  }

  /**
   * Returns the plugin's reference
   */
  static getPluginRef(): string {
-    return this.pluginRef;
+    return;
  }

  /**
   * Returns the plugin's install name
   */
  static getPluginInstallName(): string {
-    return this.plugin;
+    return;
  }

  /**
   * Returns the plugin's supported platforms
   */
  static getSupportedPlatforms(): string[] {
-    return this.platforms || [];
+    return;
  }
 }
--- a/src/@ionic-native/core/ng1.ts
+++ b/src/@ionic-native/core/ng1.ts
@@ -1,27 +0,0 @@
-declare const window: any;
-
-/**
- * Initialize the ionic.native Angular module if we're running in ng1.
- * This iterates through the list of registered plugins and dynamically
- * creates Angular 1 services of the form $cordovaSERVICE, ex: $cordovaStatusBar.
- */
-export function initAngular1(plugins: any) {
-  if (window.angular) {
-    const ngModule = window.angular.module('ionic.native', []);
-
-    for (const name in plugins) {
-      const serviceName = '$cordova' + name;
-      const cls = plugins[name];
-
-      ((serviceName, cls, name) => {
-        ngModule.service(serviceName, [
-          () => {
-            const funcs = window.angular.copy(cls);
-            funcs.__proto__['name'] = name;
-            return funcs;
-          }
-        ]);
-      })(serviceName, cls, name);
-    }
-  }
-}
--- a/src/@ionic-native/core/decorators/common.ts
+++ b/src/@ionic-native/core/decorators/common.ts
@@ -1,48 +1,179 @@
-import { fromEvent, Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { fromEvent } from 'rxjs/observable/fromEvent';

-import { CordovaOptions } from './interfaces';
+import { checkReady } from './bootstrap';
+import { CordovaOptions } from './decorators';
+import { cordovaWarn, getPlugin, getPromise, pluginWarn } from './util';

-declare const window: any;
+checkReady();
+
+// declare const window;
+// declare var Promise;

 export const ERR_CORDOVA_NOT_AVAILABLE = { error: 'cordova_not_available' };
 export const ERR_PLUGIN_NOT_INSTALLED = { error: 'plugin_not_installed' };

-export function getPromise<T>(callback: (resolve: Function, reject?: Function) => any): Promise<T> {
-  const tryNativePromise = () => {
-    if (Promise) {
-      return new Promise<T>((resolve, reject) => {
-        callback(resolve, reject);
-      });
-    } else {
-      console.error(
-        'No Promise support or polyfill found. To enable Ionic Native support, please add the es6-promise polyfill before this script, or run with a library like Angular or on a recent browser.'
-      );
-    }
-  };
+/**
+ * Checks if plugin/cordova is available
+ * @return {boolean | { error: string } }
+ * @private
+ */
+export function checkAvailability(
+  pluginRef: string,
+  methodName?: string,
+  pluginName?: string
+): boolean | { error: string };
+export function checkAvailability(
+  pluginObj: any,
+  methodName?: string,
+  pluginName?: string
+): boolean | { error: string };
+export function checkAvailability(
+  plugin: any,
+  methodName?: string,
+  pluginName?: string
+): boolean | { error: string } {
+  let pluginRef, pluginInstance, pluginPackage;

-  if (window.angular) {
-    const injector = window.angular
-      .element(document.querySelector('[ng-app]') || document.body)
-      .injector();
-    if (injector) {
-      const $q = injector.get('$q');
-      return $q((resolve: Function, reject: Function) => {
-        callback(resolve, reject);
-      });
-    }
-    console.warn(
-      `Angular 1 was detected but $q couldn't be retrieved. This is usually when the app is not bootstrapped on the html or body tag. Falling back to native promises which won't trigger an automatic digest when promises resolve.`
-    );
+  if (typeof plugin === 'string') {
+    pluginRef = plugin;
+  } else {
+    pluginRef = plugin.constructor.getPluginRef();
+    pluginName = plugin.constructor.getPluginName();
+    pluginPackage = plugin.constructor.getPluginInstallName();
  }

-  return tryNativePromise();
+  pluginInstance = getPlugin(pluginRef);
+
+  if (
+    !pluginInstance ||
+    (!!methodName && typeof pluginInstance[methodName] === 'undefined')
+  ) {
+    if (!window.cordova) {
+      cordovaWarn(pluginName, methodName);
+      return ERR_CORDOVA_NOT_AVAILABLE;
+    }
+
+    pluginWarn(pluginName, pluginPackage, methodName);
+    return ERR_PLUGIN_NOT_INSTALLED;
+  }
+
+  return true;
 }

-export function wrapPromise(
+/**
+ * Checks if _objectInstance exists and has the method/property
+ * @private
+ */
+export function instanceAvailability(
+  pluginObj: any,
+  methodName?: string
+): boolean {
+  return (
+    pluginObj._objectInstance &&
+    (!methodName ||
+      typeof pluginObj._objectInstance[methodName] !== 'undefined')
+  );
+}
+
+function setIndex(
+  args: any[],
+  opts: any = {},
+  resolve?: Function,
+  reject?: Function
+): any {
+  // ignore resolve and reject in case sync
+  if (opts.sync) {
+    return args;
+  }
+
+  // If the plugin method expects myMethod(success, err, options)
+  if (opts.callbackOrder === 'reverse') {
+    // Get those arguments in the order [resolve, reject, ...restOfArgs]
+    args.unshift(reject);
+    args.unshift(resolve);
+  } else if (opts.callbackStyle === 'node') {
+    args.push((err: any, result: any) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(result);
+      }
+    });
+  } else if (
+    opts.callbackStyle === 'object' &&
+    opts.successName &&
+    opts.errorName
+  ) {
+    const obj: any = {};
+    obj[opts.successName] = resolve;
+    obj[opts.errorName] = reject;
+    args.push(obj);
+  } else if (
+    typeof opts.successIndex !== 'undefined' ||
+    typeof opts.errorIndex !== 'undefined'
+  ) {
+    const setSuccessIndex = () => {
+      // If we've specified a success/error index
+      if (opts.successIndex > args.length) {
+        args[opts.successIndex] = resolve;
+      } else {
+        args.splice(opts.successIndex, 0, resolve);
+      }
+    };
+
+    const setErrorIndex = () => {
+      // We don't want that the reject cb gets spliced into the position of an optional argument that has not been defined and thus causing non expected behaviour.
+      if (opts.errorIndex > args.length) {
+        args[opts.errorIndex] = reject; // insert the reject fn at the correct specific index
+      } else {
+        args.splice(opts.errorIndex, 0, reject); // otherwise just splice it into the array
+      }
+    };
+
+    if (opts.successIndex > opts.errorIndex) {
+      setErrorIndex();
+      setSuccessIndex();
+    } else {
+      setSuccessIndex();
+      setErrorIndex();
+    }
+  } else {
+    // Otherwise, let's tack them on to the end of the argument list
+    // which is 90% of cases
+    args.push(resolve);
+    args.push(reject);
+  }
+  return args;
+}
+
+function callCordovaPlugin(
  pluginObj: any,
  methodName: string,
  args: any[],
-  opts: CordovaOptions = {}
+  opts: any = {},
+  resolve?: Function,
+  reject?: Function
+) {
+  // Try to figure out where the success/error callbacks need to be bound
+  // to our promise resolve/reject handlers.
+  args = setIndex(args, opts, resolve, reject);
+
+  const availabilityCheck = checkAvailability(pluginObj, methodName);
+
+  if (availabilityCheck === true) {
+    const pluginInstance = getPlugin(pluginObj.constructor.getPluginRef());
+    return pluginInstance[methodName].apply(pluginInstance, args);
+  } else {
+    return availabilityCheck;
+  }
+}
+
+function wrapPromise(
+  pluginObj: any,
+  methodName: string,
+  args: any[],
+  opts: any = {}
 ) {
  let pluginResult: any, rej: Function;
  const p = getPromise((resolve: Function, reject: Function) => {
@@ -56,7 +187,14 @@ export function wrapPromise(
        (...args: any[]) => reject(args)
      );
    } else {
-      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, resolve, reject);
+      pluginResult = callCordovaPlugin(
+        pluginObj,
+        methodName,
+        args,
+        opts,
+        resolve,
+        reject
+      );
    }
    rej = reject;
  });
@@ -70,7 +208,12 @@ export function wrapPromise(
  return p;
 }

-function wrapOtherPromise(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
+function wrapOtherPromise(
+  pluginObj: any,
+  methodName: string,
+  args: any[],
+  opts: any = {}
+) {
  return getPromise((resolve: Function, reject: Function) => {
    const pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts);
    if (pluginResult) {
@@ -85,7 +228,12 @@ function wrapOtherPromise(pluginObj: any, methodName: string, args: any[], opts:
  });
 }

-function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
+function wrapObservable(
+  pluginObj: any,
+  methodName: string,
+  args: any[],
+  opts: any = {}
+) {
  return new Observable(observer => {
    let pluginResult;

@@ -140,157 +288,7 @@ function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: a
  });
 }

-/**
- * Wrap the event with an observable
- * @private
- * @param event even name
- * @param element The element to attach the event listener to
- * @returns {Observable}
- */
-function wrapEventObservable(event: string, element: any): Observable<any> {
-  element = element ? get(window, element) : window;
-  return fromEvent(element, event);
-}
-
-/**
- * Checks if plugin/cordova is available
- * @return {boolean | { error: string } }
- * @private
- */
-export function checkAvailability(
-  pluginRef: string,
-  methodName?: string,
-  pluginName?: string
-): boolean | { error: string };
-export function checkAvailability(
-  pluginObj: any,
-  methodName?: string,
-  pluginName?: string
-): boolean | { error: string };
-export function checkAvailability(
-  plugin: any,
-  methodName?: string,
-  pluginName?: string
-): boolean | { error: string } {
-  let pluginRef, pluginInstance, pluginPackage;
-
-  if (typeof plugin === 'string') {
-    pluginRef = plugin;
-  } else {
-    pluginRef = plugin.constructor.getPluginRef();
-    pluginName = plugin.constructor.getPluginName();
-    pluginPackage = plugin.constructor.getPluginInstallName();
-  }
-
-  pluginInstance = getPlugin(pluginRef);
-
-  if (!pluginInstance || (!!methodName && typeof pluginInstance[methodName] === 'undefined')) {
-    if (!window.cordova) {
-      cordovaWarn(pluginName, methodName);
-      return ERR_CORDOVA_NOT_AVAILABLE;
-    }
-
-    pluginWarn(pluginName, pluginPackage, methodName);
-    return ERR_PLUGIN_NOT_INSTALLED;
-  }
-
-  return true;
-}
-
-/**
- * Checks if _objectInstance exists and has the method/property
- * @private
- */
-export function instanceAvailability(pluginObj: any, methodName?: string): boolean {
-  return (
-    pluginObj._objectInstance &&
-    (!methodName || typeof pluginObj._objectInstance[methodName] !== 'undefined')
-  );
-}
-
-export function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Function): any {
-  // ignore resolve and reject in case sync
-  if (opts.sync) {
-    return args;
-  }
-
-  // If the plugin method expects myMethod(success, err, options)
-  if (opts.callbackOrder === 'reverse') {
-    // Get those arguments in the order [resolve, reject, ...restOfArgs]
-    args.unshift(reject);
-    args.unshift(resolve);
-  } else if (opts.callbackStyle === 'node') {
-    args.push((err: any, result: any) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(result);
-      }
-    });
-  } else if (opts.callbackStyle === 'object' && opts.successName && opts.errorName) {
-    const obj: any = {};
-    obj[opts.successName] = resolve;
-    obj[opts.errorName] = reject;
-    args.push(obj);
-  } else if (typeof opts.successIndex !== 'undefined' || typeof opts.errorIndex !== 'undefined') {
-    const setSuccessIndex = () => {
-      // If we've specified a success/error index
-      if (opts.successIndex > args.length) {
-        args[opts.successIndex] = resolve;
-      } else {
-        args.splice(opts.successIndex, 0, resolve);
-      }
-    };
-
-    const setErrorIndex = () => {
-      // We don't want that the reject cb gets spliced into the position of an optional argument that has not been
-      // defined and thus causing non expected behavior.
-      if (opts.errorIndex > args.length) {
-        args[opts.errorIndex] = reject; // insert the reject fn at the correct specific index
-      } else {
-        args.splice(opts.errorIndex, 0, reject); // otherwise just splice it into the array
-      }
-    };
-
-    if (opts.successIndex > opts.errorIndex) {
-      setErrorIndex();
-      setSuccessIndex();
-    } else {
-      setSuccessIndex();
-      setErrorIndex();
-    }
-  } else {
-    // Otherwise, let's tack them on to the end of the argument list
-    // which is 90% of cases
-    args.push(resolve);
-    args.push(reject);
-  }
-  return args;
-}
-
-export function callCordovaPlugin(
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {},
-  resolve?: Function,
-  reject?: Function
-) {
-  // Try to figure out where the success/error callbacks need to be bound
-  // to our promise resolve/reject handlers.
-  args = setIndex(args, opts, resolve, reject);
-
-  const availabilityCheck = checkAvailability(pluginObj, methodName);
-
-  if (availabilityCheck === true) {
-    const pluginInstance = getPlugin(pluginObj.constructor.getPluginRef());
-    return pluginInstance[methodName].apply(pluginInstance, args);
-  } else {
-    return availabilityCheck;
-  }
-}
-
-export function callInstance(
+function callInstance(
  pluginObj: any,
  methodName: string,
  args: any[],
@@ -301,76 +299,67 @@ export function callInstance(
  args = setIndex(args, opts, resolve, reject);

  if (instanceAvailability(pluginObj, methodName)) {
-    return pluginObj._objectInstance[methodName].apply(pluginObj._objectInstance, args);
+    return pluginObj._objectInstance[methodName].apply(
+      pluginObj._objectInstance,
+      args
+    );
  }
 }

-export function getPlugin(pluginRef: string): any {
-  return get(window, pluginRef);
+/**
+ * Wrap the event with an observable
+ * @private
+ * @param event even name
+ * @param element The element to attach the event listener to
+ * @returns {Observable}
+ */
+export function wrapEventObservable(
+  event: string,
+  element: any = window
+): Observable<any> {
+  return fromEvent(element, event);
 }

-export function get(element: Element | Window, path: string) {
-  const paths: string[] = path.split('.');
-  let obj: any = element;
-  for (let i = 0; i < paths.length; i++) {
-    if (!obj) {
-      return null;
+/**
+ * Certain plugins expect the user to override methods in the plugin. For example,
+ * window.cordova.plugins.backgroundMode.onactivate = function() { ... }.
+ *
+ * Unfortunately, this is brittle and would be better wrapped as an Observable. overrideFunction
+ * does just this.
+ * @private
+ */
+export function overrideFunction(
+  pluginObj: any,
+  methodName: string,
+  args: any[],
+  opts: any = {}
+): Observable<any> {
+  return new Observable(observer => {
+    const availabilityCheck = checkAvailability(
+      pluginObj,
+      null,
+      pluginObj.constructor.getPluginName()
+    );
+
+    if (availabilityCheck === true) {
+      const pluginInstance = getPlugin(pluginObj.constructor.getPluginRef());
+      pluginInstance[methodName] = observer.next.bind(observer);
+      return () => (pluginInstance[methodName] = () => {});
+    } else {
+      observer.error(availabilityCheck);
+      observer.complete();
    }
-    obj = obj[paths[i]];
-  }
-  return obj;
-}
-
-export function pluginWarn(pluginName: string, plugin?: string, method?: string): void {
-  if (method) {
-    console.warn(
-      'Native: tried calling ' +
-        pluginName +
-        '.' +
-        method +
-        ', but the ' +
-        pluginName +
-        ' plugin is not installed.'
-    );
-  } else {
-    console.warn(`Native: tried accessing the ${pluginName} plugin but it's not installed.`);
-  }
-  if (plugin) {
-    console.warn(`Install the ${pluginName} plugin: 'ionic cordova plugin add ${plugin}'`);
-  }
+  });
 }

 /**
 * @private
- * @param pluginName
- * @param method
 */
-export function cordovaWarn(pluginName: string, method?: string): void {
-  if (method) {
-    console.warn(
-      'Native: tried calling ' +
-        pluginName +
-        '.' +
-        method +
-        ', but Cordova is not available. Make sure to include cordova.js or run in a device/simulator'
-    );
-  } else {
-    console.warn(
-      'Native: tried accessing the ' +
-        pluginName +
-        ' plugin but Cordova is not available. Make sure to include cordova.js or run in a device/simulator'
-    );
-  }
-}
-
-// Fixes a bug in TypeScript 2.9.2 where the ...args is being converted into args: {} and
-// causing compilation issues
-export type WrapFn = (...args: any[]) => any;
-
-/**
- * @private
- */
-export const wrap = (pluginObj: any, methodName: string, opts: CordovaOptions = {}): WrapFn => {
+export const wrap = (
+  pluginObj: any,
+  methodName: string,
+  opts: CordovaOptions = {}
+) => {
  return (...args: any[]) => {
    if (opts.sync) {
      // Sync doesn't wrap the plugin with a promise or observable, it returns the result as-is
@@ -390,7 +379,11 @@ export const wrap = (pluginObj: any, methodName: string, opts: CordovaOptions =
 /**
 * @private
 */
-export function wrapInstance(pluginObj: any, methodName: string, opts: any = {}): Function {
+export function wrapInstance(
+  pluginObj: any,
+  methodName: string,
+  opts: any = {}
+) {
  return (...args: any[]) => {
    if (opts.sync) {
      return callInstance(pluginObj, methodName, args, opts);
@@ -420,6 +413,7 @@ export function wrapInstance(pluginObj: any, methodName: string, opts: any = {})

        if (pluginResult && pluginResult.error) {
          observer.error(pluginResult.error);
+          observer.complete();
        }

        return () => {
@@ -458,9 +452,16 @@ export function wrapInstance(pluginObj: any, methodName: string, opts: any = {})
            (...args: any[]) => reject(args)
          );
        } else {
-          result = callInstance(pluginObj, methodName, args, opts, resolve, reject);
+          result = callInstance(
+            pluginObj,
+            methodName,
+            args,
+            opts,
+            resolve,
+            reject
+          );
        }
-        if (result && result.then) {
+        if (result && !!result.then) {
          result.then(resolve, reject);
        } else {
          reject();
@@ -479,7 +480,14 @@ export function wrapInstance(pluginObj: any, methodName: string, opts: any = {})
            (...args: any[]) => reject(args)
          );
        } else {
-          pluginResult = callInstance(pluginObj, methodName, args, opts, resolve, reject);
+          pluginResult = callInstance(
+            pluginObj,
+            methodName,
+            args,
+            opts,
+            resolve,
+            reject
+          );
        }
        rej = reject;
      });
--- a/src/@ionic-native/core/util.ts
+++ b/src/@ionic-native/core/util.ts
@@ -3,7 +3,7 @@ declare const window: any;
 /**
 * @private
 */
-export function get(element: Element | Window, path: string) {
+export const get = (element: Element | Window, path: string): any => {
  const paths: string[] = path.split('.');
  let obj: any = element;
  for (let i = 0; i < paths.length; i++) {
@@ -13,15 +13,15 @@ export function get(element: Element | Window, path: string) {
    obj = obj[paths[i]];
  }
  return obj;
-}
+};

 /**
 * @private
 */
-export function getPromise(callback: Function = () => {}): Promise<any> {
+export const getPromise = (callback: Function): Promise<any> => {
  const tryNativePromise = () => {
    if (window.Promise) {
-      return new Promise<any>((resolve, reject) => {
+      return new Promise((resolve, reject) => {
        callback(resolve, reject);
      });
    } else {
@@ -32,4 +32,66 @@ export function getPromise(callback: Function = () => {}): Promise<any> {
  };

  return tryNativePromise();
-}
+};
+
+/**
+ * @private
+ * @param pluginRef
+ * @returns {null|*}
+ */
+export const getPlugin = (pluginRef: string): any => {
+  return get(window, pluginRef);
+};
+
+/**
+ * @private
+ */
+export const pluginWarn = (
+  pluginName: string,
+  plugin?: string,
+  method?: string
+): void => {
+  if (method) {
+    console.warn(
+      'Ionic Native: tried calling ' +
+        pluginName +
+        '.' +
+        method +
+        ', but the ' +
+        pluginName +
+        ' plugin is not installed.'
+    );
+  } else {
+    console.warn(
+      `'Ionic Native: tried accessing the ${pluginName} plugin but it's not installed.`
+    );
+  }
+  if (plugin) {
+    console.warn(
+      `Install the ${pluginName} plugin: 'ionic cordova plugin add ${plugin}'`
+    );
+  }
+};
+
+/**
+ * @private
+ * @param pluginName
+ * @param method
+ */
+export const cordovaWarn = (pluginName: string, method?: string): void => {
+  if (method) {
+    console.warn(
+      'Ionic Native: tried calling ' +
+        pluginName +
+        '.' +
+        method +
+        ', but Cordova is not available. Make sure to a) run in a real device or simulator and b) include cordova.js in your index.html'
+    );
+  } else {
+    console.warn(
+      'Native: tried accessing the ' +
+        pluginName +
+        ' plugin but Cordova is not available. Make sure to a) run in a real device or simulator and b) include cordova.js in your index.html'
+    );
+  }
+};
--- a/src/@ionic-native/plugins/abbyy-rtr/index.ts
+++ b/src/@ionic-native/plugins/abbyy-rtr/index.ts
@@ -9,6 +9,7 @@ declare const AbbyyRtrSdk: any;
 * default setting will be used.
 */
 export interface TextCaptureOptions {
+
  /**
   * The name of the license file. This file must be located in the
   * www/rtr_assets/ directory in your project.
@@ -56,11 +57,6 @@ export interface TextCaptureOptions {
   * the latest recognition result.
   */
  isStopButtonVisible?: boolean;
-
-  /**
-   * Specify the orientation, possible values 'landscape' or 'portrait'.
-   */
-  orientation?: string;
 }

 /**
@@ -68,6 +64,7 @@ export interface TextCaptureOptions {
 * The callback you implement should parse this object and show results to user.
 */
 export interface TextCaptureResult {
+
  /**
   * An array of objects representing recognized lines of text.
   * These objects have the following keys:
@@ -78,7 +75,7 @@ export interface TextCaptureResult {
   * · rect (string): position and size of the bounding rectangle,
   *   a string of 4 integers separated with whitespaces ("x y width height").
   */
-  textLines: { text: string; quadrangle: string; rect?: string }[];
+  textLines: { text: string, quadrangle: string, rect?: string }[];

  /**
   * Additional information. This object has the following keys:
@@ -94,10 +91,10 @@ export interface TextCaptureResult {
   *   the array contains language identifiers (["English", "French", "German"]).
   */
  resultInfo: {
-    stabilityStatus: string;
-    userAction: string;
-    frameSize: string;
-    recognitionLanguages: string[];
+    stabilityStatus: string,
+    userAction: string,
+    frameSize: string,
+    recognitionLanguages: string[]
  };

  /**
@@ -117,6 +114,7 @@ export interface TextCaptureResult {
 * keys: you must specify either one of them, but not both at the same time.
 */
 export interface DataCaptureOptions {
+
  /**
   * The predefined data capture profile to use, for example: "MRZ".
   * Note: For the list of supported documents, see Specifications — Data
@@ -136,10 +134,10 @@ export interface DataCaptureOptions {
   *   the regular expression that should be matched when capturing a field.
   */
  customDataCaptureScenario?: {
-    name: string;
-    description: string;
-    recognitionLanguages: string[];
-    fields: { regEx: string }[];
+    name: string,
+    description: string,
+    recognitionLanguages: string[],
+    fields: { regEx: string }[]
  };

  /**
@@ -177,11 +175,6 @@ export interface DataCaptureOptions {
   * the latest recognition result.
   */
  isStopButtonVisible?: boolean;
-
-  /**
-   * Specify the orientation, possible values 'landscape' or 'portrait'.
-   */
-  orientation?: string;
 }

 /**
@@ -189,6 +182,7 @@ export interface DataCaptureOptions {
 * implement should parse this object and show results to user.
 */
 export interface DataCaptureResult {
+
  /**
   * The data scheme which was applied during data capture.
   * The value is an object which has two keys:
@@ -201,8 +195,8 @@ export interface DataCaptureResult {
   * present in the result.
   */
  dataScheme?: {
-    id: string;
-    name: string;
+    id: string,
+    name: string
  };

  /**
@@ -228,15 +222,15 @@ export interface DataCaptureResult {
   *   of 4 integers separated with whitespaces ("x y width height").
   */
  dataFields: {
-    id: string;
-    name: string;
-    text: string;
-    quadrangle: string;
+    id: string,
+    name: string,
+    text: string,
+    quadrangle: string,
    components: {
-      text: string;
-      quadrangle: string;
-      rect: string;
-    };
+      text: string,
+      quadrangle: string,
+      rect: string
+    }
  };

  /**
@@ -251,9 +245,9 @@ export interface DataCaptureResult {
   *   with 2 integers separated with a whitespace ("720 1280").
   */
  resultInfo: {
-    stabilityStatus: string;
-    userAction: string;
-    frameSize: string;
+    stabilityStatus: string,
+    userAction: string,
+    frameSize: string
  };

  /**
@@ -274,7 +268,7 @@ export interface DataCaptureResult {
 *
 * @usage
 * ```typescript
- * import { AbbyyRTR } from '@ionic-native/abbyy-rtr/ngx';
+ * import { AbbyyRTR } from '@ionic-native/abbyy-rtr';
 *
 *
 * constructor(private abbyyRTR: AbbyyRTR) { }
@@ -301,10 +295,9 @@ export interface DataCaptureResult {
  install: 'ionic cordova plugin add cordova-plugin-abbyy-rtr-sdk',
  platforms: ['Android', 'iOS']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AbbyyRTR extends IonicNativePlugin {
+
  /**
   * Opens a modal dialog with controls for the Text Capture scenario.
   * @param {TextCaptureOptions} options
--- a/src/@ionic-native/plugins/action-sheet/index.ts
+++ b/src/@ionic-native/plugins/action-sheet/index.ts
@@ -62,7 +62,7 @@ export interface ActionSheetOptions {
 *
 * @usage
 * ```typescript
- * import { ActionSheet, ActionSheetOptions } from '@ionic-native/action-sheet/ngx';
+ * import { ActionSheet, ActionSheetOptions } from '@ionic-native/action-sheet';
 *
 * constructor(private actionSheet: ActionSheet) { }
 *
@@ -79,7 +79,7 @@ export interface ActionSheetOptions {
 *   addDestructiveButtonWithLabel: 'Delete',
 *   androidTheme: this.actionSheet.ANDROID_THEMES.THEME_HOLO_DARK,
 *   destructiveButtonLast: true
- * }
+ * };
 *
 * this.actionSheet.show(options).then((buttonIndex: number) => {
 *   console.log('Button pressed: ' + buttonIndex);
@@ -95,9 +95,7 @@ export interface ActionSheetOptions {
  repo: 'https://github.com/EddyVerbruggen/cordova-plugin-actionsheet',
  platforms: ['Android', 'Browser', 'iOS', 'Windows', 'Windows Phone 8']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class ActionSheet extends IonicNativePlugin {
  /**
   * Convenience property to select an Android theme value
--- a/src/@ionic-native/plugins/adjust/index.ts
+++ b/src/@ionic-native/plugins/adjust/index.ts
@@ -263,7 +263,7 @@ export enum AdjustLogLevel {
 *
 * @usage
 * ```typescript
- *  import { Adjust, AdjustConfig, AdjustEnvironment } from '@ionic-native/adjust/ngx';
+ *  import { Adjust, AdjustConfig, AdjustEnvironment } from '@ionic-native/adjust';
 *
 *  constructor(private adjust: Adjust) { }
 *
@@ -295,9 +295,7 @@ export enum AdjustLogLevel {
  repo: 'https://github.com/adjust/cordova_sdk',
  platforms: ['Android', 'iOS']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class Adjust extends IonicNativePlugin {
  /**
   * This method initializes Adjust SDK
--- a/src/@ionic-native/plugins/admob-free/index.ts
+++ b/src/@ionic-native/plugins/admob-free/index.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable, fromEvent } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { fromEvent } from 'rxjs/observable/fromEvent';

 export interface AdMobFreeBannerConfig {
  /**
@@ -72,7 +73,7 @@ export interface AdMobFreeRewardVideoConfig {
 *
 * @usage
 * ```typescript
- * import { AdMobFree, AdMobFreeBannerConfig } from '@ionic-native/admob-free/ngx';
+ * import { AdMobFree, AdMobFreeBannerConfig } from '@ionic-native/admob-free';
 *
 *
 * constructor(private admobFree: AdMobFree) { }
@@ -114,9 +115,7 @@ export interface AdMobFreeRewardVideoConfig {
  repo: 'https://github.com/ratson/cordova-plugin-admob-free',
  platforms: ['Android', 'iOS']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AdMobFree extends IonicNativePlugin {
  /**
   * Convenience object to get event names
@@ -180,7 +179,7 @@ export class AdMobFree extends IonicNativePlugin {
  plugin: 'cordova-plugin-admob-free',
  pluginRef: 'admob.banner'
 })
-export class AdMobFreeBanner extends IonicNativePlugin {
+export class AdMobFreeBanner {
  /**
   * Update config
   * @param options
@@ -236,7 +235,7 @@ export class AdMobFreeBanner extends IonicNativePlugin {
  plugin: 'cordova-plugin-admob-free',
  pluginRef: 'admob.interstitial'
 })
-export class AdMobFreeInterstitial extends IonicNativePlugin {
+export class AdMobFreeInterstitial {
  /**
   * Update config
   * @param options
@@ -283,7 +282,7 @@ export class AdMobFreeInterstitial extends IonicNativePlugin {
  plugin: 'cordova-plugin-admob-free',
  pluginRef: 'admob.rewardvideo'
 })
-export class AdMobFreeRewardVideo extends IonicNativePlugin {
+export class AdMobFreeRewardVideo {
  /**
   * Update config
   * @param {AdMobFreeRewardVideoConfig} options Admob reward config
--- a/src/@ionic-native/plugins/admob-plus/index.ts
+++ b/src/@ionic-native/plugins/admob-plus/index.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable, fromEvent } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { fromEvent } from 'rxjs/observable/fromEvent';

 export type AdUnitIDOption = string | {
    android: string;
@@ -72,9 +73,7 @@ export class RewardVideo {
    pluginRef: 'admob',
    repo: 'https://github.com/admob-plus/admob-plus',
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AdMob extends IonicNativePlugin {
    banner = new Banner();
    interstitial = new Interstitial();
--- a/src/@ionic-native/plugins/admob-pro/index.ts
+++ b/src/@ionic-native/plugins/admob-pro/index.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';

 export type AdSize =
  | 'SMART_BANNER'
@@ -106,8 +106,8 @@ export interface AdExtras {
 * IMPORTANT NOTICE: this plugin takes a percentage out of your earnings if you profit more than $1,000. Read more about this on the plugin's repo. For a completely free alternative, see [AdMobPro Free](../admob-free).
 * @usage
 * ```typescript
- * import { AdMobPro } from '@ionic-native/admob-pro/ngx';
- * import { Platform } from '@ionic/angular';
+ * import { AdMobPro } from '@ionic-native/admob-pro';
+ * import { Platform } from 'ionic-angular';
 *
 * constructor(private admob: AdMobPro, private platform: Platform ) { }
 *
@@ -140,9 +140,7 @@ export interface AdExtras {
  repo: 'https://github.com/floatinghotpot/cordova-admob-pro',
  platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AdMobPro extends IonicNativePlugin {
  AD_POSITION: {
    NO_CHANGE: number;
@@ -277,7 +275,7 @@ export class AdMobPro extends IonicNativePlugin {
  @Cordova({
    eventObservable: true,
    event: 'onAdFailLoad',
-    element: 'document'
+    element: document
  })
  onAdFailLoad(): Observable<any> {
    return;
@@ -290,7 +288,7 @@ export class AdMobPro extends IonicNativePlugin {
  @Cordova({
    eventObservable: true,
    event: 'onAdLoaded',
-    element: 'document'
+    element: document
  })
  onAdLoaded(): Observable<any> {
    return;
@@ -303,7 +301,7 @@ export class AdMobPro extends IonicNativePlugin {
  @Cordova({
    eventObservable: true,
    event: 'onAdPresent',
-    element: 'document'
+    element: document
  })
  onAdPresent(): Observable<any> {
    return;
@@ -316,7 +314,7 @@ export class AdMobPro extends IonicNativePlugin {
  @Cordova({
    eventObservable: true,
    event: 'onAdLeaveApp',
-    element: 'document'
+    element: document
  })
  onAdLeaveApp(): Observable<any> {
    return;
@@ -329,7 +327,7 @@ export class AdMobPro extends IonicNativePlugin {
  @Cordova({
    eventObservable: true,
    event: 'onAdDismiss',
-    element: 'document'
+    element: document
  })
  onAdDismiss(): Observable<any> {
    return;
--- a/src/@ionic-native/plugins/admob/index.ts
+++ b/src/@ionic-native/plugins/admob/index.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Cordova, CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';

 export interface AdmobOptions {
  /**
@@ -93,7 +93,7 @@ export interface AdmobOptions {
 *
 * @usage
 * ```typescript
- * import { Admob, AdmobOptions } from '@ionic-native/admob/ngx';
+ * import { Admob, AdmobOptions } from '@ionic-native/admob';
 *
 *
 * constructor(private admob: Admob) {
@@ -239,16 +239,14 @@ export interface AdmobOptions {
  repo: 'https://github.com/appfeel/admob-google-cordova',
  platforms: ['Android', 'iOS']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class Admob extends IonicNativePlugin {
  /**
   * This enum represents AdMob's supported ad sizes.
   * Use one of these constants as adSize option when calling createBannerView
   * @readonly
   */
-  @CordovaProperty()
+  @CordovaProperty
  readonly AD_SIZE: {
    BANNER: string;
    IAB_MRECT: string;
@@ -261,7 +259,7 @@ export class Admob extends IonicNativePlugin {
   * This enum represents AdMob's supported ad types
   * @readonly
   */
-  @CordovaProperty()
+  @CordovaProperty
  readonly AD_TYPE: {
    BANNER: string;
    INTERSTITIAL: string;
--- a/src/@ionic-native/plugins/aes-256/index.ts
+++ b/src/@ionic-native/plugins/aes-256/index.ts
@@ -10,7 +10,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 *
 * @usage
 * ```typescript
- * import { AES256 } from '@ionic-native/aes-256/ngx';
+ * import { AES256 } from '@ionic-native/aes-256';
 *
 * private secureKey: string;
 * private secureIV: string;
@@ -54,10 +54,9 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
  platforms: ['Android', 'iOS'],
  install: 'ionic cordova plugin add cordova-plugin-aes256-encryption'
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AES256 extends IonicNativePlugin {
+
  /**
   * This function used to perform the aes256 encryption
   * @param {string} secureKey A 32 bytes string, which will used as input key for AES256 encryption.
--- a/src/@ionic-native/plugins/alipay/index.ts
+++ b/src/@ionic-native/plugins/alipay/index.ts
@@ -10,7 +10,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 *
 * @usage
 * ```typescript
- * import { Alipay } from '@ionic-native/alipay/ngx';
+ * import { Alipay } from '@ionic-native/alipay';
 *
 * constructor(private alipay: Alipay) {
 *
@@ -36,9 +36,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
  installVariables: ['APP_ID'],
  platforms: ['Android', 'iOS']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class Alipay extends IonicNativePlugin {
  /**
   * Open Alipay to perform App pay
--- a/src/@ionic-native/plugins/analytics-firebase/index.ts
+++ b/src/@ionic-native/plugins/analytics-firebase/index.ts
@@ -60,16 +60,14 @@ import { Cordova, CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-nati
  repo: 'https://github.com/appfeel/analytics-google',
  platforms: ['Android', 'iOS']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AnalyticsFirebase extends IonicNativePlugin {
  /**
   * This enum represents AnalyticsFirebase default events.
   * Use one of these default events or a custom event
   * @readonly
   */
-  @CordovaProperty()
+  @CordovaProperty
  readonly DEFAULT_EVENTS: {
    ADD_PAYMENT_INFO: string;
    ADD_TO_CART: string;
@@ -109,7 +107,7 @@ export class AnalyticsFirebase extends IonicNativePlugin {
   * Use one of these default params or a custom param
   * @readonly
   */
-  @CordovaProperty()
+  @CordovaProperty
  readonly DEFAULT_PARAMS: {
    ACHIEVEMENT_ID: string;
    ACLID: string;
--- a/src/@ionic-native/plugins/android-exoplayer/index.ts
+++ b/src/@ionic-native/plugins/android-exoplayer/index.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';

 export type AndroidExoPlayerAspectRatio = 'FILL_SCREEN' | 'FIT_SCREEN';

@@ -158,7 +158,7 @@ export interface AndroidExoPlayerControllerConfig {
 *
 * @usage
 * ```typescript
- * import { AndroidExoPlayer } from '@ionic-native/android-exoplayer/ngx';
+ * import { AndroidExoPlayer } from '@ionic-native/android-exoplayer';
 *
 * constructor(private androidExoPlayer: AndroidExoPlayer) { }
 *
@@ -180,9 +180,7 @@ export interface AndroidExoPlayerControllerConfig {
  repo: 'https://github.com/frontyard/cordova-plugin-exoplayer',
  platforms: ['Android']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AndroidExoplayer extends IonicNativePlugin {
  /**
   * Show the player.
--- a/src/@ionic-native/plugins/android-fingerprint-auth/index.ts
+++ b/src/@ionic-native/plugins/android-fingerprint-auth/index.ts
@@ -110,7 +110,7 @@ export interface AFADeleteOptions {
 * This plugin will open a native dialog fragment prompting the user to authenticate using their fingerprint. If the device has a secure lockscreen (pattern, PIN, or password), the user may opt to authenticate using that method as a backup.
 * @usage
 * ```typescript
- * import { AndroidFingerprintAuth } from '@ionic-native/android-fingerprint-auth/ngx';
+ * import { AndroidFingerprintAuth } from '@ionic-native/android-fingerprint-auth';
 *
 * constructor(private androidFingerprintAuth: AndroidFingerprintAuth) { }
 *
@@ -157,9 +157,7 @@ export interface AFADeleteOptions {
  repo: 'https://github.com/mjwheatley/cordova-plugin-android-fingerprint-auth',
  platforms: ['Android']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AndroidFingerprintAuth extends IonicNativePlugin {
  /**
   * Convenience property containing all possible errors
--- a/src/@ionic-native/plugins/android-full-screen/index.ts
+++ b/src/@ionic-native/plugins/android-full-screen/index.ts
@@ -3,7 +3,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';

 /**
 * Bit flag values for setSystemUiVisibility()
- * @see  https://developer.android.com/reference/android/view/View.html#setSystemUiVisibility(int)
+ * @see	https://developer.android.com/reference/android/view/View.html#setSystemUiVisibility(int)
 */
 export enum AndroidSystemUiFlags {
  /** View has requested the system UI (status bar) to be visible (the default). SYSTEM_UI_FLAG_VISIBLE */
@@ -36,7 +36,7 @@ export enum AndroidSystemUiFlags {
 * In Android 4.4+, however, you can now enter true full screen, fully interactive immersive mode. In this mode, your app will remain in true full screen until you choose otherwise; users can swipe down from the top of the screen to temporarily display the system UI.
 * @usage
 * ```typescript
- * import { AndroidFullScreen } from '@ionic-native/android-full-screen/ngx';
+ * import { AndroidFullScreen } from '@ionic-native/android-full-screen';
 *
 * constructor(private androidFullScreen: AndroidFullScreen) { }
 *
@@ -55,90 +55,70 @@ export enum AndroidSystemUiFlags {
  repo: 'https://github.com/mesmotronic/cordova-plugin-fullscreen',
  platforms: ['Android']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AndroidFullScreen extends IonicNativePlugin {
  /**
   * Is this plugin supported?
   * @return {Promise<void>}
   */
  @Cordova()
-  isSupported(): Promise<void> {
-    return;
-  }
+  isSupported(): Promise<void> { return; }

  /**
   * Is immersive mode supported?
   * @return {Promise<void>}
   */
  @Cordova()
-  isImmersiveModeSupported(): Promise<void> {
-    return;
-  }
+  isImmersiveModeSupported(): Promise<void> { return; }

  /**
   * The width of the screen in immersive mode.
   * @return {Promise<number>}
   */
  @Cordova()
-  immersiveWidth(): Promise<number> {
-    return;
-  }
+  immersiveWidth(): Promise<number> { return; }

  /**
   * The height of the screen in immersive mode.
   * @return {Promise<number>}
   */
  @Cordova()
-  immersiveHeight(): Promise<number> {
-    return;
-  }
+  immersiveHeight(): Promise<number> { return; }

  /**
   * Hide system UI until user interacts.
   * @return {Promise<void>}
   */
  @Cordova()
-  leanMode(): Promise<void> {
-    return;
-  }
+  leanMode(): Promise<void> { return; }

  /**
   * Show system UI.
   * @return {Promise<void>}
   */
  @Cordova()
-  showSystemUI(): Promise<void> {
-    return;
-  }
+  showSystemUI(): Promise<void> { return; }

  /**
   * Extend your app underneath the status bar (Android 4.4+ only).
   * @return {Promise<void>}
   */
  @Cordova()
-  showUnderStatusBar(): Promise<void> {
-    return;
-  }
+  showUnderStatusBar(): Promise<void> { return; }

  /**
   * Extend your app underneath the system UI (Android 4.4+ only).
   * @return {Promise<void>}
   */
  @Cordova()
-  showUnderSystemUI(): Promise<void> {
-    return;
-  }
+  showUnderSystemUI(): Promise<void> { return; }

  /**
   * Hide system UI and keep it hidden (Android 4.4+ only).
   * @return {Promise<void>}
   */
  @Cordova()
-  immersiveMode(): Promise<void> {
-    return;
-  }
+  immersiveMode(): Promise<void> { return; }

  /**
   * Manually set the the system UI to a custom mode. This mirrors the Android method of the same name. (Android 4.4+ only).
@@ -147,7 +127,5 @@ export class AndroidFullScreen extends IonicNativePlugin {
   * @return {Promise<void>}
   */
  @Cordova()
-  setSystemUiVisibility(visibility: AndroidSystemUiFlags): Promise<void> {
-    return;
-  }
+  setSystemUiVisibility(visibility: AndroidSystemUiFlags): Promise<void> { return; }
 }
--- a/src/@ionic-native/plugins/android-permissions/index.ts
+++ b/src/@ionic-native/plugins/android-permissions/index.ts
@@ -10,7 +10,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 *
 * @usage
 * ```
- * import { AndroidPermissions } from '@ionic-native/android-permissions/ngx';
+ * import { AndroidPermissions } from '@ionic-native/android-permissions';
 *
 *
 * constructor(private androidPermissions: AndroidPermissions) { }
@@ -35,9 +35,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
  repo: 'https://github.com/NeoLSN/cordova-plugin-android-permissions',
  platforms: ['Android']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AndroidPermissions extends IonicNativePlugin {
  PERMISSION: any = {
    ACCESS_CHECKIN_PROPERTIES: 'android.permission.ACCESS_CHECKIN_PROPERTIES',
@@ -225,7 +223,7 @@ export class AndroidPermissions extends IonicNativePlugin {

  /**
   * Request permissions
-   * @param {string[]} permissions An array with permissions
+   * @param {Array<string>} permissions An array with permissions
   * @return {Promise<any>} Returns a promise
   */
  @Cordova()
--- a/src/@ionic-native/plugins/app-availability/index.ts
+++ b/src/@ionic-native/plugins/app-availability/index.ts
@@ -10,7 +10,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 *
 * @usage
 * ```typescript
- * import { AppAvailability } from '@ionic-native/app-availability/ngx';
+ * import { AppAvailability } from '@ionic-native/app-availability';
 * import { Platform } from 'ionic-angular';
 *
 * constructor(private appAvailability: AppAvailability, private platform: Platform) { }
@@ -39,9 +39,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
  repo: 'https://github.com/ohh2ahh/AppAvailability',
  platforms: ['Android', 'iOS']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AppAvailability extends IonicNativePlugin {

  /**
@@ -50,8 +48,6 @@ export class AppAvailability extends IonicNativePlugin {
   * @returns {Promise<boolean>}
   */
  @Cordova()
-  check(app: string): Promise<boolean> {
-    return;
-  }
+  check(app: string): Promise<boolean> { return; }

 }
--- a/src/@ionic-native/plugins/app-center-analytics/index.ts
+++ b/src/@ionic-native/plugins/app-center-analytics/index.ts
@@ -17,7 +17,7 @@ export interface StringMap {
 *
 * @usage
 * ```typescript
- * import { AppCenterAnalytics } from '@ionic-native/app-center-analytics/ngx';
+ * import { AppCenterAnalytics } from '@ionic-native/app-center-analytics';
 *
 *
 * constructor(private appCenterAnalytics: AppCenterAnalytics) { }
@@ -42,9 +42,7 @@ export interface StringMap {
    'https://github.com/Microsoft/appcenter-sdk-cordova/tree/master/cordova-plugin-appcenter-analytics',
  platforms: ['Android', 'iOS']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AppCenterAnalytics extends IonicNativePlugin {
  /**
   * Tracks an custom event.
--- a/src/@ionic-native/plugins/app-center-crashes/index.ts
+++ b/src/@ionic-native/plugins/app-center-crashes/index.ts
@@ -40,7 +40,7 @@ export interface AppCenterCrashReportDevice {
 *
 * @usage
 * ```typescript
- * import { AppCenterCrashes } from '@ionic-native/app-center-crashes/ngx';
+ * import { AppCenterCrashes } from '@ionic-native/app-center-crashes';
 *
 *
 * constructor(private AppCenterCrashes: AppCenterCrashes) { }
@@ -66,9 +66,7 @@ export interface AppCenterCrashReportDevice {
    'https://github.com/Microsoft/appcenter-sdk-cordova/tree/master/cordova-plugin-appcenter-crashes',
  platforms: ['Android', 'iOS']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AppCenterCrashes extends IonicNativePlugin {
  /**
   * App Center Crashes provides you with an API to generate a test crash for easy testing of the SDK.
--- a/src/@ionic-native/plugins/app-center-push/index.ts
+++ b/src/@ionic-native/plugins/app-center-push/index.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';

 /**
 * @name App Center Push
@@ -10,7 +10,7 @@ import { Observable } from 'rxjs';
 *
 * @usage
 * ```typescript
- * import { AppCenterPush } from '@ionic-native/app-center-push/ngx';
+ * import { AppCenterPush } from '@ionic-native/app-center-push';
 *
 *
 * constructor(private appCenterPush: AppCenterPush) { }
@@ -33,9 +33,7 @@ import { Observable } from 'rxjs';
    'https://github.com/Microsoft/appcenter-sdk-cordova/tree/master/cordova-plugin-appcenter-push',
  platforms: ['Android', 'iOS']
 })
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class AppCenterPush extends IonicNativePlugin {
  /**
   * Subscribe to an event
--- a/src/@ionic-native/plugins/app-launcher/index.ts
+++ b/src/@ionic-native/plugins/app-launcher/index.ts
@@ -1,68 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-
-export interface AppLauncherOptions {
-  uri?: string;
-  packageName?: string;
-}
-
-/**
- * @name App Launcher
- * @description
- * Simple Cordova plugin to see if other apps are installed and launch them.
- *
- * @usage
- * ```typescript
- * import { AppLauncher, AppLauncherOptions } from '@ionic-native/app-launcher/ngx';
- * import { Platform } from '@ionic/angular';
- *
- * constructor(private appLauncher: AppLauncher, private platform: Platform) { }
- *
- * ...
- *
- * const options: AppLauncherOptions = {
- * }
- *
- * if(this.platform.is('ios')) {
- *   options.uri = 'fb://'
- * } else {
- *   options.packageName = 'com.facebook.katana'
- * }
- *
- * this.appLauncher.canLaunch(options)
- *   .then((canLaunch: boolean) => console.log('Facebook is available'))
- *   .catch((error: any) => console.error('Facebook is not available'));
- *
- * ```
- */
-@Plugin({
-  pluginName: 'AppLauncher',
-  plugin: 'cordova-plugin-app-launcher',
-  pluginRef: 'window.plugins.launcher',
-  repo: 'https://github.com/nchutchind/cordova-plugin-app-launcher',
-  platforms: ['Android', 'iOS']
-})
-@Injectable({
-  providedIn: 'root'
-})
-export class AppLauncher extends IonicNativePlugin {
-  /**
-   * Check if any apps are installed that can launch via a specified URI or Package Name.
-   * @param options App Launcher options
-   * @return {Promise<any>} Returns a promise that resolves if the app is installed
-   */
-  @Cordova()
-  canLaunch(options: AppLauncherOptions): Promise<boolean> {
-    return;
-  }
-
-  /**
-   * Launches the app via a specified URI or Package Name
-   * @param options App Launcher options
-   * @return {Promise<any>} Returns a promise that resolves the launched app
-   */
-  @Cordova()
-  launch(options: AppLauncherOptions): Promise<any> {
-    return;
-  }
-}
--- a/Show More
+++ b/Show More