Merge pull request #40 from NathanWalker/feat/dep-updates

chore: {N} 7 updates

Author: jdnichollsc

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

demo/app/home/home-page.ts

@@ -1,10 +1,9 @@
-import * as observable from 'tns-core-modules/data/observable';
-import * as pages from 'tns-core-modules/ui/page';
+import { EventData, Page } from '@nativescript/core';
 import {HelloWorldModel} from './home-view-model';
 
 // Event handler for Page 'loaded' event attached in main-page.xml
-export function pageLoaded(args: observable.EventData) {
+export function pageLoaded(args: EventData) {
     // Get the event sender
-    let page = <pages.Page>args.object;
+    let page = <Page>args.object;
     page.bindingContext = new HelloWorldModel();
 }

demo/app/home/home-page.xml

@@ -1,5 +1,4 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded" class="page"
-  xmlns:ui="nativescript-inappbrowser">
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded" class="page">
   <StackLayout class="content" verticalAlignment="center">
     <Label text="Welcome InAppBrowser&#xA;for NativeScript" class="t-20 text-center c-black" textWrap="true"/>
     <Label text="Type the url" class="text-center p"/>

demo/app/home/home-view-model.ts

@@ -1,7 +1,5 @@
-import { Observable } from 'tns-core-modules/data/observable';
-import { openUrl } from 'tns-core-modules/utils/utils';
-import { alert } from 'tns-core-modules/ui/dialogs';
-import InAppBrowser from 'nativescript-inappbrowser';
+import { Observable, Utils, Dialogs } from '@nativescript/core';
+import { InAppBrowser } from 'nativescript-inappbrowser';
 import { getDeepLink, sleep } from './utilities';
 
 export class HelloWorldModel extends Observable {
@@ -60,18 +58,18 @@ export class HelloWorldModel extends Observable {
           }
         });
         await sleep(800);
-        alert({
+        Dialogs.alert({
           title: 'Response',
           message: JSON.stringify(result),
           okButtonText: 'Ok'
         });
       }
       else {
-        openUrl(url);
+        Utils.openUrl(url);
       }
     }
     catch (error) {
-      alert({
+      Dialogs.alert({
         title: 'Error',
         message: error.message,
         okButtonText: 'Ok'
@@ -94,14 +92,14 @@ export class HelloWorldModel extends Observable {
           enableDefaultShare: true
         });
         await sleep(800);
-        alert({
+        Dialogs.alert({
           title: 'Response',
           message: JSON.stringify(result),
           okButtonText: 'Ok'
         });
       }
     } catch {
-      alert('Something’s wrong with the app :(');
+      Dialogs.alert('Something’s wrong with the app :(');
     }
   }
 }

demo/app/home/utilities.ts

@@ -1,8 +1,6 @@
-import { android } from "tns-core-modules/application";
-
 export const getDeepLink = (path = "") => {
   const scheme = 'my-demo';
-  const prefix = android ? `${scheme}://demo/` : `${scheme}://`;
+  const prefix = global.isAndroid ? `${scheme}://demo/` : `${scheme}://`;
   return prefix + path;
 };
 

demo/app/package.json

@@ -0,0 +1,12 @@
+import { NativeScriptConfig } from '@nativescript/core'
+
+export default {
+  id: 'org.nativescript.demo',
+  appResourcesPath: 'app/App_Resources',
+  android: {
+    v8Flags: '--expose_gc',
+    markingMode: 'none',
+  },
+  useLegacyWorkflow: false,
+  appPath: 'app',
+} as NativeScriptConfig

demo/nativescript.config.ts

@@ -1,25 +1,18 @@
 {
-  "nativescript": {
-    "id": "org.nativescript.demo",
-    "tns-ios": {
-      "version": "6.5.0"
-    },
-    "tns-android": {
-      "version": "6.5.0"
-    }
-  },
   "description": "NativeScript Application",
   "license": "SEE LICENSE IN <your-license-filename>",
   "repository": "<fill-your-repository-here>",
   "dependencies": {
     "nativescript-inappbrowser": "file:../src",
     "nativescript-theme-core": "~2.0.24",
-    "tns-core-modules": "~6.5.1"
+    "@nativescript/core": "~7.0.0"
   },
   "devDependencies": {
-    "nativescript-dev-webpack": "~1.5.1",
-    "typescript": "~3.8.3"
+    "@nativescript/ios": "7.0.0",
+    "@nativescript/webpack": "~3.0.0",
+    "typescript": "~3.9.7"
   },
   "gitHead": "42f2a6a9c94eaf9c68d2a41e0daaa1a2544bc28f",
-  "readme": "NativeScript Application"
+  "readme": "NativeScript Application",
+  "main": "app.js"
 }

demo/nsconfig.json

@@ -0,0 +1 @@
+/// <reference path="../src/references.d.ts" />