nativescript-community · kefahB · Oct 7, 2020 · Oct 7, 2020 · Oct 7, 2020 · Oct 7, 2020
diff --git a/demo/app/main-page.ts b/demo/app/main-page.ts
@@ -1,14 +1,12 @@
 import * as Https from "nativescript-https";
-import * as Observable from "@nativescript/core/data/observable";
+import {fromObject, Dialogs as dialogs, Page, EventData} from "@nativescript/core";
 import * as fs from "@nativescript/core/file-system";
-import * as dialogs from "@nativescript/core/ui/dialogs";
-import * as Page from "@nativescript/core/ui/page";
 
 let page;
 let viewModel;
-export function pageLoaded(args: Page.NavigatedData) {
-    page = args.object as Page.Page;
-    viewModel = Observable.fromObject({
+export function pageLoaded(args: EventData) {
+    page = args.object as Page;
+    viewModel = fromObject({
         enabled: false,
         progress: 0,
         currentRequest: null,
@@ -141,7 +139,7 @@ export function get404() {
     getRequest("https://mockbin.com/reque2st");
 }
 
-export function enableSSLPinning(args: Observable.EventData) {
+export function enableSSLPinning(args: EventData) {
     let dir = fs.knownFolders.currentApp().getFolder("assets");
     let certificate = dir.getFile("httpbin.org.cer").path;
     Https.enableSSLPinning({
@@ -152,14 +150,14 @@ export function enableSSLPinning(args: Observable.EventData) {
     console.log("enabled");
 }
 
-export function enableSSLPinningExpired(args: Observable.EventData) {
+export function enableSSLPinningExpired(args: EventData) {
     let dir = fs.knownFolders.currentApp().getFolder("assets");
     let certificate = dir.getFile("httpbin.org.expired.cer").path;
     Https.enableSSLPinning({ host: "httpbin.org", certificate });
     console.log("enabled");
 }
 
-export function disableSSLPinning(args: Observable.EventData) {
+export function disableSSLPinning(args: EventData) {
     Https.disableSSLPinning();
     console.log("disabled");
 }
diff --git a/demo/app/package.json b/demo/app/package.json
diff --git a/demo/nativescript.config.ts b/demo/nativescript.config.ts
@@ -0,0 +1,14 @@
+import { NativeScriptConfig } from '@nativescript/core'
+
+export default {
+  id: 'org.nativescript.plugindemo.https',
+  appResourcesPath: 'app/App_Resources',
+  android: {
+    v8Flags: '--expose_gc',
+    markingMode: 'none',
+    requireModules: {
+      0: 'nativescript-https',
+    },
+  },
+  appPath: 'app',
+} as NativeScriptConfig
diff --git a/demo/package.json b/demo/package.json
@@ -1,28 +1,22 @@
 {
-  "nativescript": {
-    "id": "org.nativescript.plugindemo.https",
-    "tns-android": {
-      "version": "6.4.1"
-    },
-    "tns-ios": {
-      "version": "7.0.0-beta.3-v8-2020-03-21-010353-01"
-    }
-  },
   "dependencies": {
     "nativescript-https": "file:../src",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "0.7.0",
-    "@nativescript/core": "~6.4.0"
+    "@nativescript/core": "7.0.10"
   },
   "devDependencies": {
+    "@nativescript/android": "7.0.0",
+    "@nativescript/ios": "7.0.1",
+    "@nativescript/types": "7.0.0",
+    "@nativescript/webpack": "3.0.0",
     "nativescript-css-loader": "~0.26.1",
-    "nativescript-dev-webpack": "~1.5.0",
-    "tns-platform-declarations": "~6.4.0",
     "tslint": "~5.11.0",
-    "typescript": "3.4.5"
+    "typescript": "3.9.7"
   },
   "scripts": {
     "build.plugin": "cd ../src && npm run build",
     "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**'"
-  }
+  },
+  "main": "app.js"
 }
diff --git a/demo/references.d.ts b/demo/references.d.ts
@@ -1,2 +1 @@
-/// <reference path="../src/node_modules/tns-platform-declarations/ios.d.ts" />
-/// <reference path="../src/node_modules/tns-platform-declarations/android.d.ts" />
+/// <reference path="./node_modules/@nativescript/types/index.d.ts" />
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
@@ -1,15 +1,16 @@
 {
   "compilerOptions": {
-    "target": "es5",
-    "module": "commonjs",
+    "target": "es2017",
+    "module": "esnext",
     "declaration": false,
-    "removeComments": true,
+    "removeComments": false,
     "noLib": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "lib": [
       "es6",
-      "dom"
+      "dom",
+      "es2017"
     ],
     "pretty": true,
     "allowUnreachableCode": false,
@@ -28,7 +29,8 @@
       "~/*": [
         "app/*"
       ]
-    }
+    },
+    "moduleResolution": "node"
   },
   "include": [
     "**/*"

diff --git a/demo/tsconfig.tns.json b/demo/tsconfig.tns.json