Merge branch 'master' into djenkov/e2e-reset-root

Author: ADjenkov

Diff for: .gitignore

@@ -29,9 +29,7 @@ ng-sample/app/**/*.js
 
 # Webpack configuration files
 webpack.config.js
-vendor.ts
-vendor-platform.android.ts
-vendor-platform.ios.ts
+tsconfig.esm.json
 
 # IDEs and editors
 /.idea

Diff for: CHANGELOG.md

@@ -1,3 +1,15 @@
+<a name="6.0.6"></a>
+## [6.0.6](https://github.com/NativeScript/nativescript-angular/compare/6.0.0...6.0.6) (2018-06-22)
+
+> IMPORTANT! You should use this version with @angular/* v6.0.6 and up.
+
+### Bug Fixes
+
+* clean up properly shared modal page router outlets ([#1360](https://github.com/NativeScript/nativescript-angular/issues/1360)) ([3332ca2](https://github.com/NativeScript/nativescript-angular/commit/3332ca2))
+* **animations:** inject document object in the animation engine ([#1395](https://github.com/NativeScript/nativescript-angular/issues/1395)) ([379e958](https://github.com/NativeScript/nativescript-angular/commit/379e958)), closes [#1393](https://github.com/NativeScript/nativescript-angular/issues/1393)
+* **modal:** lower isModalNavigation flag when closing modal ([#1378](https://github.com/NativeScript/nativescript-angular/issues/1378)) ([6ab1cac](https://github.com/NativeScript/nativescript-angular/commit/6ab1cac))
+
+
 <a name="6.0.0"></a>
 # [6.0.0](https://github.com/NativeScript/nativescript-angular/compare/5.3.0...6.0.0) (2018-05-30)
 

Diff for: e2e/renderer/package.json

@@ -4,31 +4,26 @@
   "readme": "NativeScript Application",
   "repository": "<fill-your-repository-here>",
   "nativescript": {
-    "id": "org.nativescript.renderer",
-    "tns-android": {
-      "version": "4.1.0-2018.4.13.1"
-    }
+    "id": "org.nativescript.renderer"
   },
   "dependencies": {
-    "@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",
+    "@angular/common": "~6.0.6",
+    "@angular/compiler": "~6.0.6",
+    "@angular/core": "~6.0.6",
+    "@angular/forms": "~6.0.6",
+    "@angular/http": "~6.0.6",
+    "@angular/platform-browser": "~6.0.6",
+    "@angular/platform-browser-dynamic": "~6.0.6",
+    "@angular/router": "~6.0.6",
     "nativescript-angular": "file:../../nativescript-angular",
     "nativescript-intl": "^3.0.0",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~6.0.0-rc.1",
+    "rxjs": "~6.1.0",
     "tns-core-modules": "next",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@angular-devkit/core": "~0.5.5",
-    "@angular/compiler-cli": "~6.0.0-rc.3",
-    "@ngtools/webpack": "~6.0.0-rc.3",
+    "@angular/compiler-cli": "~6.1.0-beta.1",
     "@types/chai": "^4.0.2",
     "@types/mocha": "^2.2.41",
     "@types/node": "^7.0.5",
@@ -37,29 +32,17 @@
     "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.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.7.1",
     "nativescript-dev-webpack": "next",
-    "nativescript-worker-loader": "~0.8.1",
-    "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.3.0",
     "tslib": "^1.7.1",
     "typescript": "~2.7.2",
-    "uglifyjs-webpack-plugin": "~1.2.4",
-    "webpack": "~4.5.0",
-    "webpack-bundle-analyzer": "^2.9.1",
-    "clean-webpack-plugin": "~0.1.19",
-    "webpack-cli": "~2.0.14",
-    "webpack-sources": "~1.1.0"
+    "@angular-devkit/build-angular": "~0.7.0-rc.0"
   },
   "scripts": {
     "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

Diff for: e2e/renderer/tsconfig.json

@@ -16,6 +16,9 @@
             "*": [
                 "./node_modules/tns-core-modules/*",
                 "./node_modules/*"
+            ],
+            "~/*": [
+                "app/*"
             ]
         }
     },
@@ -24,4 +27,4 @@
         "platforms",
         "e2e"
     ]
-}
+}

Diff for: e2e/router/package.json

@@ -4,35 +4,28 @@
   "readme": "NativeScript Application",
   "repository": "<fill-your-repository-here>",
   "nativescript": {
-    "id": "org.nativescript.router",
-    "tns-android": {
-      "version": "next"
-    },
-    "tns-ios": {
-      "version": "next"
-    }
+    "id": "org.nativescript.router"
   },
   "dependencies": {
-    "@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",
+    "@angular/animations": "~6.0.6",
+    "@angular/common": "~6.0.6",
+    "@angular/compiler": "~6.0.6",
+    "@angular/core": "~6.0.6",
+    "@angular/forms": "~6.0.6",
+    "@angular/http": "~6.0.6",
+    "@angular/platform-browser": "~6.0.6",
+    "@angular/platform-browser-dynamic": "~6.0.6",
+    "@angular/router": "~6.0.6",
     "nativescript-angular": "file:../../nativescript-angular",
     "nativescript-intl": "^3.0.0",
     "reflect-metadata": "~0.1.8",
-    "rxjs": "~6.0.0-rc.1",
+    "rxjs": "~6.1.0",
     "tns-core-modules": "next",
-    "zone.js": "^0.8.4"
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/core": "~0.5.5",
-    "@angular/compiler-cli": "~6.0.0-rc.3",
-    "@ngtools/webpack": "~6.0.0-rc.3",
+    "@angular-devkit/build-angular": "~0.7.0-rc.0",
+    "@angular/compiler-cli": "~6.1.0-beta.1",
     "@types/chai": "^4.0.2",
     "@types/mocha": "^2.2.41",
     "@types/node": "^7.0.5",
@@ -41,30 +34,16 @@
     "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.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": "next",
-    "nativescript-worker-loader": "~0.8.1",
-    "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.3.0",
     "tslib": "^1.7.1",
-    "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",
-    "webpack-cli": "~2.0.14",
-    "webpack-sources": "~1.1.0",
-    "clean-webpack-plugin": "~0.1.19"
+    "typescript": "~2.7.2"
   },
   "scripts": {
     "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",

Diff for: nativescript-angular/animations/animations.module.ts

@@ -1,5 +1,14 @@
-import { NgModule, Injectable, NgZone, Provider, RendererFactory2, Optional, SkipSelf } from "@angular/core";
-
+import {
+    NgModule,
+    Injectable,
+    Inject,
+    NgZone,
+    Provider,
+    RendererFactory2,
+    Optional,
+    SkipSelf,
+} from "@angular/core";
+import { DOCUMENT } from "@angular/common";
 import { AnimationBuilder } from "@angular/animations";
 
 import {
@@ -21,8 +30,8 @@ import { throwIfAlreadyLoaded } from "../common/utils";
 
 @Injectable()
 export class InjectableAnimationEngine extends AnimationEngine {
-    constructor(driver: AnimationDriver, normalizer: AnimationStyleNormalizer) {
-        super(driver, normalizer);
+    constructor(@Inject(DOCUMENT) doc: any, driver: AnimationDriver, normalizer: AnimationStyleNormalizer) {
+        super(doc.body, driver, normalizer);
     }
 }
 

Diff for: nativescript-angular/directives/tab-view.ts

@@ -14,6 +14,12 @@ import { InvisibleNode } from "../element-registry";
 import { rendererLog } from "../trace";
 import { isBlank } from "../lang-facade";
 
+export interface TabViewItemDef {
+    title?: string;
+    iconSource?: string;
+    textTransform?: TextTransform;
+}
+
 @Directive({
     selector: "TabView", // tslint:disable-line:directive-selector
 })
@@ -52,9 +58,7 @@ export class TabViewDirective implements AfterViewInit {
 })
 export class TabViewItemDirective implements OnInit {
     private item: TabViewItem;
-    private _title: string;
-    private _iconSource: string;
-    private _textTransform: TextTransform;
+    private _config: TabViewItemDef;
 
     constructor(
         private owner: TabViewDirective,
@@ -63,46 +67,46 @@ export class TabViewItemDirective implements OnInit {
     ) {
     }
 
-    @Input("tabItem") config: any; // tslint:disable-line:no-input-rename
+    @Input("tabItem")
+    set config(config: TabViewItemDef) {
+        if (!this._config
+            || this._config.iconSource !== config.iconSource
+            || this._config.title !== config.title
+            || this._config.textTransform !== config.textTransform) {
+            this._config = config;
+            this.applyConfig();
+        }
+    }
+
+    get config(): TabViewItemDef { // tslint:disable-line:no-input-rename
+        return this._config || {};
+    }
 
     @Input()
-    get title() {
-        return this._title;
+    set title(title: string) {
+        this.config = Object.assign(this.config, { title });
     }
 
-    set title(value: string) {
-        if (this._title !== value) {
-            this._title = value;
-            this.ensureItem();
-            this.item.title = this._title;
-        }
+    get title() {
+        return this.config.title;
     }
 
     @Input()
-    get iconSource() {
-        return this._iconSource;
+    set iconSource(iconSource: string) {
+        this.config = Object.assign(this.config, { iconSource });
     }
 
-    set iconSource(value: string) {
-        if (this._iconSource !== value) {
-            this._iconSource = value;
-            this.ensureItem();
-            this.item.iconSource = this._iconSource;
-        }
+    get iconSource() {
+        return this.config.iconSource;
     }
 
-
     @Input()
-    get textTransform() {
-        return this._textTransform;
+    set textTransform(textTransform: TextTransform) {
+        this.config = Object.assign(this.config, { textTransform });
     }
 
-    set textTransform(value: TextTransform) {
-        if (this._textTransform && this._textTransform !== value) {
-            this._textTransform = value;
-            this.ensureItem();
-            this.item.textTransform = this._textTransform;
-        }
+    get textTransform() {
+        return this.config.textTransform;
     }
 
     private ensureItem() {
@@ -111,19 +115,26 @@ export class TabViewItemDirective implements OnInit {
         }
     }
 
-    ngOnInit() {
+    private applyConfig() {
         this.ensureItem();
-        if (this.config) {
-            this.item.title = this._title || this.config.title;
-            this.item.iconSource = this._iconSource || this.config.iconSource;
-
-            //  TabViewItem textTransform has a default value for Android that kick in
-            // only if no value (even a null value) is set.
-            const textTransformValue = this._textTransform || this.config.textTransform;
-            if (textTransformValue) {
-                this.item.textTransform = textTransformValue;
-            }
+
+        if (this.config.title) {
+            this.item.title = this.config.title;
+        }
+
+        if (this.config.iconSource) {
+            this.item.iconSource = this.config.iconSource;
+        }
+
+        //  TabViewItem textTransform has a default value for Android that kick in
+        // only if no value (even a null value) is set.
+        if (this.config.textTransform) {
+            this.item.textTransform = this.config.textTransform;
         }
+    }
+
+    ngOnInit() {
+        this.applyConfig();
 
         const viewRef = this.viewContainer.createEmbeddedView(this.templateRef);
         // Filter out text nodes and comments