Fix: NS7

demo-glasses/package.json

@@ -21,7 +21,7 @@
     "@angular/platform-browser-dynamic": "~11.0.0",
     "@angular/router": "~11.0.0",
     "@nativescript/angular": "~11.0.0",
-    "nativescript-ar": "file:../publish/package/nativescript-ar-1.1.0.tgz",
+    "nativescript-ar": "file:../publish/package/nativescript-ar-2.0.0.tgz",
     "nativescript-pager": "~11.0.10",
     "nativescript-theme-core": "^2.0.24",
     "reflect-metadata": "~0.1.12",

demo-glasses/src/app.css

@@ -9,7 +9,8 @@ In many cases you may want to use the NativeScript core theme instead
 of writing your own CSS rules. For a full list of class names in the theme
 refer to http://docs.nativescript.org/ui/theme.
 */
-@import '~nativescript-theme-core/css/core.light.css';
+@import '@nativescript/theme/core';
+@import '@nativescript/theme/default';
 
 /*
 For example, the following CSS rule changes the font size of all UI

demo-pokemon/nativescript.config.ts

@@ -0,0 +1,11 @@
+import { NativeScriptConfig } from '@nativescript/core'
+
+export default {
+  id: 'org.nativescript.plugindemo.ar.ng.pokemon',
+  appPath: 'src',
+  appResourcesPath: 'App_Resources',
+  android: {
+    v8Flags: '--expose_gc',
+    markingMode: 'none',
+  },
+} as NativeScriptConfig

demo-pokemon/package.json

@@ -1,46 +1,39 @@
 {
-  "nativescript": {
-    "id": "org.nativescript.plugindemo.ar.ng.pokemon",
-    "tns-android": {
-      "version": "6.1.2"
-    },
-    "tns-ios": {
-      "version": "6.1.1"
-    }
-  },
   "description": "NativeScript Application",
   "license": "SEE LICENSE IN <your-license-filename>",
   "repository": "<fill-your-repository-here>",
   "scripts": {
     "lint": "tslint \"src/**/*.ts\""
   },
   "dependencies": {
-    "@angular/animations": "~11.0.0",
-    "@angular/common": "~11.0.0",
-    "@angular/compiler": "~11.0.0",
-    "@angular/core": "~11.0.0",
-    "@angular/forms": "~11.0.0",
-    "@angular/platform-browser": "~11.0.0",
-    "@angular/platform-browser-dynamic": "~11.0.0",
-    "@angular/router": "~11.0.0",
-    "@nativescript/angular": "~11.0.0",
-    "nativescript-ar": "file:../publish/package/nativescript-ar-1.1.0.tgz",
-    "nativescript-theme-core": "^2.0.24",
-    "nativescript-ui-sidedrawer": "~7.0.2",
+    "@angular/animations": "~11.2.7",
+    "@angular/common": "~11.2.7",
+    "@angular/compiler": "~11.2.7",
+    "@angular/core": "~11.2.7",
+    "@angular/forms": "~11.2.7",
+    "@angular/platform-browser": "~11.2.7",
+    "@angular/platform-browser-dynamic": "~11.2.7",
+    "@angular/router": "~11.2.7",
+    "@nativescript/angular": "~11.8.0",
+    "@nativescript/core": "~8.0.0",
+    "@nativescript/theme": "~3.0.1",
+    "nativescript-ar": "file:../publish/package/nativescript-ar-2.0.0.tgz",
+    "nativescript-ui-sidedrawer": "~9.0.3",
     "reflect-metadata": "~0.1.12",
     "rxjs": "^6.4.0",
-    "@nativescript/core": "^7.0.13",
-    "zone.js": "~0.9.1"
+    "zone.js": "~0.11.1"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~11.0.0",
-    "@ngtools/webpack": "~11.0.0",
+    "@angular/compiler-cli": "~11.2.7",
+    "@nativescript/ios": "8.0.0",
+    "@nativescript/webpack": "~5.0.0-beta.0",
+    "@ngtools/webpack": "~11.2.6",
     "codelyzer": "~4.5.0",
-    "nativescript-dev-webpack": "~1.2.0",
     "node-sass": "^4.7.1",
     "tslint": "~5.19.0",
-    "typescript": "~3.5.3"
+    "typescript": "~4.0.0"
   },
   "gitHead": "5fa096231ded5351b53700f0d111d60160e52ebc",
-  "readme": "NativeScript Application"
+  "readme": "NativeScript Application",
+  "main": "./src/main.ts"
 }

demo-pokemon/src/_app-variables.scss

@@ -1,7 +1,8 @@
 // Import the theme’s variables. If you’re using a color scheme
 // other than “light”, switch the path to the alternative scheme,
 // for example '~nativescript-theme-core/scss/dark'.
-@import '~nativescript-theme-core/scss/light';
+@import '@nativescript/theme/core';
+@import '@nativescript/theme/default';
 
 // Custom colors
 $background-dark: #F8F8F8 !default;

demo-pokemon/src/app.android.scss

@@ -2,8 +2,8 @@
 @import 'app-variables';
 
 // Import the theme’s main ruleset - both index and platform specific.
-@import '~nativescript-theme-core/scss/index';
-@import '~nativescript-theme-core/scss/platforms/index.android';
+@import '@nativescript/theme/core';
+@import '@nativescript/theme/default';
 
 // Import common styles
 @import 'app-common';

demo-pokemon/src/app.ios.scss

@@ -2,8 +2,8 @@
 @import 'app-variables';
 
 // Import the theme’s main ruleset - both index and platform specific.
-@import '~nativescript-theme-core/scss/index';
-@import '~nativescript-theme-core/scss/platforms/index.ios';
+@import '@nativescript/theme/core';
+@import '@nativescript/theme/default';
 
 // Import common styles
 @import 'app-common';

demo-pokemon/src/app/app-routing.module.ts

@@ -4,11 +4,11 @@ import { NativeScriptRouterModule } from "@nativescript/angular";
 
 const routes: Routes = [
     {path: "", redirectTo: "/home", pathMatch: "full"},
-    {path: "home", loadChildren: "~/app/home/home.module#HomeModule"},
-    {path: "augment-card", loadChildren: "~/app/augment-card/augment-card.module#AugmentCardModule"},
-    {path: "search-by-card", loadChildren: "~/app/search-by-card/search-by-card.module#SearchByCardModule"},
-    {path: "try-before-you-buy", loadChildren: "~/app/try-before-you-buy/try-before-you-buy.module#TryBeforeYouBuyModule"},
-    {path: "settings", loadChildren: "~/app/settings/settings.module#SettingsModule"}
+    {path: "home", loadChildren: () => import("../app/home/home.module").then(m=>m.HomeModule)},
+    {path: "augment-card", loadChildren: () => import("../app/augment-card/augment-card.module").then(m=>m.AugmentCardModule)},
+    {path: "search-by-card", loadChildren: () => import("../app/search-by-card/search-by-card.module").then(m=>m.SearchByCardModule)},
+    {path: "try-before-you-buy", loadChildren: () => import("../app/try-before-you-buy/try-before-you-buy.module").then(m=>m.TryBeforeYouBuyModule)},
+    {path: "settings", loadChildren: () => import("../app/settings/settings.module").then(m=>m.SettingsModule)}
 ];
 
 @NgModule({

demo-pokemon/src/app/app.module.ts

@@ -1,8 +1,8 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptModule, registerElement } from "@nativescript/angular";
 import { NativeScriptUISideDrawerModule } from "nativescript-ui-sidedrawer/angular";
-import { PokemonDataService } from "~/app/pokemon-data/pokemon-data-service";
-import { PokemonFavoritesService } from "~/app/pokemon-data/pokemon-favorites-service";
+import { PokemonDataService } from "../app/pokemon-data/pokemon-data-service";
+import { PokemonFavoritesService } from "../app/pokemon-data/pokemon-favorites-service";
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";
 

demo-pokemon/src/app/augment-card/augment-card.component.ts

@@ -2,8 +2,8 @@ import { Component } from "@angular/core";
 import { RouterExtensions } from "@nativescript/angular";
 import { ARCommonNode, ARTrackingImageDetectedEventData } from "nativescript-ar";
 import { isIOS } from "@nativescript/core";
-import { PokemonDataService } from "~/app/pokemon-data/pokemon-data-service";
-import { PokemonFavoritesService } from "~/app/pokemon-data/pokemon-favorites-service";
+import { PokemonDataService } from "../../app/pokemon-data/pokemon-data-service";
+import { PokemonFavoritesService } from "../../app/pokemon-data/pokemon-favorites-service";
 
 @Component({
     selector: "AugmentCard",
@@ -68,7 +68,7 @@ export class AugmentCardComponent {
                         const rotateDegreesPerSecond = 60;
                         interval = setInterval(() => {
                             nodeInteraction.node.rotateBy({x: 0, y: rotateDegreesPerSecond / fps, z: 0});
-                        }, 1000 / fps);
+                        }, 1000 / fps) as any;
                     }
                 }
             });

demo-pokemon/src/app/home/home.module.ts

@@ -14,6 +14,7 @@ import { HomeComponent } from "./home.component";
     ],
     schemas: [
         NO_ERRORS_SCHEMA
-    ]
+    ],
+    providers: []
 })
 export class HomeModule { }

demo-pokemon/src/app/pokemon-data/pokemon-data-service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core";
 import { knownFolders } from "@nativescript/core";
-import { PokemonFavoritesService } from "~/app/pokemon-data/pokemon-favorites-service";
+import { PokemonFavoritesService } from "../../app/pokemon-data/pokemon-favorites-service";
 import { Pokemon } from "./pokemon";
 
 @Injectable()

demo-pokemon/src/app/search-by-card/pokemon-search-result/pokemon-search-result.component.ts

@@ -1,8 +1,8 @@
 import { Component, OnDestroy } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { RouterExtensions } from "@nativescript/angular";
-import { Pokemon } from "~/app/pokemon-data/pokemon";
-import { PokemonDataService } from "~/app/pokemon-data/pokemon-data-service";
+import { Pokemon } from "../../../app/pokemon-data/pokemon";
+import { PokemonDataService } from "../../../app/pokemon-data/pokemon-data-service";
 
 @Component({
     selector: "PokemonSearchResult",

demo-pokemon/src/app/search-by-card/search-by-card-routing.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from "@angular/core";
 import { Routes } from "@angular/router";
 import { NativeScriptRouterModule } from "@nativescript/angular";
-import { PokemonSearchResultComponent } from "~/app/search-by-card/pokemon-search-result/pokemon-search-result.component";
+import { PokemonSearchResultComponent } from "../../app/search-by-card/pokemon-search-result/pokemon-search-result.component";
 import { SearchByCardComponent } from "./search-by-card.component";
 
 const routes: Routes = [

demo-pokemon/src/app/search-by-card/search-by-card.component.ts

@@ -3,9 +3,9 @@ import { RouterExtensions } from "@nativescript/angular";
 import { ARTrackingImageDetectedEventData } from "nativescript-ar";
 import { RadSideDrawer } from "nativescript-ui-sidedrawer";
 import { View, Application } from "@nativescript/core";
-import { Pokemon } from "~/app/pokemon-data/pokemon";
-import { PokemonDataService } from "~/app/pokemon-data/pokemon-data-service";
-import { PokemonFavoritesService } from "~/app/pokemon-data/pokemon-favorites-service";
+import { Pokemon } from "../../app/pokemon-data/pokemon";
+import { PokemonDataService } from "../../app/pokemon-data/pokemon-data-service";
+import { PokemonFavoritesService } from "../../app/pokemon-data/pokemon-favorites-service";
 
 const DEFAULT_SCAN_HINT = "Scan a Pokémon card";
 

demo-pokemon/src/app/search-by-card/search-by-card.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptCommonModule } from "@nativescript/angular";
-import { PokemonSearchResultComponent } from "./pokemon-search-result/pokemon-search-result.component";
 import { SearchByCardRoutingModule } from "./search-by-card-routing.module";
 import { SearchByCardComponent } from "./search-by-card.component";
 
@@ -11,7 +10,6 @@ import { SearchByCardComponent } from "./search-by-card.component";
     ],
     declarations: [
         SearchByCardComponent,
-        PokemonSearchResultComponent
     ],
     schemas: [
         NO_ERRORS_SCHEMA

demo-pokemon/src/app/try-before-you-buy/try-before-you-buy-routing.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from "@angular/core";
 import { Routes } from "@angular/router";
 import { NativeScriptRouterModule } from "@nativescript/angular";
-import { TryBeforeYouBuyComponent } from "~/app/try-before-you-buy/try-before-you-buy.component";
+import { TryBeforeYouBuyComponent } from "../../app/try-before-you-buy/try-before-you-buy.component";
 
 const routes: Routes = [
     {path: "", component: TryBeforeYouBuyComponent}

demo-pokemon/src/app/try-before-you-buy/try-before-you-buy.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit } from "@angular/core";
 import { RouterExtensions } from "@nativescript/angular";
 import { AR, ARCommonNode, ARMaterial, ARPlaneTappedEventData } from "nativescript-ar";
-import { Color, Action, isIOS } from "@nativescript/core";
-import { Pokemon } from "~/app/pokemon-data/pokemon";
-import { PokemonDataService } from "~/app/pokemon-data/pokemon-data-service";
-import { PokemonFavoritesService } from "~/app/pokemon-data/pokemon-favorites-service";
+import { Color, Dialogs, isIOS } from "@nativescript/core";
+import { Pokemon } from "../../app/pokemon-data/pokemon";
+import { PokemonDataService } from "../../app/pokemon-data/pokemon-data-service";
+import { PokemonFavoritesService } from "../../app/pokemon-data/pokemon-favorites-service";
 
 @Component({
     selector: "TryBeforeYouBuy",
@@ -71,7 +71,7 @@ export class TryBeforeYouBuyComponent implements OnInit {
     private async pokemonPicker(): Promise<Pokemon> {
         const options: Array<string> = [];
         this.pokemonList.map(p => options.push(p.name));
-        const pickedItem: string = await Action("Pick a Pokémon", "Cancel", options);
+        const pickedItem: string = await Dialogs.action("Pick a Pokémon", "Cancel", options);
         return this.pokemonList[options.indexOf(pickedItem)];
     }
 }

demo-pokemon/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
-    "target": "es5",
+    "module": "esnext",
+    "target": "es2017",
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "noEmitHelpers": true,
@@ -10,7 +10,8 @@
     "lib": [
       "es6",
       "dom",
-      "es2015.iterable"
+      "es2015.iterable",
+      "es2017"
     ],
     "baseUrl": ".",
     "paths": {
@@ -20,10 +21,12 @@
       "*": [
         "./node_modules/*"
       ]
-    }
+    },
+    "moduleResolution": "node",
+    "removeComments": false
   },
   "exclude": [
     "node_modules",
     "platforms"
   ]
-}
+}