Merge branch 'master' into djenkov/modal-navigation

Author: ADjenkov

Diff for: .travis.yml

@@ -1,10 +1,9 @@
 env:
   global:
-    - NODE_VERSION=6
     - NODE_VERSION=8
-    - EMULATOR_API_LEVEL=22
+    - EMULATOR_API_LEVEL=23
     - ANDROID_VERSION=25
-    - ANDROID_BUILD_TOOLS_VERSION=26.0.2
+    - ANDROID_BUILD_TOOLS_VERSION=27.0.3
     - ANDROID_ABI=armeabi-v7a
     - APPIUM_VERSION=1.7.0
     - EMULATOR_NAME=test
@@ -23,24 +22,6 @@ matrix:
         - npm run tslint
     - stage: "Build"
       os: osx
-      env:
-        - Build="iOS"
-      osx_image: xcode9.3
-      language: node_js
-      node_js: "6"
-      jdk: oraclejdk8
-      before_install: 
-        - cd nativescript-angular
-        - npm install
-        - cd ../tests
-        - npm install
-        - cd ..
-      script: 
-        - cd nativescript-angular
-        - npm run ngc
-        - cd ../tests
-        - tns build ios
-    - os: osx
       env:
         - Build="iOS"
       osx_image: xcode9.3
@@ -58,28 +39,6 @@ matrix:
         - npm run ngc
         - cd ../tests
         - tns build ios
-    - language: android
-      node_js: "6"
-      os: linux
-      env:
-        - Build="Android"
-      jdk: oraclejdk8
-      before_install: 
-        - echo no | android create avd --force -n $EMULATOR_NAME -t "android-"$EMULATOR_API_LEVEL --abi $ANDROID_ABI --tag $ANDROID_TAG -c 12M
-        - QEMU_AUDIO_DRV=none emulator -avd $EMULATOR_NAME -no-window &
-        - nvm install $NODE_VERSION
-        - cd nativescript-angular
-        - npm install
-        - cd ../tests
-        - npm install
-        - cd ..
-        - android-wait-for-emulator
-        - adb shell input keyevent 82 &
-      script: 
-        - cd nativescript-angular
-        - npm run ngc
-        - cd ../tests
-        - tns build android
     - language: android
       node_js: "8"
       os: linux
@@ -107,20 +66,13 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-25.0.2
     - build-tools-$ANDROID_BUILD_TOOLS_VERSION
-    - android-25
     - android-$EMULATOR_API_LEVEL
     - extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
-    - addon-google_apis-google-25
     # Specify at least one system image,
     # if you need to run emulator(s) during your tests
-    - sys-img-armeabi-v7a-android-26
-    - sys-img-armeabi-v7a-android-25
-    - sys-img-armeabi-v7a-android-17
-    - sys-img-armeabi-v7a-android-19
     - sys-img-armeabi-v7a-google_apis-$EMULATOR_API_LEVEL
   licenses:
     - ".+"

Diff for: CHANGELOG.md

@@ -1,3 +1,23 @@
+<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)
+
+
+### Bug Fixes
+
+* Use cssType (uglify safe) instead typeName of for view metadata. ([d85910c](https://github.com/NativeScript/nativescript-angular/commit/d85910c))
+* **modal:** closeCallback(...) should not have side effects when called multiple times ([#1349](https://github.com/NativeScript/nativescript-angular/issues/1349)) ([bffbbc2](https://github.com/NativeScript/nativescript-angular/commit/bffbbc2))
+* **modal:** missing animated & stretched params ([#1293](https://github.com/NativeScript/nativescript-angular/issues/1293)) ([a9a901b](https://github.com/NativeScript/nativescript-angular/commit/a9a901b))
+* **router:** state is not guarded before use ([#1331](https://github.com/NativeScript/nativescript-angular/issues/1331)) ([d27a893](https://github.com/NativeScript/nativescript-angular/commit/d27a893)), closes [/github.com/NativeScript/nativescript-angular/commit/b98da83adb3f5c51ee448fa38a51b7c65274c82e#diff-a7820fa2a2eb0ce14f3f0b8bfc666dd5R49](https://github.com//github.com/NativeScript/nativescript-angular/commit/b98da83adb3f5c51ee448fa38a51b7c65274c82e/issues/diff-a7820fa2a2eb0ce14f3f0b8bfc666dd5R49)
+* **TabViewItemDirective :** textTransform property added ([#1315](https://github.com/NativeScript/nativescript-angular/issues/1315)) ([11d01f9](https://github.com/NativeScript/nativescript-angular/commit/11d01f9))
+
+
+### Features
+
+* Angular 6 support
+* **router:** enable flexible page router outlets ([#1298](https://github.com/NativeScript/nativescript-angular/issues/1298)) ([b98da83](https://github.com/NativeScript/nativescript-angular/commit/b98da83))
+* **testing:** Testing Components with TestBed ([#1175](https://github.com/NativeScript/nativescript-angular/issues/1175)) ([52f3ec6](https://github.com/NativeScript/nativescript-angular/commit/52f3ec6))
+
+
 <a name="5.3.0"></a>
 # [5.3.0](https://github.com/NativeScript/nativescript-angular/compare/5.2.0...v5.3.0) (2018-04-10)
 

Diff for: nativescript-angular/common/utils.ts

@@ -2,7 +2,20 @@ export function throwIfAlreadyLoaded(
     parentModule: any,
     moduleName: string,
 ) {
-    if ( parentModule ) {
+    if (parentModule) {
         throw new Error(`${moduleName} has already been loaded. Import ${moduleName} in the AppModule only.`);
     }
 }
+
+export function once(fn: Function) {
+    let wasCalled = false;
+
+    return function wrapper() {
+        if (wasCalled) {
+            return;
+        }
+
+        wasCalled = true;
+        fn.apply(null, arguments);
+    };
+}

Diff for: nativescript-angular/directives/dialogs.ts

@@ -16,6 +16,7 @@ import { ProxyViewContainer } from "tns-core-modules/ui/proxy-view-container/pro
 import { AppHostView } from "../app-host-view";
 import { DetachedLoader } from "../common/detached-loader";
 import { PageFactory, PAGE_FACTORY } from "../platform-providers";
+import { once } from "../common/utils";
 
 export interface ModalDialogOptions {
     context?: any;
@@ -106,19 +107,17 @@ export class ModalDialogService {
         let componentView: View;
         let detachedLoaderRef: ComponentRef<DetachedLoader>;
 
-        const closeCallback = (...args) => {
+        const closeCallback = once((...args) => {
             doneCallback.apply(undefined, args);
-            if (componentView && !this.location._isModalClosing) {
+            if (componentView) {
                 this.location._beginCloseModalNavigation();
-
                 componentView.closeModal();
-            } else if (this.location._isModalClosing) {
                 this.location.back();
                 this.location._finishCloseModalNavigation();
                 detachedLoaderRef.instance.detectChanges();
                 detachedLoaderRef.destroy();
             }
-        };
+        });
 
         const modalParams = new ModalDialogParams(context, closeCallback);
         const providers = ReflectiveInjector.resolve([
@@ -141,7 +140,7 @@ export class ModalDialogService {
             }
 
             // TODO: remove <any> cast after https://github.com/NativeScript/NativeScript/pull/5734
-            //       is in a published version of tns-core-modules.
+            // is in a published version of tns-core-modules.
             (<any>parentView).showModal(componentView, context, closeCallback, fullscreen, animated, stretched);
         });
     }

Diff for: nativescript-angular/package.json

@@ -1,7 +1,6 @@
 {
-  "private": true,
   "name": "nativescript-angular",
-  "version": "5.3.0",
+  "version": "6.0.0",
   "description": "An Angular renderer that lets you build mobile apps with NativeScript.",
   "homepage": "https://www.nativescript.org/",
   "bugs": "https://github.com/NativeScript/nativescript-angular/issues",

Diff for: tests/package.json

@@ -2,10 +2,10 @@
   "nativescript": {
     "id": "org.nativescript.ngtests",
     "tns-ios": {
-      "version": "4.0.2-2018-04-13-01"
+      "version": "next"
     },
     "tns-android": {
-      "version": "4.1.0-2018.4.16.8"
+      "version": "next"
     }
   },
   "name": "ngtests",