Merge remote-tracking branch 'origin/master' into merge-release-in-master

Author: SvetoslavTsenov

.travis.yml

@@ -1,95 +1,8 @@
-env:
-  global:
-    - NODE_VERSION=8
-    - EMULATOR_API_LEVEL=23
-    - ANDROID_VERSION=28
-    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
-    - ANDROID_ABI=armeabi-v7a
-    - EMULATOR_NAME=test
-    - ANDROID_TAG=google_apis
-
-matrix:
-  include:
-    - stage: "Lint"
-      language: node_js
-      os: linux
-      before_install: 
-        - nvm install $NODE_VERSION
-      script: 
-        - cd nativescript-angular
-        - npm install
-        - npm run tslint
-    - stage: "Build"
-      os: osx
-      env:
-        - Build="iOS"
-      osx_image: xcode9.3
-      language: node_js
-      node_js: "8"
-      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
-    - language: android
-      node_js: "8"
-      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
-
-android:
-  components:
-    - tools
-    - platform-tools
-    - android-$ANDROID_VERSION
-    - build-tools-$ANDROID_BUILD_TOOLS_VERSION
-    - android-$EMULATOR_API_LEVEL
-    - extra-google-google_play_services
-    - extra-google-m2repository
-    - extra-android-m2repository
-    # Specify at least one system image,
-    # if you need to run emulator(s) during your tests
-    - sys-img-armeabi-v7a-google_apis-$EMULATOR_API_LEVEL
-  licenses:
-    - ".+"
-
-before_cache:
-    - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
-
-cache:
-    directories:
-        - .nvm
-        - $HOME/.gradle/caches/
-        - $HOME/.gradle/wrapper/
-
-install:
-    - nvm install $NODE_VERSION
-    - npm install -g typings
-    - wget -O ./nativescript.tgz "https://s3.amazonaws.com/nativescript-ci/build_result/nativescript.tgz"
-    - npm install -g nativescript.tgz --ignore-scripts
-    - tns usage-reporting disable
-    - tns error-reporting disable
+language: node_js
+node_js:
+  - "node"
+script:
+  - cd nativescript-angular
+  - npm install
+  - npm run tslint
+  - npm pack

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2015-2018 Progress Software Corporation
+   Copyright (c) 2015-2019 Progress Software Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

nativescript-angular/router/ns-empty-outlet.component.ts

@@ -4,7 +4,6 @@ import { PageRouterOutlet } from "./page-router-outlet";
 @Component({
     // tslint:disable-next-line:component-selector
     selector: "ns-empty-outlet",
-    moduleId: module.id,
     template: "<page-router-outlet isEmptyOutlet='true'></page-router-outlet>"
 })
 export class NSEmptyOutletComponent {