Merge pull request #1640 from nstudio/feat/dep-updates

feat(nativescript): v7 updates and compatibility to target es2017+

Author: EddyVerbruggen

.gitignore

@@ -5,8 +5,10 @@ package-lock.json
 *.js
 !src/*-hooks.js
 build/
+*.tgz
 *.log.*
 src/**/*.d.ts
+src/**/*.map
 src/platforms/ios_lib/TNSMLKitCamera/TNSMLKitCamera.xcodeproj/project.xcworkspace
 src/platforms/ios_lib/TNSMLKitCamera/TNSMLKitCamera.xcodeproj/xcuserdata
 src/platforms/ios/Podfile

demo/app/app.ts

@@ -1,13 +1,11 @@
-import "./bundle-config";
-import * as application from "tns-core-modules/application";
-import { UnhandledErrorEventData } from "tns-core-modules/application";
+import { Application, UnhandledErrorEventData } from "@nativescript/core";
 
 // added this here so we can do some wiring
-require("nativescript-plugin-firebase");
+require("@nativescript/firebase");
 
 // testing this.. we may be able to hook that up to Crashlytics. Either via docs, or automatically.
-application.on(application.uncaughtErrorEvent, (args: UnhandledErrorEventData) => {
+Application.on(Application.uncaughtErrorEvent, (args: UnhandledErrorEventData) => {
   console.log("[app.js]: Uncaught NativeScript Error: " + args.error);
 });
 
-application.run({ moduleName: "main-page" });
+Application.run({ moduleName: "main-page" });

demo/app/bundle-config.ts

@@ -1,12 +1,11 @@
-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 "./main-view-model";
 
 const model = new HelloWorldModel();
 
 // 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 = model;
 }

demo/app/main-page.ts

@@ -1,15 +1,11 @@
-import * as firebase from "nativescript-plugin-firebase";
-import { AddEventListenerResult, admob as firebaseAdMob, crashlytics as firebaseCrashlytics, GetRemoteConfigResult, IdTokenResult, LogComplexEventTypeParameter, performance as firebasePerformance, storage as firebaseStorage, User } from "nativescript-plugin-firebase";
-import { RewardedVideoAdReward } from "nativescript-plugin-firebase/admob/admob";
-import { FirebaseTrace } from "nativescript-plugin-firebase/performance/performance";
-import { Observable } from "tns-core-modules/data/observable";
-import * as fs from "tns-core-modules/file-system";
-import { isAndroid, isIOS } from "tns-core-modules/platform";
-import { alert, prompt } from "tns-core-modules/ui/dialogs";
+import { firebase, AddEventListenerResult, admob as firebaseAdMob, crashlytics as firebaseCrashlytics, GetRemoteConfigResult, IdTokenResult, LogComplexEventTypeParameter, performance as firebasePerformance, storage as firebaseStorage, User } from "@nativescript/firebase";
+import { RewardedVideoAdReward } from "@nativescript/firebase/admob/admob";
+import { FirebaseTrace } from "@nativescript/firebase/performance/performance";
+import { Observable, isAndroid, isIOS, Dialogs, knownFolders, File } from "@nativescript/core";
 import { UploadMetadata } from "../../src/storage/storage";
 import { MessagingViewModel } from "./messaging-view-model";
 
-const firebaseWebApi = require("nativescript-plugin-firebase/app");
+const firebaseWebApi = require("@nativescript/firebase/app");
 
 declare const Crashlytics: any;
 
@@ -309,7 +305,7 @@ export class HelloWorldModel extends Observable {
 
   public doWebUploadFile(): void {
     // let's first create a File object using the tns file module
-    const appPath = fs.knownFolders.currentApp().path;
+    const appPath = knownFolders.currentApp().path;
     const logoPath = appPath + "/images/telerik-logo.png";
 
     const storageRef = firebaseWebApi.storage().ref();
@@ -324,7 +320,7 @@ export class HelloWorldModel extends Observable {
       }
     };
 
-    childRef.put(fs.File.fromPath(logoPath), metadata).then(
+    childRef.put(File.fromPath(logoPath), metadata).then(
         uploadedFile => {
           console.log("Uploaded! " + JSON.stringify(uploadedFile));
           this.set("storageFeedback", "Uploaded!");
@@ -341,7 +337,7 @@ export class HelloWorldModel extends Observable {
     const childRef = storageRef.child("uploads/images/telerik-logo-uploaded.png");
 
     // let's first determine where we'll create the file using the 'file-system' module
-    const documents = fs.knownFolders.documents();
+    const documents = knownFolders.documents();
     const logoPath = documents.path + "/telerik-logo-downloaded.png";
 
     childRef.download(logoPath)
@@ -1666,7 +1662,7 @@ export class HelloWorldModel extends Observable {
 
   public doUploadFile(): void {
     // let's first create a File object using the tns file module
-    const appPath = fs.knownFolders.currentApp().path;
+    const appPath = knownFolders.currentApp().path;
     const logoPath = appPath + "/images/telerik-logo.png";
 
     const metadata: UploadMetadata = {
@@ -1680,7 +1676,7 @@ export class HelloWorldModel extends Observable {
 
     firebaseStorage.uploadFile({
       remoteFullPath: 'uploads/images/telerik-logo-uploaded.png',
-      localFile: fs.File.fromPath(logoPath), // use this (a file-system module File object)
+      localFile: File.fromPath(logoPath), // use this (a file-system module File object)
       // localFullPath: logoPath, // or this, a full file path
       onProgress: status => {
         console.log("Uploaded fraction: " + status.fractionCompleted + " (" + status.percentageCompleted + "%)");
@@ -1702,7 +1698,7 @@ export class HelloWorldModel extends Observable {
 
   public doDownloadFile(): void {
     // let's first determine where we'll create the file using the 'file-system' module
-    const documents = fs.knownFolders.documents();
+    const documents = knownFolders.documents();
     const logoPath = documents.path + "/telerik-logo-downloaded.png";
 
     // this will create or overwrite a local file in the app's documents folder

demo/app/main-view-model.ts

@@ -1,7 +1,6 @@
-import { alert } from "tns-core-modules/ui/dialogs";
-import * as platform from "tns-core-modules/platform";
-import * as firebase from "nativescript-plugin-firebase";
-import { messaging } from "nativescript-plugin-firebase/messaging";
+import { Dialogs } from "@nativescript/core";
+import { firebase } from "@nativescript/firebase";
+import { messaging } from "@nativescript/firebase/messaging";
 
 const getCircularReplacer = () => {
   const seen = new WeakSet;
@@ -21,7 +20,7 @@ export class MessagingViewModel {
     firebase.getCurrentPushToken().then(token => {
       // may be null if not known yet
       console.log("Current push token: " + token);
-      alert({
+      Dialogs.alert({
         title: "Current Push Token",
         message: (token === null ? "Not received yet" : token + ("\n\nSee the console log if you want to copy-paste it.")),
         okButtonText: "OK, thx"
@@ -30,7 +29,7 @@ export class MessagingViewModel {
   }
 
   public doRegisterForInteractivePush(): void {
-    if (platform.isIOS) {
+    if (global.isIOS) {
       const model = new messaging.PushNotificationModel();
       model.iosSettings = new messaging.IosPushSettings();
       model.iosSettings.badge = false;

demo/app/messaging-view-model.ts

@@ -1,4 +1,4 @@
-const firebase = require("nativescript-plugin-firebase");
+const firebase = require("@nativescript/firebase");
 
 // TODO make this slightly more useful :P
 

demo/app/package.json

@@ -1,4 +1,4 @@
-const firebaseWebApi = require("nativescript-plugin-firebase/app");
+const firebaseWebApi = require("@nativescript/firebase/app");
 
 // TODO make this slightly more useful :P
 

demo/app/tests/tests.native-api.ts

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