From 2f1c86a55e851dab51076b58a31503fa2af51e42 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Mon, 20 Apr 2020 11:35:59 -0700
Subject: [PATCH 1/2] feat(angular): angular 9 support and cleanup

---
 demo-angular/package.json                     |   33 +-
 demo-angular/src/app/app-routing.module.ts    |    2 +-
 demo-angular/src/app/app.module.ts            |    2 +-
 .../src/app/home/home-routing.module.ts       |    2 +-
 demo-angular/src/app/home/home.component.ts   |    3 +-
 demo-angular/src/app/home/home.module.ts      |    3 +-
 demo-angular/src/main.ts                      |    2 +-
 demo-angular/tsconfig.json                    |   12 +-
 demo-vue/app/components/Home.vue              |    3 +-
 demo-vue/jsconfig.json                        |    2 +-
 demo-vue/package.json                         |    6 +-
 demo-vue/tsconfig.json                        |    1 -
 demo/app/app.ts                               |    4 +-
 demo/app/home/home-page.ts                    |    2 +-
 demo/app/home/home-view-model.ts              |    5 +-
 demo/package.json                             |    6 +-
 ...nativescript-datetimepicker.accessors.d.ts |   19 +-
 .../nativescript-datetimepicker.accessors.ts  |    2 +-
 ...ativescript-datetimepicker.directives.d.ts |    4 +-
 .../nativescript-datetimepicker.directives.ts |    8 +-
 .../nativescript-datetimepicker.module.d.ts   |    2 +
 .../nativescript-datetimepicker.module.ts     |   49 +-
 src/angular/package.json                      |    4 -
 src/datetimepicker.android.d.ts               |   24 +
 src/datetimepicker.android.ts                 |    2 +-
 src/datetimepicker.common.d.ts                |   41 +
 src/datetimepicker.common.ts                  |    8 +-
 src/datetimepicker.d.ts                       |    3 +-
 src/datetimepicker.ios.d.ts                   |   24 +
 src/datetimepicker.ios.ts                     |    6 +-
 src/index.d.ts                                |    4 +-
 src/index.ts                                  |    4 +-
 src/package-lock.json                         | 1136 +++++++++++++++++
 src/package.json                              |   36 +-
 src/tsconfig.json                             |   13 +-
 src/ui/date-picker-field.android.d.ts         |    4 +
 src/ui/date-picker-field.common.d.ts          |   30 +
 src/ui/date-picker-field.common.ts            |    3 +-
 src/ui/date-picker-field.d.ts                 |    4 +-
 src/ui/date-picker-field.ios.d.ts             |    3 +
 src/ui/date-time-picker-fields.d.ts           |  207 +--
 src/ui/date-time-picker-fields.ts             |   11 +-
 src/ui/index.d.ts                             |    3 +
 src/ui/index.ts                               |    3 +
 src/ui/picker-field-base.d.ts                 |   21 +
 src/ui/picker-field-base.ts                   |    6 +-
 src/ui/time-picker-field.android.d.ts         |    4 +
 src/ui/time-picker-field.common.d.ts          |   27 +
 src/ui/time-picker-field.common.ts            |    3 +-
 src/ui/time-picker-field.d.ts                 |    4 +-
 src/ui/time-picker-field.ios.d.ts             |    3 +
 src/utils/date-utils.d.ts                     |    4 +
 src/utils/localization-utils.android.d.ts     |   10 +
 src/utils/localization-utils.common.d.ts      |   11 +
 src/utils/localization-utils.ios.d.ts         |    9 +
 src/vue/index.d.ts                            |    5 +-
 src/vue/index.ts                              |    4 +-
 src/vue/package.json                          |    4 -
 58 files changed, 1561 insertions(+), 299 deletions(-)
 delete mode 100644 src/angular/package.json
 create mode 100644 src/datetimepicker.android.d.ts
 create mode 100644 src/datetimepicker.common.d.ts
 create mode 100644 src/datetimepicker.ios.d.ts
 create mode 100644 src/package-lock.json
 create mode 100644 src/ui/date-picker-field.android.d.ts
 create mode 100644 src/ui/date-picker-field.common.d.ts
 create mode 100644 src/ui/date-picker-field.ios.d.ts
 create mode 100644 src/ui/index.d.ts
 create mode 100644 src/ui/index.ts
 create mode 100644 src/ui/picker-field-base.d.ts
 create mode 100644 src/ui/time-picker-field.android.d.ts
 create mode 100644 src/ui/time-picker-field.common.d.ts
 create mode 100644 src/ui/time-picker-field.ios.d.ts
 create mode 100644 src/utils/date-utils.d.ts
 create mode 100644 src/utils/localization-utils.android.d.ts
 create mode 100644 src/utils/localization-utils.common.d.ts
 create mode 100644 src/utils/localization-utils.ios.d.ts
 delete mode 100644 src/vue/package.json

diff --git a/demo-angular/package.json b/demo-angular/package.json
index 821ee23..b099519 100644
--- a/demo-angular/package.json
+++ b/demo-angular/package.json
@@ -18,29 +18,30 @@
     "e2e-watch": "tsc -p e2e --watch"
   },
   "dependencies": {
-    "@angular/animations": "~8.2.0",
-    "@angular/common": "~8.2.0",
-    "@angular/compiler": "~8.2.0",
-    "@angular/core": "~8.2.0",
-    "@angular/forms": "~8.2.0",
-    "@angular/platform-browser": "~8.2.0",
-    "@angular/platform-browser-dynamic": "~8.2.0",
-    "@angular/router": "~8.2.0",
-    "nativescript-angular": "~8.20.0",
+    "@angular/animations": "~9.1.0",
+    "@angular/common": "~9.1.0",
+    "@angular/compiler": "~9.1.0",
+    "@angular/core": "~9.1.0",
+    "@angular/forms": "~9.1.0",
+    "@angular/platform-browser": "~9.1.0",
+    "@angular/platform-browser-dynamic": "~9.1.0",
+    "@angular/router": "~9.1.0",
+    "@nativescript/angular": "https://github.com/nstudio/ns-ng/blob/master/nativescript-angular-9.0.0.tgz?raw=true",
+    "nativescript-angular": "https://github.com/nstudio/ns-ng/blob/master/nativescript-angular-compat.tgz?raw=true",
     "nativescript-datetimepicker": "file:../src",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.10",
-    "rxjs": "^6.4.0",
-    "tns-core-modules": "^6.0.0",
-    "zone.js": "^0.9.1"
+    "rxjs": "^6.5.0",
+    "tns-core-modules": "^6.5.0",
+    "zone.js": "^0.10.3"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~8.2.0",
-    "@ngtools/webpack": "~8.2.0",
+    "@angular/compiler-cli": "~9.1.0",
+    "@ngtools/webpack": "~9.1.0",
     "@types/node": "~10.12.18",
-    "nativescript-dev-webpack": "^1.3.0",
+    "nativescript-dev-webpack": "^1.5.0",
     "tslint": "~5.11.0",
-    "typescript": "~3.5.3"
+    "typescript": "~3.8.3"
   },
   "readme": "NativeScript DateTimePicker Demo NG"
 }
diff --git a/demo-angular/src/app/app-routing.module.ts b/demo-angular/src/app/app-routing.module.ts
index 8317fd8..ed78560 100644
--- a/demo-angular/src/app/app-routing.module.ts
+++ b/demo-angular/src/app/app-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 import { Routes } from "@angular/router";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
+import { NativeScriptRouterModule } from "@nativescript/angular";
 
 const routes: Routes = [
     { path: "", redirectTo: "/home", pathMatch: "full" },
diff --git a/demo-angular/src/app/app.module.ts b/demo-angular/src/app/app.module.ts
index e531604..bb47fe9 100644
--- a/demo-angular/src/app/app.module.ts
+++ b/demo-angular/src/app/app.module.ts
@@ -1,5 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptModule } from "@nativescript/angular";
 
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";
diff --git a/demo-angular/src/app/home/home-routing.module.ts b/demo-angular/src/app/home/home-routing.module.ts
index a697bdb..d0218c1 100644
--- a/demo-angular/src/app/home/home-routing.module.ts
+++ b/demo-angular/src/app/home/home-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 import { Routes } from "@angular/router";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
+import { NativeScriptRouterModule } from "@nativescript/angular";
 
 import { HomeComponent } from "./home.component";
 
diff --git a/demo-angular/src/app/home/home.component.ts b/demo-angular/src/app/home/home.component.ts
index 8f4e9e2..3429392 100644
--- a/demo-angular/src/app/home/home.component.ts
+++ b/demo-angular/src/app/home/home.component.ts
@@ -1,7 +1,6 @@
 import { Component, OnInit, ViewChild, ElementRef } from "@angular/core";
 import { DateTimePicker } from "nativescript-datetimepicker";
-import { EventData } from "tns-core-modules/data/observable";
-import { Button } from "tns-core-modules/ui/button";
+import { Button, EventData } from "@nativescript/core";
 
 @Component({
     selector: "Home",
diff --git a/demo-angular/src/app/home/home.module.ts b/demo-angular/src/app/home/home.module.ts
index f78b7d9..0fee216 100644
--- a/demo-angular/src/app/home/home.module.ts
+++ b/demo-angular/src/app/home/home.module.ts
@@ -1,7 +1,6 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptCommonModule } from "nativescript-angular/common";
+import { NativeScriptCommonModule, NativeScriptFormsModule } from "@nativescript/angular";
 import { NativeScriptDateTimePickerModule } from "nativescript-datetimepicker/angular";
-import { NativeScriptFormsModule } from "nativescript-angular/forms";
 
 import { HomeRoutingModule } from "./home-routing.module";
 import { HomeComponent } from "./home.component";
diff --git a/demo-angular/src/main.ts b/demo-angular/src/main.ts
index 8015ce5..3cae736 100644
--- a/demo-angular/src/main.ts
+++ b/demo-angular/src/main.ts
@@ -1,5 +1,5 @@
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
-import { platformNativeScriptDynamic } from "nativescript-angular/platform";
+import { platformNativeScriptDynamic } from "@nativescript/angular/platform";
 
 import { AppModule } from "./app/app.module";
 
diff --git a/demo-angular/tsconfig.json b/demo-angular/tsconfig.json
index 58b7643..2d3a263 100644
--- a/demo-angular/tsconfig.json
+++ b/demo-angular/tsconfig.json
@@ -8,9 +8,9 @@
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "lib": [
-            "es6",
-            "dom",
-            "es2015.iterable"
+          "es2017",
+          "dom",
+          "es6"
         ],
         "pretty": true,
         "allowUnreachableCode": false,
@@ -25,7 +25,6 @@
         "baseUrl": ".",
         "paths": {
             "*": [
-                "./node_modules/tns-core-modules/*",
                 "./node_modules/*"
             ],
             "~/*": [
@@ -42,5 +41,8 @@
         "node_modules",
         "platforms"
     ],
-    "compileOnSave": false
+    "compileOnSave": false,
+    "angularCompilerOptions": {
+      "enableIvy": false
+    }
 }
\ No newline at end of file
diff --git a/demo-vue/app/components/Home.vue b/demo-vue/app/components/Home.vue
index 75c69c3..631d54a 100644
--- a/demo-vue/app/components/Home.vue
+++ b/demo-vue/app/components/Home.vue
@@ -172,8 +172,7 @@
 
 <script>
     import { DateTimePicker } from "nativescript-datetimepicker";
-    import { EventData } from "tns-core-modules/data/observable";
-    import { Button } from "tns-core-modules/ui/button";
+    import { EventData, Button } from "@nativescript/core";
     export default {
         computed: {
             message() {
diff --git a/demo-vue/jsconfig.json b/demo-vue/jsconfig.json
index 7f09289..eeade72 100644
--- a/demo-vue/jsconfig.json
+++ b/demo-vue/jsconfig.json
@@ -2,7 +2,7 @@
     "compilerOptions": {
         "baseUrl": "./",
         "paths": {
-            "*": ["./node_modules/tns-core-modules/*", "./node_modules/*"],
+            "*": ["./node_modules/*"],
             "~/*": ["app/*"]
         }
     },
diff --git a/demo-vue/package.json b/demo-vue/package.json
index 3a0fe44..1ca34d3 100644
--- a/demo-vue/package.json
+++ b/demo-vue/package.json
@@ -15,17 +15,17 @@
         "nativescript-datetimepicker": "file:../src",
         "nativescript-theme-core": "~1.0.4",
         "nativescript-vue": "~2.4.0",
-        "tns-core-modules": "^6.0.0"
+        "tns-core-modules": "^6.5.0"
     },
     "devDependencies": {
         "@babel/core": "~7.2.0",
         "@babel/preset-env": "~7.2.0",
         "babel-loader": "~8.0.0",
-        "nativescript-dev-webpack": "^1.3.0",
+        "nativescript-dev-webpack": "^1.5.0",
         "nativescript-vue-template-compiler": "~2.4.0",
         "node-sass": "~4.12.0",
         "vue-loader": "~15.4.0",
-        "typescript": "~3.5.3"
+        "typescript": "~3.8.3"
     },
     "readme": "NativeScript DateTimePicker Demo Vue"
 }
diff --git a/demo-vue/tsconfig.json b/demo-vue/tsconfig.json
index f7c65d6..ea9be73 100644
--- a/demo-vue/tsconfig.json
+++ b/demo-vue/tsconfig.json
@@ -16,7 +16,6 @@
                 "app/*"
             ],
             "*": [
-                "./node_modules/tns-core-modules/*",
                 "./node_modules/*"
             ]
         }
diff --git a/demo/app/app.ts b/demo/app/app.ts
index 002e32f..d3c28d4 100644
--- a/demo/app/app.ts
+++ b/demo/app/app.ts
@@ -4,9 +4,9 @@ You can use this file to perform app-level initialization, but the primary
 purpose of the file is to pass control to the app’s first module.
 */
 
-import * as app from "tns-core-modules/application";
+import { Application } from "@nativescript/core";
 
-app.run({ moduleName: "app-root" });
+Application.run({ moduleName: "app-root" });
 
 /*
 Do not place any code after the application has been started as it will not
diff --git a/demo/app/home/home-page.ts b/demo/app/home/home-page.ts
index 2fd8328..023f27b 100644
--- a/demo/app/home/home-page.ts
+++ b/demo/app/home/home-page.ts
@@ -4,7 +4,7 @@ a code-behind file. The code-behind is a great place to place your view
 logic, and to set up your page’s data binding.
 */
 
-import { NavigatedData, Page } from "tns-core-modules/ui/page";
+import { NavigatedData, Page } from "@nativescript/core";
 
 import { HomeViewModel } from "./home-view-model";
 
diff --git a/demo/app/home/home-view-model.ts b/demo/app/home/home-view-model.ts
index a1ee075..3606599 100644
--- a/demo/app/home/home-view-model.ts
+++ b/demo/app/home/home-view-model.ts
@@ -1,8 +1,5 @@
-import { Observable } from "tns-core-modules/data/observable";
 import { DateTimePicker } from "nativescript-datetimepicker";
-import { EventData } from "tns-core-modules/data/observable";
-import { Button } from "tns-core-modules/ui/button";
-import { ScrollView } from "tns-core-modules/ui/scroll-view";
+import { ScrollView, Button, EventData, Observable } from "@nativescript/core";
 
 export class HomeViewModel extends Observable {
     private scrollView: ScrollView;
diff --git a/demo/package.json b/demo/package.json
index f5800a7..8bb11b1 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -18,12 +18,12 @@
     "dependencies": {
         "nativescript-datetimepicker": "file:../src",
         "nativescript-theme-core": "~1.0.4",
-        "tns-core-modules": "^6.0.0"
+        "tns-core-modules": "^6.5.0"
     },
     "devDependencies": {
-        "nativescript-dev-webpack": "^1.3.0",
+        "nativescript-dev-webpack": "^1.5.0",
         "tslint": "~5.11.0",
-        "typescript": "~3.5.3"
+        "typescript": "~3.8.3"
     },
     "readme": "NativeScript DateTimePicker Demo Core"
 }
diff --git a/src/angular/nativescript-datetimepicker.accessors.d.ts b/src/angular/nativescript-datetimepicker.accessors.d.ts
index 477b31b..50fe710 100644
--- a/src/angular/nativescript-datetimepicker.accessors.d.ts
+++ b/src/angular/nativescript-datetimepicker.accessors.d.ts
@@ -1,12 +1,29 @@
 import { ElementRef } from "@angular/core";
-import { BaseValueAccessor } from "nativescript-angular/forms/value-accessors";
+import { BaseValueAccessor } from "@nativescript/angular/forms/value-accessors";
 import { DatePickerField } from "../ui/date-picker-field";
 import { TimePickerField } from "../ui/time-picker-field";
+import { DateTimePickerFields } from "../ui/date-time-picker-fields";
 export declare class DatePickerValueAccessor extends BaseValueAccessor<DatePickerField> {
+    private _hasBeenOpened;
     constructor(elementRef: ElementRef);
     writeValue(value: any): void;
+    handleDateChange(args: any): void;
+    handleDatePickerOpened(args: any): void;
+    handleDatePickerClosed(args: any): void;
 }
 export declare class TimePickerValueAccessor extends BaseValueAccessor<TimePickerField> {
+    private _hasBeenOpened;
     constructor(elementRef: ElementRef);
     writeValue(value: any): void;
+    handleTimeChange(args: any): void;
+    handleTimePickerOpened(args: any): void;
+    handleTimePickerClosed(args: any): void;
+}
+export declare class DateTimePickersValueAccessor extends BaseValueAccessor<DateTimePickerFields> {
+    private _hasBeenOpened;
+    constructor(elementRef: ElementRef);
+    writeValue(value: any): void;
+    handleDateChange(args: any): void;
+    handlePickerOpened(args: any): void;
+    handlePickerClosed(args: any): void;
 }
diff --git a/src/angular/nativescript-datetimepicker.accessors.ts b/src/angular/nativescript-datetimepicker.accessors.ts
index ae23f41..56eb841 100644
--- a/src/angular/nativescript-datetimepicker.accessors.ts
+++ b/src/angular/nativescript-datetimepicker.accessors.ts
@@ -1,6 +1,6 @@
 import { Directive, ElementRef, forwardRef } from "@angular/core";
 import { NG_VALUE_ACCESSOR } from "@angular/forms";
-import { BaseValueAccessor } from "nativescript-angular/forms/value-accessors";
+import { BaseValueAccessor } from "@nativescript/angular/forms/value-accessors";
 import { DatePickerField } from "../ui/date-picker-field";
 import { TimePickerField } from "../ui/time-picker-field";
 import { DateTimePickerFields } from "../ui/date-time-picker-fields";
diff --git a/src/angular/nativescript-datetimepicker.directives.d.ts b/src/angular/nativescript-datetimepicker.directives.d.ts
index 521d9b9..93d945f 100644
--- a/src/angular/nativescript-datetimepicker.directives.d.ts
+++ b/src/angular/nativescript-datetimepicker.directives.d.ts
@@ -1,6 +1,6 @@
-import { DatePickerValueAccessor, TimePickerValueAccessor } from "./nativescript-datetimepicker.accessors";
 export declare class DatePickerFieldDirective {
 }
 export declare class TimePickerFieldDirective {
 }
-export declare const DIRECTIVES: (typeof DatePickerFieldDirective | typeof DatePickerValueAccessor | typeof TimePickerValueAccessor)[];
+export declare class DateTimePickerFieldsDirective {
+}
diff --git a/src/angular/nativescript-datetimepicker.directives.ts b/src/angular/nativescript-datetimepicker.directives.ts
index 5c8bb4f..b3f9e6d 100644
--- a/src/angular/nativescript-datetimepicker.directives.ts
+++ b/src/angular/nativescript-datetimepicker.directives.ts
@@ -1,7 +1,4 @@
 import { Directive } from "@angular/core";
-import {
-    DatePickerValueAccessor, TimePickerValueAccessor, DateTimePickersValueAccessor
-} from "./nativescript-datetimepicker.accessors";
 
 @Directive({
     selector: "DatePickerField"
@@ -16,7 +13,4 @@ export class TimePickerFieldDirective { }
 @Directive({
     selector: "DateTimePickerFields"
 })
-export class DateTimePickerFieldsDirective { }
-
-export const DIRECTIVES = [DatePickerFieldDirective, TimePickerFieldDirective, DateTimePickerFieldsDirective,
-    DatePickerValueAccessor, TimePickerValueAccessor, DateTimePickersValueAccessor];
\ No newline at end of file
+export class DateTimePickerFieldsDirective { }
\ No newline at end of file
diff --git a/src/angular/nativescript-datetimepicker.module.d.ts b/src/angular/nativescript-datetimepicker.module.d.ts
index b83a402..2b02051 100644
--- a/src/angular/nativescript-datetimepicker.module.d.ts
+++ b/src/angular/nativescript-datetimepicker.module.d.ts
@@ -1,2 +1,4 @@
+export { DatePickerFieldDirective, TimePickerFieldDirective, DateTimePickerFieldsDirective, } from "./nativescript-datetimepicker.directives";
+export { DatePickerValueAccessor, TimePickerValueAccessor, DateTimePickersValueAccessor, } from "./nativescript-datetimepicker.accessors";
 export declare class NativeScriptDateTimePickerModule {
 }
diff --git a/src/angular/nativescript-datetimepicker.module.ts b/src/angular/nativescript-datetimepicker.module.ts
index 3dfad8c..c6ae6d7 100644
--- a/src/angular/nativescript-datetimepicker.module.ts
+++ b/src/angular/nativescript-datetimepicker.module.ts
@@ -1,17 +1,48 @@
 import { NgModule } from "@angular/core";
-import { registerElement } from "nativescript-angular/element-registry";
-import { DatePickerField } from "../ui/date-picker-field";
-import { TimePickerField } from "../ui/time-picker-field";
-import { DateTimePickerFields } from "../ui/date-time-picker-fields";
+import { registerElement } from "@nativescript/angular";
+import { DatePickerField, TimePickerField, DateTimePickerFields } from "../ui";
+import {
+  DatePickerFieldDirective,
+  TimePickerFieldDirective,
+  DateTimePickerFieldsDirective,
+} from "./nativescript-datetimepicker.directives";
+import {
+  DatePickerValueAccessor,
+  TimePickerValueAccessor,
+  DateTimePickersValueAccessor,
+} from "./nativescript-datetimepicker.accessors";
 
-import { DIRECTIVES } from "./nativescript-datetimepicker.directives";
+export {
+  DatePickerFieldDirective,
+  TimePickerFieldDirective,
+  DateTimePickerFieldsDirective,
+} from "./nativescript-datetimepicker.directives";
+export {
+  DatePickerValueAccessor,
+  TimePickerValueAccessor,
+  DateTimePickersValueAccessor,
+} from "./nativescript-datetimepicker.accessors";
 
 @NgModule({
-    declarations: [DIRECTIVES],
-    exports: [DIRECTIVES],
+  declarations: [
+    DatePickerFieldDirective,
+    TimePickerFieldDirective,
+    DateTimePickerFieldsDirective,
+    DatePickerValueAccessor,
+    TimePickerValueAccessor,
+    DateTimePickersValueAccessor,
+  ],
+  exports: [
+    DatePickerFieldDirective,
+    TimePickerFieldDirective,
+    DateTimePickerFieldsDirective,
+    DatePickerValueAccessor,
+    TimePickerValueAccessor,
+    DateTimePickersValueAccessor,
+  ],
 })
-export class NativeScriptDateTimePickerModule { }
+export class NativeScriptDateTimePickerModule {}
 
 registerElement("DatePickerField", () => DatePickerField);
 registerElement("TimePickerField", () => TimePickerField);
-registerElement("DateTimePickerFields", () => DateTimePickerFields);
\ No newline at end of file
+registerElement("DateTimePickerFields", () => DateTimePickerFields);
diff --git a/src/angular/package.json b/src/angular/package.json
deleted file mode 100644
index 7c433e6..0000000
--- a/src/angular/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "name": "nativescript-datetimepicker",
-    "main": "index.js"
-}
\ No newline at end of file
diff --git a/src/datetimepicker.android.d.ts b/src/datetimepicker.android.d.ts
new file mode 100644
index 0000000..3ea7323
--- /dev/null
+++ b/src/datetimepicker.android.d.ts
@@ -0,0 +1,24 @@
+import { DateTimePickerBase, DateTimePickerStyleBase, DatePickerOptions, TimePickerOptions, PickerOptions } from "./datetimepicker.common";
+export declare class DateTimePickerStyle extends DateTimePickerStyleBase {
+}
+export declare class DateTimePicker extends DateTimePickerBase {
+    private static _defaultOkText;
+    private static _defaultCancelText;
+    private static _defaultsInitialized;
+    static pickDate(options: DatePickerOptions, style?: DateTimePickerStyle): Promise<Date>;
+    static pickTime(options: TimePickerOptions, style?: DateTimePickerStyle): Promise<Date>;
+    static _createNativeDatePicker(options: DatePickerOptions): android.widget.DatePicker;
+    static _createNativeTimePicker(options: TimePickerOptions): android.widget.TimePicker;
+    static _createNativeDialog(nativePicker: android.view.View, options: PickerOptions, value: Date, callback: Function): android.app.AlertDialog.Builder;
+    static _showNativeDialog(nativePickerBuilder: android.app.AlertDialog.Builder, nativePicker: any, style: DateTimePickerStyle): void;
+    private static _trimDate;
+    private static _applyDialogColors;
+    private static _applyDialogSpinnersColors;
+    private static _applyDialogOkButtonColors;
+    private static _applyDialogCancelButtonColors;
+    private static _applyTextViewColor;
+    private static _applyNumberPickerColor;
+    private static _findViewById;
+    private static _findFieldByName;
+    private static _initializeTextResources;
+}
diff --git a/src/datetimepicker.android.ts b/src/datetimepicker.android.ts
index 7163c31..f426c69 100644
--- a/src/datetimepicker.android.ts
+++ b/src/datetimepicker.android.ts
@@ -1,4 +1,4 @@
-import { Color } from "tns-core-modules/color";
+import { Color } from "@nativescript/core";
 import { LocalizationUtils } from "./utils/localization-utils";
 import { getDateNow, getDateToday } from "./utils/date-utils";
 import {
diff --git a/src/datetimepicker.common.d.ts b/src/datetimepicker.common.d.ts
new file mode 100644
index 0000000..da56ebb
--- /dev/null
+++ b/src/datetimepicker.common.d.ts
@@ -0,0 +1,41 @@
+import { View, Page, Color } from "@nativescript/core";
+import { DateTimePicker as DateTimePickerDefinition, DateTimePickerStyle as DateTimePickerStyleDefinition } from "./datetimepicker";
+export declare const CSS_NAME = "date-time-picker";
+export declare const SPINNERS_CSS_NAME = "date-time-picker-spinners";
+export declare const BUTTONS_CSS_NAME = "date-time-picker-buttons";
+export declare const BUTTON_OK_CSS_NAME = "date-time-picker-button-ok";
+export declare const BUTTON_CANCEL_CSS_NAME = "date-time-picker-button-cancel";
+export declare class DateTimePickerBase implements DateTimePickerDefinition {
+    static pickDate(options: DatePickerOptions, style?: DateTimePickerStyleDefinition): Promise<Date>;
+    static pickTime(options: TimePickerOptions, style?: DateTimePickerStyleDefinition): Promise<Date>;
+}
+export interface DatePickerOptions extends PickerOptions {
+    date?: Date;
+    minDate?: Date;
+    maxDate?: Date;
+}
+export interface TimePickerOptions extends PickerOptions {
+    time?: Date;
+    is24Hours?: boolean;
+}
+export interface PickerOptions {
+    context: any;
+    locale?: string;
+    title?: string;
+    okButtonText?: string;
+    cancelButtonText?: string;
+}
+export declare class DateTimePickerStyleBase implements DateTimePickerStyleDefinition {
+    dialogBackgroundColor: Color;
+    titleTextColor: Color;
+    spinnersTextColor: Color;
+    spinnersBackgroundColor: Color;
+    buttonsTextColor: Color;
+    buttonsBackgroundColor: Color;
+    buttonOkTextColor: Color;
+    buttonOkBackgroundColor: Color;
+    buttonCancelTextColor: Color;
+    buttonCancelBackgroundColor: Color;
+    static create(view: View): DateTimePickerStyleBase;
+}
+export declare function getCurrentPage(): Page;
diff --git a/src/datetimepicker.common.ts b/src/datetimepicker.common.ts
index 058dd35..3475f7d 100644
--- a/src/datetimepicker.common.ts
+++ b/src/datetimepicker.common.ts
@@ -1,8 +1,4 @@
-import { View } from "tns-core-modules/ui/core/view";
-import { ContentView } from "tns-core-modules/ui/content-view";
-import { Page } from "tns-core-modules/ui/page";
-import { Color } from "tns-core-modules/color";
-import * as frameModule from "tns-core-modules/ui/frame";
+import { View, ContentView, Page, Color, Frame } from "@nativescript/core";
 import {
     DateTimePicker as DateTimePickerDefinition,
     DateTimePickerStyle as DateTimePickerStyleDefinition
@@ -76,7 +72,7 @@ export class DateTimePickerStyleBase implements DateTimePickerStyleDefinition {
 }
 
 export function getCurrentPage(): Page {
-    let topmostFrame = frameModule.topmost();
+    let topmostFrame = Frame.topmost();
     if (topmostFrame) {
         return topmostFrame.currentPage;
     }
diff --git a/src/datetimepicker.d.ts b/src/datetimepicker.d.ts
index 0a3c0c8..7254c19 100644
--- a/src/datetimepicker.d.ts
+++ b/src/datetimepicker.d.ts
@@ -1,5 +1,4 @@
-import { Color } from "tns-core-modules/color";
-import { View } from "tns-core-modules/ui/core/view";
+import { Color, View } from "@nativescript/core";
 
 /**
  * Represents a class that provides methods for picking date and time.
diff --git a/src/datetimepicker.ios.d.ts b/src/datetimepicker.ios.d.ts
new file mode 100644
index 0000000..ab1f248
--- /dev/null
+++ b/src/datetimepicker.ios.d.ts
@@ -0,0 +1,24 @@
+import { DateTimePickerBase, DateTimePickerStyleBase, DatePickerOptions, TimePickerOptions, PickerOptions } from "./datetimepicker.common";
+export declare class DateTimePickerStyle extends DateTimePickerStyleBase {
+}
+export declare class DateTimePicker extends DateTimePickerBase {
+    static PICKER_DEFAULT_MESSAGE_HEIGHT: number;
+    static PICKER_WIDTH_INSETS: number;
+    static PICKER_WIDTH_PAD: number;
+    static PICKER_DEFAULT_TITLE_OFFSET: number;
+    static PICKER_DEFAULT_TITLE_HEIGHT: number;
+    static PICKER_DEFAULT_MESSAGE: string;
+    static pickDate(options: DatePickerOptions, style?: DateTimePickerStyle): Promise<Date>;
+    static pickTime(options: TimePickerOptions, style?: DateTimePickerStyle): Promise<Date>;
+    static _createNativeDatePicker(options: DatePickerOptions): UIDatePicker;
+    static _createNativeTimePicker(options: TimePickerOptions): UIDatePicker;
+    static _createNativeDialog(nativePicker: UIDatePicker, options: PickerOptions, style: DateTimePickerStyle, callback: Function): UIAlertController;
+    static _showNativeDialog(nativeDialog: UIAlertController, nativePicker: UIDatePicker, style: DateTimePickerStyle): void;
+    private static _applyDialogTitleTextColor;
+    private static _applyDialogSpinnersColors;
+    private static _applyDialogButtonTextColor;
+    private static _applyBackgroundColors;
+    private static _clearVibrancyEffects;
+    private static _getLabelContainer;
+    private static _findLabelWithText;
+}
diff --git a/src/datetimepicker.ios.ts b/src/datetimepicker.ios.ts
index bceac1f..c1f794f 100644
--- a/src/datetimepicker.ios.ts
+++ b/src/datetimepicker.ios.ts
@@ -1,5 +1,5 @@
-import { Color } from "tns-core-modules/color";
-import { View, ios as iosView } from "tns-core-modules/ui/core/view";
+import { Color, View, iOSApplication } from "@nativescript/core";
+import { ios } from "@nativescript/core/ui/core/view";
 import {
     DateTimePickerBase, DateTimePickerStyleBase, getCurrentPage,
     DatePickerOptions, TimePickerOptions, PickerOptions
@@ -145,7 +145,7 @@ export class DateTimePicker extends DateTimePickerBase {
                 if (view.ios instanceof UIViewController) {
                     viewController = view.ios;
                 } else {
-                    const parentWithController = iosView.getParentWithViewController(view);
+                    const parentWithController = ios.getParentWithViewController(view);
                     viewController = parentWithController ? parentWithController.viewController : undefined;
                 }
             }
diff --git a/src/index.d.ts b/src/index.d.ts
index 38410b0..2df4741 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -1,4 +1,2 @@
 export * from "./datetimepicker";
-export * from "./ui/date-picker-field";
-export * from "./ui/time-picker-field";
-export * from "./ui/date-time-picker-fields";
+export * from "./ui";
diff --git a/src/index.ts b/src/index.ts
index 4eb037f..ce48373 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,4 +1,2 @@
 export * from "./datetimepicker";
-export * from "./ui/date-picker-field";
-export * from "./ui/time-picker-field";
-export * from "./ui/date-time-picker-fields";
\ No newline at end of file
+export * from "./ui";
\ No newline at end of file
diff --git a/src/package-lock.json b/src/package-lock.json
new file mode 100644
index 0000000..339ab92
--- /dev/null
+++ b/src/package-lock.json
@@ -0,0 +1,1136 @@
+{
+  "name": "nativescript-datetimepicker",
+  "version": "2.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@angular/common": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.2.tgz",
+      "integrity": "sha512-MAQW0DGq2NhvJSETLTwuImdzwI+wboG+5Uzgc0L8C/hX7SrEE65Hmz4nIjmGi2CPGLpodfWEcCPlV0R0dHun4A==",
+      "dev": true
+    },
+    "@angular/compiler": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.2.tgz",
+      "integrity": "sha512-82DitvlZA5DoE++qiiJdgx6HE71h96sfLHCjjvYJHApoOcnX+zBZFBrflpbXK9W4YdvydU4Lc1Ql1eleQPeT/g==",
+      "dev": true
+    },
+    "@angular/compiler-cli": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.2.tgz",
+      "integrity": "sha512-zC/oIuT68vtuiYrgXqWsDNi/0DQ1Ti6J6gMTrXVvZXlEDikEExTAJKrrBV5jo6B0bpUofe/dDcJaKR3Ys3cM3Q==",
+      "dev": true,
+      "requires": {
+        "canonical-path": "1.0.0",
+        "chokidar": "^3.0.0",
+        "convert-source-map": "^1.5.1",
+        "dependency-graph": "^0.7.2",
+        "fs-extra": "4.0.2",
+        "magic-string": "^0.25.0",
+        "minimist": "^1.2.0",
+        "reflect-metadata": "^0.1.2",
+        "semver": "^6.3.0",
+        "source-map": "^0.6.1",
+        "sourcemap-codec": "^1.4.8",
+        "yargs": "15.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@angular/core": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.2.tgz",
+      "integrity": "sha512-nAqRl+5drAnZlBT7AgSo2JJubmPNrGCvhZ83dosPEUqJoLr69/lYipnF/iqKzYn5xo4MM1O27WIhSNDtDjBmzQ==",
+      "dev": true
+    },
+    "@angular/forms": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.2.tgz",
+      "integrity": "sha512-/f2WhMiKDo1/RoisTI71Dy4Z4+sAsAuzgIxJEXvgDGSYvzLl9G8erFx4N6be8Cy/xXwErmp3JOwXIAXjzxF8tA==",
+      "dev": true
+    },
+    "@angular/platform-browser": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.2.tgz",
+      "integrity": "sha512-/3L4DdvnebvaJUurusaq8RJBFfr/SHWG6DMmV1VVpADxe8kjREyN0LdNDSkZgVf/QcUSwNEA6153iwcF92Otew==",
+      "dev": true
+    },
+    "@angular/platform-browser-dynamic": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.2.tgz",
+      "integrity": "sha512-BWHxy8S71z+NmUQmtR+/Dkohlj3LQIXltOqeVdCSpjV9cultBNN3bE1w0Rjp3BmCRGCIDH7qFlr4U5woHa7ldw==",
+      "dev": true
+    },
+    "@angular/router": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.2.tgz",
+      "integrity": "sha512-csxE4HkuhVR1X932Q3kSDqBoF7Awuq5dsjv0nFk78raiHgG3CNnfMLHt8xD9XtOmR7ZT+D4yh/YmIK6W7J5hbQ==",
+      "dev": true
+    },
+    "@babel/code-frame": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+      "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.8.3"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.9.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
+      "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+      "dev": true
+    },
+    "@babel/highlight": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+      "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.9.0",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@nativescript/angular": {
+      "version": "https://github.com/nstudio/ns-ng/blob/master/nativescript-angular-9.0.0.tgz?raw=true",
+      "integrity": "sha512-mMI11jRHhiAZJ3lXoeZA9mtl7LPvcb0mqQOHy4iNdEGqSCZn7ZBvWHDZboAK7KgdFkJ37oWang21FKBkroYc6A==",
+      "dev": true,
+      "requires": {
+        "nativescript-intl": "^3.0.0"
+      }
+    },
+    "@nativescript/core": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-6.5.1.tgz",
+      "integrity": "sha512-+kxCLIKSw8mTMVnBf2oBy9Q0DR0ptbyUICyL744AVmOdOsvoQmngmBZZpgnbrZO6wwbeC6yixtK6Hq9KHx1YkA==",
+      "dev": true,
+      "requires": {
+        "css-tree": "^1.0.0-alpha.37",
+        "nativescript-hook": "0.2.5",
+        "reduce-css-calc": "^2.1.6",
+        "semver": "6.3.0",
+        "tns-core-modules-widgets": "6.5.0",
+        "tslib": "1.10.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "tslib": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+          "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+          "dev": true
+        }
+      }
+    },
+    "@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+      "dev": true,
+      "requires": {
+        "@types/color-name": "^1.1.1",
+        "color-convert": "^2.0.1"
+      }
+    },
+    "anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "async": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+      "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
+    "canonical-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz",
+      "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        }
+      }
+    },
+    "chokidar": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz",
+      "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==",
+      "dev": true,
+      "requires": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "fsevents": "~2.1.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.3.0"
+      }
+    },
+    "cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "css-tree": {
+      "version": "1.0.0-alpha.39",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
+      "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+      "dev": true,
+      "requires": {
+        "mdn-data": "2.0.6",
+        "source-map": "^0.6.1"
+      }
+    },
+    "css-unit-converter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz",
+      "integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=",
+      "dev": true
+    },
+    "cycle": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+      "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=",
+      "dev": true
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "deep-equal": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
+      "integrity": "sha1-hLdFiW80xoTpjyzg5Cq69Du6AX0=",
+      "dev": true
+    },
+    "dependency-graph": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz",
+      "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==",
+      "dev": true
+    },
+    "diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "eyes": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+      "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=",
+      "dev": true
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "fs-extra": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
+      "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
+      "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+      "dev": true,
+      "optional": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "glob": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+      "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+      "dev": true,
+      "requires": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "2 || 3",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "i": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/i/-/i-0.3.6.tgz",
+      "integrity": "sha1-2WyScyB28HJxG2sQ/X1PZa2O4j0=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^4.1.0"
+      }
+    },
+    "magic-string": {
+      "version": "0.25.7",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+      "dev": true,
+      "requires": {
+        "sourcemap-codec": "^1.4.4"
+      }
+    },
+    "mdn-data": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
+      "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
+    "nativescript-angular": {
+      "version": "https://github.com/nstudio/ns-ng/blob/master/nativescript-angular-compat.tgz?raw=true",
+      "integrity": "sha512-Fr4zb5CDdzbshvq6C+zjHYoUxRDbdiw2yIinYkEHibwWHmU0IReBV85Q+Eg8WzDu9jjEavaqBkdbWkTI1GHy5w==",
+      "dev": true
+    },
+    "nativescript-hook": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/nativescript-hook/-/nativescript-hook-0.2.5.tgz",
+      "integrity": "sha512-ciGJtNbtMB2lGv8jAkUripkRjd3g8atX9VYPSt6e8PI6YPiOKeoma3xjcXoW66pFMYpHnfrbp6Mq9U/QtiQrVg==",
+      "dev": true,
+      "requires": {
+        "glob": "^6.0.1",
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "nativescript-intl": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/nativescript-intl/-/nativescript-intl-3.0.0.tgz",
+      "integrity": "sha1-gu6b59N3Fys8QpVzRyMDdijhhqc=",
+      "dev": true
+    },
+    "nativescript-vue": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/nativescript-vue/-/nativescript-vue-2.4.0.tgz",
+      "integrity": "sha512-GRRab7oT8A+vurUNuN/FrAcG649IceZ1LGHjEF2U9hzZp7taEvPTml4kMAF0SmWgVZVz7ftIEeAIF2lmNb6Hcg==",
+      "dev": true,
+      "requires": {
+        "nativescript-hook": "0.2.5"
+      }
+    },
+    "ncp": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz",
+      "integrity": "sha1-0VNn5cuHQyuhF9K/gP30Wuz7QkY=",
+      "dev": true
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^2.2.0"
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true
+    },
+    "pkginfo": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz",
+      "integrity": "sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=",
+      "dev": true
+    },
+    "postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "prompt": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prompt/-/prompt-1.0.0.tgz",
+      "integrity": "sha1-jlcSPDlquYiJf7Mn/Trtw+c15P4=",
+      "dev": true,
+      "requires": {
+        "colors": "^1.1.2",
+        "pkginfo": "0.x.x",
+        "read": "1.0.x",
+        "revalidator": "0.1.x",
+        "utile": "0.3.x",
+        "winston": "2.1.x"
+      }
+    },
+    "read": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+      "dev": true,
+      "requires": {
+        "mute-stream": "~0.0.4"
+      }
+    },
+    "readdirp": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz",
+      "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
+      "dev": true,
+      "requires": {
+        "picomatch": "^2.0.7"
+      }
+    },
+    "reduce-css-calc": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.7.tgz",
+      "integrity": "sha512-fDnlZ+AybAS3C7Q9xDq5y8A2z+lT63zLbynew/lur/IR24OQF5x98tfNwf79mzEdfywZ0a2wpM860FhFfMxZlA==",
+      "dev": true,
+      "requires": {
+        "css-unit-converter": "^1.1.1",
+        "postcss-value-parser": "^3.3.0"
+      }
+    },
+    "reflect-metadata": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
+      "dev": true
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz",
+      "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "revalidator": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
+      "integrity": "sha1-/s5hv6DBtSoga9axgZgYS91SOjs=",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "rxjs": {
+      "version": "6.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
+      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "dev": true
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.0"
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "tns-core-modules": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/tns-core-modules/-/tns-core-modules-6.5.1.tgz",
+      "integrity": "sha512-UVPnCDHdEwyAVCBvEsM3mRobhpdTPMSCLjmBy2m8q1kzo/jUcLYebSMQGev4c9IsRlQhiTRVL1T2sWzTHVpU5g==",
+      "dev": true,
+      "requires": {
+        "@nativescript/core": "6.5.1"
+      }
+    },
+    "tns-core-modules-widgets": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/tns-core-modules-widgets/-/tns-core-modules-widgets-6.5.0.tgz",
+      "integrity": "sha512-aSftTLvWZ8jRmM4IttuEd1Y04HlDZNYDLY6e/brt0wcrugihGgxdb3Ia85b8DRP0+WXbNyKitKVHgbCFLiABRw==",
+      "dev": true
+    },
+    "tns-platform-declarations": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/tns-platform-declarations/-/tns-platform-declarations-6.5.1.tgz",
+      "integrity": "sha512-kN94WlMEAqnS5+i4oyS3FGYXw0aUjp/lRIBCu+2kzSJW0GOaxeCbSGO6i/+bDph75VLEwz3PI9eo4hEXY8y8pg==",
+      "dev": true
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "tslib": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
+      "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
+      "dev": true
+    },
+    "tslint": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.1.tgz",
+      "integrity": "sha512-kd6AQ/IgPRpLn6g5TozqzPdGNZ0q0jtXW4//hRcj10qLYBaa3mTUU2y2MCG+RXZm8Zx+KZi0eA+YCrMyNlF4UA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "builtin-modules": "^1.1.1",
+        "chalk": "^2.3.0",
+        "commander": "^2.12.1",
+        "diff": "^4.0.1",
+        "glob": "^7.1.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.3",
+        "resolve": "^1.3.2",
+        "semver": "^5.3.0",
+        "tslib": "^1.10.0",
+        "tsutils": "^2.29.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "tsutils": {
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.8.1"
+      }
+    },
+    "typescript": {
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
+      "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
+      "dev": true
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
+    "utile": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/utile/-/utile-0.3.0.tgz",
+      "integrity": "sha1-E1LDQOuCDk2N26A5pPv6oy7U7zo=",
+      "dev": true,
+      "requires": {
+        "async": "~0.9.0",
+        "deep-equal": "~0.2.1",
+        "i": "0.3.x",
+        "mkdirp": "0.x.x",
+        "ncp": "1.0.x",
+        "rimraf": "2.x.x"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "winston": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz",
+      "integrity": "sha1-PJNJ0ZYgf9G9/51LxD73JRDjoS4=",
+      "dev": true,
+      "requires": {
+        "async": "~1.0.0",
+        "colors": "1.0.x",
+        "cycle": "1.0.x",
+        "eyes": "0.1.x",
+        "isstream": "0.1.x",
+        "pkginfo": "0.3.x",
+        "stack-trace": "0.0.x"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
+          "dev": true
+        },
+        "colors": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+          "dev": true
+        },
+        "pkginfo": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+          "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=",
+          "dev": true
+        }
+      }
+    },
+    "wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz",
+      "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==",
+      "dev": true,
+      "requires": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.0"
+      }
+    },
+    "yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "zone.js": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
+      "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==",
+      "dev": true
+    }
+  }
+}
diff --git a/src/package.json b/src/package.json
index bf6e983..1c65c9c 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,7 +1,8 @@
 {
   "name": "nativescript-datetimepicker",
-  "version": "1.2.2",
+  "version": "2.0.0",
   "description": "A NativeScript plugin for picking date and time.",
+  "main": "index",
   "typings": "index.d.ts",
   "nativescript": {
     "platforms": {
@@ -11,7 +12,7 @@
   },
   "scripts": {
     "tsc": "npm i && tsc",
-    "build": "npm run tsc",
+    "build": "npm run tsc && npm run ngc",
     "tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\" --exclude \"**/platforms/**\"",
     "plugin.tscwatch": "npm run tsc -- -w",
     "demo.ios": "npm run build && cd ../demo && tns run ios --emulator",
@@ -55,25 +56,26 @@
   "homepage": "https://github.com/NativeScript/nativescript-datetimepicker",
   "readmeFilename": "README.md",
   "devDependencies": {
-    "@angular/common": "~8.2.0",
-    "@angular/compiler": "~8.2.0",
-    "@angular/compiler-cli": "~8.2.0",
-    "@angular/core": "~8.2.0",
-    "@angular/forms": "~8.2.0",
-    "@angular/platform-browser": "~8.2.0",
-    "@angular/platform-browser-dynamic": "~8.2.0",
-    "@angular/router": "~8.2.0",
-    "nativescript-angular": "~8.20.0",
+    "@angular/common": "~9.1.0",
+    "@angular/compiler": "~9.1.0",
+    "@angular/compiler-cli": "~9.1.0",
+    "@angular/core": "~9.1.0",
+    "@angular/forms": "~9.1.0",
+    "@angular/platform-browser": "~9.1.0",
+    "@angular/platform-browser-dynamic": "~9.1.0",
+    "@angular/router": "~9.1.0",
+    "@nativescript/angular": "https://github.com/nstudio/ns-ng/blob/master/nativescript-angular-9.0.0.tgz?raw=true",
+    "nativescript-angular": "https://github.com/nstudio/ns-ng/blob/master/nativescript-angular-compat.tgz?raw=true",
     "nativescript-vue": "~2.4.0",
     "prompt": "^1.0.0",
     "rimraf": "^2.6.2",
-    "rxjs": "^6.3.3",
+    "rxjs": "^6.5.0",
     "semver": "^5.6.0",
-    "tns-core-modules": "^6.0.0",
-    "tns-platform-declarations": "^6.0.0",
-    "tslint": "^5.11.0",
-    "typescript": "~3.5.3",
-    "zone.js": "^0.8.4"
+    "tns-core-modules": "^6.5.0",
+    "tns-platform-declarations": "^6.5.0",
+    "tslint": "~6.1.0",
+    "typescript": "~3.8.3",
+    "zone.js": "^0.10.3"
   },
   "dependencies": {},
   "bootstrapper": "nativescript-plugin-seed"
diff --git a/src/tsconfig.json b/src/tsconfig.json
index 80ff702..385f91b 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -4,26 +4,31 @@
         "module": "commonjs",
         "removeComments": true,
         "noLib": false,
+        "declaration": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "skipLibCheck": true,
-        "lib": ["es6", "dom"],
+        "lib": [
+          "es2017",
+          "dom",
+          "webworker",
+          "es6"],
         "sourceMap": true,
         "pretty": true,
         "allowUnreachableCode": false,
         "allowUnusedLabels": false,
         "noEmitHelpers": true,
-        "noEmitOnError": false,
+        "noEmitOnError": true,
         "noImplicitAny": false,
         "noImplicitReturns": true,
         "noImplicitUseStrict": false,
         "noFallthroughCasesInSwitch": true
     },
     "angularCompilerOptions": {
-        "genDir": ".",
         "skipMetadataEmit": false,
         "skipTemplateCodegen": true,
-        "strictMetadataEmit": true
+        "strictMetadataEmit": true,
+        "enableIvy": false
     },
     "exclude": [
         "node_modules",
diff --git a/src/ui/date-picker-field.android.d.ts b/src/ui/date-picker-field.android.d.ts
new file mode 100644
index 0000000..f0e5bfe
--- /dev/null
+++ b/src/ui/date-picker-field.android.d.ts
@@ -0,0 +1,4 @@
+import { DatePickerFieldBase } from "./date-picker-field.common";
+export declare class DatePickerField extends DatePickerFieldBase {
+    initNativeView(): void;
+}
diff --git a/src/ui/date-picker-field.common.d.ts b/src/ui/date-picker-field.common.d.ts
new file mode 100644
index 0000000..c45c3fc
--- /dev/null
+++ b/src/ui/date-picker-field.common.d.ts
@@ -0,0 +1,30 @@
+import { Property } from "@nativescript/core/ui/core/view";
+import { DatePickerField as DatePickerFieldDefinition } from "./date-picker-field";
+import { PickerFieldBase } from "./picker-field-base";
+export declare class DatePickerFieldBase extends PickerFieldBase implements DatePickerFieldDefinition {
+    maxDate: Date;
+    minDate: Date;
+    date: Date;
+    dateFormat: string;
+    pickerDefaultDate: Date;
+    static datePickerOpenedEvent: string;
+    static datePickerClosedEvent: string;
+    private _nativeLocale;
+    private _nativeDateFormatter;
+    static dateProperty: Property<DatePickerFieldBase, Date>;
+    static maxDateProperty: Property<DatePickerFieldBase, Date>;
+    static minDateProperty: Property<DatePickerFieldBase, Date>;
+    static dateFormatProperty: Property<DatePickerFieldBase, string>;
+    static pickerDefaultDateProperty: Property<DatePickerFieldBase, Date>;
+    open(): void;
+    updateText(): void;
+    initNativeView(): void;
+    private static datePropertyChanged;
+    private static dateFormatPropertyChanged;
+    protected onDateFormatChanged(oldValue: string, newValue: string): void;
+    protected onLocaleChanged(oldValue: string, newValue: string): void;
+    protected getFormattedDate(date: Date): string;
+    private _initRegionalSettings;
+    private _updateRegionalSettings;
+}
+export declare function dateValueConverter(v: any): Date;
diff --git a/src/ui/date-picker-field.common.ts b/src/ui/date-picker-field.common.ts
index d37c6dc..8413e3d 100644
--- a/src/ui/date-picker-field.common.ts
+++ b/src/ui/date-picker-field.common.ts
@@ -1,4 +1,5 @@
-import { Property, CSSType, EventData } from "tns-core-modules/ui/core/view";
+import { EventData } from "@nativescript/core";
+import { Property, CSSType } from "@nativescript/core/ui/core/view";
 import { DateTimePicker, DateTimePickerStyle } from "../datetimepicker";
 import { DatePickerField as DatePickerFieldDefinition } from "./date-picker-field";
 import { LocalizationUtils } from "../utils/localization-utils";
diff --git a/src/ui/date-picker-field.d.ts b/src/ui/date-picker-field.d.ts
index cda9a88..cfcdf3f 100644
--- a/src/ui/date-picker-field.d.ts
+++ b/src/ui/date-picker-field.d.ts
@@ -1,8 +1,8 @@
 /**
  * Contains the DatePickerField class.
  */
-import { Property } from "tns-core-modules/ui/core/view";
-import { TextField } from "tns-core-modules/ui/text-field/text-field";
+import { Property } from "@nativescript/core/ui/core/view";
+import { TextField } from "@nativescript/core";
 
 /**
  * Represents a TextField that can be tapped to open a picker. The picker is a dialog with
diff --git a/src/ui/date-picker-field.ios.d.ts b/src/ui/date-picker-field.ios.d.ts
new file mode 100644
index 0000000..7f55b69
--- /dev/null
+++ b/src/ui/date-picker-field.ios.d.ts
@@ -0,0 +1,3 @@
+import { DatePickerFieldBase } from "./date-picker-field.common";
+export declare class DatePickerField extends DatePickerFieldBase {
+}
diff --git a/src/ui/date-time-picker-fields.d.ts b/src/ui/date-time-picker-fields.d.ts
index db32b9a..8b3a905 100644
--- a/src/ui/date-time-picker-fields.d.ts
+++ b/src/ui/date-time-picker-fields.d.ts
@@ -1,194 +1,67 @@
-/**
- * Contains the DatePickerField class.
- */
-import { Property, View } from "tns-core-modules/ui/core/view";
-import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
-import { Orientation } from "tns-core-modules/ui/layouts/stack-layout";
-
-/**
- * Represents a TextField that can be tapped to open a picker. The picker is a dialog with
- * date picking spinners along with OK/Cancel buttons.
- */
-export class DateTimePickerFields extends GridLayout {
-    /**
-     * Gets or sets the selected date.
-     */
+import { Property } from "@nativescript/core/ui/core/view";
+import { GridLayout, EventData } from "@nativescript/core";
+import { Orientation } from "@nativescript/core/ui/scroll-view";
+import { DatePickerField } from "./date-picker-field";
+import { TimePickerField } from "./time-picker-field";
+export declare class DateTimePickerFields extends GridLayout {
+    dateField: DatePickerField;
+    timeField: TimePickerField;
     date: Date;
-
-    /**
-     * Gets or sets the max date. Note that this property only affects the date component.
-     */
     maxDate: Date;
-
-    /**
-     * Gets or sets the min date. Note that this property only affects the date component.
-     */
     minDate: Date;
-
-    /**
-     * Gets or sets a format for displaying the date in the field.
-     * Default value is undefined, meaning that the format will be based on the current locale.
-     * Here are some examples with the way 1st of April, 2019 is displayed for each of the formats:
-     * MMM dd, yyyy - Apr 01, 2019
-     * d.M.yy - 1.4.19
-     * EEE, d MMMM yyyy - Mon, 1 April 2019
-     */
     dateFormat: string;
-
-    /**
-     * Gets or sets a format for displaying the date in the field.
-     * Default value is undefined, meaning that the format will be based on the current locale.
-     * Here are some examples with the way 1st of April, 2019 is displayed for each of the formats:
-     * MMM dd, yyyy - Apr 01, 2019
-     * d.M.yy - 1.4.19
-     * EEE, d MMMM yyyy - Mon, 1 April 2019
-     */
     timeFormat: string;
-
-    /**
-     * Gets or sets a locale for displaying the date in the field, and also for the picker.
-     * Default value is undefined, meaning that the format will be based on the device's settings.
-     * In order to fixate the date to English, you can use English-based locales like: en_US, en_UK, etc.
-     * If you want to provide localization for your app, you can supply different locales, depending
-     * on the selected setting.
-     * Note that changing the locale will not affect the {@link pickerOkText}, {@link pickerCancelText}
-     * and {@link pickerTitle} or {@link hint} properties.
-     */
     locale: string;
-
-    /**
-     * Gets or sets the hint text for the date component. Hint is the text that is displayed in a field when {@link date} is null.
-     */
     hintDate: string;
-
-    /**
-     * Gets or sets the hint text for the time component. Hint is the text that is displayed in a field when {@link date} is null.
-     */
     hintTime: string;
-
-    /**
-     * Gets or sets the date that will be initially selected in the picker when {@link date} is null.
-     *
-     * @default now
-     */
     pickerDefaultDate: Date;
-
-    /**
-     * Gets or sets the title for picker selecting date. The title is the text that is displayed in the picker
-     * above the date selecting spinners.
-     */
     pickerTitleDate: string;
-
-    /**
-     * Gets or sets the title for picker selecting time. The title is the text that is displayed in the picker
-     * above the time selecting spinners.
-     */
     pickerTitleTime: string;
-
-    /**
-     * Gets or sets the text of the button in the picker that is used to confirm the selection.
-     * By default, on iOS the text will be OK, while on android the text will be
-     * determined by the current device's localization settings. Please note, that the value
-     * is not related with the value {@link locale} property.
-     */
     pickerOkText: string;
-
-    /**
-     * Gets or sets the text of the button in the picker that is used to dismiss the picker,
-     * and cancel the current date selection.
-     * By default, on iOS the text will be Cancel, while on android the text will be
-     * determined by the current device's localization settings. Please note, that the value
-     * is not related with the value {@link locale} property.
-     */
     pickerCancelText: string;
-
-    /**
-     * Gets or sets a value that indicates whether the time should be assigned a value as soon as date is picked.
-     *
-     * @default false
-     */
-    autoPickTime: boolean;
-
-    /**
-     * Gets or sets a value that indicates whether the date and time components should be on the same row or not.
-     * Default value is horizontal, meaning that the two fields will be on the same row.
-     *
-     * @default horizontal
-     */
     orientation: Orientation;
-
-    /**
-     * Identifies the {@link date} dependency property.
-     */
+    autoPickTime: boolean;
+    _shouldSkipTimeAssignment: boolean;
+    private _dateChangeHandler;
+    private _timeChangeHandler;
+    constructor();
     static dateProperty: Property<DateTimePickerFields, Date>;
-
-    /**
-     * Identifies the {@link maxDate} dependency property.
-     */
     static maxDateProperty: Property<DateTimePickerFields, Date>;
-
-    /**
-     * Identifies the {@link minDate} dependency property.
-     */
     static minDateProperty: Property<DateTimePickerFields, Date>;
-
-    /**
-     * Identifies the {@link dateFormat} dependency property.
-     */
     static dateFormatProperty: Property<DateTimePickerFields, string>;
-
-    /**
-     * Identifies the {@link timeFormat} dependency property.
-     */
     static timeFormatProperty: Property<DateTimePickerFields, string>;
-
-    /**
-     * Identifies the {@link locale} dependency property.
-     */
     static localeProperty: Property<DateTimePickerFields, string>;
-
-    /**
-     * Identifies the {@link hintDate} dependency property.
-     */
     static hintDateProperty: Property<DateTimePickerFields, string>;
-
-    /**
-     * Identifies the {@link hintTime} dependency property.
-     */
     static hintTimeProperty: Property<DateTimePickerFields, string>;
-
-    /**
-     * Identifies the {@link pickerDefaultDate} dependency property.
-     */
-    static pickerDefaultDateProperty: Property<DateTimePickerFields, string>;
-
-    /**
-     * Identifies the {@link pickerTitleDate} dependency property.
-     */
+    static pickerDefaultDateProperty: Property<DateTimePickerFields, Date>;
     static pickerTitleDateProperty: Property<DateTimePickerFields, string>;
-
-    /**
-     * Identifies the {@link pickerTitleTime} dependency property.
-     */
     static pickerTitleTimeProperty: Property<DateTimePickerFields, string>;
-
-    /**
-     * Identifies the {@link pickerOkText} dependency property.
-     */
     static pickerOkTextProperty: Property<DateTimePickerFields, string>;
-
-    /**
-     * Identifies the {@link pickerCancelText} dependency property.
-     */
     static pickerCancelTextProperty: Property<DateTimePickerFields, string>;
-
-    /**
-     * Identifies the {@link autoPickTime} dependency property.
-     */
-    static autoPickTimeProperty: Property<DateTimePickerFields, boolean>;
-
-    /**
-     * Identifies the {@link orientation} dependency property.
-     */
     static orientationProperty: Property<DateTimePickerFields, Orientation>;
-}
\ No newline at end of file
+    static autoPickTimeProperty: Property<DateTimePickerFields, boolean>;
+    private static datePropertyChanged;
+    private static maxDatePropertyChanged;
+    private static minDatePropertyChanged;
+    private static dateFormatPropertyChanged;
+    private static timeFormatPropertyChanged;
+    private static localePropertyChanged;
+    private static hintDatePropertyChanged;
+    private static hintTimePropertyChanged;
+    private static pickerDefaultDatePropertyChanged;
+    private static pickerTitleDatePropertyChanged;
+    private static pickerTitleTimePropertyChanged;
+    private static pickerOkTextPropertyChanged;
+    private static pickerCancelTextPropertyChanged;
+    private static orientationPropertyChanged;
+    private static autoPickTimePropertyChanged;
+    createNativeView(): Object;
+    initNativeView(): void;
+    disposeNativeView(): void;
+    addEventListener(eventNames: string, callback: (data: EventData) => void, thisArg?: Object): void;
+    removeEventListener(eventNames: string, callback?: any, thisArg?: Object): void;
+    private _updateHandlers;
+    private _handleClassNameChange;
+    private static _updateOrientation;
+}
+export declare function dateValueConverter(v: any): Date;
diff --git a/src/ui/date-time-picker-fields.ts b/src/ui/date-time-picker-fields.ts
index 555d502..9d5e8bc 100644
--- a/src/ui/date-time-picker-fields.ts
+++ b/src/ui/date-time-picker-fields.ts
@@ -1,14 +1,13 @@
-import { Property, CSSType, EventData } from "tns-core-modules/ui/core/view";
-import { PropertyChangeData } from "tns-core-modules/data/observable";
-import { DateTimePickerFields as DateTimePickerFieldsDefinition } from "./date-time-picker-fields";
-import { GridLayout, ItemSpec } from "tns-core-modules/ui/layouts/grid-layout";
-import { Orientation } from "tns-core-modules/ui/layouts/stack-layout";
+import { Property, CSSType } from "@nativescript/core/ui/core/view";
+import { GridLayout, PropertyChangeData, EventData } from "@nativescript/core";
+import { ItemSpec } from "@nativescript/core/ui/layouts/grid-layout";
+import { Orientation } from "@nativescript/core/ui/scroll-view";
 import { DatePickerField } from "./date-picker-field";
 import { TimePickerField } from "./time-picker-field";
 import { getDateNow, clearTime, dateComparer } from "../utils/date-utils";
 
 @CSSType("DateTimePickerFields")
-export class DateTimePickerFields extends GridLayout implements DateTimePickerFieldsDefinition {
+export class DateTimePickerFields extends GridLayout {
     public dateField: DatePickerField;
     public timeField: TimePickerField;
 
diff --git a/src/ui/index.d.ts b/src/ui/index.d.ts
new file mode 100644
index 0000000..561ae12
--- /dev/null
+++ b/src/ui/index.d.ts
@@ -0,0 +1,3 @@
+export { DatePickerField } from './date-picker-field';
+export { DateTimePickerFields } from './date-time-picker-fields';
+export { TimePickerField } from './time-picker-field';
diff --git a/src/ui/index.ts b/src/ui/index.ts
new file mode 100644
index 0000000..464c7f2
--- /dev/null
+++ b/src/ui/index.ts
@@ -0,0 +1,3 @@
+export { DatePickerField } from './date-picker-field';
+export { DateTimePickerFields } from './date-time-picker-fields';
+export { TimePickerField } from './time-picker-field';
\ No newline at end of file
diff --git a/src/ui/picker-field-base.d.ts b/src/ui/picker-field-base.d.ts
new file mode 100644
index 0000000..d1c0ab0
--- /dev/null
+++ b/src/ui/picker-field-base.d.ts
@@ -0,0 +1,21 @@
+import { TextField } from "@nativescript/core";
+import { Property } from "@nativescript/core/ui/core/view";
+export declare abstract class PickerFieldBase extends TextField {
+    locale: string;
+    pickerTitle: string;
+    pickerOkText: string;
+    pickerCancelText: string;
+    private _pickerFieldBaseTapHandler;
+    constructor();
+    static localeProperty: Property<PickerFieldBase, string>;
+    static pickerTitleProperty: Property<PickerFieldBase, string>;
+    static pickerOkTextProperty: Property<PickerFieldBase, string>;
+    static pickerCancelTextProperty: Property<PickerFieldBase, string>;
+    abstract open(): void;
+    initNativeView(): void;
+    disposeNativeView(): void;
+    private static localePropertyChanged;
+    protected onLocaleChanged(oldValue: string, newValue: string): void;
+    private _updatePickerFieldBaseTapHandler;
+    private _onPickerFieldBaseTap;
+}
diff --git a/src/ui/picker-field-base.ts b/src/ui/picker-field-base.ts
index 8071c70..55372a6 100644
--- a/src/ui/picker-field-base.ts
+++ b/src/ui/picker-field-base.ts
@@ -1,6 +1,6 @@
-import { TextField } from "tns-core-modules/ui/text-field";
-import { GestureTypes, TouchGestureEventData } from "tns-core-modules/ui/gestures";
-import { Property } from "tns-core-modules/ui/core/view";
+import { TextField } from "@nativescript/core";
+import { GestureTypes, TouchGestureEventData } from "@nativescript/core/ui/gestures";
+import { Property } from "@nativescript/core/ui/core/view";
 
 export abstract class PickerFieldBase extends TextField {
     public locale: string;
diff --git a/src/ui/time-picker-field.android.d.ts b/src/ui/time-picker-field.android.d.ts
new file mode 100644
index 0000000..3738974
--- /dev/null
+++ b/src/ui/time-picker-field.android.d.ts
@@ -0,0 +1,4 @@
+import { TimePickerFieldBase } from "./time-picker-field.common";
+export declare class TimePickerField extends TimePickerFieldBase {
+    initNativeView(): void;
+}
diff --git a/src/ui/time-picker-field.common.d.ts b/src/ui/time-picker-field.common.d.ts
new file mode 100644
index 0000000..6e33579
--- /dev/null
+++ b/src/ui/time-picker-field.common.d.ts
@@ -0,0 +1,27 @@
+import { Property } from "@nativescript/core/ui/core/view";
+import { TimePickerField as TimePickerFieldDefinition } from "./time-picker-field";
+import { PickerFieldBase } from "./picker-field-base";
+export declare class TimePickerFieldBase extends PickerFieldBase implements TimePickerFieldDefinition {
+    time: Date;
+    timeFormat: string;
+    pickerDefaultTime: Date;
+    static timePickerOpenedEvent: string;
+    static timePickerClosedEvent: string;
+    private _nativeLocale;
+    private _nativeTimeFormatter;
+    static timeProperty: Property<TimePickerFieldBase, Date>;
+    static timeFormatProperty: Property<TimePickerFieldBase, string>;
+    static pickerDefaultTimeProperty: Property<TimePickerFieldBase, Date>;
+    open(): void;
+    updateText(): void;
+    initNativeView(): void;
+    private static timePropertyChanged;
+    private static timeFormatPropertyChanged;
+    protected onTimeFormatChanged(oldValue: string, newValue: string): void;
+    protected onLocaleChanged(oldValue: string, newValue: string): void;
+    protected _updateRegionalSettings(): void;
+    protected getFormattedTime(time: Date): string;
+    private _initRegionalSettings;
+    private is24Hours;
+}
+export declare function timeValueConverter(timeString: string): Date;
diff --git a/src/ui/time-picker-field.common.ts b/src/ui/time-picker-field.common.ts
index 838e592..f52a285 100644
--- a/src/ui/time-picker-field.common.ts
+++ b/src/ui/time-picker-field.common.ts
@@ -1,4 +1,5 @@
-import { Property, CSSType, EventData } from "tns-core-modules/ui/core/view";
+import { Property, CSSType } from "@nativescript/core/ui/core/view";
+import { EventData } from "@nativescript/core";
 import { DateTimePicker, DateTimePickerStyle } from "../datetimepicker";
 import { TimePickerField as TimePickerFieldDefinition } from "./time-picker-field";
 import { LocalizationUtils } from "../utils/localization-utils";
diff --git a/src/ui/time-picker-field.d.ts b/src/ui/time-picker-field.d.ts
index 42f5e5d..9ab7698 100644
--- a/src/ui/time-picker-field.d.ts
+++ b/src/ui/time-picker-field.d.ts
@@ -1,8 +1,8 @@
 /**
  * Contains the TimePickerField class.
  */
-import { Property } from "tns-core-modules/ui/core/view";
-import { TextField } from "tns-core-modules/ui/text-field/text-field";
+import { Property } from "@nativescript/core/ui/core/view";
+import { TextField } from "@nativescript/core";
 
 /**
  * Represents a TextField that can be tapped to open a picker. The picker is a dialog with
diff --git a/src/ui/time-picker-field.ios.d.ts b/src/ui/time-picker-field.ios.d.ts
new file mode 100644
index 0000000..98ed425
--- /dev/null
+++ b/src/ui/time-picker-field.ios.d.ts
@@ -0,0 +1,3 @@
+import { TimePickerFieldBase } from "./time-picker-field.common";
+export declare class TimePickerField extends TimePickerFieldBase {
+}
diff --git a/src/utils/date-utils.d.ts b/src/utils/date-utils.d.ts
new file mode 100644
index 0000000..72ba447
--- /dev/null
+++ b/src/utils/date-utils.d.ts
@@ -0,0 +1,4 @@
+export declare function getDateNow(): Date;
+export declare function getDateToday(): Date;
+export declare function clearTime(date: Date): Date;
+export declare function dateComparer(x: Date, y: Date): boolean;
diff --git a/src/utils/localization-utils.android.d.ts b/src/utils/localization-utils.android.d.ts
new file mode 100644
index 0000000..e2ff16f
--- /dev/null
+++ b/src/utils/localization-utils.android.d.ts
@@ -0,0 +1,10 @@
+import { LocalizationUtilsBase } from "./localization-utils.common";
+export declare class LocalizationUtils extends LocalizationUtilsBase {
+    private static _localesCache;
+    static createNativeLocale(locale?: string): any;
+    static createDefaultTimeFormat(context: any): string;
+    static createNativeDateFormatter(formatPattern: string, nativeLocale: any): any;
+    static createNativeTimeFormatter(formatPattern: string, nativeLocale: any): any;
+    static formatDateTime(formatter: any, dateTime: Date): string;
+    static is24Hours(formatter: any): boolean;
+}
diff --git a/src/utils/localization-utils.common.d.ts b/src/utils/localization-utils.common.d.ts
new file mode 100644
index 0000000..2ffdd26
--- /dev/null
+++ b/src/utils/localization-utils.common.d.ts
@@ -0,0 +1,11 @@
+import { LocalizationUtils } from "./localization-utils";
+export declare class LocalizationUtilsBase implements LocalizationUtils {
+    protected static TIME_24H_FORMAT: string;
+    protected static TIME_12H_FORMAT: string;
+    static createNativeLocale(localeIdentifier: string): any;
+    static createDefaultTimeFormat(context: any): string;
+    static createNativeDateFormatter(formatPattern: string, nativeLocale: any): any;
+    static createNativeTimeFormatter(formatPattern: string, nativeLocale: any): any;
+    static formatDateTime(formatter: any, dateTime: Date): string;
+    static is24Hours(formatter: any, context: any): boolean;
+}
diff --git a/src/utils/localization-utils.ios.d.ts b/src/utils/localization-utils.ios.d.ts
new file mode 100644
index 0000000..d680b66
--- /dev/null
+++ b/src/utils/localization-utils.ios.d.ts
@@ -0,0 +1,9 @@
+import { LocalizationUtilsBase } from "./localization-utils.common";
+export declare class LocalizationUtils extends LocalizationUtilsBase {
+    private static _localesCache;
+    static createNativeLocale(localeIdentifier: string): any;
+    static createNativeDateFormatter(formatPattern: string, nativeLocale: any): any;
+    static createNativeTimeFormatter(formatPattern: string, nativeLocale: any): any;
+    static formatDateTime(formatter: any, dateTime: Date): string;
+    static is24Hours(formatter: any): boolean;
+}
diff --git a/src/vue/index.d.ts b/src/vue/index.d.ts
index 6d1e0ee..e5c2e84 100644
--- a/src/vue/index.d.ts
+++ b/src/vue/index.d.ts
@@ -1 +1,4 @@
-export * from "./index";
+declare const DateTimePicker: {
+    install(Vue: any): void;
+};
+export default DateTimePicker;
diff --git a/src/vue/index.ts b/src/vue/index.ts
index 9a655f7..75f45c5 100644
--- a/src/vue/index.ts
+++ b/src/vue/index.ts
@@ -1,6 +1,4 @@
-import { DatePickerField } from "../ui/date-picker-field";
-import { TimePickerField } from "../ui/time-picker-field";
-import { DateTimePickerFields } from "../ui/date-time-picker-fields";
+import { DatePickerField, TimePickerField, DateTimePickerFields } from "../ui";
 
 const DateTimePicker = {
     install(Vue) {
diff --git a/src/vue/package.json b/src/vue/package.json
deleted file mode 100644
index 7c433e6..0000000
--- a/src/vue/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "name": "nativescript-datetimepicker",
-    "main": "index.js"
-}
\ No newline at end of file

From 7d51b9e881814aa33978436df7680e189d36e2f0 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Fri, 17 Jul 2020 23:16:50 -0700
Subject: [PATCH 2/2] feat(angular): v10 support

---
 demo-angular/src/main.ts                      |   2 +-
 ...nativescript-datetimepicker.accessors.d.ts |   9 +-
 .../nativescript-datetimepicker.accessors.ts  |   2 +-
 ...ativescript-datetimepicker.directives.d.ts |   7 +
 .../nativescript-datetimepicker.module.d.ts   |   5 +
 src/datetimepicker.ios.ts                     |   5 +-
 src/package-lock.json                         | 399 ++++++++++--------
 src/package.json                              |  31 +-
 src/references.d.ts                           |   4 +-
 src/tsconfig.json                             |   2 +-
 src/ui/date-picker-field.common.d.ts          |   2 +-
 src/ui/date-picker-field.common.ts            |   3 +-
 src/ui/date-time-picker-fields.d.ts           |  10 +-
 src/ui/date-time-picker-fields.ts             |  13 +-
 src/ui/picker-field-base.d.ts                 |   3 +-
 src/ui/picker-field-base.ts                   |   4 +-
 src/ui/time-picker-field.common.d.ts          |   2 +-
 src/ui/time-picker-field.common.ts            |   3 +-
 18 files changed, 286 insertions(+), 220 deletions(-)

diff --git a/demo-angular/src/main.ts b/demo-angular/src/main.ts
index 3cae736..1a6fb2c 100644
--- a/demo-angular/src/main.ts
+++ b/demo-angular/src/main.ts
@@ -1,5 +1,5 @@
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
-import { platformNativeScriptDynamic } from "@nativescript/angular/platform";
+import { platformNativeScriptDynamic } from "@nativescript/angular";
 
 import { AppModule } from "./app/app.module";
 
diff --git a/src/angular/nativescript-datetimepicker.accessors.d.ts b/src/angular/nativescript-datetimepicker.accessors.d.ts
index 50fe710..e53fa2d 100644
--- a/src/angular/nativescript-datetimepicker.accessors.d.ts
+++ b/src/angular/nativescript-datetimepicker.accessors.d.ts
@@ -1,8 +1,9 @@
 import { ElementRef } from "@angular/core";
-import { BaseValueAccessor } from "@nativescript/angular/forms/value-accessors";
+import { BaseValueAccessor } from "@nativescript/angular";
 import { DatePickerField } from "../ui/date-picker-field";
 import { TimePickerField } from "../ui/time-picker-field";
 import { DateTimePickerFields } from "../ui/date-time-picker-fields";
+import * as i0 from "@angular/core";
 export declare class DatePickerValueAccessor extends BaseValueAccessor<DatePickerField> {
     private _hasBeenOpened;
     constructor(elementRef: ElementRef);
@@ -10,6 +11,8 @@ export declare class DatePickerValueAccessor extends BaseValueAccessor<DatePicke
     handleDateChange(args: any): void;
     handleDatePickerOpened(args: any): void;
     handleDatePickerClosed(args: any): void;
+    static ɵfac: i0.ɵɵFactoryDef<DatePickerValueAccessor, never>;
+    static ɵdir: i0.ɵɵDirectiveDefWithMeta<DatePickerValueAccessor, "DatePickerField[ngModel],DatePickerField[formControlName],DatePickerField[formControl],datepickerfield[ngModel],datepickerfield[formControlName],datepickerfield[formControl],datePickerField[ngModel],datePickerField[formControlName],datePickerField[formControl],date-picker-field[ngModel],date-picker-field[formControlName],date-picker-field[formControl]", never, {}, {}, never>;
 }
 export declare class TimePickerValueAccessor extends BaseValueAccessor<TimePickerField> {
     private _hasBeenOpened;
@@ -18,6 +21,8 @@ export declare class TimePickerValueAccessor extends BaseValueAccessor<TimePicke
     handleTimeChange(args: any): void;
     handleTimePickerOpened(args: any): void;
     handleTimePickerClosed(args: any): void;
+    static ɵfac: i0.ɵɵFactoryDef<TimePickerValueAccessor, never>;
+    static ɵdir: i0.ɵɵDirectiveDefWithMeta<TimePickerValueAccessor, "TimePickerField[ngModel],TimePickerField[formControlName],TimePickerField[formControl],timepickerfield[ngModel],timepickerfield[formControlName],timepickerfield[formControl],timePickerField[ngModel],timePickerField[formControlName],timePickerField[formControl],time-picker-field[ngModel],time-picker-field[formControlName],time-picker-field[formControl]", never, {}, {}, never>;
 }
 export declare class DateTimePickersValueAccessor extends BaseValueAccessor<DateTimePickerFields> {
     private _hasBeenOpened;
@@ -26,4 +31,6 @@ export declare class DateTimePickersValueAccessor extends BaseValueAccessor<Date
     handleDateChange(args: any): void;
     handlePickerOpened(args: any): void;
     handlePickerClosed(args: any): void;
+    static ɵfac: i0.ɵɵFactoryDef<DateTimePickersValueAccessor, never>;
+    static ɵdir: i0.ɵɵDirectiveDefWithMeta<DateTimePickersValueAccessor, "DateTimePickerFields[ngModel],DateTimePickerFields[formControlName],DateTimePickerFields[formControl],datetimepickerfields[ngModel],datetimepickerfields[formControlName],datetimepickerfields[formControl],dateTimePickerFields[ngModel],dateTimePickerFields[formControlName],dateTimePickerFields[formControl],date-time-picker-fields[ngModel],date-time-picker-fields[formControlName],date-time-picker-fields[formControl]", never, {}, {}, never>;
 }
diff --git a/src/angular/nativescript-datetimepicker.accessors.ts b/src/angular/nativescript-datetimepicker.accessors.ts
index 56eb841..cf560b6 100644
--- a/src/angular/nativescript-datetimepicker.accessors.ts
+++ b/src/angular/nativescript-datetimepicker.accessors.ts
@@ -1,6 +1,6 @@
 import { Directive, ElementRef, forwardRef } from "@angular/core";
 import { NG_VALUE_ACCESSOR } from "@angular/forms";
-import { BaseValueAccessor } from "@nativescript/angular/forms/value-accessors";
+import { BaseValueAccessor } from "@nativescript/angular";
 import { DatePickerField } from "../ui/date-picker-field";
 import { TimePickerField } from "../ui/time-picker-field";
 import { DateTimePickerFields } from "../ui/date-time-picker-fields";
diff --git a/src/angular/nativescript-datetimepicker.directives.d.ts b/src/angular/nativescript-datetimepicker.directives.d.ts
index 93d945f..d2a8c94 100644
--- a/src/angular/nativescript-datetimepicker.directives.d.ts
+++ b/src/angular/nativescript-datetimepicker.directives.d.ts
@@ -1,6 +1,13 @@
+import * as i0 from "@angular/core";
 export declare class DatePickerFieldDirective {
+    static ɵfac: i0.ɵɵFactoryDef<DatePickerFieldDirective, never>;
+    static ɵdir: i0.ɵɵDirectiveDefWithMeta<DatePickerFieldDirective, "DatePickerField", never, {}, {}, never>;
 }
 export declare class TimePickerFieldDirective {
+    static ɵfac: i0.ɵɵFactoryDef<TimePickerFieldDirective, never>;
+    static ɵdir: i0.ɵɵDirectiveDefWithMeta<TimePickerFieldDirective, "TimePickerField", never, {}, {}, never>;
 }
 export declare class DateTimePickerFieldsDirective {
+    static ɵfac: i0.ɵɵFactoryDef<DateTimePickerFieldsDirective, never>;
+    static ɵdir: i0.ɵɵDirectiveDefWithMeta<DateTimePickerFieldsDirective, "DateTimePickerFields", never, {}, {}, never>;
 }
diff --git a/src/angular/nativescript-datetimepicker.module.d.ts b/src/angular/nativescript-datetimepicker.module.d.ts
index 2b02051..c776043 100644
--- a/src/angular/nativescript-datetimepicker.module.d.ts
+++ b/src/angular/nativescript-datetimepicker.module.d.ts
@@ -1,4 +1,9 @@
+import * as i0 from "@angular/core";
+import * as i1 from "./nativescript-datetimepicker.directives";
+import * as i2 from "./nativescript-datetimepicker.accessors";
 export { DatePickerFieldDirective, TimePickerFieldDirective, DateTimePickerFieldsDirective, } from "./nativescript-datetimepicker.directives";
 export { DatePickerValueAccessor, TimePickerValueAccessor, DateTimePickersValueAccessor, } from "./nativescript-datetimepicker.accessors";
 export declare class NativeScriptDateTimePickerModule {
+    static ɵmod: i0.ɵɵNgModuleDefWithMeta<NativeScriptDateTimePickerModule, [typeof i1.DatePickerFieldDirective, typeof i1.TimePickerFieldDirective, typeof i1.DateTimePickerFieldsDirective, typeof i2.DatePickerValueAccessor, typeof i2.TimePickerValueAccessor, typeof i2.DateTimePickersValueAccessor], never, [typeof i1.DatePickerFieldDirective, typeof i1.TimePickerFieldDirective, typeof i1.DateTimePickerFieldsDirective, typeof i2.DatePickerValueAccessor, typeof i2.TimePickerValueAccessor, typeof i2.DateTimePickersValueAccessor]>;
+    static ɵinj: i0.ɵɵInjectorDef<NativeScriptDateTimePickerModule>;
 }
diff --git a/src/datetimepicker.ios.ts b/src/datetimepicker.ios.ts
index c1f794f..ec3533d 100644
--- a/src/datetimepicker.ios.ts
+++ b/src/datetimepicker.ios.ts
@@ -1,5 +1,4 @@
-import { Color, View, iOSApplication } from "@nativescript/core";
-import { ios } from "@nativescript/core/ui/core/view";
+import { Color, View, iOSApplication, IOSHelper } from "@nativescript/core";
 import {
     DateTimePickerBase, DateTimePickerStyleBase, getCurrentPage,
     DatePickerOptions, TimePickerOptions, PickerOptions
@@ -145,7 +144,7 @@ export class DateTimePicker extends DateTimePickerBase {
                 if (view.ios instanceof UIViewController) {
                     viewController = view.ios;
                 } else {
-                    const parentWithController = ios.getParentWithViewController(view);
+                    const parentWithController = IOSHelper.getParentWithViewController(view);
                     viewController = parentWithController ? parentWithController.viewController : undefined;
                 }
             }
diff --git a/src/package-lock.json b/src/package-lock.json
index 339ab92..d617b6d 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -1,25 +1,31 @@
 {
-  "name": "nativescript-datetimepicker",
-  "version": "2.0.0",
+  "name": "@nativescript/datetimepicker",
+  "version": "2.0.0-rc.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@angular/common": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.2.tgz",
-      "integrity": "sha512-MAQW0DGq2NhvJSETLTwuImdzwI+wboG+5Uzgc0L8C/hX7SrEE65Hmz4nIjmGi2CPGLpodfWEcCPlV0R0dHun4A==",
-      "dev": true
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-10.0.4.tgz",
+      "integrity": "sha512-9DJMD8GgHz7i2fMz0f1IHZlDSIz83uE6fcH8SIq1iCSWT2dubRRpCX000VpIyhAgfkCgdNCYXQ7VGNsZceoagQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.0"
+      }
     },
     "@angular/compiler": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.2.tgz",
-      "integrity": "sha512-82DitvlZA5DoE++qiiJdgx6HE71h96sfLHCjjvYJHApoOcnX+zBZFBrflpbXK9W4YdvydU4Lc1Ql1eleQPeT/g==",
-      "dev": true
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-10.0.4.tgz",
+      "integrity": "sha512-1rnEmSHJtrKC1QD+PyF36xwMnSqG4Slgi5+PYk3BxIa5vbWBibrYijtd/uCNhscfPSpfb06MVM2mRsrc+BmbQg==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.0"
+      }
     },
     "@angular/compiler-cli": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.2.tgz",
-      "integrity": "sha512-zC/oIuT68vtuiYrgXqWsDNi/0DQ1Ti6J6gMTrXVvZXlEDikEExTAJKrrBV5jo6B0bpUofe/dDcJaKR3Ys3cM3Q==",
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-10.0.4.tgz",
+      "integrity": "sha512-uZKk6Ab4Pw8qcaXhpORuEoCbPSHWx3TWcs9OXIKIhzOOoMMe9OSt2SzOkHCrySSaik1IhQODnHww7sGRw5mxwQ==",
       "dev": true,
       "requires": {
         "canonical-path": "1.0.0",
@@ -33,6 +39,7 @@
         "semver": "^6.3.0",
         "source-map": "^0.6.1",
         "sourcemap-codec": "^1.4.8",
+        "tslib": "^2.0.0",
         "yargs": "15.3.0"
       },
       "dependencies": {
@@ -45,97 +52,122 @@
       }
     },
     "@angular/core": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.2.tgz",
-      "integrity": "sha512-nAqRl+5drAnZlBT7AgSo2JJubmPNrGCvhZ83dosPEUqJoLr69/lYipnF/iqKzYn5xo4MM1O27WIhSNDtDjBmzQ==",
-      "dev": true
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-10.0.4.tgz",
+      "integrity": "sha512-lA8RDagJ/O0gUX95h00+nnUZs/1QmmhAVWVtHcuI12ueC836tJhLtPGnEx9ib9NXrgRyNwb8lO1xJPmmuQgdQQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.0"
+      }
     },
     "@angular/forms": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.2.tgz",
-      "integrity": "sha512-/f2WhMiKDo1/RoisTI71Dy4Z4+sAsAuzgIxJEXvgDGSYvzLl9G8erFx4N6be8Cy/xXwErmp3JOwXIAXjzxF8tA==",
-      "dev": true
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-10.0.4.tgz",
+      "integrity": "sha512-SJSYZCfHua9fi/dks1q+ad9OGBblRUn3Q1V4B7r99fJYr39qRiIHcegikhY4h8H3Wk1bJRGJG7iXmxJhjWXK3Q==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.0"
+      }
     },
     "@angular/platform-browser": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.2.tgz",
-      "integrity": "sha512-/3L4DdvnebvaJUurusaq8RJBFfr/SHWG6DMmV1VVpADxe8kjREyN0LdNDSkZgVf/QcUSwNEA6153iwcF92Otew==",
-      "dev": true
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.0.4.tgz",
+      "integrity": "sha512-iaZ8pFS5XUgPCO6/C47TzSFPzlzgleayq099cVOOx9z0t/SwUCSKt4AdAVhyQ8RTnx6l1JmmwBgRaXpScZlqzg==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.0"
+      }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.2.tgz",
-      "integrity": "sha512-BWHxy8S71z+NmUQmtR+/Dkohlj3LQIXltOqeVdCSpjV9cultBNN3bE1w0Rjp3BmCRGCIDH7qFlr4U5woHa7ldw==",
-      "dev": true
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-10.0.4.tgz",
+      "integrity": "sha512-RoUMqYhUwF6+Mvk/aH0IZQ1D0SDEi9k5EZlx9CJ3RvNuKygk7to+S4vMWVpGxFQlwdS3bytRLKi+Kki6f4nLkg==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.0"
+      }
     },
     "@angular/router": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.2.tgz",
-      "integrity": "sha512-csxE4HkuhVR1X932Q3kSDqBoF7Awuq5dsjv0nFk78raiHgG3CNnfMLHt8xD9XtOmR7ZT+D4yh/YmIK6W7J5hbQ==",
-      "dev": true
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-10.0.4.tgz",
+      "integrity": "sha512-iDLWdmltU5pZ6M/fBKC5Kg2o9Aqb1YJ+oHXFu186BQAl2RNeNCmMQ0VaCxjpMgD/MoSxpuRuGQ6rRrCSFCxtcQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.0"
+      }
     },
     "@babel/code-frame": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-      "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.8.3"
+        "@babel/highlight": "^7.10.4"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
-      "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
       "dev": true
     },
     "@babel/highlight": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-      "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.9.0",
+        "@babel/helper-validator-identifier": "^7.10.4",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       }
     },
     "@nativescript/angular": {
-      "version": "https://github.com/nstudio/ns-ng/blob/master/nativescript-angular-9.0.0.tgz?raw=true",
-      "integrity": "sha512-mMI11jRHhiAZJ3lXoeZA9mtl7LPvcb0mqQOHy4iNdEGqSCZn7ZBvWHDZboAK7KgdFkJ37oWang21FKBkroYc6A==",
+      "version": "10.0.0-rc.5",
+      "resolved": "https://registry.npmjs.org/@nativescript/angular/-/angular-10.0.0-rc.5.tgz",
+      "integrity": "sha512-6GywNtKUIjQG9ecVbBe/AX7OBnGPusjN86ncbCYUY+e+OGHIoXsFUYRLAly8UCqwpXWRepEunQgklOfhlGjwRw==",
       "dev": true,
       "requires": {
-        "nativescript-intl": "^3.0.0"
+        "@nativescript/zone-js": "~1.0.0",
+        "nativescript-angular": "^10.0.0-rc.5",
+        "nativescript-intl": "^4.0.0",
+        "tslib": "^2.0.0"
       }
     },
     "@nativescript/core": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-6.5.1.tgz",
-      "integrity": "sha512-+kxCLIKSw8mTMVnBf2oBy9Q0DR0ptbyUICyL744AVmOdOsvoQmngmBZZpgnbrZO6wwbeC6yixtK6Hq9KHx1YkA==",
+      "version": "7.0.0-rc.20",
+      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-7.0.0-rc.20.tgz",
+      "integrity": "sha512-U0rblSqRuMQBM+Lq3/OmldJzL9H7lMfUEmnQd7Svlr+/ykBdcLrJikAHkMdC3A57l22nmY5iUA5QyvA0rGrBvA==",
       "dev": true,
       "requires": {
-        "css-tree": "^1.0.0-alpha.37",
-        "nativescript-hook": "0.2.5",
-        "reduce-css-calc": "^2.1.6",
-        "semver": "6.3.0",
-        "tns-core-modules-widgets": "6.5.0",
-        "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "tslib": {
-          "version": "1.10.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-          "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
-          "dev": true
-        }
+        "@nativescript/hook": "~1.0.0",
+        "css-tree": "^1.0.0-alpha.39",
+        "reduce-css-calc": "^2.1.7",
+        "tns-core-modules": "^7.0.0-rc.20"
       }
     },
+    "@nativescript/hook": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@nativescript/hook/-/hook-1.0.0.tgz",
+      "integrity": "sha512-AyrvuIuDki0+r7EgcxPuaujkDxkTWoFLWeQFMzrcyZfXkTnBU3J7EtiAmaFE82MouXGCTl+38x53A3c1F8g+8Q==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.0",
+        "mkdirp": "^1.0.4"
+      }
+    },
+    "@nativescript/types": {
+      "version": "7.0.0-rc.0",
+      "resolved": "https://registry.npmjs.org/@nativescript/types/-/types-7.0.0-rc.0.tgz",
+      "integrity": "sha512-2eD1+aEv4znX9ETGOCYU04l/puaVtGySe2oNc7gpgaYu9XDHU02sEHpPxZXpjPG07f0SItqzwFL9RFR5K8Vm3A==",
+      "dev": true
+    },
+    "@nativescript/zone-js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@nativescript/zone-js/-/zone-js-1.0.1.tgz",
+      "integrity": "sha512-dVbjtHC0sZW+Vm2twn8xL15b7QgnR1hP5gZ5G24uQ5uSgIcsUlWvmOfzrHFqE/I8zC20kPpc4kAzgieqLak6Yg==",
+      "dev": true
+    },
     "@types/color-name": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
@@ -190,9 +222,9 @@
       "dev": true
     },
     "binary-extensions": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-      "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
       "dev": true
     },
     "brace-expansion": {
@@ -270,9 +302,9 @@
       }
     },
     "chokidar": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz",
-      "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz",
+      "integrity": "sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==",
       "dev": true,
       "requires": {
         "anymatch": "~3.1.1",
@@ -282,7 +314,7 @@
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.3.0"
+        "readdirp": "~3.4.0"
       }
     },
     "cliui": {
@@ -349,9 +381,9 @@
       }
     },
     "css-unit-converter": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz",
-      "integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz",
+      "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==",
       "dev": true
     },
     "cycle": {
@@ -445,9 +477,9 @@
       "dev": true
     },
     "fsevents": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
-      "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
       "dev": true,
       "optional": true
     },
@@ -458,14 +490,15 @@
       "dev": true
     },
     "glob": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-      "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
       "dev": true,
       "requires": {
+        "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "2 || 3",
+        "minimatch": "^3.0.4",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
       }
@@ -480,9 +513,9 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
       "dev": true
     },
     "has-flag": {
@@ -562,9 +595,9 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -620,13 +653,10 @@
       "dev": true
     },
     "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true
     },
     "mute-stream": {
       "version": "0.0.8",
@@ -635,9 +665,13 @@
       "dev": true
     },
     "nativescript-angular": {
-      "version": "https://github.com/nstudio/ns-ng/blob/master/nativescript-angular-compat.tgz?raw=true",
-      "integrity": "sha512-Fr4zb5CDdzbshvq6C+zjHYoUxRDbdiw2yIinYkEHibwWHmU0IReBV85Q+Eg8WzDu9jjEavaqBkdbWkTI1GHy5w==",
-      "dev": true
+      "version": "10.0.0-rc.5",
+      "resolved": "https://registry.npmjs.org/nativescript-angular/-/nativescript-angular-10.0.0-rc.5.tgz",
+      "integrity": "sha512-O2kbGubTZ/9eXPmkq6IxNXoC7RuvZ+V/KpeDeA588l86kB8Pg9msxi2+YEigEYPZb6KZmXyubvWE6upxqi7K1Q==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.0"
+      }
     },
     "nativescript-hook": {
       "version": "0.2.5",
@@ -647,18 +681,42 @@
       "requires": {
         "glob": "^6.0.1",
         "mkdirp": "^0.5.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+          "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
       }
     },
     "nativescript-intl": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/nativescript-intl/-/nativescript-intl-3.0.0.tgz",
-      "integrity": "sha1-gu6b59N3Fys8QpVzRyMDdijhhqc=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/nativescript-intl/-/nativescript-intl-4.0.1.tgz",
+      "integrity": "sha512-KTIo7Alh4CKU4J8d1HfG38VKmSqVKhCRADh/6omR3hS4BNsVpYbcdxUOwerzcbZBWlG7mcdMnctYg5gc4f+E9A==",
       "dev": true
     },
     "nativescript-vue": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/nativescript-vue/-/nativescript-vue-2.4.0.tgz",
-      "integrity": "sha512-GRRab7oT8A+vurUNuN/FrAcG649IceZ1LGHjEF2U9hzZp7taEvPTml4kMAF0SmWgVZVz7ftIEeAIF2lmNb6Hcg==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/nativescript-vue/-/nativescript-vue-2.7.0.tgz",
+      "integrity": "sha512-kEjZky7XxcqNW4JjdMPOXd5/aW6JZ4npnS41DLZWM7i9G6Fgt8KktxhhKoz0LuJafYwkYFYgjOHWdTLFUulBmw==",
       "dev": true,
       "requires": {
         "nativescript-hook": "0.2.5"
@@ -769,12 +827,12 @@
       }
     },
     "readdirp": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz",
-      "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
       "dev": true,
       "requires": {
-        "picomatch": "^2.0.7"
+        "picomatch": "^2.2.1"
       }
     },
     "reduce-css-calc": {
@@ -806,9 +864,9 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz",
-      "integrity": "sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
       "dev": true,
       "requires": {
         "path-parse": "^1.0.6"
@@ -827,31 +885,23 @@
       "dev": true,
       "requires": {
         "glob": "^7.1.3"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
       }
     },
     "rxjs": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz",
+      "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+          "dev": true
+        }
       }
     },
     "safe-buffer": {
@@ -926,24 +976,9 @@
       }
     },
     "tns-core-modules": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/tns-core-modules/-/tns-core-modules-6.5.1.tgz",
-      "integrity": "sha512-UVPnCDHdEwyAVCBvEsM3mRobhpdTPMSCLjmBy2m8q1kzo/jUcLYebSMQGev4c9IsRlQhiTRVL1T2sWzTHVpU5g==",
-      "dev": true,
-      "requires": {
-        "@nativescript/core": "6.5.1"
-      }
-    },
-    "tns-core-modules-widgets": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/tns-core-modules-widgets/-/tns-core-modules-widgets-6.5.0.tgz",
-      "integrity": "sha512-aSftTLvWZ8jRmM4IttuEd1Y04HlDZNYDLY6e/brt0wcrugihGgxdb3Ia85b8DRP0+WXbNyKitKVHgbCFLiABRw==",
-      "dev": true
-    },
-    "tns-platform-declarations": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/tns-platform-declarations/-/tns-platform-declarations-6.5.1.tgz",
-      "integrity": "sha512-kN94WlMEAqnS5+i4oyS3FGYXw0aUjp/lRIBCu+2kzSJW0GOaxeCbSGO6i/+bDph75VLEwz3PI9eo4hEXY8y8pg==",
+      "version": "7.0.0-rc.20",
+      "resolved": "https://registry.npmjs.org/tns-core-modules/-/tns-core-modules-7.0.0-rc.20.tgz",
+      "integrity": "sha512-fjqJgFhd/ynqWP0Fi69OHcr+y4UeB0AWKfv9mtV9Co4tIfHfGlIvPkPzLU/okLS+9ZB2D91cnkaXPIHjOEXMGA==",
       "dev": true
     },
     "to-regex-range": {
@@ -956,15 +991,15 @@
       }
     },
     "tslib": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
-      "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",
+      "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==",
       "dev": true
     },
     "tslint": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.1.tgz",
-      "integrity": "sha512-kd6AQ/IgPRpLn6g5TozqzPdGNZ0q0jtXW4//hRcj10qLYBaa3mTUU2y2MCG+RXZm8Zx+KZi0eA+YCrMyNlF4UA==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz",
+      "integrity": "sha512-UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -982,19 +1017,20 @@
         "tsutils": "^2.29.0"
       },
       "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "minimist": "^1.2.5"
           }
+        },
+        "tslib": {
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+          "dev": true
         }
       }
     },
@@ -1005,12 +1041,20 @@
       "dev": true,
       "requires": {
         "tslib": "^1.8.1"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+          "dev": true
+        }
       }
     },
     "typescript": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
-      "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
+      "version": "3.9.7",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
+      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
       "dev": true
     },
     "universalify": {
@@ -1031,6 +1075,17 @@
         "mkdirp": "0.x.x",
         "ncp": "1.0.x",
         "rimraf": "2.x.x"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
       }
     },
     "which-module": {
diff --git a/src/package.json b/src/package.json
index 1c65c9c..b6ed68b 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "nativescript-datetimepicker",
-  "version": "2.0.0",
+  "name": "@nativescript/datetimepicker",
+  "version": "2.0.0-rc.0",
   "description": "A NativeScript plugin for picking date and time.",
   "main": "index",
   "typings": "index.d.ts",
@@ -56,25 +56,24 @@
   "homepage": "https://github.com/NativeScript/nativescript-datetimepicker",
   "readmeFilename": "README.md",
   "devDependencies": {
-    "@angular/common": "~9.1.0",
-    "@angular/compiler": "~9.1.0",
-    "@angular/compiler-cli": "~9.1.0",
-    "@angular/core": "~9.1.0",
-    "@angular/forms": "~9.1.0",
-    "@angular/platform-browser": "~9.1.0",
-    "@angular/platform-browser-dynamic": "~9.1.0",
-    "@angular/router": "~9.1.0",
-    "@nativescript/angular": "https://github.com/nstudio/ns-ng/blob/master/nativescript-angular-9.0.0.tgz?raw=true",
-    "nativescript-angular": "https://github.com/nstudio/ns-ng/blob/master/nativescript-angular-compat.tgz?raw=true",
-    "nativescript-vue": "~2.4.0",
+    "@angular/common": "~10.0.0",
+    "@angular/compiler": "~10.0.0",
+    "@angular/compiler-cli": "~10.0.0",
+    "@angular/core": "~10.0.0",
+    "@angular/forms": "~10.0.0",
+    "@angular/platform-browser": "~10.0.0",
+    "@angular/platform-browser-dynamic": "~10.0.0",
+    "@angular/router": "~10.0.0",
+    "@nativescript/angular": "rc",
+    "@nativescript/core": "rc",
+    "@nativescript/types": "rc",
+    "nativescript-vue": "~2.7.0",
     "prompt": "^1.0.0",
     "rimraf": "^2.6.2",
     "rxjs": "^6.5.0",
     "semver": "^5.6.0",
-    "tns-core-modules": "^6.5.0",
-    "tns-platform-declarations": "^6.5.0",
     "tslint": "~6.1.0",
-    "typescript": "~3.8.3",
+    "typescript": "~3.9.0",
     "zone.js": "^0.10.3"
   },
   "dependencies": {},
diff --git a/src/references.d.ts b/src/references.d.ts
index 1e5e961..a698cd3 100644
--- a/src/references.d.ts
+++ b/src/references.d.ts
@@ -1,2 +1,2 @@
-/// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
-/// <reference path="./node_modules/tns-platform-declarations/android.d.ts" />
+/// <reference path="./node_modules/@nativescript/types/ios.d.ts" />
+/// <reference path="./node_modules/@nativescript/types/android.d.ts" />
diff --git a/src/tsconfig.json b/src/tsconfig.json
index 385f91b..c13ead1 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -28,7 +28,7 @@
         "skipMetadataEmit": false,
         "skipTemplateCodegen": true,
         "strictMetadataEmit": true,
-        "enableIvy": false
+        "enableIvy": true
     },
     "exclude": [
         "node_modules",
diff --git a/src/ui/date-picker-field.common.d.ts b/src/ui/date-picker-field.common.d.ts
index c45c3fc..7c76814 100644
--- a/src/ui/date-picker-field.common.d.ts
+++ b/src/ui/date-picker-field.common.d.ts
@@ -1,4 +1,4 @@
-import { Property } from "@nativescript/core/ui/core/view";
+import { Property } from "@nativescript/core";
 import { DatePickerField as DatePickerFieldDefinition } from "./date-picker-field";
 import { PickerFieldBase } from "./picker-field-base";
 export declare class DatePickerFieldBase extends PickerFieldBase implements DatePickerFieldDefinition {
diff --git a/src/ui/date-picker-field.common.ts b/src/ui/date-picker-field.common.ts
index 8413e3d..b92dca7 100644
--- a/src/ui/date-picker-field.common.ts
+++ b/src/ui/date-picker-field.common.ts
@@ -1,5 +1,4 @@
-import { EventData } from "@nativescript/core";
-import { Property, CSSType } from "@nativescript/core/ui/core/view";
+import { EventData, Property, CSSType } from "@nativescript/core";
 import { DateTimePicker, DateTimePickerStyle } from "../datetimepicker";
 import { DatePickerField as DatePickerFieldDefinition } from "./date-picker-field";
 import { LocalizationUtils } from "../utils/localization-utils";
diff --git a/src/ui/date-time-picker-fields.d.ts b/src/ui/date-time-picker-fields.d.ts
index 8b3a905..ded117f 100644
--- a/src/ui/date-time-picker-fields.d.ts
+++ b/src/ui/date-time-picker-fields.d.ts
@@ -1,8 +1,7 @@
-import { Property } from "@nativescript/core/ui/core/view";
-import { GridLayout, EventData } from "@nativescript/core";
-import { Orientation } from "@nativescript/core/ui/scroll-view";
+import { Property, GridLayout, EventData } from "@nativescript/core";
 import { DatePickerField } from "./date-picker-field";
 import { TimePickerField } from "./time-picker-field";
+declare type ScrollOrientation = 'horizontal' | 'vertical';
 export declare class DateTimePickerFields extends GridLayout {
     dateField: DatePickerField;
     timeField: TimePickerField;
@@ -19,7 +18,7 @@ export declare class DateTimePickerFields extends GridLayout {
     pickerTitleTime: string;
     pickerOkText: string;
     pickerCancelText: string;
-    orientation: Orientation;
+    orientation: ScrollOrientation;
     autoPickTime: boolean;
     _shouldSkipTimeAssignment: boolean;
     private _dateChangeHandler;
@@ -38,7 +37,7 @@ export declare class DateTimePickerFields extends GridLayout {
     static pickerTitleTimeProperty: Property<DateTimePickerFields, string>;
     static pickerOkTextProperty: Property<DateTimePickerFields, string>;
     static pickerCancelTextProperty: Property<DateTimePickerFields, string>;
-    static orientationProperty: Property<DateTimePickerFields, Orientation>;
+    static orientationProperty: Property<DateTimePickerFields, ScrollOrientation>;
     static autoPickTimeProperty: Property<DateTimePickerFields, boolean>;
     private static datePropertyChanged;
     private static maxDatePropertyChanged;
@@ -65,3 +64,4 @@ export declare class DateTimePickerFields extends GridLayout {
     private static _updateOrientation;
 }
 export declare function dateValueConverter(v: any): Date;
+export {};
diff --git a/src/ui/date-time-picker-fields.ts b/src/ui/date-time-picker-fields.ts
index 9d5e8bc..d312961 100644
--- a/src/ui/date-time-picker-fields.ts
+++ b/src/ui/date-time-picker-fields.ts
@@ -1,11 +1,10 @@
-import { Property, CSSType } from "@nativescript/core/ui/core/view";
-import { GridLayout, PropertyChangeData, EventData } from "@nativescript/core";
-import { ItemSpec } from "@nativescript/core/ui/layouts/grid-layout";
-import { Orientation } from "@nativescript/core/ui/scroll-view";
+import { Property, CSSType, GridLayout, PropertyChangeData, EventData, ItemSpec } from "@nativescript/core";
 import { DatePickerField } from "./date-picker-field";
 import { TimePickerField } from "./time-picker-field";
 import { getDateNow, clearTime, dateComparer } from "../utils/date-utils";
 
+type ScrollOrientation = 'horizontal' | 'vertical';
+
 @CSSType("DateTimePickerFields")
 export class DateTimePickerFields extends GridLayout {
     public dateField: DatePickerField;
@@ -28,7 +27,7 @@ export class DateTimePickerFields extends GridLayout {
     public pickerOkText: string;
     public pickerCancelText: string;
 
-    public orientation: Orientation;
+    public orientation: ScrollOrientation;
     public autoPickTime: boolean;
 
     _shouldSkipTimeAssignment: boolean;
@@ -131,7 +130,7 @@ export class DateTimePickerFields extends GridLayout {
         valueChanged: DateTimePickerFields.pickerCancelTextPropertyChanged
     });
 
-    public static orientationProperty = new Property<DateTimePickerFields, Orientation>({
+    public static orientationProperty = new Property<DateTimePickerFields, ScrollOrientation>({
         name: "orientation",
         defaultValue: "horizontal",
         valueChanged: DateTimePickerFields.orientationPropertyChanged
@@ -203,7 +202,7 @@ export class DateTimePickerFields extends GridLayout {
         field.timeField.pickerCancelText = newValue;
     }
 
-    private static orientationPropertyChanged(field: DateTimePickerFields, oldValue: Orientation, newValue: Orientation) {
+    private static orientationPropertyChanged(field: DateTimePickerFields, oldValue: ScrollOrientation, newValue: ScrollOrientation) {
         DateTimePickerFields._updateOrientation(field);
     }
 
diff --git a/src/ui/picker-field-base.d.ts b/src/ui/picker-field-base.d.ts
index d1c0ab0..6281cca 100644
--- a/src/ui/picker-field-base.d.ts
+++ b/src/ui/picker-field-base.d.ts
@@ -1,5 +1,4 @@
-import { TextField } from "@nativescript/core";
-import { Property } from "@nativescript/core/ui/core/view";
+import { TextField, Property } from "@nativescript/core";
 export declare abstract class PickerFieldBase extends TextField {
     locale: string;
     pickerTitle: string;
diff --git a/src/ui/picker-field-base.ts b/src/ui/picker-field-base.ts
index 55372a6..7ddade0 100644
--- a/src/ui/picker-field-base.ts
+++ b/src/ui/picker-field-base.ts
@@ -1,6 +1,4 @@
-import { TextField } from "@nativescript/core";
-import { GestureTypes, TouchGestureEventData } from "@nativescript/core/ui/gestures";
-import { Property } from "@nativescript/core/ui/core/view";
+import { TextField, Property, GestureTypes, TouchGestureEventData } from "@nativescript/core";
 
 export abstract class PickerFieldBase extends TextField {
     public locale: string;
diff --git a/src/ui/time-picker-field.common.d.ts b/src/ui/time-picker-field.common.d.ts
index 6e33579..1d16ff0 100644
--- a/src/ui/time-picker-field.common.d.ts
+++ b/src/ui/time-picker-field.common.d.ts
@@ -1,4 +1,4 @@
-import { Property } from "@nativescript/core/ui/core/view";
+import { Property } from "@nativescript/core";
 import { TimePickerField as TimePickerFieldDefinition } from "./time-picker-field";
 import { PickerFieldBase } from "./picker-field-base";
 export declare class TimePickerFieldBase extends PickerFieldBase implements TimePickerFieldDefinition {
diff --git a/src/ui/time-picker-field.common.ts b/src/ui/time-picker-field.common.ts
index f52a285..c342f32 100644
--- a/src/ui/time-picker-field.common.ts
+++ b/src/ui/time-picker-field.common.ts
@@ -1,5 +1,4 @@
-import { Property, CSSType } from "@nativescript/core/ui/core/view";
-import { EventData } from "@nativescript/core";
+import { Property, CSSType, EventData } from "@nativescript/core";
 import { DateTimePicker, DateTimePickerStyle } from "../datetimepicker";
 import { TimePickerField as TimePickerFieldDefinition } from "./time-picker-field";
 import { LocalizationUtils } from "../utils/localization-utils";