diff --git a/.travis.yml b/.travis.yml index 741790a5d..2c0a3c368 100644 --- a/.travis.yml +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index cf6c050eb..8e3886a97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ + +## [7.1.2](https://github.com/NativeScript/nativescript-angular/compare/7.1.1...7.1.2) (2019-01-21) + + +### Bug Fixes + + * **page-router-outlet:** fix(empty-outlet): remove unnecessary moduleId ([#1686](https://github.com/NativeScript/nativescript-angular/issues/1686)) ([1222e57](https://github.com/NativeScript/nativescript-angular/commit/1222e57)) + + ## [7.1.1](https://github.com/NativeScript/nativescript-angular/compare/7.1.0...7.1.1) (2018-12-20) diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json index 22a25b6d1..a8bacc57a 100644 --- a/nativescript-angular/package.json +++ b/nativescript-angular/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-angular", - "version": "7.1.1", + "version": "7.1.2", "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 --git a/nativescript-angular/router/ns-empty-outlet.component.ts b/nativescript-angular/router/ns-empty-outlet.component.ts index 502f6e4fc..4de7f9e69 100644 --- a/nativescript-angular/router/ns-empty-outlet.component.ts +++ b/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: "" }) export class NSEmptyOutletComponent {