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