Skip to content

Commit 707fc07

Browse files
authored
Merge pull request #140 from mpalourdio/ng11
chore(ng11): @angular/* migration
2 parents ef3edd5 + 3517a3f commit 707fc07

File tree

14 files changed

+1284
-1362
lines changed

14 files changed

+1284
-1362
lines changed

.browserslistrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ last 2 Edge major versions
1414
last 2 Safari major versions
1515
last 2 iOS major versions
1616
Firefox ESR
17-
not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
1817
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

.editorconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ insert_final_newline = true
99
trim_trailing_whitespace = true
1010
end_of_line = lf
1111

12-
[{package.json,ng-package.json,angular.json,tslint.json,karma.conf.js,tsconfig*.json,test.ts,main.ts,polyfills.ts,.travis.yml}]
12+
[{package.json,ng-package.json,angular.json,tslint.json,karma.conf.js,tsconfig*.json,test.ts,main.ts,polyfills.ts}]
1313
indent_size = 2
1414

1515
[*.md]
1616
max_line_length = off
1717
trim_trailing_whitespace = false
18+
19+
[*.yml]
20+
indent_size = 2

.github/workflows/main.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: CI
2+
3+
on: [ push, pull_request, workflow_dispatch ]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
max-parallel: 4
10+
matrix:
11+
node-version: [ 14.x, 15.x ]
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v2
15+
16+
- name: Use Node.js ${{ matrix.node-version }}
17+
uses: actions/setup-node@v1
18+
with:
19+
node-version: ${{ matrix.node-version }}
20+
21+
- name: yarn, lint, audit, build, test
22+
run: |
23+
yarn
24+
yarn lint
25+
yarn audit
26+
yarn build --prod
27+
yarn test --code-coverage
28+
29+
- name: Coveralls
30+
uses: coverallsapp/github-action@master
31+
with:
32+
github-token: ${{ secrets.GITHUB_TOKEN }}
33+
path-to-lcov: ./coverage/lcov.info

.travis.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## v9.0.0
4+
- Added angular 11 support.
5+
36
## v8.0.0
47
- Added angular 10 support.
58

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ng-http-loader
22

3-
[![Build Status](https://travis-ci.org/mpalourdio/ng-http-loader.svg?branch=master)](https://travis-ci.org/mpalourdio/ng-http-loader)
3+
[![Build Status](https://github.com/mpalourdio/ng-http-loader/workflows/CI/badge.svg?branch=master)](https://github.com/mpalourdio/ng-http-loader/actions)
44
[![Coverage Status](https://coveralls.io/repos/github/mpalourdio/ng-http-loader/badge.svg?branch=master)](https://coveralls.io/github/mpalourdio/ng-http-loader?branch=master)
55
[![npm](https://img.shields.io/npm/v/ng-http-loader.svg)](https://www.npmjs.com/package/ng-http-loader)
66
[![npm](https://img.shields.io/npm/dm/ng-http-loader.svg)](https://www.npmjs.com/package/ng-http-loader)
@@ -37,7 +37,8 @@ The HTTP interceptor listens to all HTTP requests and shows a spinner / loader i
3737
| >=3.2.0 <5.1.0 | ^7.0.0 |
3838
| >=6.0.0 <7.0.0 | ^8.0.0 |
3939
| >=7.0.0 <8.0.0 | ^9.0.0 |
40-
| >=8.0.0 | ^10.0.0 |
40+
| >=8.0.0 <9.0.0 | ^10.0.0 |
41+
| >=9.0.0 | ^11.0.0 |
4142

4243
If you experience errors like below, **please double check the version you use.**
4344

angular.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@
99
"schematics": {
1010
"@schematics/angular:component": {
1111
"style": "scss"
12+
},
13+
"@schematics/angular:application": {
14+
"strict": true
1215
}
1316
},
1417
"architect": {
1518
"build": {
16-
"builder": "@angular-devkit/build-ng-packagr:build",
19+
"builder": "@angular-devkit/build-angular:ng-packagr",
1720
"options": {
1821
"tsConfig": "./tsconfig.lib.json",
1922
"project": "./ng-package.json"

karma.conf.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,20 @@ module.exports = function (config) {
1313
require('karma-chrome-launcher'),
1414
require('karma-firefox-launcher'),
1515
require('karma-jasmine-html-reporter'),
16-
require('karma-coverage-istanbul-reporter'),
16+
require('karma-coverage'),
1717
require('@angular-devkit/build-angular/plugins/karma')
1818
],
1919
client: {
2020
clearContext: false // leave Jasmine Spec Runner output visible in browser
2121
},
22-
coverageIstanbulReporter: {
22+
coverageReporter: {
2323
dir: require('path').join(__dirname, 'coverage'),
24-
reports: ['html', 'lcovonly', 'text-summary'],
25-
fixWebpackSourcePaths: true
24+
subdir: '.',
25+
reporters: [
26+
{ type: 'html' },
27+
{ type: 'lcovonly' },
28+
{ type: 'text-summary' }
29+
],
2630
},
2731
reporters: ['progress', 'kjhtml'],
2832
port: 9876,

package.json

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ng-http-loader",
3-
"version": "8.0.0",
3+
"version": "9.0.0",
44
"scripts": {
55
"ng": "ng",
66
"build": "ng build",
@@ -27,6 +27,8 @@
2727
"ng7",
2828
"ng8",
2929
"ng9",
30+
"ng10",
31+
"ng11",
3032
"loader",
3133
"progressbar",
3234
"spinner",
@@ -41,34 +43,31 @@
4143
"tslib": "^2.0.0"
4244
},
4345
"peerDependencies": {
44-
"@angular/common": "^10.1.0",
45-
"@angular/core": "^10.1.0",
46+
"@angular/common": "^11.0.0",
47+
"@angular/core": "^11.0.0",
4648
"rxjs": "^6.6.0"
4749
},
4850
"devDependencies": {
49-
"@angular-devkit/build-angular": "~0.1001.0",
50-
"@angular-devkit/build-ng-packagr": "~0.1001.0",
51-
"@angular/cli": "^10.1.0",
52-
"@angular/common": "^10.1.0",
53-
"@angular/compiler": "^10.1.0",
54-
"@angular/compiler-cli": "^10.1.0",
55-
"@angular/core": "^10.1.0",
56-
"@angular/platform-browser": "^10.1.0",
57-
"@angular/platform-browser-dynamic": "^10.1.0",
58-
"@types/jasmine": "~3.5.0",
59-
"@types/jasminewd2": "~2.0.3",
51+
"@angular-devkit/build-angular": "~0.1100.0",
52+
"@angular/cli": "^11.0.0",
53+
"@angular/common": "^11.0.0",
54+
"@angular/compiler": "^11.0.0",
55+
"@angular/compiler-cli": "^11.0.0",
56+
"@angular/core": "^11.0.0",
57+
"@angular/platform-browser": "^11.0.0",
58+
"@angular/platform-browser-dynamic": "^11.0.0",
59+
"@types/jasmine": "~3.6.0",
6060
"@types/node": "^12.11.1",
6161
"codelyzer": "^6.0.0",
62-
"coveralls": "^3.0.1",
6362
"jasmine-core": "~3.6.0",
6463
"jasmine-spec-reporter": "~5.0.0",
65-
"karma": "~5.0.0",
64+
"karma": "~5.1.0",
6665
"karma-chrome-launcher": "~3.1.0",
67-
"karma-coverage-istanbul-reporter": "~3.0.2",
66+
"karma-coverage": "~2.0.3",
6867
"karma-firefox-launcher": "^1.1.0",
6968
"karma-jasmine": "~4.0.0",
7069
"karma-jasmine-html-reporter": "^1.5.0",
71-
"ng-packagr": "^10.1.0",
70+
"ng-packagr": "^11.0.0",
7271
"puppeteer": "^5.1.0",
7372
"rxjs": "^6.6.0",
7473
"rxjs-tslint-rules": "^4.13.0",

polyfills.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* BROWSER POLYFILLS
1919
*/
2020

21-
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
21+
/** IE11 requires the following for NgClass support on SVG elements */
2222
// import 'classlist.js'; // Run `npm install --save classlist.js`.
2323

2424
/**

0 commit comments

Comments
 (0)