Skip to content

Commit

Permalink
Merge 250939e into d9df85e
Browse files Browse the repository at this point in the history
  • Loading branch information
kdinev committed Jun 9, 2020
2 parents d9df85e + 250939e commit 953fe14
Show file tree
Hide file tree
Showing 137 changed files with 9,905 additions and 11,288 deletions.
File renamed without changes.
15 changes: 6 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
sudo: required
dist: trusty
dist: xenial
language: node_js
node_js:
- '10.13.0'
- 'lts/*'
addons:
chrome: stable
services:
- xvfb
before_install:
- export NG_CLI_ANALYTICS=false
- export CHROME_BIN=/usr/bin/google-chrome
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sudo apt-get -qq update
- sudo apt-get install -y libappindicator1 fonts-liberation
- wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- sudo dpkg -i google-chrome*.deb
- sleep 3

script:
Expand Down
14 changes: 9 additions & 5 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@
"options": {
"tsConfig": "projects/igniteui-angular-wrappers/tsconfig.lib.json",
"project": "projects/igniteui-angular-wrappers/ng-package.json"
}
, "configurations": {
},
"configurations": {
"production": {
"tsConfig": "projects/igniteui-angular-wrappers/tsconfig.lib.prod.json"
}
}
},
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
Expand All @@ -160,6 +160,10 @@
}
}
}
}},
"defaultProject": "wrappers"
}
},
"defaultProject": "wrappers",
"cli": {
"analytics": false
}
}
4 changes: 2 additions & 2 deletions e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": [
"jasmine",
"jasminewd2",
Expand Down
Loading

0 comments on commit 953fe14

Please sign in to comment.