Skip to content

Commit 2377d50

Browse files
authored
Merge pull request #319 from IgniteUI/update-10
Updating to Angular 10
2 parents d9df85e + 8458ceb commit 2377d50

File tree

140 files changed

+9472
-9610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+9472
-9610
lines changed
File renamed without changes.

.github/workflows/node.js.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: Node.js CI
5+
6+
on:
7+
push:
8+
branches: [ master ]
9+
pull_request:
10+
branches: [ master ]
11+
12+
jobs:
13+
build:
14+
15+
runs-on: ubuntu-latest
16+
17+
strategy:
18+
matrix:
19+
node-version: [10.x, 12.x, 14.x]
20+
21+
steps:
22+
- uses: actions/checkout@v2
23+
- name: Use Node.js ${{ matrix.node-version }}
24+
uses: actions/setup-node@v1
25+
with:
26+
node-version: ${{ matrix.node-version }}
27+
- run: npm ci
28+
- run: npm run lint
29+
- run: npm run build --if-present
30+
- run: npm run test:lib

.travis.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
sudo: required
2-
dist: trusty
2+
dist: xenial
33
language: node_js
44
node_js:
5-
- '10.13.0'
5+
- 'lts/*'
6+
addons:
7+
chrome: stable
8+
services:
9+
- xvfb
610
before_install:
7-
- export NG_CLI_ANALYTICS=false
8-
- export CHROME_BIN=/usr/bin/google-chrome
911
- export DISPLAY=:99.0
10-
- sh -e /etc/init.d/xvfb start
11-
- sudo apt-get -qq update
12-
- sudo apt-get install -y libappindicator1 fonts-liberation
13-
- wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
14-
- sudo dpkg -i google-chrome*.deb
1512
- sleep 3
1613

1714
script:
15+
- npm run lint
1816
- npm run test:lib
17+
- npm run build
1918
- cat ./coverage/igniteui-angular-wrappers/lcov.info | coveralls
2019

2120
before_deploy:

angular.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,20 +124,20 @@
124124
"projectType": "library",
125125
"root": "projects/igniteui-angular-wrappers",
126126
"sourceRoot": "projects/igniteui-angular-wrappers/src",
127-
"prefix": "lib",
127+
"prefix": "ig",
128128
"architect": {
129129
"build": {
130130
"builder": "@angular-devkit/build-ng-packagr:build",
131131
"options": {
132132
"tsConfig": "projects/igniteui-angular-wrappers/tsconfig.lib.json",
133133
"project": "projects/igniteui-angular-wrappers/ng-package.json"
134-
}
135-
, "configurations": {
134+
},
135+
"configurations": {
136136
"production": {
137137
"tsConfig": "projects/igniteui-angular-wrappers/tsconfig.lib.prod.json"
138138
}
139139
}
140-
},
140+
},
141141
"test": {
142142
"builder": "@angular-devkit/build-angular:karma",
143143
"options": {
@@ -160,6 +160,10 @@
160160
}
161161
}
162162
}
163-
}},
164-
"defaultProject": "wrappers"
165-
}
163+
}
164+
},
165+
"defaultProject": "wrappers",
166+
"cli": {
167+
"analytics": false
168+
}
169+
}

e2e/protractor.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ exports.config = {
2121
jasmineNodeOpts: {
2222
showColors: true,
2323
defaultTimeoutInterval: 30000,
24-
print: function() {}
24+
print: () => {}
2525
},
2626
onPrepare() {
2727
require('ts-node').register({
2828
project: require('path').join(__dirname, './tsconfig.json')
2929
});
3030
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
3131
}
32-
};
32+
};

e2e/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",
6-
"target": "es5",
6+
"target": "es2018",
77
"types": [
88
"jasmine",
99
"jasminewd2",

0 commit comments

Comments
 (0)