chore(): update changelog

feat(ionic-webview): plugin for cordova-plugin-ionic-webview 2.0

.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

.gitignore

@@ -5,4 +5,6 @@ node_modules/
 aot/
 scripts/ionic-native-bower
 dist/
-
+src/@ionic-native/plugins/**/ngx
+*.d.ts
+injectable-classes.json

CHANGELOG.md

@@ -1,245 +1,28 @@
-<a name="4.15.0"></a>
-# [4.15.0](https://github.com/ionic-team/ionic-native/compare/v4.14.0...v4.15.0) (2018-09-25)
+<a name="5.0.0-beta.12"></a>
+# [5.0.0-beta.12](https://github.com/ionic-team/ionic-native/compare/v4.7.0...v5.0.0-beta.12) (2018-06-23)
 
 
 ### Bug Fixes
 
-* **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)
-
-
-### Features
-
-* **plugins:** add AppleWallet ([#2740](https://github.com/ionic-team/ionic-native/issues/2740)) ([307477d](https://github.com/ionic-team/ionic-native/commit/307477d))
-* **plugins:** add web-server plugin ([#2726](https://github.com/ionic-team/ionic-native/issues/2726)) ([8116ddd](https://github.com/ionic-team/ionic-native/commit/8116ddd))
-* **siri-shortcuts:** Add clear option for the activated shortcut ([#2734](https://github.com/ionic-team/ionic-native/issues/2734)) ([3eff280](https://github.com/ionic-team/ionic-native/commit/3eff280))
-* **taptic-engine:** add missing functions and types ([a6bcc9a](https://github.com/ionic-team/ionic-native/commit/a6bcc9a))
-
-
-
-<a name="4.14.0"></a>
-# [4.14.0](https://github.com/ionic-team/ionic-native/compare/v4.13.0...v4.14.0) (2018-09-18)
-
-
-### Bug Fixes
-
-* **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)
-* **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)
-
-
-### Features
-
-* **chooster:** add plugin ([04db233](https://github.com/ionic-team/ionic-native/commit/04db233)), closes [#2612](https://github.com/ionic-team/ionic-native/issues/2612)
-* **local-notifications:** add missing functions ([10d222d](https://github.com/ionic-team/ionic-native/commit/10d222d))
-* **onesignal:** add missing functions ([51006a7](https://github.com/ionic-team/ionic-native/commit/51006a7)), closes [#2504](https://github.com/ionic-team/ionic-native/issues/2504)
-
-
-
-<a name="4.13.0"></a>
-# [4.13.0](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.17...v4.13.0) (2018-09-15)
-
-
-### Bug Fixes
-
-* **bluetooth-le:** Various methods fixes  ([#2707](https://github.com/ionic-team/ionic-native/issues/2707)) ([7047920](https://github.com/ionic-team/ionic-native/commit/7047920))
-* **in-app-review:** Transfer Plugin to the correct folder ([#2688](https://github.com/ionic-team/ionic-native/issues/2688)) ([22fd49b](https://github.com/ionic-team/ionic-native/commit/22fd49b))
-* **ms-adal:** Update createAuthenticationContext ([#2705](https://github.com/ionic-team/ionic-native/issues/2705)) ([890129b](https://github.com/ionic-team/ionic-native/commit/890129b))
-
-
-### Features
-
-* **appsflyer:** Added Appsflyer Cordova SDK as ionic native plugin ([#2690](https://github.com/ionic-team/ionic-native/issues/2690)) ([3b3f942](https://github.com/ionic-team/ionic-native/commit/3b3f942))
-* **branch-io:** Add branch.io attribution and invitation plugin ([#2691](https://github.com/ionic-team/ionic-native/issues/2691)) ([90d75af](https://github.com/ionic-team/ionic-native/commit/90d75af))
-* **calldirectory:** add log function ([#2708](https://github.com/ionic-team/ionic-native/issues/2708)) ([9601a64](https://github.com/ionic-team/ionic-native/commit/9601a64))
-* **janalytics:** add  plugin ([#2711](https://github.com/ionic-team/ionic-native/issues/2711)) ([0b97176](https://github.com/ionic-team/ionic-native/commit/0b97176))
-* **local-notifications:** Added local additional local notification action fields ([#2713](https://github.com/ionic-team/ionic-native/issues/2713)) ([267149b](https://github.com/ionic-team/ionic-native/commit/267149b))
-* **mixpanel:** Update/add functions ([#2697](https://github.com/ionic-team/ionic-native/issues/2697)) ([ac467c5](https://github.com/ionic-team/ionic-native/commit/ac467c5))
-* **wechat:** add plugin ([#2716](https://github.com/ionic-team/ionic-native/issues/2716)) ([10ac9ff](https://github.com/ionic-team/ionic-native/commit/10ac9ff))
-
-
-
-<a name="5.0.0-beta.17"></a>
-# [5.0.0-beta.17](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.16...v5.0.0-beta.17) (2018-08-31)
-
-
-### Bug Fixes
-
-* **in-app-browser:** fix mandatory options ([#2684](https://github.com/ionic-team/ionic-native/issues/2684)) ([d82e675](https://github.com/ionic-team/ionic-native/commit/d82e675))
-
-
-
-<a name="4.12.1"></a>
-## [4.12.1](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.15...v4.12.1) (2018-08-31)
-
-
-### Bug Fixes
-
-* **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))
-
-
-### Features
-
-* **aes256:** Added new utility methods to generate secure key and secure IV ([#2675](https://github.com/ionic-team/ionic-native/issues/2675)) ([a731466](https://github.com/ionic-team/ionic-native/commit/a731466))
-* **in-app-browser:** Add missing InAppBrowserOptions-properties ([#2669](https://github.com/ionic-team/ionic-native/issues/2669)) ([d90724e](https://github.com/ionic-team/ionic-native/commit/d90724e))
-* **push:** Added voip property to IOSPushOptions ([#2681](https://github.com/ionic-team/ionic-native/issues/2681)) ([03e4f0e](https://github.com/ionic-team/ionic-native/commit/03e4f0e))
-
-
-
-<a name="5.0.0-beta.15"></a>
-# [5.0.0-beta.15](https://github.com/ionic-team/ionic-native/compare/v4.12.0...v5.0.0-beta.15) (2018-08-25)
-
-
-### 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))
-* **http:** add setSSLCertMode function ([8db1dbe](https://github.com/ionic-team/ionic-native/commit/8db1dbe))
-
-
-
-<a name="4.12.0"></a>
-# [4.12.0](https://github.com/ionic-team/ionic-native/compare/v4.11.0...v4.12.0) (2018-08-16)
-
-
-### Bug Fixes
-
-* **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)
-
-
-### Features
-
-* **fabric:** add fabric plugin ([#2618](https://github.com/ionic-team/ionic-native/issues/2618)) ([9b4fd02](https://github.com/ionic-team/ionic-native/commit/9b4fd02))
-* **local-notifications:** add new foreground property ([#2633](https://github.com/ionic-team/ionic-native/issues/2633)) ([229b62c](https://github.com/ionic-team/ionic-native/commit/229b62c))
-* **webengage:** add optional config with initialization ([#2637](https://github.com/ionic-team/ionic-native/issues/2637)) ([ca9a702](https://github.com/ionic-team/ionic-native/commit/ca9a702))
-
-
-
-<a name="4.11.0"></a>
-# [4.11.0](https://github.com/ionic-team/ionic-native/compare/v4.10.1...v4.11.0) (2018-07-29)
-
-
-### Bug Fixes
-
-* **http:** add correct return types for downloadFile and uploadFile ([4092831](https://github.com/ionic-team/ionic-native/commit/4092831)), closes [#2615](https://github.com/ionic-team/ionic-native/issues/2615)
-
-
-### Features
-
-* **clevertap:** add CleverTap plugin ([#2609](https://github.com/ionic-team/ionic-native/issues/2609)) ([27d380e](https://github.com/ionic-team/ionic-native/commit/27d380e))
-* **facebook:** add getDeferredApplink function ([3b32e19](https://github.com/ionic-team/ionic-native/commit/3b32e19)), closes [#2510](https://github.com/ionic-team/ionic-native/issues/2510)
-* **webengage:** add webengage plugin ([#2604](https://github.com/ionic-team/ionic-native/issues/2604)) ([bd5bd7e](https://github.com/ionic-team/ionic-native/commit/bd5bd7e))
-
-
-
-<a name="4.10.1"></a>
-## [4.10.1](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.14...v4.10.1) (2018-07-25)
-
-
-### Bug Fixes
-
-* **nfs:** Optional arguments for records like textRecord ([#2605](https://github.com/ionic-team/ionic-native/issues/2605)) ([b635ba9](https://github.com/ionic-team/ionic-native/commit/b635ba9))
-* **user-agent:** Plugin not installed ([#2607](https://github.com/ionic-team/ionic-native/issues/2607)) ([79cb478](https://github.com/ionic-team/ionic-native/commit/79cb478))
-
-
-
-<a name="5.0.0-beta.14"></a>
-# [5.0.0-beta.14](https://github.com/ionic-team/ionic-native/compare/v4.10.0...v5.0.0-beta.14) (2018-07-18)
-
-
-### Features
-
-* **abbyy-rtr:** add ABBYY Real-Time Recognition plugin ([#2580](https://github.com/ionic-team/ionic-native/issues/2580)) ([ecc698e](https://github.com/ionic-team/ionic-native/commit/ecc698e))
-* **alipay:** replace plugin ([#2591](https://github.com/ionic-team/ionic-native/issues/2591)) ([e640983](https://github.com/ionic-team/ionic-native/commit/e640983))
-* **ccm:** replace plugin source ([#2601](https://github.com/ionic-team/ionic-native/issues/2601)) ([b581a5b](https://github.com/ionic-team/ionic-native/commit/b581a5b))
-* **classkit:** add ClassKit plugin ([#2590](https://github.com/ionic-team/ionic-native/issues/2590)) ([a6c8045](https://github.com/ionic-team/ionic-native/commit/a6c8045))
-
-
-### BREAKING CHANGES
-
-* **alipay:** Replaced plugin with maintained Cordova plugin
-
-
-
-<a name="4.9.2"></a>
-## [4.9.2](https://github.com/ionic-team/ionic-native/compare/v4.9.1...v4.9.2) (2018-07-13)
-
-
-### Bug Fixes
-
-* **ble:** change signature for autoConnect ([#2594](https://github.com/ionic-team/ionic-native/issues/2594)) ([d95a359](https://github.com/ionic-team/ionic-native/commit/d95a359)), closes [#2573](https://github.com/ionic-team/ionic-native/issues/2573) [#2573](https://github.com/ionic-team/ionic-native/issues/2573)
-* **sqlite:** mark optional arguments for executeSql ([#2592](https://github.com/ionic-team/ionic-native/issues/2592)) ([565c766](https://github.com/ionic-team/ionic-native/commit/565c766))
-
-
-
-<a name="4.9.1"></a>
-## [4.9.1](https://github.com/ionic-team/ionic-native/compare/v5.0.0-beta.13...v4.9.1) (2018-07-09)
-
-
-### Bug Fixes
-
-* **barcode-scanner:** wrong barcode format identifier PDF417 -> PDF_417 ([#2574](https://github.com/ionic-team/ionic-native/issues/2574)) ([61714ff](https://github.com/ionic-team/ionic-native/commit/61714ff))
-* **health-kit:** add missing checkAuthStatus param ([#2544](https://github.com/ionic-team/ionic-native/issues/2544)) ([956e644](https://github.com/ionic-team/ionic-native/commit/956e644))
-
-
-### Features
-
-* **ble:** add missing functions ([#2572](https://github.com/ionic-team/ionic-native/issues/2572)) ([9f9a346](https://github.com/ionic-team/ionic-native/commit/9f9a346))
-* **network-interface:** match latest plugin release ([#2587](https://github.com/ionic-team/ionic-native/issues/2587)) ([4f41589](https://github.com/ionic-team/ionic-native/commit/4f41589))
-* **streaming-media:** add new parameters & docs ([#2576](https://github.com/ionic-team/ionic-native/issues/2576)) ([f62a123](https://github.com/ionic-team/ionic-native/commit/f62a123))
-
-
-
-<a name="5.0.0-beta.13"></a>
-# [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
-
-* **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))
+* build errors ([f70eaea](https://github.com/ionic-team/ionic-native/commit/f70eaea))
+* **calendar:** Fixes createCalendar parameter typing ([84e0aa1](https://github.com/ionic-team/ionic-native/commit/84e0aa1))
 * **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))
-* **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))
-* **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))
+* fix lint ([b36a1f9](https://github.com/ionic-team/ionic-native/commit/b36a1f9))
+* **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))
+* **str-prnt:** rxjs 6 import ([48714d7](https://github.com/ionic-team/ionic-native/commit/48714d7))
+* **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))
 * **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))
+* 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))
 
 
 ### 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))
 * **file-picker:** add missing options ([1d9c449](https://github.com/ionic-team/ionic-native/commit/1d9c449))
 * **firebase:** add new functions ([36450e1](https://github.com/ionic-team/ionic-native/commit/36450e1))
-* **firebase:** add verifyPhoneNumber support for iOS ([567f525](https://github.com/ionic-team/ionic-native/commit/567f525))
-* **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))
-* **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))
-* **star-prnt:** Added support for connected to devices with barcode readers ([#2509](https://github.com/ionic-team/ionic-native/issues/2509)) ([58615f1](https://github.com/ionic-team/ionic-native/commit/58615f1))
-* **tealium:** add tealium ionic wrappers ([#2414](https://github.com/ionic-team/ionic-native/issues/2414)) ([5f41ef1](https://github.com/ionic-team/ionic-native/commit/5f41ef1))
+* **ionic-webview:** plugin for cordova-plugin-ionic-webview 2.0 ([8beb177](https://github.com/ionic-team/ionic-native/commit/8beb177))
 * **uptime:** add deep sleep parameter ([#2456](https://github.com/ionic-team/ionic-native/issues/2456)) ([91d22c5](https://github.com/ionic-team/ionic-native/commit/91d22c5))
 
 
@@ -251,9 +34,11 @@
 ### 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))
@@ -262,6 +47,7 @@
 * **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))
@@ -316,6 +102,11 @@
 
 
 
+<a name="5.0.0-beta.4"></a>
+# [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)
+
+
+
 <a name="5.0.0-beta.3"></a>
 # [5.0.0-beta.3](https://github.com/ionic-team/ionic-native/compare/v4.5.1...v5.0.0-beta.3) (2017-12-29)
 

LICENSE

@@ -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.

README.md

@@ -1,5 +1,6 @@
 [![Circle CI](https://circleci.com/gh/ionic-team/ionic-native.svg?style=shield)](https://circleci.com/gh/ionic-team/ionic-native) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/) ![](https://img.shields.io/npm/v/@ionic-native/core.svg)
 
+
 # Ionic Native
 
 Ionic Native is a curated set of wrappers for Cordova plugins that make adding any native functionality you need to your [Ionic](https://ionicframework.com/) mobile app easy.
@@ -9,24 +10,27 @@ Ionic Native wraps plugin callbacks in a Promise or Observable, providing a comm
 ## Installation
 
 Run following command to install Ionic Native in your project.
-
 ```bash
-npm install @ionic-native/core
+npm install @ionic-native/core@beta --save
 ```
 
 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.
 
+**NOTE: to use Ionic Native v5, you must use the `@beta` tag when installing any NPM package.**
+
 ## Documentation
 
 For the full Ionic Native documentation, please visit [https://ionicframework.com/docs/native/](https://ionicframework.com/docs/native/).
 
 ### Basic Usage
 
-To use a plugin, import and add the plugin provider to your `@NgModule`, and then inject it where you wish to use it.
+#### 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:
 
 ```typescript
 // app.module.ts
-import { Camera } from '@ionic-native/camera';
+import { Camera } from '@ionic-native/camera/ngx';
 
 ...
 
@@ -44,7 +48,7 @@ export class AppModule { }
 ```
 
 ```typescript
-import { Geolocation } from '@ionic-native/geolocation';
+import { Geolocation } from '@ionic-native/geolocation/ngx';
 import { Platform } from 'ionic-angular';
 
 @Component({ ... })
@@ -52,10 +56,10 @@ export class MyComponent {
 
   constructor(private geolocation: Geolocation, private platform: Platform) {
 
-    this.platform.ready().then(() => {
+    platform.ready().then(() => {
 
       // get position
-      this.geolocation.getCurrentPosition().then(pos => {
+      geolocation.getCurrentPosition().then(pos => {
         console.log(`lat: ${pos.coords.latitude}, lon: ${pos.coords.longitude}`)
       });
 
@@ -63,27 +67,83 @@ export class MyComponent {
       // watch position
       const watch = geolocation.watchPosition().subscribe(pos => {
         console.log(`lat: ${pos.coords.latitude}, lon: ${pos.coords.longitude}`)
+        this.position = pos;
       });
 
       // to stop watching
       watch.unsubscribe();
     });
-
+    
   }
-
+  
 }
 ```
 
-### Mocking and Browser Development
+#### 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';
 
-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`.
+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`.
 
 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';
+import { Camera } from '@ionic-native/camera/ngx';
 ```
 
 Then create a new class that extends the `Camera` class with a mock implementation:
@@ -92,8 +152,8 @@ Then create a new class that extends the `Camera` class with a mock implementati
 class CameraMock extends Camera {
   getPicture(options) {
     return new Promise((resolve, reject) => {
-      resolve('BASE_64_ENCODED_DATA_GOES_HERE');
-    });
+      resolve("BASE_64_ENCODED_DATA_GOES_HERE");
+    })
   }
 }
 ```
@@ -101,33 +161,44 @@ class CameraMock extends Camera {
 Finally, override the previous `Camera` class in your `providers` for this module:
 
 ```typescript
-providers: [{ provide: Camera, useClass: CameraMock }];
+providers: [
+  { provide: Camera, useClass: CameraMock }
+]
 ```
 
 Here's the full example:
 
 ```typescript
-import { ErrorHandler, NgModule } from '@angular/core';
+import { NgModule, ErrorHandler } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { Camera } from '@ionic-native/camera';
-import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular';
-
-import { HomePage } from '../pages/home/home';
+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';
 
 class CameraMock extends Camera {
   getPicture(options) {
     return new Promise((resolve, reject) => {
-      resolve('BASE_64_ENCODED_DATA_GOES_HERE');
-    });
+      resolve("BASE_64_ENCODED_DATA_GOES_HERE");
+    })
   }
 }
 
 @NgModule({
-  declarations: [MyApp, HomePage],
-  imports: [BrowserModule, IonicModule.forRoot(MyApp)],
+  declarations: [
+    MyApp,
+    HomePage
+  ],
+  imports: [
+    BrowserModule,
+    IonicModule.forRoot(MyApp)
+  ],
   bootstrap: [IonicApp],
-  entryComponents: [MyApp, HomePage],
+  entryComponents: [
+    MyApp,
+    HomePage
+  ],
   providers: [
     { provide: ErrorHandler, useClass: IonicErrorHandler },
     { provide: Camera, useClass: CameraMock }
@@ -136,26 +207,22 @@ class CameraMock extends Camera {
 export class AppModule {}
 ```
 
+
 ### Runtime Diagnostics
 
 Spent way too long diagnosing an issue only to realize a plugin wasn't firing or installed? Ionic Native lets you know what the issue is and how you can resolve it.
 
 ![img](https://ionic-io-assets.s3.amazonaws.com/ionic-native-console.png)
 
-## Plugin Missing?
 
+## Plugin Missing?
 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
 
 Ibby Hadeed - [@ihadeed](https://github.com/ihadeed)
 
-Daniel Sogl - [@sogldaniel](https://twitter.com/sogldaniel)
-
 Tim Lancina - [@timlancina](https://twitter.com/timlancina)
 
 Mike Hartington - [@mhartington](https://twitter.com/mhartington)

circle.yml

@@ -33,7 +33,7 @@ jobs:
       - run: bash ./scripts/git/config.sh
       - run:
           name: Build Ionic Native
-          command: npm run build:core && ./node_modules/.bin/tsc
+          command: npm run build
       - run:
           name: Generate README files to ensure docs are valid
           command: npm run readmes

gulpfile.js

@@ -1,53 +1,51 @@
-'use strict';
+"use strict";
 
 const gulp = require('gulp'),
   minimist = require('minimist'),
-  rename = require('gulp-rename'),
+  rename = require("gulp-rename"),
   tslint = require('gulp-tslint'),
+  decamelize = require('decamelize'),
   replace = require('gulp-replace'),
   _ = require('lodash');
 
 const flagConfig = {
     string: ['port', 'version', 'ngVersion', 'animations'],
     boolean: ['dry-run'],
-    alias: { p: 'port', v: 'version', a: 'ngVersion' },
+    alias: {'p': 'port', 'v': 'version', 'a': 'ngVersion'},
     default: { port: 8000 }
   },
+
   flags = minimist(process.argv.slice(2), flagConfig);
 
 /* Docs tasks */
 require('./scripts/docs/gulp-tasks')(gulp, flags);
 
 gulp.task('lint', () => {
-  return gulp
-    .src('src/**/*.ts')
-    .pipe(
-      tslint({
-        formatter: 'verbose',
-        configuration: 'tslint.json'
-      })
-    )
+  return gulp.src('src/**/*.ts')
+    .pipe(tslint({
+      formatter: "verbose",
+      configuration: 'tslint.json'
+    }))
     .pipe(tslint.report());
 });
 
 gulp.task('plugin:create', () => {
-  if (flags.n && flags.n !== '') {
-    const src = flags.m
-        ? './scripts/templates/wrap-min.tmpl'
-        : './scripts/templates/wrap.tmpl',
+  if (flags.n && flags.n !== ''){
+
+    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);
 
-    return gulp
-      .src(src)
+    return gulp.src(src)
       .pipe(replace('{{ PluginName }}', pluginName))
       .pipe(replace('{{ Plugin_Name }}', spaced))
       .pipe(replace('{{ pluginName }}', _.lowerFirst(pluginName)))
       .pipe(replace('{{ plugin-name }}', kebabCase))
       .pipe(rename('index.ts'))
       .pipe(gulp.dest('./src/@ionic-native/plugins/' + kebabCase));
+
   } else {
-    console.log('Usage is: gulp plugin:create -n PluginName');
+    console.log("Usage is: gulp plugin:create -n PluginName");
   }
 });

karma.conf.js

@@ -1,40 +0,0 @@
-'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);
-};

package.json

@@ -1,62 +1,87 @@
 {
   "name": "ionic-native",
-  "version": "4.15.0",
+  "version": "5.0.0-beta.12",
   "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",
-  "devDependencies": {
-    "@angular/compiler": "^5.2.11",
-    "@angular/compiler-cli": "^5.2.11",
-    "@angular/core": "^5.2.11",
-    "@types/cordova": "0.0.34",
-    "@types/jasmine": "^2.8.8",
-    "@types/node": "8.10.20",
-    "canonical-path": "0.0.2",
-    "child-process-promise": "2.2.1",
-    "conventional-changelog-cli": "^2.0.5",
-    "cz-conventional-changelog": "^2.1.0",
-    "dgeni": "^0.4.10",
-    "dgeni-packages": "0.16.10",
-    "fs-extra": "^7.0.0",
-    "gulp": "3.9.1",
-    "gulp-rename": "^1.4.0",
-    "gulp-replace": "^1.0.0",
-    "gulp-tslint": "^8.1.3",
-    "jasmine-core": "^3.2.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",
-    "node-html-encoder": "0.0.2",
-    "q": "^1.5.1",
-    "queue": "^4.5.0",
-    "rimraf": "^2.6.2",
-    "rxjs": "^5.5.12",
-    "semver": "^5.5.1",
-    "tslint": "^5.11.0",
-    "tslint-ionic-rules": "0.0.19",
-    "typescript": "~2.4.2",
-    "zone.js": "^0.8.26"
-  },
   "scripts": {
-    "start": "npm run test:watch",
+    "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",
-    "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",
+    "readmes": "gulp readmes",
     "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"
+    "shipit": "npm run build && npm run readmes && npm run npmpub"
+  },
+  "devDependencies": {
+    "@angular/common": "^6.0.6",
+    "@angular/compiler": "^6.0.6",
+    "@angular/compiler-cli": "^6.0.6",
+    "@angular/core": "^6.0.6",
+    "@types/cordova": "0.0.34",
+    "@types/fs-extra": "^5.0.3",
+    "@types/jest": "^23.1.1",
+    "@types/lodash": "^4.14.110",
+    "@types/node": "^9.6.22",
+    "@types/rimraf": "^2.0.2",
+    "@types/webpack": "^4.4.2",
+    "async-promise-queue": "^1.0.4",
+    "babel-core": "^6.26.3",
+    "babel-preset-env": "^1.7.0",
+    "babelify": "^8.0.0",
+    "browserify": "^16.2.2",
+    "canonical-path": "0.0.2",
+    "conventional-changelog-cli": "^2.0.1",
+    "cpr": "^3.0.1",
+    "cz-conventional-changelog": "^2.1.0",
+    "decamelize": "^2.0.0",
+    "dgeni": "^0.4.9",
+    "dgeni-packages": "0.16.10",
+    "fs-extra": "^6.0.1",
+    "fs-extra-promise": "^1.0.1",
+    "gulp": "3.9.1",
+    "gulp-rename": "^1.3.0",
+    "gulp-replace": "^1.0.0",
+    "gulp-tslint": "^8.1.3",
+    "jest": "^23.1.0",
+    "lodash": "^4.17.10",
+    "minimist": "1.2.0",
+    "nodemon": "^1.17.5",
+    "rimraf": "^2.6.2",
+    "rxjs": "^6.2.1",
+    "rxjs-tslint-rules": "^4.4.2",
+    "string-replace-webpack-plugin": "^0.1.3",
+    "ts-jest": "^22.4.6",
+    "ts-node": "^6.1.2",
+    "tslint": "^5.10.0",
+    "tslint-ionic-rules": "0.0.14",
+    "typescript": "~2.7.2",
+    "uglifyjs-webpack-plugin": "^1.2.6",
+    "unminified-webpack-plugin": "^2.0.0",
+    "webpack": "^4.12.0",
+    "winston": "^3.0.0",
+    "zone.js": "latest"
+  },
+  "jest": {
+    "transform": {
+      "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+    },
+    "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(js?|ts?)$",
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js",
+      "jsx",
+      "json"
+    ]
   },
   "repository": {
     "type": "git",

scripts/build/build.js

@@ -1,154 +0,0 @@
-'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!');
-  }
-});

scripts/build/core-package.json

@@ -1,14 +0,0 @@
-{
-  "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"
-  }
-}

scripts/build/helpers.ts

@@ -0,0 +1,125 @@
+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:
+        val = prop.initializer.text;
+        // args[prop.name.escapedText] = val;
+        break;
+
+      case ts.SyntaxKind.ArrayLiteralExpression:
+        val = prop.initializer.elements.map(e => 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)];
+}

scripts/build/ngx.ts

@@ -0,0 +1,105 @@
+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('src', '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'))
+  );
+}

scripts/build/plugin-package.json

@@ -1,14 +0,0 @@
-{
-  "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"
-  }
-}

scripts/build/publish.js

@@ -1,51 +0,0 @@
-'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!');
-  }
-});

scripts/build/remove-tslib-helpers.js

@@ -0,0 +1,2 @@
+// 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, '');

scripts/build/transformers/extract-injectables.ts

@@ -0,0 +1,59 @@
+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);
+}

scripts/build/transformers/imports.ts

@@ -0,0 +1,69 @@
+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'];
+
+  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));
+
+    importStatement.importClause.namedBindings.elements = [
+      ts.createIdentifier('IonicNativePlugin'),
+      ...methods.map(m => ts.createIdentifier(m)),
+      ...importStatement.importClause.namedBindings.elements.filter(el => keep.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);
+    };
+  };
+}

scripts/build/transformers/members.ts

@@ -0,0 +1,37 @@
+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;
+}
+
+
+
+

scripts/build/transformers/methods.ts

@@ -0,0 +1,49 @@
+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')
+      ]);
+  }
+
+}

scripts/build/transformers/plugin-class.ts

@@ -0,0 +1,80 @@
+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;
+    };
+  };
+}

scripts/build/transformers/properties.ts

@@ -0,0 +1,67 @@
+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];
+}

scripts/build/transpile.ts

@@ -0,0 +1,51 @@
+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;
+}
+

scripts/build/tsconfig-plugin.json

@@ -1,23 +0,0 @@
-{
-  "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": []
-}

scripts/ci-tests.js

@@ -1,71 +0,0 @@
-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);
-  });

scripts/docs/config.json

@@ -2,5 +2,5 @@
   "sitePath": "../ionic-site",
   "v2DocsDir": "docs/native",
   "docsDest": "../ionic-site/content/docs/native",
-  "pluginDir": "dist/@ionic-native"
+  "pluginDir": "dist/@ionic-native/plugins"
 }

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'
       ];

scripts/docs/dgeni/dgeni-readmes-config.js

@@ -40,7 +40,6 @@ module.exports = currentVersion => {
       computePathsProcessor.pathTemplates = [{
         docTypes: ['class'],
         getOutputPath: doc => doc.originalModule.replace(config.pluginDir + '/', '')
-          .replace('/plugins', '')
           .replace(/\/index$/, '/README.md')
       }];
 
@@ -50,15 +49,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/';
+      writeFilesProcessor.outputFolder  = './dist/@ionic-native/';
     })
 
     // Configure rendering

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/', '');
+        doc.outputPath = doc.outputPath.replace('src/@ionic-native/', '');
       });
 
       return docs;

scripts/docs/gulp-tasks.js

@@ -1,8 +1,8 @@
 "use strict";
-const config = require('../config.json'),
+const config = require('./config.json'),
   projectPackage = require('../../package.json'),
   path = require('path'),
-  fs = require('fs-extra'),
+  fs = require('fs-extra-promise').useFs(require('fs-extra')),
   Dgeni = require('dgeni');
 
 module.exports = gulp => {
@@ -10,7 +10,7 @@ module.exports = gulp => {
 
     try {
 
-      const ionicPackage = require('./dgeni-config')(projectPackage.version),
+      const ionicPackage = require('./dgeni/dgeni-config')(projectPackage.version),
         dgeni = new Dgeni([ionicPackage]);
 
       return dgeni.generate().then(docs => console.log(docs.length + ' docs generated'));
@@ -27,7 +27,7 @@ module.exports = gulp => {
 
     try {
 
-      const ionicPackage = require('./dgeni-readmes-config')(projectPackage.version),
+      const ionicPackage = require('./dgeni/dgeni-readmes-config')(projectPackage.version),
         dgeni = new Dgeni([ionicPackage]);
       return dgeni.generate().then(docs => console.log(docs.length + ' README files generated'));
 

scripts/docs/update_readmes.sh

@@ -31,7 +31,7 @@ function run {
 
     # git push origin master || :
 
-    echo "-- Updated docs for $VERSION_NAME succesfully!"
+    echo "-- Updated docs for $VERSION_NAME successfully!"
   fi
 }
 

scripts/docs/utils.inc.sh

@@ -1,244 +1,244 @@
-# bash utils from angularjs
-
-# This file provides:
-# - a default control flow
-#   * initializes the environment
-#   * call a function in your script based on the arguments
-# - named argument parsing and automatic generation of the "usage" for your script
-# - utility functions
-#
-# Usage:
-# - define the variable ARGS_DEF (see below) with the arguments for your script
-# - include this file using `source utils.inc` at the end of your script.
-#
-# Default control flow:
-# 0. Set the current directory to the directory of the script. By this
-#    the script can be called from anywhere.
-# 1. Parse the named arguments
-# 2. [Redacted]
-# 3. If the parameter "verbose" is set, the `-x` flag will be set in bash.
-# 4. The function "init" will be called if it exists
-# 5. If the parameter "action" is set, it will call the function with the name of that parameter.
-#    Otherwise the function "run" will be called.
-#
-# Named Argument Parsing:
-# - The variable ARGS_DEF defines the valid command arguments
-#   * Required args syntax: --paramName=paramRegex
-#   * Optional args syntax: [--paramName=paramRegex]
-#   * e.g. ARG_DEFS=("--required_param=(.+)" "[--optional_param=(.+)]")
-# - Checks that:
-#   * all arguments match to an entry in ARGS_DEF
-#   * all required arguments are present
-#   * all arguments match their regex
-# - Afterwards, every paramter value will be stored in a variable
-#   with the name of the parameter in upper case (with dash converted to underscore).
-#
-# 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:
-# - readJsonProp
-# - replaceJsonProp
-# - resolveDir
-# - getVar
-# - serVar
-# - isFunction
-
-# always stop on errors
-set -e
-
-function usage {
-  echo "Usage: ${0} ${ARG_DEFS[@]}"
-  exit 1
-}
-
-
-function parseArgs {
-  local REQUIRED_ARG_NAMES=()
-
-  # -- helper functions
-  function varName {
-    # everything to upper case and dash to underscore
-    echo ${1//-/_} | tr '[:lower:]' '[:upper:]'
-  }
-
-  function readArgDefs {
-    local ARG_DEF
-    local AD_OPTIONAL
-    local AD_NAME
-    local AD_RE
-
-    # -- helper functions
-    function parseArgDef {
-      local ARG_DEF_REGEX="(\[?)--([^=]+)=(.*)"
-      if [[ ! $1 =~ $ARG_DEF_REGEX ]]; then
-        echo "Internal error: arg def has wrong format: $ARG_DEF"
-        exit 1
-      fi
-      AD_OPTIONAL="${BASH_REMATCH[1]}"
-      AD_NAME="${BASH_REMATCH[2]}"
-      AD_RE="${BASH_REMATCH[3]}"
-      if [[ $AD_OPTIONAL ]]; then
-        # Remove last bracket for optional args.
-        # Can't put this into the ARG_DEF_REGEX somehow...
-        AD_RE=${AD_RE%?}
-      fi
-    }
-
-    # -- run
-    for ARG_DEF in "${ARG_DEFS[@]}"
-    do
-      parseArgDef $ARG_DEF
-
-      local AD_NAME_UPPER=$(varName $AD_NAME)
-      setVar "${AD_NAME_UPPER}_OPTIONAL" "$AD_OPTIONAL"
-      setVar "${AD_NAME_UPPER}_RE" "$AD_RE"
-      if [[ ! $AD_OPTIONAL ]]; then
-        REQUIRED_ARG_NAMES+=($AD_NAME)
-      fi
-    done
-  }
-
-  function readAndValidateArgs {
-    local ARG_NAME
-    local ARG_VALUE
-    local ARG_NAME_UPPER
-
-    # -- helper functions
-    function parseArg {
-      local ARG_REGEX="--([^=]+)=?(.*)"
-
-      if [[ ! $1 =~ $ARG_REGEX ]]; then
-        echo "Can't parse argument $i"
-        usage
-      fi
-
-      ARG_NAME="${BASH_REMATCH[1]}"
-      ARG_VALUE="${BASH_REMATCH[2]}"
-      ARG_NAME_UPPER=$(varName $ARG_NAME)
-    }
-
-    function validateArg {
-      local AD_RE=$(getVar ${ARG_NAME_UPPER}_RE)
-
-      if [[ ! $AD_RE ]]; then
-        echo "Unknown option: $ARG_NAME"
-        usage
-      fi
-
-      if [[ ! $ARG_VALUE =~ ^${AD_RE}$ ]]; then
-        echo "Wrong format: $ARG_NAME"
-        usage;
-      fi
-
-      # validate that the "action" option points to a valid function
-      if [[ $ARG_NAME == "action" ]] && ! isFunction $ARG_VALUE; then
-        echo "No action $ARG_VALUE defined in this script"
-        usage;
-      fi
-    }
-
-    # -- run
-    for i in "$@"
-    do
-      parseArg $i
-      validateArg
-      setVar "${ARG_NAME_UPPER}" "$ARG_VALUE"
-    done
-  }
-
-  function checkMissingArgs {
-    local ARG_NAME
-    for ARG_NAME in "${REQUIRED_ARG_NAMES[@]}"
-    do
-      ARG_VALUE=$(getVar $(varName $ARG_NAME))
-
-      if [[ ! $ARG_VALUE ]]; then
-        echo "Missing: $ARG_NAME"
-        usage;
-      fi
-    done
-  }
-
-  # -- run
-  readArgDefs
-  readAndValidateArgs "$@"
-  checkMissingArgs
-
-}
-
-# getVar(varName)
-function getVar {
-  echo ${!1}
-}
-
-# setVar(varName, varValue)
-function setVar {
-  eval "$1=\"$2\""
-}
-
-# isFunction(name)
-# - to be used in an if, so return 0 if successful and 1 if not!
-function isFunction {
-  if [[ $(type -t $1) == "function" ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-# readJsonProp(jsonFile, property)
-# - restriction: property needs to be on an own line!
-function readJsonProp {
-  echo $(sed -En 's/.*"'$2'"[ ]*:[ ]*"(.*)".*/\1/p' $1)
-}
-
-# replaceJsonProp(jsonFile, property, newValue)
-# - note: propertyRegex will be automatically placed into a
-#   capturing group! -> all other groups start at index 2!
-function replaceJsonProp {
-  replaceInFile $1 "\"$2\": \".*?\"" "\"$2\": \"$3\""
-}
-
-# replaceInFile(file, findPattern, replacePattern)
-function replaceInFile {
-  perl -pi -e "s/$2/$3/g;" $1
-}
-
-# resolveDir(relativeDir)
-# - resolves a directory relative to the current script
-function resolveDir {
-  echo $(cd $SCRIPT_DIR; cd $1; pwd)
-}
-
-function main {
-  # normalize the working dir to the directory of the script
-  cd $(dirname $0);SCRIPT_DIR=$(pwd)
-
-  ARG_DEFS+=("[--verbose=(true|false)]")
-  parseArgs "$@"
-
-
-  # --verbose argument
-  if [[ $VERBOSE == "true" ]]; then
-    set -x
-  fi
-
-  if isFunction init; then
-    init "$@"
-  fi
-
-  # jump to the function denoted by the --action argument,
-  # otherwise call the "run" function
-  if [[ $ACTION ]]; then
-    $ACTION "$@"
-  else
-    run "$@"
-  fi
-}
-
-
-main "$@"
+# bash utils from angularjs
+
+# This file provides:
+# - a default control flow
+#   * initializes the environment
+#   * call a function in your script based on the arguments
+# - named argument parsing and automatic generation of the "usage" for your script
+# - utility functions
+#
+# Usage:
+# - define the variable ARGS_DEF (see below) with the arguments for your script
+# - include this file using `source utils.inc` at the end of your script.
+#
+# Default control flow:
+# 0. Set the current directory to the directory of the script. By this
+#    the script can be called from anywhere.
+# 1. Parse the named arguments
+# 2. [Redacted]
+# 3. If the parameter "verbose" is set, the `-x` flag will be set in bash.
+# 4. The function "init" will be called if it exists
+# 5. If the parameter "action" is set, it will call the function with the name of that parameter.
+#    Otherwise the function "run" will be called.
+#
+# Named Argument Parsing:
+# - The variable ARGS_DEF defines the valid command arguments
+#   * Required args syntax: --paramName=paramRegex
+#   * Optional args syntax: [--paramName=paramRegex]
+#   * e.g. ARG_DEFS=("--required_param=(.+)" "[--optional_param=(.+)]")
+# - Checks that:
+#   * all arguments match to an entry in ARGS_DEF
+#   * all required arguments are present
+#   * all arguments match their regex
+# - Afterwards, every paramter value will be stored in a variable
+#   with the name of the parameter in upper case (with dash converted to underscore).
+#
+# 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:
+# - readJsonProp
+# - replaceJsonProp
+# - resolveDir
+# - getVar
+# - serVar
+# - isFunction
+
+# always stop on errors
+set -e
+
+function usage {
+  echo "Usage: ${0} ${ARG_DEFS[@]}"
+  exit 1
+}
+
+
+function parseArgs {
+  local REQUIRED_ARG_NAMES=()
+
+  # -- helper functions
+  function varName {
+    # everything to upper case and dash to underscore
+    echo ${1//-/_} | tr '[:lower:]' '[:upper:]'
+  }
+
+  function readArgDefs {
+    local ARG_DEF
+    local AD_OPTIONAL
+    local AD_NAME
+    local AD_RE
+
+    # -- helper functions
+    function parseArgDef {
+      local ARG_DEF_REGEX="(\[?)--([^=]+)=(.*)"
+      if [[ ! $1 =~ $ARG_DEF_REGEX ]]; then
+        echo "Internal error: arg def has wrong format: $ARG_DEF"
+        exit 1
+      fi
+      AD_OPTIONAL="${BASH_REMATCH[1]}"
+      AD_NAME="${BASH_REMATCH[2]}"
+      AD_RE="${BASH_REMATCH[3]}"
+      if [[ $AD_OPTIONAL ]]; then
+        # Remove last bracket for optional args.
+        # Can't put this into the ARG_DEF_REGEX somehow...
+        AD_RE=${AD_RE%?}
+      fi
+    }
+
+    # -- run
+    for ARG_DEF in "${ARG_DEFS[@]}"
+    do
+      parseArgDef $ARG_DEF
+
+      local AD_NAME_UPPER=$(varName $AD_NAME)
+      setVar "${AD_NAME_UPPER}_OPTIONAL" "$AD_OPTIONAL"
+      setVar "${AD_NAME_UPPER}_RE" "$AD_RE"
+      if [[ ! $AD_OPTIONAL ]]; then
+        REQUIRED_ARG_NAMES+=($AD_NAME)
+      fi
+    done
+  }
+
+  function readAndValidateArgs {
+    local ARG_NAME
+    local ARG_VALUE
+    local ARG_NAME_UPPER
+
+    # -- helper functions
+    function parseArg {
+      local ARG_REGEX="--([^=]+)=?(.*)"
+
+      if [[ ! $1 =~ $ARG_REGEX ]]; then
+        echo "Can't parse argument $i"
+        usage
+      fi
+
+      ARG_NAME="${BASH_REMATCH[1]}"
+      ARG_VALUE="${BASH_REMATCH[2]}"
+      ARG_NAME_UPPER=$(varName $ARG_NAME)
+    }
+
+    function validateArg {
+      local AD_RE=$(getVar ${ARG_NAME_UPPER}_RE)
+
+      if [[ ! $AD_RE ]]; then
+        echo "Unknown option: $ARG_NAME"
+        usage
+      fi
+
+      if [[ ! $ARG_VALUE =~ ^${AD_RE}$ ]]; then
+        echo "Wrong format: $ARG_NAME"
+        usage;
+      fi
+
+      # validate that the "action" option points to a valid function
+      if [[ $ARG_NAME == "action" ]] && ! isFunction $ARG_VALUE; then
+        echo "No action $ARG_VALUE defined in this script"
+        usage;
+      fi
+    }
+
+    # -- run
+    for i in "$@"
+    do
+      parseArg $i
+      validateArg
+      setVar "${ARG_NAME_UPPER}" "$ARG_VALUE"
+    done
+  }
+
+  function checkMissingArgs {
+    local ARG_NAME
+    for ARG_NAME in "${REQUIRED_ARG_NAMES[@]}"
+    do
+      ARG_VALUE=$(getVar $(varName $ARG_NAME))
+
+      if [[ ! $ARG_VALUE ]]; then
+        echo "Missing: $ARG_NAME"
+        usage;
+      fi
+    done
+  }
+
+  # -- run
+  readArgDefs
+  readAndValidateArgs "$@"
+  checkMissingArgs
+
+}
+
+# getVar(varName)
+function getVar {
+  echo ${!1}
+}
+
+# setVar(varName, varValue)
+function setVar {
+  eval "$1=\"$2\""
+}
+
+# isFunction(name)
+# - to be used in an if, so return 0 if successful and 1 if not!
+function isFunction {
+  if [[ $(type -t $1) == "function" ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+# readJsonProp(jsonFile, property)
+# - restriction: property needs to be on an own line!
+function readJsonProp {
+  echo $(sed -En 's/.*"'$2'"[ ]*:[ ]*"(.*)".*/\1/p' $1)
+}
+
+# replaceJsonProp(jsonFile, property, newValue)
+# - note: propertyRegex will be automatically placed into a
+#   capturing group! -> all other groups start at index 2!
+function replaceJsonProp {
+  replaceInFile $1 "\"$2\": \".*?\"" "\"$2\": \"$3\""
+}
+
+# replaceInFile(file, findPattern, replacePattern)
+function replaceInFile {
+  perl -pi -e "s/$2/$3/g;" $1
+}
+
+# resolveDir(relativeDir)
+# - resolves a directory relative to the current script
+function resolveDir {
+  echo $(cd $SCRIPT_DIR; cd $1; pwd)
+}
+
+function main {
+  # normalize the working dir to the directory of the script
+  cd $(dirname $0);SCRIPT_DIR=$(pwd)
+
+  ARG_DEFS+=("[--verbose=(true|false)]")
+  parseArgs "$@"
+
+
+  # --verbose argument
+  if [[ $VERBOSE == "true" ]]; then
+    set -x
+  fi
+
+  if isFunction init; then
+    init "$@"
+  fi
+
+  # jump to the function denoted by the --action argument,
+  # otherwise call the "run" function
+  if [[ $ACTION ]]; then
+    $ACTION "$@"
+  else
+    run "$@"
+  fi
+}
+
+
+main "$@"

scripts/logger.ts

@@ -0,0 +1,11 @@
+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 })]
+});

scripts/tasks/build-es5.ts

@@ -0,0 +1,97 @@
+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();

scripts/tasks/build-esm.ts

@@ -0,0 +1,46 @@
+import * as fs from 'fs-extra';
+import * as path from 'path';
+
+import { PLUGIN_PATHS } 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('src', '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');
+});

scripts/tasks/build-ngx.ts

@@ -0,0 +1,13 @@
+import {
+  cleanupNgx,
+  generateDeclarationFiles,
+  modifyMetadata,
+  transpileNgx,
+  transpileNgxCore
+} from '../build/ngx';
+
+transpileNgxCore();
+transpileNgx();
+generateDeclarationFiles();
+modifyMetadata();
+cleanupNgx();

scripts/tasks/publish.ts

@@ -0,0 +1,113 @@
+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 --tag beta';
+
+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 RXJS_VEERSION = '*';
+const CORE_VERSION = '^5.0.0';
+
+const PLUGIN_PEER_DEPENDENCIES = {
+  '@ionic-native/core': VERSION, // TODO change this in production
+  rxjs: RXJS_VEERSION
+};
+
+function getPackageJsonContent(name, 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_VEERSION }, { '@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();

scripts/templates/wrap-min.tmpl

@@ -11,7 +11,7 @@
  */
 import { Injectable } from '@angular/core';
 import { Plugin, Cordova, CordovaProperty, CordovaInstance, InstanceProperty, IonicNativePlugin } from '@ionic-native/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 /**
  * @name {{ Plugin_Name }}

scripts/templates/wrap.tmpl

@@ -11,7 +11,7 @@
  */
 import { Injectable } from '@angular/core';
 import { Plugin, Cordova, CordovaProperty, CordovaInstance, InstanceProperty, IonicNativePlugin } from '@ionic-native/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 /**
  * @name {{ Plugin_Name }}

scripts/tsconfig.json

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es5",
+    "moduleResolution": "node",
+    "noImplicitAny": false,
+    "lib": ["es6"]
+  },
+  "exclude": [
+    "node_modules"
+  ]
+}

src/@ionic-native/core/bootstrap.ts

@@ -16,7 +16,7 @@ export function checkReady() {
   });
 
   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.`
       );

src/@ionic-native/core/decorators.spec.ts

@@ -1,251 +0,0 @@
-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');
-    });
-  });
-});

src/@ionic-native/core/decorators.ts

@@ -1,326 +0,0 @@
-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
-    };
-  };
-}

src/@ionic-native/core/decorators/common.spec.ts

@@ -0,0 +1,108 @@
+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');
+    });
+  });
+});

src/@ionic-native/core/decorators/common.ts

@@ -1,179 +1,50 @@
-import { Observable } from 'rxjs/Observable';
-import { fromEvent } from 'rxjs/observable/fromEvent';
+import { Observable, fromEvent } from 'rxjs';
 
-import { checkReady } from './bootstrap';
-import { CordovaOptions } from './decorators';
-import { cordovaWarn, getPlugin, getPromise, pluginWarn } from './util';
+import { CordovaOptions } from './interfaces';
 
-checkReady();
-
-// declare const window;
-// declare var Promise;
+declare const window: any;
 
 export const ERR_CORDOVA_NOT_AVAILABLE = { error: 'cordova_not_available' };
 export const ERR_PLUGIN_NOT_INSTALLED = { error: 'plugin_not_installed' };
 
-/**
- * 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')
-  );
-}
-
-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();
+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 {
-      setSuccessIndex();
-      setErrorIndex();
+      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.'
+      );
     }
-  } 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);
+  };
+
+  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.`
+    );
   }
-  return args;
+
+  return tryNativePromise();
 }
 
-function callCordovaPlugin(
+export function wrapPromise(
   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;
-  }
-}
-
-function wrapPromise(
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {}
+  opts: CordovaOptions = {}
 ) {
   let pluginResult: any, rej: Function;
   const p = getPromise((resolve: Function, reject: Function) => {
@@ -288,7 +159,180 @@ function wrapObservable(
   });
 }
 
-function callInstance(
+/**
+ * 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> {
+  if (element) {
+    get(window, element);
+  } else {
+    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(
   pluginObj: any,
   methodName: string,
   args: any[],
@@ -306,60 +350,80 @@ function callInstance(
   }
 }
 
-/**
- * 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 getPlugin(pluginRef: string): any {
+  return get(window, pluginRef);
 }
 
-/**
- * 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();
+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;
     }
-  });
+    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'
+    );
+  }
 }
 
 /**
  * @private
  */
-export const wrap = (
+export const wrap = function(
   pluginObj: any,
   methodName: string,
   opts: CordovaOptions = {}
-) => {
+): Function {
   return (...args: any[]) => {
     if (opts.sync) {
       // Sync doesn't wrap the plugin with a promise or observable, it returns the result as-is
@@ -383,7 +447,7 @@ export function wrapInstance(
   pluginObj: any,
   methodName: string,
   opts: any = {}
-) {
+): Function {
   return (...args: any[]) => {
     if (opts.sync) {
       return callInstance(pluginObj, methodName, args, opts);
@@ -413,7 +477,6 @@ export function wrapInstance(
 
         if (pluginResult && pluginResult.error) {
           observer.error(pluginResult.error);
-          observer.complete();
         }
 
         return () => {
@@ -461,7 +524,7 @@ export function wrapInstance(
             reject
           );
         }
-        if (result && !!result.then) {
+        if (result && result.then) {
           result.then(resolve, reject);
         } else {
           reject();

src/@ionic-native/core/decorators/cordova-function-override.ts

@@ -0,0 +1,25 @@
+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 | Array<any> = []
+) {
+  return overrideFunction(pluginObj, methodName);
+}

src/@ionic-native/core/decorators/cordova-instance.ts

@@ -0,0 +1,7 @@
+import { wrapInstance } from './common';
+import { CordovaOptions } from './interfaces';
+
+export function cordovaInstance(pluginObj: any, methodName: string, config: CordovaOptions, args: IArguments | Array<any>) {
+  args = Array.from(args);
+  return wrapInstance(pluginObj, methodName, config).apply(this, args);
+}

src/@ionic-native/core/decorators/cordova-property.ts

@@ -0,0 +1,14 @@
+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;
+  }
+}

src/@ionic-native/core/decorators/cordova.ts

@@ -0,0 +1,6 @@
+import { wrap } from './common';
+import { CordovaOptions } from './interfaces';
+
+export function cordova(pluginObj: any, methodName: string, config: CordovaOptions, args: IArguments | Array<any>) {
+  return wrap(pluginObj, methodName, config).apply(this, args);
+}

src/@ionic-native/core/decorators/instance-property.ts

@@ -0,0 +1,12 @@
+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]) {
+    pluginObj._objectInstance[key] = value;
+  }
+}

src/@ionic-native/core/decorators/interfaces.ts

@@ -0,0 +1,107 @@
+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;

src/@ionic-native/core/index.ts

@@ -1,4 +1,14 @@
-export * from './plugin';
-export * from './decorators';
-export * from './util';
-export * from './ionic-native-plugin';
+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();

src/@ionic-native/core/ionic-native-plugin.spec.ts

@@ -1,74 +0,0 @@
-// 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');
-  });
-});

src/@ionic-native/core/ionic-native-plugin.ts

@@ -1,3 +1,6 @@
+import { checkAvailability } from './decorators/common';
+import { get } from './util';
+
 export class IonicNativePlugin {
   static pluginName: string;
 
@@ -15,40 +18,31 @@ export class IonicNativePlugin {
    * Returns a boolean that indicates whether the plugin is installed
    * @return {boolean}
    */
-  static installed(): boolean {
-    return false;
-  }
+  static installed(): boolean { return checkAvailability(this.pluginRef) === true; }
 
   /**
    * Returns the original plugin object
    */
-  static getPlugin(): any {}
+  static getPlugin(): any { return get(window, this.pluginRef); }
 
   /**
    * Returns the plugin's name
    */
-  static getPluginName(): string {
-    return;
-  }
+  static getPluginName(): string { return this.pluginName; }
 
   /**
    * Returns the plugin's reference
    */
-  static getPluginRef(): string {
-    return;
-  }
+  static getPluginRef(): string { return this.pluginRef; }
 
   /**
    * Returns the plugin's install name
    */
-  static getPluginInstallName(): string {
-    return;
-  }
+  static getPluginInstallName(): string { return this.plugin; }
 
   /**
    * Returns the plugin's supported platforms
    */
-  static getSupportedPlatforms(): string[] {
-    return;
-  }
+  static getSupportedPlatforms(): string[] { return this.platforms || []; }
+
 }

src/@ionic-native/core/ng1.ts

@@ -0,0 +1,25 @@
+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];
+
+      (function (serviceName, cls, name) {
+        ngModule.service(serviceName, [function () {
+          const funcs = window.angular.copy(cls);
+          funcs.__proto__['name'] = name;
+          return funcs;
+        }]);
+      })(serviceName, cls, name);
+    }
+  }
+}

src/@ionic-native/core/util.ts

@@ -3,25 +3,24 @@ declare const window: any;
 /**
  * @private
  */
-export const get = (element: Element | Window, path: string): any => {
+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;
-    }
+    if (!obj) { return null; }
     obj = obj[paths[i]];
   }
   return obj;
-};
+}
 
 /**
  * @private
  */
-export const getPromise = (callback: Function): Promise<any> => {
+export function getPromise(callback: Function = () => {}): Promise<any> {
+
   const tryNativePromise = () => {
     if (window.Promise) {
-      return new Promise((resolve, reject) => {
+      return new Promise<any>((resolve, reject) => {
         callback(resolve, reject);
       });
     } else {
@@ -32,66 +31,4 @@ export const 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'
-    );
-  }
-};
+}

src/@ionic-native/plugins/abbyy-rtr/index.ts

@@ -1,336 +0,0 @@
-import { Injectable } from '@angular/core';
-import { CordovaCheck, IonicNativePlugin, Plugin } from '@ionic-native/core';
-
-declare const AbbyyRtrSdk: any;
-
-/**
- * JSON object that you can pass as the options argument to change text
- * capture settings. All keys are optional. Omitting a key means that a
- * 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.
-   */
-  licenseFileName?: string;
-
-  /**
-   * Recognition languages which can be selected by the user,
-   * for example: ["English", "French", "German"]. Empty array
-   * disables language selection.
-   */
-  selectableRecognitionLanguages?: string[];
-
-  /**
-   * Recognition language selected by default.
-   */
-  recognitionLanguages?: string[];
-
-  /**
-   * Width and height of the recognition area, separated by a
-   * whitespace — for example: "0.8 0.3". The area of interest is
-   * centered in the preview frame, its width and height are
-   * relative to the preview frame size and should be in the [0.0, 1.0] range.
-   */
-  areaOfInterest?: string;
-
-  /**
-   * Whether to stop the plugin as soon as the result status is
-   * "Stable" (see Result status). When enabled (true), the
-   * recognition process can be stopped automatically. When
-   * disabled (false), recognition can be stopped only manually
-   * by user.
-   */
-  stopWhenStable?: boolean;
-
-  /**
-   * Show (true) or hide (false) the flashlight button in the text
-   * capture dialog.
-   */
-  isFlashlightVisible?: boolean;
-
-  /**
-   * Show (true) or hide (false) the stop button in the text
-   * capture dialog. When the user taps stop, RTR SDK returns
-   * the latest recognition result.
-   */
-  isStopButtonVisible?: boolean;
-}
-
-/**
- * JSON object that represents text recognition results.
- * 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:
-   * · text (string): the recognized text.
-   * · quadrangle (string): vertex coordinates of the bounding quadrangle,
-   *   a string of 8 integers separated with whitespaces ("x1 y1 ... x4 y4"),
-   *   goes clockwise starting from the bottom left.
-   * · 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 }[];
-
-  /**
-   * Additional information. This object has the following keys:
-   * · stabilityStatus (string): result stability status.
-   *   See Result status for details.
-   * · userAction (string): the user's action which stopped the plugin,
-   *   if any. Can be "Manually Stopped" if the stop button has been used,
-   *   and "Canceled" if the user canceled processing. If the plugin has
-   *   stopped automatically, the userAction key is not present in resultInfo.
-   * · frameSize (string): full size of the preview frame, a string
-   *   with 2 integers separated with a whitespace ("720 1280").
-   * · recognitionLanguages (string array): languages used for recognition,
-   *   the array contains language identifiers (["English", "French", "German"]).
-   */
-  resultInfo: {
-    stabilityStatus: string,
-    userAction: string,
-    frameSize: string,
-    recognitionLanguages: string[]
-  };
-
-  /**
-   * Error details. This key is present only if an error occurs.
-   * The value is an object which has a single key:
-   * · description (string): human-readable error description.
-   */
-  error?: {
-    description: string;
-  };
-}
-
-/**
- * JSON object that you can pass as the options argument to change data
- * capture settings. All keys are optional. Omitting a key means that a default
- * setting will be used, except the profile and customDataCaptureScenario
- * 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
-   * Capture Profiles in the ABBYY Real-Time Recognition SDK 1 Developer's Guide.
-   */
-  profile?: string;
-
-  /**
-   * Custom data capture settings. This object has the following keys:
-   * · name (string): the name of your custom data capture scenario, required.
-   * · description (string): a more detailed description. This key is optional;
-   *   if not given, it will be assigned the same value as name.
-   * · recognitionLanguages (string array): recognition languages to use.
-   *   Default is ["English"].
-   * · fields (object array): describes data fields to capture. Each object
-   *   in this array has a single regEx key; its value is a string containing
-   *   the regular expression that should be matched when capturing a field.
-   */
-  customDataCaptureScenario?: {
-    name: string,
-    description: string,
-    recognitionLanguages: string[],
-    fields: { regEx: string }[]
-  };
-
-  /**
-   * The name of the license file. This file must be located in the
-   * www/rtr_assets/ directory in your project.
-   */
-  licenseFileName?: string;
-
-  /**
-   * Width and height of the recognition area, separated by a
-   * whitespace — for example: "0.8 0.3". The area of interest is
-   * centered in the preview frame, its width and height are
-   * relative to the preview frame size and should be in the [0.0, 1.0] range.
-   */
-  areaOfInterest?: string;
-
-  /**
-   * Whether to stop the plugin as soon as the result status is
-   * "Stable" (see Result status). When enabled (true), the
-   * recognition process can be stopped automatically. When
-   * disabled (false), recognition can be stopped only manually
-   * by user.
-   */
-  stopWhenStable?: boolean;
-
-  /**
-   * Show (true) or hide (false) the flashlight button in the text
-   * capture dialog.
-   */
-  isFlashlightVisible?: boolean;
-
-  /**
-   * Show (true) or hide (false) the stop button in the text
-   * capture dialog. When the user taps stop, RTR SDK returns
-   * the latest recognition result.
-   */
-  isStopButtonVisible?: boolean;
-}
-
-/**
- * JSON object that represents data recognition results. The callback you
- * 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:
-   * · id (string): the internal scheme identifier.
-   * · name (string): the scheme name.
-   * If you had defined a custom data capture scenario in options, both the
-   * id and name will be the same as the scenario name you specified. If
-   * you selected a predefined profile, the id and name are specified by the
-   * profile. If an error occurs during processing, the dataScheme key is not
-   * present in the result.
-   */
-  dataScheme?: {
-    id: string,
-    name: string
-  };
-
-  /**
-   * Recognized data fields. Each object in the array represents a separate
-   * data field. The data field objects have the following keys:
-   * · id (string): the internal identifier of the field.
-   * · name (string): the field name.
-   * Similarly to dataScheme, in custom scenarios both id and name are the same
-   * as the scenario name you specified (currently custom scenarios allow
-   * only 1 recognized field).
-   * · text (string): full text of the field.
-   * · quadrangle (string): vertex coordinates of the bounding quadrangle, a
-   *   string of 8 integers separated with whitespaces ("x1 y1 ... x4 y4"),
-   *   goes clockwise starting from the bottom left.
-   * · components (object array): an array of objects representing field
-   *   components, that is, the text fragments found on the image, which
-   *   constitute the field.
-   * In the components array each element is an object with the following keys:
-   * · text (string): text of this fragment.
-   * · quadrangle (string): vertex coordinates of the bounding quadrangle of
-   *   this fragment, similar to the field's quadrangle.
-   * · rect (string): position and size of the bounding rectangle, a string
-   *   of 4 integers separated with whitespaces ("x y width height").
-   */
-  dataFields: {
-    id: string,
-    name: string,
-    text: string,
-    quadrangle: string,
-    components: {
-      text: string,
-      quadrangle: string,
-      rect: string
-    }
-  };
-
-  /**
-   * Additional information. This object has the following keys:
-   * · stabilityStatus (string): result stability status.
-   *   See Result status for details.
-   * · userAction (string): the user's action which stopped the plugin,
-   *   if any. Can be "Manually Stopped" if the stop button has been used,
-   *   and "Canceled" if the user canceled processing. If the plugin has
-   *   stopped automatically, the userAction key is not present in resultInfo.
-   * · frameSize (string): full size of the preview frame, a string
-   *   with 2 integers separated with a whitespace ("720 1280").
-   */
-  resultInfo: {
-    stabilityStatus: string,
-    userAction: string,
-    frameSize: string
-  };
-
-  /**
-   * Error details. This key is present only if an error occurs.
-   * The value is an object which has a single key:
-   * · description (string): human-readable error description.
-   */
-  error?: {
-    description: string;
-  };
-}
-
-/**
- * @name ABBYY Real-Time Recognition
- * @description
- * This plugin allows to use the Text Capture and Data Capture features of
- * ABBYY Real-Time Recognition SDK (RTR SDK) in apps.
- *
- * @usage
- * ```typescript
- * import { AbbyyRTR } from '@ionic-native/abbyy-rtr';
- *
- *
- * constructor(private abbyyRTR: AbbyyRTR) { }
- *
- * ...
- *
- *
- * this.abbyyRTR.startTextCapture(options)
- *   .then((res: any) => console.log(res))
- *   .catch((error: any) => console.error(error));
- *
- *
- * this.abbyyRTR.startDataCapture(options)
- *   .then((res: any) => console.log(res))
- *   .catch((error: any) => console.error(error));
- *
- * ```
- */
-@Plugin({
-  pluginName: 'AbbyyRTR',
-  plugin: 'cordova-plugin-abbyy-rtr-sdk',
-  pluginRef: 'AbbyyRtrSdk',
-  repo: 'https://github.com/abbyysdk/RTR-SDK.Cordova',
-  install: 'ionic cordova plugin add cordova-plugin-abbyy-rtr-sdk',
-  platforms: ['Android', 'iOS']
-})
-@Injectable()
-export class AbbyyRTR extends IonicNativePlugin {
-
-  /**
-   * Opens a modal dialog with controls for the Text Capture scenario.
-   * @param {TextCaptureOptions} options
-   * @return {Promise<TextCaptureResult>}
-   */
-  @CordovaCheck()
-  startTextCapture(options: TextCaptureOptions): Promise<TextCaptureResult> {
-    return new Promise<any>((resolve, reject) => {
-      AbbyyRtrSdk.startTextCapture((result: DataCaptureResult) => {
-        if (result.error) {
-          reject(result);
-        } else {
-          resolve(result);
-        }
-      }, options);
-    });
-  }
-
-  /**
-   * Opens a modal dialog with controls for the Data Capture scenario.
-   * @param {DataCaptureOptions} options
-   * @return {Promise<DataCaptureResult>}
-   */
-  @CordovaCheck()
-  startDataCapture(options: DataCaptureOptions): Promise<DataCaptureResult> {
-    return new Promise<any>((resolve, reject) => {
-      AbbyyRtrSdk.startDataCapture((result: DataCaptureResult) => {
-        if (result.error) {
-          reject(result);
-        } else {
-          resolve(result);
-        }
-      }, options);
-    });
-  }
-}

src/@ionic-native/plugins/action-sheet/index.ts

@@ -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);

src/@ionic-native/plugins/admob-free/index.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable } from 'rxjs/Observable';
-import { fromEvent } from 'rxjs/observable/fromEvent';
+import { fromEvent, Observable } from 'rxjs';
 
 export interface AdMobFreeBannerConfig {
   /**
@@ -64,113 +63,6 @@ export interface AdMobFreeRewardVideoConfig {
   autoShow?: boolean;
 }
 
-/**
- * @name AdMob Free
- * @description
- * A free, no ad-sharing version of Google AdMob plugin for Cordova.
- *
- * Requires Cordova plugin: `cordova-plugin-admob-free`. For more info, please see the [AdMob Free plugin docs](https://github.com/ratson/cordova-plugin-admob-free).
- *
- * @usage
- * ```typescript
- * import { AdMobFree, AdMobFreeBannerConfig } from '@ionic-native/admob-free';
- *
- *
- * constructor(private admobFree: AdMobFree) { }
- *
- *
- * ...
- *
- *
- * const bannerConfig: AdMobFreeBannerConfig = {
- *  // add your config here
- *  // for the sake of this example we will just use the test config
- *  isTesting: true,
- *  autoShow: true
- * };
- * this.admobFree.banner.config(bannerConfig);
- *
- * this.admobFree.banner.prepare()
- *   .then(() => {
- *     // banner Ad is ready
- *     // if we set autoShow to false, then we will need to call the show method here
- *   })
- *   .catch(e => console.log(e));
- *
- *
- * ```
- * @interfaces
- * AdMobFreeBannerConfig
- * AdMobFreeInterstitialConfig
- * AdMobFreeRewardVideoConfig
- * @classes
- * AdMobFreeBanner
- * AdMobFreeInterstitial
- * AdMobFreeRewardVideo
- */
-@Plugin({
-  pluginName: 'AdMobFree',
-  plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob',
-  repo: 'https://github.com/ratson/cordova-plugin-admob-free',
-  platforms: ['Android', 'iOS']
-})
-@Injectable()
-export class AdMobFree extends IonicNativePlugin {
-  /**
-   * Convenience object to get event names
-   * @type {Object}
-   */
-  events = {
-    BANNER_LOAD: 'admob.banner.events.LOAD',
-    BANNER_LOAD_FAIL: 'admob.banner.events.LOAD_FAIL',
-    BANNER_OPEN: 'admob.banner.events.OPEN',
-    BANNER_CLOSE: 'admob.banner.events.CLOSE',
-    BANNER_EXIT_APP: 'admob.banner.events.EXIT_APP',
-
-    INTERSTITIAL_LOAD: 'admob.interstitial.events.LOAD',
-    INTERSTITIAL_LOAD_FAIL: 'admob.interstitial.events.LOAD_FAIL',
-    INTERSTITIAL_OPEN: 'admob.interstitial.events.OPEN',
-    INTERSTITIAL_CLOSE: 'admob.interstitial.events.CLOSE',
-    INTERSTITIAL_EXIT_APP: 'admob.interstitial.events.EXIT_APP',
-
-    REWARD_VIDEO_LOAD: 'admob.rewardvideo.events.LOAD',
-    REWARD_VIDEO_LOAD_FAIL: 'admob.rewardvideo.events.LOAD_FAIL',
-    REWARD_VIDEO_OPEN: 'admob.rewardvideo.events.OPEN',
-    REWARD_VIDEO_CLOSE: 'admob.rewardvideo.events.CLOSE',
-    REWARD_VIDEO_EXIT_APP: 'admob.rewardvideo.events.EXIT_APP',
-    REWARD_VIDEO_START: 'admob.rewardvideo.events.START',
-    REWARD_VIDEO_REWARD: 'admob.rewardvideo.events.REWARD'
-  };
-
-  /**
-   * Watch an event
-   * @param event {string} event name
-   * @return {Observable<any>}
-   */
-  on(event: string): Observable<any> {
-    return fromEvent(document, event);
-  }
-
-  /**
-   * Returns the AdMobFreeBanner object
-   * @type {AdMobFreeBanner}
-   */
-  banner: AdMobFreeBanner = new AdMobFreeBanner();
-
-  /**
-   * Returns the AdMobFreeInterstitial object
-   * @type {AdMobFreeInterstitial}
-   */
-  interstitial: AdMobFreeInterstitial = new AdMobFreeInterstitial();
-
-  /**
-   * Returns the AdMobFreeRewardVideo object
-   * @type {AdMobFreeRewardVideo}
-   */
-  rewardVideo: AdMobFreeRewardVideo = new AdMobFreeRewardVideo();
-}
-
 /**
  * @hidden
  */
@@ -179,7 +71,7 @@ export class AdMobFree extends IonicNativePlugin {
   plugin: 'cordova-plugin-admob-free',
   pluginRef: 'admob.banner'
 })
-export class AdMobFreeBanner {
+export class AdMobFreeBanner extends IonicNativePlugin {
   /**
    * Update config
    * @param options
@@ -235,7 +127,7 @@ export class AdMobFreeBanner {
   plugin: 'cordova-plugin-admob-free',
   pluginRef: 'admob.interstitial'
 })
-export class AdMobFreeInterstitial {
+export class AdMobFreeInterstitial extends IonicNativePlugin {
   /**
    * Update config
    * @param options
@@ -282,7 +174,7 @@ export class AdMobFreeInterstitial {
   plugin: 'cordova-plugin-admob-free',
   pluginRef: 'admob.rewardvideo'
 })
-export class AdMobFreeRewardVideo {
+export class AdMobFreeRewardVideo extends IonicNativePlugin {
   /**
    * Update config
    * @param {AdMobFreeRewardVideoConfig} options Admob reward config
@@ -320,3 +212,104 @@ export class AdMobFreeRewardVideo {
     return;
   }
 }
+
+/**
+ * @name AdMob Free
+ * @description
+ *
+ * @usage
+ * ```typescript
+ * import { AdMobFree, AdMobFreeBannerConfig } from '@ionic-native/admob-free';
+ *
+ *
+ * constructor(private admobFree: AdMobFree) { }
+ *
+ *
+ * ...
+ *
+ *
+ * const bannerConfig: AdMobFreeBannerConfig = {
+ *  // add your config here
+ *  // for the sake of this example we will just use the test config
+ *  isTesting: true,
+ *  autoShow: true
+ * }
+ * this.admobFree.banner.config(bannerConfig);
+ *
+ * this.admobFree.banner.prepare()
+ *   .then(() => {
+ *     // banner Ad is ready
+ *     // if we set autoShow to false, then we will need to call the show method here
+ *   })
+ *   .catch(e => console.log(e));
+ *
+ *
+ * ```
+ * @interfaces
+ * AdMobFreeBannerConfig
+ * AdMobFreeInterstitialConfig
+ * AdMobFreeRewardVideoConfig
+ * @classes
+ * AdMobFreeBanner
+ * AdMobFreeInterstitial
+ * AdMobFreeRewardVideo
+ */
+@Plugin({
+  pluginName: 'AdMobFree',
+  plugin: 'cordova-plugin-admob-free',
+  pluginRef: 'admob',
+  repo: 'https://github.com/ratson/cordova-plugin-admob-free',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class AdMobFree extends IonicNativePlugin {
+  /**
+   * Convenience object to get event names
+   * @type {Object}
+   */
+  events: any = {
+    BANNER_LOAD: 'admob.banner.events.LOAD',
+    BANNER_LOAD_FAIL: 'admob.banner.events.LOAD_FAIL',
+    BANNER_OPEN: 'admob.banner.events.OPEN',
+    BANNER_CLOSE: 'admob.banner.events.CLOSE',
+    BANNER_EXIT_APP: 'admob.banner.events.EXIT_APP',
+
+    INTERSTITIAL_LOAD: 'admob.interstitial.events.LOAD',
+    INTERSTITIAL_LOAD_FAIL: 'admob.interstitial.events.LOAD_FAIL',
+    INTERSTITIAL_OPEN: 'admob.interstitial.events.OPEN',
+    INTERSTITIAL_CLOSE: 'admob.interstitial.events.CLOSE',
+    INTERSTITIAL_EXIT_APP: 'admob.interstitial.events.EXIT_APP',
+
+    REWARD_VIDEO_LOAD: 'admob.rewardvideo.events.LOAD',
+    REWARD_VIDEO_LOAD_FAIL: 'admob.rewardvideo.events.LOAD_FAIL',
+    REWARD_VIDEO_OPEN: 'admob.rewardvideo.events.OPEN',
+    REWARD_VIDEO_CLOSE: 'admob.rewardvideo.events.CLOSE',
+    REWARD_VIDEO_EXIT_APP: 'admob.rewardvideo.events.EXIT_APP',
+    REWARD_VIDEO_START: 'admob.rewardvideo.events.START',
+    REWARD_VIDEO_REWARD: 'admob.rewardvideo.events.REWARD'
+  };
+  /**
+   * Returns the AdMobFreeBanner object
+   * @type {AdMobFreeBanner}
+   */
+  banner: AdMobFreeBanner = new AdMobFreeBanner();
+  /**
+   * Returns the AdMobFreeInterstitial object
+   * @type {AdMobFreeInterstitial}
+   */
+  interstitial: AdMobFreeInterstitial = new AdMobFreeInterstitial();
+  /**
+   * Returns the AdMobFreeRewardVideo object
+   * @type {AdMobFreeRewardVideo}
+   */
+  rewardVideo: AdMobFreeRewardVideo = new AdMobFreeRewardVideo();
+
+  /**
+   * Watch an event
+   * @param event {string} event name
+   * @return {Observable<any>}
+   */
+  on(event: string): Observable<any> {
+    return fromEvent(document, event);
+  }
+}

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/Observable';
+import { Observable } from 'rxjs';
 
 export type AdSize =
   | 'SMART_BANNER'
@@ -275,7 +275,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onAdFailLoad',
-    element: document
+    element: 'document'
   })
   onAdFailLoad(): Observable<any> {
     return;
@@ -288,7 +288,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onAdLoaded',
-    element: document
+    element: 'document'
   })
   onAdLoaded(): Observable<any> {
     return;
@@ -301,7 +301,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onAdPresent',
-    element: document
+    element: 'document'
   })
   onAdPresent(): Observable<any> {
     return;
@@ -314,7 +314,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onAdLeaveApp',
-    element: document
+    element: 'document'
   })
   onAdLeaveApp(): Observable<any> {
     return;
@@ -327,7 +327,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onAdDismiss',
-    element: document
+    element: 'document'
   })
   onAdDismiss(): Observable<any> {
     return;

src/@ionic-native/plugins/aes-256/index.ts

@@ -1,106 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-
-/**
- * @name AES256
- * @description
- * This cordova ionic plugin allows you to perform AES 256 encryption and decryption on the plain text.
- * It's a cross-platform plugin which supports both Android and iOS.
- * The encryption and decryption are performed on the device native layer so that the performance is much faster.
- *
- * @usage
- * ```typescript
- * import { AES256 } from '@ionic-native/aes-256';
- *
- * private secureKey: string;
- * private secureIV: string;
- *
- * constructor(private aes256: AES256) {
- *    this.generateSecureKeyAndIV(); // To generate the random secureKey and secureIV
- * }
- *
- * ...
- *
- * async generateSecureKeyAndIV() {
- *    this.secureKey = await this.aes256.generateSecureKey('random password 12345'); // Returns a 32 bytes string
- *    this.secureIV = await this.aes256.generateSecureIV('random password 12345'); // Returns a 16 bytes string
- * }
- *
- * this.aes256.encrypt(this.secureKey, this.secureIV, 'testdata')
- *   .then(res => console.log('Encrypted Data: ',res))
- *   .catch((error: any) => console.error(error));
- *
- * this.aes256.decrypt(this.secureKey, this.secureIV, 'encryptedData')
- *   .then(res => console.log('Decrypted Data : ',res))
- *   .catch((error: any) => console.error(error));
- *
- *
- * * this.aes256.generateSecureKey('random password 12345')
- *   .then(res => console.log('Secure Key : ',res))
- *   .catch((error: any) => console.error(error));
- *
- *
- * * this.aes256.generateSecureIV('random password 12345')
- *   .then(res => console.log('Secure IV : ',res))
- *   .catch((error: any) => console.error(error));
- *
- * ```
- */
-@Plugin({
-  pluginName: 'AES256',
-  plugin: 'cordova-plugin-aes256-encryption',
-  pluginRef: 'cordova.plugins.AES256',
-  repo: 'https://github.com/Ideas2IT/cordova-aes256',
-  platforms: ['Android', 'iOS'],
-  install: 'ionic cordova plugin add cordova-plugin-aes256-encryption'
-})
-@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.
-   * @param {string} secureIV A 16 bytes string, which will used as initial vector for AES256 encryption.
-   * @param {string} data A string which will be encrypted
-   * @return {Promise<string>} Returns a promise that resolves when encryption happens. The success response will returns encrypted data.
-   */
-  @Cordova()
-  encrypt(secureKey: string, secureIV: string, data: string): Promise<string> {
-    return;
-  }
-
-  /**
-   * This function used to perform the aes256 decryption
-   * @param {string} secureKey A 32 bytes string, which will used as input key for AES256 decryption.
-   * @param {string} secureIV A 16 bytes string, which will used as initial vector for AES256 decryption.
-   * @param {string} data An AES256 encrypted data which will be decrypted.
-   * @return {Promise<string>} Returns a promise that resolves when decryption happens. The success response will returns decrypted data.
-   */
-  @Cordova()
-  decrypt(secureKey: string, secureIV: string, data: string): Promise<string> {
-    return;
-  }
-
-  /**
-   * This function used to generate a secure key based on an password. Perfect if you want to delegate the key generation for encryption to the plugin.
-   * Make sure to save the return value of this function somewhere so your encrypted data can be decrypted in the future.
-   * @param {string} password A random string, which will be used as input for a PBKDF2 function
-   * @return {Promise<string>} Returns a promise that resolves when key is generated.
-   */
-  @Cordova()
-  generateSecureKey(password: string): Promise<string> {
-    return;
-  }
-
-  /**
-   * This function used to generate a secure IV based on an password. Perfect if you want to delegate the IV generation for encryption to the plugin.
-   * Make sure to save the return value of this function somewhere so your encrypted data can be decrypted in the future.
-   * @param {string} password A random string, which will be used as input for a PBKDF2 function
-   * @return {Promise<string>} Returns a promise that resolves when IV is generated.
-   */
-  @Cordova()
-  generateSecureIV(password: string): Promise<string> {
-    return;
-  }
-
-}

src/@ionic-native/plugins/alipay/index.ts

@@ -1,20 +1,83 @@
 import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
+export interface AlipayOrder {
+  /**
+   * appId assigned by Alipay
+   */
+  app_id: string;
+
+  /**
+   * Api name.
+   * Should be: alipay.trade.app.pay
+   */
+  method: string;
+
+  /**
+   * Data format
+   * Default: "JSON"
+   */
+  format?: string;
+
+  /**
+   * Charset
+   * Possible values: "UTF-8", "GBK"
+   * Default: "UTF-8"
+   */
+  charset: string;
+
+  /**
+   * Sign method
+   * Default: 'RSA'
+   */
+  sign_type: string;
+
+  /**
+   * Sign value. Should be got from server side.
+   * Default: 'RSA'
+   */
+  sign: string;
+
+  /**
+   * Timestamp, formated like "yyyy-MM-dd HH:mm:ss", e.g. 2014-07-24 03:07:50
+   */
+  timestamp: string;
+
+  /**
+   * Api version. Fixed value '1.0'
+   */
+  version: string;
+
+  /**
+   * Notify url.
+   */
+  notify_url: string;
+
+  /**
+   * biz content. formated in json. see alipay doc for detail.
+   */
+  biz_content: string;
+}
+
 /**
  * @name Alipay
  * @description
- * This plugin facilitates the usage of Alipay 支付宝 in an Ionic apps with the integrated AlipaySDK dated on 20180601.
+ * This plugin is used for Alipay APP support. Integrated with the latest SDK.
  *
- * Requires Cordova plugin: `cordova-plugin-gubnoi-alipay`. For more info, please see https://github.com/jing-zhou/cordova-plugin-alipay .
+ * Requires Cordova plugin: `cordova-alipay-base`. For more info, please see the [Alipay plugin docs](https://github.com/xueron/cordova-alipay-base).
  *
  * @usage
  * ```typescript
- * import { Alipay } from '@ionic-native/alipay';
+ * import { Alipay, AlipayOrder } from '@ionic-native/alipay';
  *
  * constructor(private alipay: Alipay) {
  *
- * //alipayOrder is a string that has been generated and signed by the server side.
+ * // Should get from server side with sign.
+ * const alipayOrder: AlipayOrder = {
+ *       ...
+ *     }
+ *
+ *
  * this.alipay.pay(alipayOrder)
  *    .then(result => {
  *       console.log(result); // Success
@@ -25,26 +88,31 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
  *
  * }
  *
+ *
  * ```
+ *
+ * @interfaces
+ * AlipayOrder
  */
 @Plugin({
   pluginName: 'Alipay',
-  plugin: 'cordova-plugin-gubnoi-alipay',
-  pluginRef: 'Alipay',
-  repo: 'https://github.com/jing-zhou/cordova-plugin-alipay',
-  install: 'ionic cordova plugin add cordova-plugin-gubnoi-alipay --variable APP_ID=your_app_id',
-  installVariables: ['APP_ID'],
+  plugin: 'cordova-alipay-base',
+  pluginRef: 'Alipay.Base',
+  repo: 'https://github.com/xueron/cordova-alipay-base',
+  install:
+    'ionic cordova plugin add cordova-alipay-base --variable ALI_PID=your_app_id',
+  installVariables: ['ALI_PID'],
   platforms: ['Android', 'iOS']
 })
 @Injectable()
 export class Alipay extends IonicNativePlugin {
   /**
    * Open Alipay to perform App pay
-   * @param {string} order alipay order string
+   * @param { AlipayOrder | string } order alipay options
    * @returns {Promise<any>} Returns a Promise that resolves with the success return, or rejects with an error.
    */
   @Cordova()
-  pay(order: string): Promise<any> {
+  pay(order: AlipayOrder | string): Promise<any> {
     return;
   }
 }

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/Observable';
+import { Observable } from 'rxjs';
 
 export type AndroidExoPlayerAspectRatio = 'FILL_SCREEN' | 'FIT_SCREEN';
 

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 */
@@ -62,63 +62,81 @@ export class AndroidFullScreen extends IonicNativePlugin {
    * @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).
@@ -127,5 +145,7 @@ export class AndroidFullScreen extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  setSystemUiVisibility(visibility: AndroidSystemUiFlags): Promise<void> { return; }
+  setSystemUiVisibility(visibility: AndroidSystemUiFlags): Promise<void> {
+    return;
+  }
 }

src/@ionic-native/plugins/app-availability/index.ts

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

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/Observable';
+import { Observable } from 'rxjs';
 
 /**
  * @name App Center Push

src/@ionic-native/plugins/app-minimize/index.ts

@@ -37,6 +37,8 @@ export class AppMinimize extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  minimize(): Promise<any> { return; }
+  minimize(): Promise<any> {
+    return;
+  }
 
 }

src/@ionic-native/plugins/app-preferences/index.ts

@@ -1,5 +1,5 @@
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
 
 /**
@@ -25,11 +25,18 @@ import { Injectable } from '@angular/core';
   plugin: 'cordova-plugin-app-preferences',
   pluginRef: 'plugins.appPreferences',
   repo: 'https://github.com/apla/me.apla.cordova.app-preferences',
-  platforms: ['Android', 'BlackBerry 10', 'Browser', 'iOS', 'macOS', 'Windows 8', 'Windows Phone']
+  platforms: [
+    'Android',
+    'BlackBerry 10',
+    'Browser',
+    'iOS',
+    'macOS',
+    'Windows 8',
+    'Windows Phone'
+  ]
 })
 @Injectable()
 export class AppPreferences extends IonicNativePlugin {
-
   /**
    * Get a preference value
    *
@@ -40,7 +47,9 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  fetch(dict: string, key?: string): Promise<any> { return; }
+  fetch(dict: string, key?: string): Promise<any> {
+    return;
+  }
 
   /**
    * Set a preference value
@@ -67,7 +76,9 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  remove(dict: string, key?: string): Promise<any> { return; }
+  remove(dict: string, key?: string): Promise<any> {
+    return;
+  }
 
   /**
    * Clear preferences
@@ -77,7 +88,9 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  clearAll(): Promise<any> { return; }
+  clearAll(): Promise<any> {
+    return;
+  }
 
   /**
    * Show native preferences interface
@@ -87,7 +100,9 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  show(): Promise<any> { return; }
+  show(): Promise<any> {
+    return;
+  }
 
   /**
    * Show native preferences interface
@@ -98,7 +113,9 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  watch(subscribe: boolean): Observable<any> { return; }
+  watch(subscribe: boolean): Observable<any> {
+    return;
+  }
 
   /**
    * Return named configuration context
@@ -111,13 +128,17 @@ export class AppPreferences extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  suite(suiteName: string): any { return; }
+  suite(suiteName: string): any {
+    return;
+  }
 
   @Cordova({
     platforms: ['iOS'],
     sync: true
   })
-  iosSuite(suiteName: string): any { return; }
+  iosSuite(suiteName: string): any {
+    return;
+  }
 
   /**
    * Return cloud synchronized configuration context
@@ -127,7 +148,9 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS', 'Windows', 'Windows Phone 8']
   })
-  cloudSync(): Object { return; }
+  cloudSync(): Object {
+    return;
+  }
 
   /**
    * Return default configuration context
@@ -137,6 +160,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS', 'Windows', 'Windows Phone 8']
   })
-  defaults(): Object { return; }
-
+  defaults(): Object {
+    return;
+  }
 }

src/@ionic-native/plugins/app-rate/index.ts

@@ -75,7 +75,7 @@ export interface AppRateCustomLocale {
   /** No button label */
   noButtonLabel?: string;
 
-  /** App rate prompt title */
+  /** App rate promt title */
   appRatePromptTitle?: string;
 
   /** Feedback prompt title */
@@ -144,7 +144,7 @@ export interface AppUrls {
  *   ios: '<app_id>',
  *   android: 'market://details?id=<package_name>',
  *   windows: 'ms-windows-store://review/?ProductId=<store_id>'
- * };
+ * }
  *
  * this.appRate.promptForRating(true);
  *
@@ -156,7 +156,7 @@ export interface AppUrls {
  *    android: 'market://details?id=<package_name>',
  *    windows: 'ms-windows-store://review/?ProductId=<store_id>'
  *   }
- * };
+ * }
  *
  * this.appRate.promptForRating(false);
  * ```
@@ -181,7 +181,8 @@ export class AppRate extends IonicNativePlugin {
    * Configure various settings for the Rating View.
    * See table below for options
    */
-  @CordovaProperty preferences: AppRatePreferences;
+  @CordovaProperty()
+  preferences: AppRatePreferences;
 
   /**
    * Prompts the user for rating

src/@ionic-native/plugins/app-version/index.ts

@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 
-
 /**
  * @name App Version
  * @description
@@ -37,30 +36,28 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 export class AppVersion extends IonicNativePlugin {
 
   /**
-   * Returns the name of the app, e.g.: "My Awesome App"
+   * Returns the name of the app
    * @returns {Promise<string>}
    */
   @Cordova()
   getAppName(): Promise<string> { return; }
 
   /**
-   * Returns the package name of the app, e.g.: "com.example.myawesomeapp"
+   * Returns the package name of the app
    * @returns {Promise<string>}
    */
   @Cordova()
   getPackageName(): Promise<string> { return; }
 
   /**
-   * Returns the build identifier of the app.
-   * In iOS a string with the build version like "1.6095"
-   * In Android a number generated from the version string, like 10203 for version "1.2.3"
-   * @returns {Promise<string | number>}
+   * Returns the build identifier of the app
+   * @returns {Promise<string>}
    */
   @Cordova()
-  getVersionCode(): Promise<string | number> { return; }
+  getVersionCode(): Promise<string> { return; }
 
   /**
-   * Returns the version of the app, e.g.: "1.2.3"
+   * Returns the version of the app
    * @returns {Promise<string>}
    */
   @Cordova()

src/@ionic-native/plugins/apple-pay/index.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable } from 'rxjs/Observable';
 
 export type IMakePayments =
   | 'This device can make payments and has a supported card'
@@ -71,6 +71,7 @@ export interface IShippingMethod {
   detail: string;
   amount: number;
 }
+
 export interface IOrderItemsAndShippingMethods {
   items: IOrderItem[];
   shippingMethods?: IShippingMethod[];
@@ -237,7 +238,7 @@ export class ApplePay extends IonicNativePlugin {
    *   this.paySheetItems.shippingCost = {
    *      label: 'Shipping Cost',
    *      amount: shippingMethod[0].amount
-   *   };
+   *   }
    *   this.applePay.updateItemsAndShippingMethods(this.paySheetItems, shippingMethods);
    * });
    */

src/@ionic-native/plugins/apple-wallet/index.ts

@@ -1,116 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-
-export interface EncryptedCardData {
-  activationData: string;
-  encryptedPassData: string;
-  wrappedKey: string;
-}
-
-export interface CardData {
-  cardholderName: string;
-  primaryAccountNumberSuffix: string;
-  localizedDescription?: string;
-  paymentNetwork: string;
-}
-
-/**
- * @name Apple Wallet
- * @description
- * A Cordova plugin that enables users from Add Payment Cards to their Apple Wallet.
- *
- * @usage
- * ```typescript
- * import { AppleWallet } from '@ionic-native/apple-wallet';
- *
- *
- * constructor(private appleWallet: AppleWallet) { }
- *
- * ...
- *
- *
- * this.appleWallet.available()
- *  .then((res) => {
- *    // res is a boolean value, either true or false
- *    console.log("Is Apple Wallet available? ", res);
- *   })
- *  .catch((message) => {
- *    console.error("ERROR AVAILBLE>> ", message);
- *  });
- *
- * ...
- *
- * let data: cardData = {
- *    cardholderName: 'Test User',
- *    primaryAccountNumberSuffix: '1234',
- *    localizedDescription: 'Description of payment card',
- *    paymentNetwork: 'VISA'
- *  }
- *
- * this.appleWallet.startAddPaymentPass(data: cardData)
- *  .then((res) => {
- *    console.log("startAddPaymentPass success response ", res);
- *   })
- *  .catch((err) => {
- *    console.error("startAddPaymentPass ERROR response", err);
- *  });
- *
- * ...
- *
- * let data: encryptedCardData = {
- *    activationData: 'encoded Base64 activationData from your server',
- *    encryptedPassData: 'encoded Base64 encryptedPassData from your server',
- *    wrappedKey: 'encoded Base64 wrappedKey from your server',
- *  }
- *
- * this.appleWallet.encryptedCardData(data: encryptedCardData)
- *  .then((res) => {
- *    console.log("completeAddCardToAppleWallet success response ", res);
- *   })
- *  .catch((err) => {
- *    console.error("completeAddCardToAppleWallet ERROR response", err);
- *  });
- *
- * ```
- * @Interfaces
- * EncryptedCardData
- * CardData
- */
-@Plugin({
-  pluginName: 'AppleWallet',
-  plugin: 'cordova-apple-wallet',
-  pluginRef: 'AppleWallet',
-  repo: 'https://github.com/tomavic/cordova-apple-wallet',
-  platforms: ['iOS']
-})
-@Injectable()
-export class AppleWallet extends IonicNativePlugin {
-  /**
-   * Detects if the current device supports Apple Wallet
-   * @return {Promise<boolean>} Returns a promise
-   */
-  @Cordova()
-  available(): Promise<boolean> {
-    return;
-  }
-
-  /**
-   * Simple call with the configuration data needed to instantiate a new PKAddPaymentPassViewController object.
-   * @param {cardData} data
-   * @return {Promise<any>} Returns a promise
-   */
-  @Cordova()
-  startAddPaymentPass(data: CardData): Promise<any> {
-    return;
-  }
-
-  /**
-   * Simple call contains the card data needed to add a card to Apple Pay.
-   * @param {encryptedCardData} data
-   * @return {Promise<any>} Returns a promise
-   */
-  @Cordova()
-  completeAddPaymentPass(data: EncryptedCardData): Promise<any> {
-    return;
-  }
-}

src/@ionic-native/plugins/appodeal/index.ts

@@ -1,3 +1,5 @@
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
@@ -361,7 +363,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialLoaded',
-    element: document
+    element: 'document'
   })
   onInterstitialLoaded(): Observable<any> {
     return;
@@ -370,7 +372,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialFailedToLoad',
-    element: document
+    element: 'document'
   })
   onInterstitialFailedToLoad(): Observable<any> {
     return;
@@ -379,7 +381,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialShown',
-    element: document
+    element: 'document'
   })
   onInterstitialShown(): Observable<any> {
     return;
@@ -388,7 +390,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialClicked',
-    element: document
+    element: 'document'
   })
   onInterstitialClicked(): Observable<any> {
     return;
@@ -397,7 +399,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialClosed',
-    element: document
+    element: 'document'
   })
   onInterstitialClosed(): Observable<any> {
     return;
@@ -406,7 +408,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoLoaded',
-    element: document
+    element: 'document'
   })
   onSkippableVideoLoaded(): Observable<any> {
     return;
@@ -415,7 +417,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoFailedToLoad',
-    element: document
+    element: 'document'
   })
   onSkippableVideoFailedToLoad(): Observable<any> {
     return;
@@ -424,7 +426,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoShown',
-    element: document
+    element: 'document'
   })
   onSkippableVideoShown(): Observable<any> {
     return;
@@ -433,7 +435,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoFinished',
-    element: document
+    element: 'document'
   })
   onSkippableVideoFinished(): Observable<any> {
     return;
@@ -442,7 +444,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoClosed',
-    element: document
+    element: 'document'
   })
   onSkippableVideoClosed(): Observable<any> {
     return;
@@ -451,7 +453,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoLoaded',
-    element: document
+    element: 'document'
   })
   onRewardedVideoLoaded(): Observable<any> {
     return;
@@ -460,7 +462,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoFailedToLoad',
-    element: document
+    element: 'document'
   })
   onRewardedVideoFailedToLoad(): Observable<any> {
     return;
@@ -469,7 +471,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoShown',
-    element: document
+    element: 'document'
   })
   onRewardedVideoShown(): Observable<any> {
     return;
@@ -478,7 +480,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoFinished',
-    element: document
+    element: 'document'
   })
   onRewardedVideoFinished(): Observable<any> {
     return;
@@ -487,7 +489,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoClosed',
-    element: document
+    element: 'document'
   })
   onRewardedVideoClosed(): Observable<any> {
     return;
@@ -496,7 +498,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoLoaded',
-    element: document
+    element: 'document'
   })
   onNonSkippableVideoLoaded(): Observable<any> {
     return;
@@ -505,7 +507,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoFailedToLoad',
-    element: document
+    element: 'document'
   })
   onNonSkippableVideoFailedToLoad(): Observable<any> {
     return;
@@ -514,7 +516,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoShown',
-    element: document
+    element: 'document'
   })
   onNonSkippableVideoShown(): Observable<any> {
     return;
@@ -523,7 +525,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoFinished',
-    element: document
+    element: 'document'
   })
   onNonSkippableVideoFinished(): Observable<any> {
     return;
@@ -532,7 +534,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoClosed',
-    element: document
+    element: 'document'
   })
   onNonSkippableVideoClosed(): Observable<any> {
     return;
@@ -541,7 +543,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onBannerClicked',
-    element: document
+    element: 'document'
   })
   onBannerClicked(): Observable<any> {
     return;
@@ -550,7 +552,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onBannerFailedToLoad',
-    element: document
+    element: 'document'
   })
   onBannerFailedToLoad(): Observable<any> {
     return;
@@ -559,7 +561,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onBannerLoaded',
-    element: document
+    element: 'document'
   })
   onBannerLoaded(): Observable<any> {
     return;
@@ -568,7 +570,7 @@ export class Appodeal extends IonicNativePlugin {
   @Cordova({
     eventObservable: true,
     event: 'onBannerShown',
-    element: document
+    element: 'document'
   })
   onBannerShown(): Observable<any> {
     return;

src/@ionic-native/plugins/appsflyer/index.ts

@@ -1,188 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-
-export interface AppsflyerOptions {
-  /**
-   * Appsflyer Dev key
-   */
-  devKey: string;
-
-  /**
-   * Apple Application ID(for iOS only)
-   */
-  appId?: string;
-
-  /**
-   * debug mode
-   */
-  isDebug?: boolean;
-
-  /**
-   * optout of collection of IMEI
-   */
-  collectIMEI?: boolean;
-
-  /**
-   * 	optout of collection of collectAndroidID
-   */
-  collectAndroidID?: boolean;
-
-  /**
-   * default false 	Accessing AppsFlyer Attribution / Conversion Data from the SDK (Deferred Deeplinking). Read more: Android, iOS. AppsFlyer plugin will return attribution data in onSuccess callback.
-   */
-  onInstallConversionDataListener?: boolean;
-}
-
-export interface AppsflyerEvent {
-  [x: string]: any;
-}
-
-export interface AppsflyerInviteOptions {
-  channel?: string;
-  campaign?: string;
-  userParams?: {
-    [x: string]: any;
-  };
-}
-
-/**
- * @name Appsflyer
- * @description
- * Appsflyer Cordova SDK support for Attribution
- *
- * @usage
- * ```typescript
- * import { Appsflyer } from '@ionic-native/appsflyer';
- *
- *
- * constructor(private appsflyer: Appsflyer) { }
- *
- * ...
- *
- *
- * this.appsflyer.initSdk(options);
- *
- * ```
- *
- * @interfaces
- * AppsflyerOptions
- * AppsflyerEvent
- * AppsflyerInviteOptions
- */
-@Plugin({
-  pluginName: 'Appsflyer',
-  plugin: 'cordova-plugin-appsflyer-sdk',
-  pluginRef: 'window.plugins.appsFlyer',
-  repo: 'https://github.com/AppsFlyerSDK/cordova-plugin-appsflyer-sdk',
-  platforms: ['iOS', 'Android'],
-  install: 'Add to config.xml like stated on github and then start'
-})
-@Injectable()
-export class Appsflyer extends IonicNativePlugin {
-  /**
-   * initialize the SDK
-   * @param {AppsflyerOptions} options
-   * @returns {Promise<any>}
-   */
-  @Cordova()
-  initSdk(options: AppsflyerOptions): Promise<any> {
-    return;
-  }
-
-  /**
-   * These in-app events help you track how loyal users discover your app, and attribute them to specific campaigns/media-sources. Please take the time define the event/s you want to measure to allow you to track ROI (Return on Investment) and LTV (Lifetime Value).
-   * @param {string} eventName custom event name, is presented in your dashboard
-   * @param {AppsflyerEvent} eventValues event details
-   */
-  @Cordova({ sync: true })
-  trackEvent(eventName: string, eventValues: AppsflyerEvent): void {}
-
-  /**
-   * Setting your own Custom ID enables you to cross-reference your own unique ID with AppsFlyer’s user ID and the other devices’ IDs. This ID is available in AppsFlyer CSV reports along with postbacks APIs for cross-referencing with you internal IDs.
-   * @param {string} customerUserId user id
-   */
-  @Cordova({ sync: true })
-  setAppUserId(customerUserId: string): void {}
-
-  /**
-   * Setting your own Custom ID enables you to cross-reference your own unique ID with AppsFlyer’s user ID and the other devices’ IDs. This ID is available in AppsFlyer CSV reports along with postbacks APIs for cross-referencing with you internal IDs.
-   * @param {boolean} customerUserId In some extreme cases you might want to shut down all SDK tracking due to legal and privacy compliance. This can be achieved with the isStopTracking API. Once this API is invoked, our SDK will no longer communicate with our servers and stop functioning.
-   */
-  @Cordova({ sync: true })
-  stopTracking(isStopTracking: boolean): void {}
-
-  /**
-   * Get the data from Attribution
-   * @returns {Promise<any>}
-   */
-  @Cordova()
-  registerOnAppOpenAttribution(): Promise<any> {
-    return;
-  }
-
-  /**
-   * Enables app uninstall tracking
-   * @param {string} token GCM/FCM ProjectNumber
-   * @returns {Promise<any>}
-   */
-  @Cordova()
-  enableUninstallTracking(token: string): Promise<any> {
-    return;
-  }
-
-  /**
-   * Allows to pass GCM/FCM Tokens that where collected by third party plugins to the AppsFlyer server. Can be used for Uninstall Tracking.
-   * @param {string} token GCM/FCM ProjectNumber
-   */
-  @Cordova({ sync: true })
-  updateServerUninstallToken(token: string): void {}
-
-  /**
-   * Get AppsFlyer’s proprietary Device ID. The AppsFlyer Device ID is the main ID used by AppsFlyer in Reports and APIs.
-   */
-  @Cordova()
-  getAppsFlyerUID(): Promise<any> {
-    return;
-  }
-
-  /**
-   * End User Opt-Out (Optional) AppsFlyer provides you a method to opt‐out specific users from AppsFlyer analytics. This method complies with the latest privacy requirements and complies with Facebook data and privacy policies. Default is FALSE, meaning tracking is enabled by default.
-   * @param {boolean} disable Set to true to opt-out user from tracking
-   */
-  @Cordova({ sync: true })
-  deviceTrackingDisabled(disable: boolean): void {}
-
-  /**
-   * Set AppsFlyer’s OneLink ID. Setting a valid OneLink ID will result in shortened User Invite links, when one is generated. The OneLink ID can be obtained on the AppsFlyer Dashboard.
-   * @param {string} oneLinkId OneLink ID
-   */
-  @Cordova({ sync: true })
-  setAppInviteOneLinkID(oneLinkId: string): void {}
-
-  /**
-   * Allowing your existing users to invite their friends and contacts as new users to your app can be a key growth factor for your app. AppsFlyer allows you to track and attribute new installs originating from user invites within your app.
-   * @param {AppsflyerInviteOptions} options Parameters for Invite link
-   * @returns {Promise<any>}
-   */
-  @Cordova()
-  generateInviteLink(options: AppsflyerInviteOptions): Promise<any> {
-    return;
-  }
-
-  /**
-   * Use this call to track an impression use the following API call. Make sure to use the promoted App ID as it appears within the AppsFlyer dashboard.
-   * @param {string} appId Promoted Application ID
-   * @param {string} campaign Promoted Campaign
-   */
-  @Cordova({ sync: true })
-  trackCrossPromotionImpression(appId: string, campaign: string): void {}
-
-  /**
-   * Use this call to track the click and launch the app store's app page (via Browser)
-   * @param {string} appId Promoted Application ID
-   * @param {string} campaign Promoted Campaign
-   * @param {Object} options Additional Parameters to track
-   */
-  @Cordova({ sync: true })
-  trackAndOpenStore(appId: string, campaign: string, options: Object): void {}
-}

src/@ionic-native/plugins/autostart/index.ts

@@ -1,5 +1,5 @@
-import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
 
 /**
  * @name Autostart
@@ -36,12 +36,14 @@ export class Autostart extends IonicNativePlugin {
    * Enable the automatic startup after the boot
    */
   @Cordova({ sync: true })
-  enable(): void { }
+  enable(): void {
+  }
 
   /**
    * Disable the automatic startup after the boot
    */
   @Cordova({ sync: true })
-  disable(): void { }
+  disable(): void {
+  }
 
 }

src/@ionic-native/plugins/background-fetch/index.ts

@@ -27,7 +27,7 @@ export interface BackgroundFetchConfig {
  *
  *   const config: BackgroundFetchConfig = {
  *     stopOnTerminate: false, // Set true to cease background-fetch from operating after user "closes" the app. Defaults to true.
- *   };
+ *   }
  *
  *   backgroundFetch.configure(config)
  *      .then(() => {
@@ -72,7 +72,9 @@ export class BackgroundFetch extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  configure(config: BackgroundFetchConfig): Promise<any> { return; }
+  configure(config: BackgroundFetchConfig): Promise<any> {
+    return;
+  }
 
   /**
    * Start the background-fetch API.
@@ -80,14 +82,18 @@ export class BackgroundFetch extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  start(): Promise<any> { return; }
+  start(): Promise<any> {
+    return;
+  }
 
   /**
    * Stop the background-fetch API from firing fetch events. Your callbackFn provided to #configure will no longer be executed.
    * @returns {Promise<any>}
    */
   @Cordova()
-  stop(): Promise<any> { return; }
+  stop(): Promise<any> {
+    return;
+  }
 
   /**
    * You MUST call this method in your fetch callbackFn provided to #configure in order to signal to iOS that your fetch action is complete. iOS provides only 30s of background-time for a fetch-event -- if you exceed this 30s, iOS will kill your app.
@@ -95,13 +101,16 @@ export class BackgroundFetch extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  finish(): void { }
+  finish(): void {
+  }
 
   /**
    * Return the status of the background-fetch
    * @returns {Promise<any>}
    */
   @Cordova()
-  status(): Promise<any> { return; }
+  status(): Promise<any> {
+    return;
+  }
 
 }

src/@ionic-native/plugins/background-geolocation/index.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 export interface BackgroundGeolocationResponse {
   /**
@@ -274,7 +274,7 @@ export interface BackgroundGeolocationConfig {
  *             distanceFilter: 30,
  *             debug: true, //  enable this hear sounds for background-geolocation life-cycle.
  *             stopOnTerminate: false, // enable this to clear background location settings when the app terminates
- *     };
+ *     }
  *
  * this.backgroundGeolocation.configure(config)
  *   .subscribe((location: BackgroundGeolocationResponse) => {
@@ -482,9 +482,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
     platforms: ['Android'],
     observable: true
   })
-  watchLocationMode(): Observable<number> {
-    return;
-  }
+  watchLocationMode(): Observable<number> { return; }
 
   /**
    * Stop watching for location mode changes.

src/@ionic-native/plugins/background-mode/index.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 /**
  * Configurations items that can be updated.

src/@ionic-native/plugins/backlight/index.ts

@@ -39,13 +39,17 @@ export class Backlight extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when the backlight is on
    */
   @Cordova()
-  on(): Promise<any> { return; }
+  on(): Promise<any> {
+    return;
+  }
 
   /**
    * This function turns backlight off
    * @return {Promise<any>} Returns a promise that resolves when the backlight is off
    */
   @Cordova()
-  off(): Promise<any> { return; }
+  off(): Promise<any> {
+    return;
+  }
 
 }