feat: Angular 6.0 rc initial support

e2e/modal-navigation-ng/package.json

@@ -6,31 +6,31 @@
   "nativescript": {
     "id": "org.nativescript.modalnavigationng",
     "tns-android": {
-      "version": "next"
+      "version": "4.1.0-2018.4.16.8"
     },
     "tns-ios": {
       "version": "next"
     }
   },
   "dependencies": {
-    "@angular/animations": "~5.2.0",
-    "@angular/common": "~5.2.0",
-    "@angular/compiler": "~5.2.0",
-    "@angular/core": "~5.2.0",
-    "@angular/forms": "~5.2.0",
-    "@angular/http": "~5.2.0",
-    "@angular/platform-browser": "~5.2.0",
-    "@angular/platform-browser-dynamic": "~5.2.0",
-    "@angular/router": "~5.2.0",
+    "@angular/animations": "~6.0.0-rc.3",
+    "@angular/common": "~6.0.0-rc.3",
+    "@angular/compiler": "~6.0.0-rc.3",
+    "@angular/core": "~6.0.0-rc.3",
+    "@angular/forms": "~6.0.0-rc.3",
+    "@angular/http": "~6.0.0-rc.3",
+    "@angular/platform-browser": "~6.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "~6.0.0-rc.3",
+    "@angular/router": "~6.0.0-rc.3",
     "nativescript-angular": "file:../../nativescript-angular",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~5.5.2",
+    "rxjs": "~6.0.0-rc.1",
     "tns-core-modules": "next",
     "zone.js": "~0.8.2"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~5.2.0",
+    "@angular/compiler-cli": "~6.0.0-rc.3",
     "@ngtools/webpack": "~1.9.4",
     "@types/chai": "^4.0.2",
     "@types/mocha": "^2.2.41",
@@ -44,11 +44,11 @@
     "lazy": "1.0.11",
     "nativescript-dev-appium": "next",
     "nativescript-dev-typescript": "next",
-    "nativescript-dev-webpack": "^0.11.0",
+    "nativescript-dev-webpack": "next",
     "nativescript-worker-loader": "~0.8.1",
     "raw-loader": "~0.5.1",
     "resolve-url-loader": "~2.2.1",
-    "typescript": "~2.6.2",
+    "typescript": "~2.7.2",
     "uglifyjs-webpack-plugin": "~1.1.6",
     "webpack": "~3.10.0",
     "webpack-bundle-analyzer": "^2.9.1",

e2e/renderer/.vscode/settings.json

@@ -1,18 +1,13 @@
 {
-    "typescript.check.tscVersion": false,
-    "window.zoomLevel": 0,
-    "workbench.iconTheme": "vscode-icons",
-    "vsicons.dontShowNewVersionMessage": true,
-    "workbench.colorTheme": "Default Light+",
     "files.exclude": {
         "**/.git": true,
         "**/.svn": true,
         "**/.hg": true,
         "**/CVS": true,
         "**/.DS_Store": true,
-        "**/*.js": true,
+        // "**/*.js": true,
         "**/*.map": true,
-        "node_modules": true,
+        // "node_modules": true,
         "hooks": true, 
         "platforms": true
     }

e2e/renderer/app/app.module.ts

@@ -1,4 +1,4 @@
-import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
+import { NgModule, NO_ERRORS_SCHEMA, ErrorHandler } from "@angular/core";
 import { NativeScriptModule } from "nativescript-angular/nativescript.module";
 
 import {
@@ -10,20 +10,30 @@ import { AppComponent } from "./app.component";
 import { ItemsService } from "./items.service";
 
 import { rendererTraceCategory, viewUtilCategory, bootstrapCategory } from "nativescript-angular/trace";
-import { addCategories, enable } from "trace";
+import { addCategories, enable, categories } from "trace";
 addCategories(bootstrapCategory);
-// addCategories(rendererTraceCategory);
-// addCategories(viewUtilCategory);
+addCategories(rendererTraceCategory);
+addCategories(viewUtilCategory);
+addCategories(categories.ViewHierarchy);
 enable();
 
+export class MyErrorHandler implements ErrorHandler {
+    handleError(error) {
+        console.log("### ErrorHandler Error: " + error.toString());
+        console.log("### ErrorHandler Stack: " + error.stack);
+    }
+}  
+
+
 @NgModule({
     declarations: [
         AppComponent,
         ...navigatableComponents,
     ],
     bootstrap: [AppComponent],
     providers: [
-        ItemsService 
+        ItemsService,
+        { provide: ErrorHandler, useClass: MyErrorHandler }
     ],
     imports: [
         NativeScriptModule,

e2e/renderer/package.json

@@ -6,28 +6,29 @@
   "nativescript": {
     "id": "org.nativescript.renderer",
     "tns-android": {
-      "version": "3.4.1-2018-02-06-02"
+      "version": "4.1.0-2018.4.13.1"
     }
   },
   "dependencies": {
-    "@angular/common": "~5.2.0",
-    "@angular/compiler": "~5.2.0",
-    "@angular/core": "~5.2.0",
-    "@angular/forms": "~5.2.0",
-    "@angular/http": "~5.2.0",
-    "@angular/platform-browser": "~5.2.0",
-    "@angular/platform-browser-dynamic": "~5.2.0",
-    "@angular/router": "~5.2.0",
+    "@angular/common": "~6.0.0-rc.3",
+    "@angular/compiler": "~6.0.0-rc.3",
+    "@angular/core": "~6.0.0-rc.3",
+    "@angular/forms": "~6.0.0-rc.3",
+    "@angular/http": "~6.0.0-rc.3",
+    "@angular/platform-browser": "~6.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "~6.0.0-rc.3",
+    "@angular/router": "~6.0.0-rc.3",
     "nativescript-angular": "file:../../nativescript-angular",
     "nativescript-intl": "^3.0.0",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "^5.5.0",
+    "rxjs": "~6.0.0-rc.1",
     "tns-core-modules": "next",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~5.2.0",
-    "@ngtools/webpack": "~1.9.4",
+    "@angular-devkit/core": "~0.5.5",
+    "@angular/compiler-cli": "~6.0.0-rc.3",
+    "@ngtools/webpack": "~6.0.0-rc.3",
     "@types/chai": "^4.0.2",
     "@types/mocha": "^2.2.41",
     "@types/node": "^7.0.5",
@@ -36,27 +37,29 @@
     "babylon": "6.17.4",
     "chai": "~4.1.1",
     "chai-as-promised": "~7.1.1",
+    "clean-webpack-plugin": "~0.1.19",
     "colors": "^1.1.2",
-    "copy-webpack-plugin": "~4.3.0",
+    "copy-webpack-plugin": "~4.5.1",
     "css-loader": "~0.28.7",
     "extract-text-webpack-plugin": "~3.0.2",
     "lazy": "1.0.11",
     "mocha": "~3.5.0",
     "mocha-junit-reporter": "^1.13.0",
     "mocha-multi": "^0.11.0",
     "nativescript-dev-appium": "next",
-    "nativescript-dev-typescript": "~0.4.0",
-    "nativescript-dev-webpack": "^0.11.0",
+    "nativescript-dev-typescript": "~0.7.1",
+    "nativescript-dev-webpack": "next",
     "nativescript-worker-loader": "~0.8.1",
     "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.2.1",
+    "resolve-url-loader": "~2.3.0",
     "tslib": "^1.7.1",
-    "typescript": "~2.6.2",
-    "uglifyjs-webpack-plugin": "~1.1.6",
-    "webpack": "~3.10.0",
+    "typescript": "~2.7.2",
+    "uglifyjs-webpack-plugin": "~1.2.4",
+    "webpack": "~4.5.0",
     "webpack-bundle-analyzer": "^2.9.1",
-    "webpack-sources": "~1.1.0",
-    "clean-webpack-plugin": "~0.1.19"
+    "clean-webpack-plugin": "~0.1.19",
+    "webpack-cli": "~2.0.14",
+    "webpack-sources": "~1.1.0"
   },
   "scripts": {
     "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

e2e/router-tab-view/app/player/player-detail.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 
 import { DataService, DataItem } from "../data.service";
-import { Subscription } from "rxjs/Subscription";
+import { Subscription } from "rxjs";
 
 @Component({
     selector: "ns-player-details",

e2e/router-tab-view/app/team/team-detail.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 
 import { DataService, DataItem } from "../data.service";
-import { Subscription } from "rxjs/Subscription";
+import { Subscription } from "rxjs";
 
 @Component({
     selector: "ns-team-details",

e2e/router-tab-view/package.json

@@ -13,19 +13,19 @@
     }
   },
   "dependencies": {
-    "@angular/animations": "~5.2.0",
-    "@angular/common": "~5.2.0",
-    "@angular/compiler": "~5.2.0",
-    "@angular/core": "~5.2.0",
-    "@angular/forms": "~5.2.0",
-    "@angular/http": "~5.2.0",
-    "@angular/platform-browser": "~5.2.0",
-    "@angular/platform-browser-dynamic": "~5.2.0",
-    "@angular/router": "~5.2.0",
+    "@angular/animations": "~6.0.0-rc.3",
+    "@angular/common": "~6.0.0-rc.3",
+    "@angular/compiler": "~6.0.0-rc.3",
+    "@angular/core": "~6.0.0-rc.3",
+    "@angular/forms": "~6.0.0-rc.3",
+    "@angular/http": "~6.0.0-rc.3",
+    "@angular/platform-browser": "~6.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "~6.0.0-rc.3",
+    "@angular/router": "~6.0.0-rc.3",
     "nativescript-angular": "file:../../nativescript-angular",
     "nativescript-theme-core": "~1.0.4",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~5.5.2",
+    "rxjs": "~6.0.0-rc.1",
     "tns-core-modules": "next",
     "zone.js": "~0.8.2"
   },
@@ -36,7 +36,7 @@
     "lazy": "1.0.11",
     "nativescript-dev-appium": "^3.1.0",
     "nativescript-dev-typescript": "~0.6.0",
-    "typescript": "~2.6.2"
+    "typescript": "~2.7.2"
   },
   "scripts": {
     "e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",

e2e/router/app/app.module.ts

@@ -2,8 +2,6 @@ import { NgModule, NgModuleFactoryLoader, NO_ERRORS_SCHEMA } from "@angular/core
 import { NativeScriptModule } from "nativescript-angular/nativescript.module";
 import { NSModuleFactoryLoader } from "nativescript-angular/router";
 
-import "./rxjs-operators";
-
 import {
     AppRoutingModule,
     navigatableComponents,

e2e/router/app/first/first.component.ts

@@ -4,7 +4,6 @@ import { Location } from "@angular/common";
 import { RouterExtensions } from "nativescript-angular/router";
 
 import { Page } from "ui/page";
-import { Observable } from "rxjs/Observable";
 
 @Component({
     selector: "first",

e2e/router/app/lazy/lazy-componentless-route.component.ts

@@ -4,7 +4,6 @@ import { Location } from "@angular/common";
 import { RouterExtensions } from "nativescript-angular/router";
 
 import { Page } from "ui/page";
-import { Observable } from "rxjs/Observable";
 
 @Component({
     selector: "lazy",

e2e/router/app/lazy/lazy.component.ts

@@ -4,7 +4,6 @@ import { Location } from "@angular/common";
 import { RouterExtensions } from "nativescript-angular/router";
 
 import { Page } from "ui/page";
-import { Observable } from "rxjs/Observable";
 
 @Component({
     selector: "lazy",

e2e/router/app/second/detail.component.ts

@@ -2,7 +2,8 @@ import { Component, OnInit, OnDestroy } from "@angular/core";
 import { ActivatedRoute, Router, Route } from "@angular/router";
 import { Location } from "@angular/common";
 import { Page } from "ui/page";
-import { Observable } from "rxjs/Observable";
+import { Observable } from "rxjs";
+import { map } from "rxjs/operators";
 
 @Component({
     selector: "detail",
@@ -19,7 +20,7 @@ export class DetailComponent {
 
     constructor(private router: Router, private route: ActivatedRoute) {
         console.log("DetailComponent - constructor()");
-        this.id$ = route.params.map(r => r["id"]);
+        this.id$ = route.params.pipe(map(r => r["id"]));
     }
 
     ngOnInit() {
@@ -29,4 +30,4 @@ export class DetailComponent {
     ngOnDestroy() {
         console.log("DetailComponent - ngOnDestroy()");
     }
-}
+}

e2e/router/app/second/second.component.ts

@@ -3,7 +3,8 @@ import { ActivatedRoute, Router, Route } from "@angular/router";
 
 import { RouterExtensions } from "nativescript-angular/router";
 import { Page } from "ui/page";
-import { Observable } from "rxjs/Observable";
+import { Observable } from "rxjs";
+import { map } from "rxjs/operators";
 
 @Component({
     selector: "second",
@@ -28,8 +29,8 @@ export class SecondComponent implements OnInit, OnDestroy {
 
     constructor(private routerExt: RouterExtensions, route: ActivatedRoute, page: Page) {
         console.log("SecondComponent - constructor() page: " + page);
-        this.depth$ = route.params.map(r => r["depth"]);
-        this.nextDepth$ = route.params.map(r => +r["depth"] + 1);
+        this.depth$ = route.params.pipe(map(r => r["depth"]));
+        this.nextDepth$ = route.params.pipe(map(r => +r["depth"] + 1));
     }
 
     ngOnInit() {
@@ -43,4 +44,4 @@ export class SecondComponent implements OnInit, OnDestroy {
     goBack() {
         this.routerExt.back();
     }
-}
+}