Skip to content

Commit 7826007

Browse files
authored
Merge pull request #146 from mpalourdio/v10
chore(deps): @angular/*:^12 compatibility
2 parents 9844993 + c8785c1 commit 7826007

File tree

12 files changed

+2127
-3007
lines changed

12 files changed

+2127
-3007
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
max-parallel: 4
1010
matrix:
11-
node-version: [ 14.x, 15.x ]
11+
node-version: [ 14.x ]
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v2
@@ -22,8 +22,8 @@ jobs:
2222
run: |
2323
yarn
2424
yarn lint
25-
yarn audit
26-
yarn build --prod
25+
yarn audit:prod
26+
yarn build
2727
yarn test --code-coverage
2828
2929
- name: Coveralls

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v10.0.0
4+
- Added angular 12 support.
5+
- BC break: The library is not `view-engine`compatible anymore.
6+
37
## v9.1.0
48
- Added the possibility to specify the backdrop `background-color`. Contribution by [krishnakumarp](https://github.com/krishnakumarp).
59

@@ -11,7 +15,7 @@
1115

1216
## v7.0.0
1317
- Added angular 9 support.
14-
- BC break : `AbstractLoader` has been renamed to `AbstractLoaderDirective`. See [here](https://next.angular.io/guide/deprecations#undecorated-base-classes) and [here](https://angular.io/guide/styleguide#style-02-03).
18+
- BC break: `AbstractLoader` has been renamed to `AbstractLoaderDirective`. See [here](https://next.angular.io/guide/deprecations#undecorated-base-classes) and [here](https://angular.io/guide/styleguide#style-02-03).
1519

1620
## v6.0.1
1721
- The `rxjs` peer dependency is now `^6.5.0`, because the module uses the new `creation function partition observable` introduced in [v6.5.0](https://github.com/ReactiveX/rxjs/blob/f07d349da8c2e0dbddca17d33a9b4a1ceaf59354/CHANGELOG.md#650-2019-04-23).

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2017-2019 mpalourdio
3+
Copyright (c) 2017-2021 mpalourdio
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ The HTTP interceptor listens to all HTTP requests and shows a spinner / loader i
3939
| >=7.0.0 <8.0.0 | ^9.0.0 |
4040
| >=8.0.0 <9.0.0 | ^10.0.0 |
4141
| >=9.0.0 | ^11.0.0 |
42+
| >=10.0.0 | ^12.0.0 |
4243

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

angular.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"production": {
2626
"tsConfig": "./tsconfig.lib.prod.json"
2727
}
28-
}
28+
},
29+
"defaultConfiguration": "production"
2930
},
3031
"test": {
3132
"builder": "@angular-devkit/build-angular:karma",
@@ -34,6 +35,7 @@
3435
"karmaConfig": "./karma.conf.js",
3536
"polyfills": "./polyfills.ts",
3637
"tsConfig": "./tsconfig.spec.json",
38+
"inlineStyleLanguage": "scss",
3739
"watch": false
3840
}
3941
},

package.json

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"name": "ng-http-loader",
3-
"version": "9.1.0",
3+
"version": "10.0.0",
44
"scripts": {
55
"ng": "ng",
66
"build": "ng build",
77
"test": "ng test",
88
"lint": "ng lint",
9+
"audit:prod": "yarn audit --groups dependencies",
910
"preversion": "yarn lint && yarn test",
10-
"version": "yarn build --prod",
11+
"version": "yarn build",
1112
"postversion": "git push && git push --tags"
1213
},
1314
"repository": {
@@ -40,40 +41,36 @@
4041
"url": "https://github.com/mpalourdio/ng-http-loader/issues"
4142
},
4243
"dependencies": {
43-
"tslib": "^2.0.0"
44+
"tslib": "^2.1.0"
4445
},
4546
"peerDependencies": {
46-
"@angular/common": "^11.0.0",
47-
"@angular/core": "^11.0.0",
4847
"rxjs": "^6.6.0"
4948
},
5049
"devDependencies": {
51-
"@angular-devkit/build-angular": "~0.1102.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",
50+
"@angular-devkit/build-angular": "~12.0.0",
51+
"@angular/cli": "^12.0.0",
52+
"@angular/common": "^12.0.0",
53+
"@angular/compiler": "^12.0.0",
54+
"@angular/compiler-cli": "^12.0.0",
55+
"@angular/core": "^12.0.0",
56+
"@angular/platform-browser": "^12.0.0",
57+
"@angular/platform-browser-dynamic": "^12.0.0",
5958
"@types/jasmine": "~3.6.0",
6059
"@types/node": "^12.11.1",
6160
"codelyzer": "^6.0.0",
62-
"jasmine-core": "~3.6.0",
63-
"jasmine-spec-reporter": "~5.0.0",
64-
"karma": "~6.1.0",
61+
"jasmine-core": "~3.7.0",
62+
"karma": "~6.3.2",
6563
"karma-chrome-launcher": "~3.1.0",
6664
"karma-coverage": "~2.0.3",
6765
"karma-firefox-launcher": "^1.1.0",
6866
"karma-jasmine": "~4.0.0",
6967
"karma-jasmine-html-reporter": "^1.5.0",
70-
"ng-packagr": "^11.0.0",
71-
"puppeteer": "^8.0.0",
68+
"ng-packagr": "^12.0.0",
69+
"puppeteer": "^9.0.0",
7270
"rxjs": "^6.6.0",
7371
"rxjs-tslint-rules": "^4.13.0",
74-
"ts-node": "~8.3.0",
7572
"tslint": "~6.1.0",
76-
"typescript": "~4.1.2",
77-
"zone.js": "~0.11.3"
73+
"typescript": "~4.2.4",
74+
"zone.js": "~0.11.4"
7875
}
7976
}

polyfills.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
/***************************************************************************************************
5858
* Zone JS is required by default for Angular itself.
5959
*/
60-
import 'zone.js/dist/zone'; // Included with Angular CLI.
60+
import 'zone.js'; // Included with Angular CLI.
6161

6262

6363
/***************************************************************************************************

src/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
22

3-
import 'zone.js/dist/zone-testing';
3+
import 'zone.js/testing';
44
import { getTestBed } from '@angular/core/testing';
55
import {
66
BrowserDynamicTestingModule,

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"experimentalDecorators": true,
1414
"moduleResolution": "node",
1515
"importHelpers": true,
16-
"target": "es2015",
16+
"target": "es2017",
1717
"module": "es2020",
1818
"lib": [
1919
"es2018",

tsconfig.lib.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
"es2018"
1414
]
1515
},
16-
"angularCompilerOptions": {
17-
"skipTemplateCodegen": true,
18-
"strictMetadataEmit": true,
19-
"enableResourceInlining": true
20-
},
2116
"exclude": [
2217
"./src/test.ts",
2318
"**/*.spec.ts"

0 commit comments

Comments
 (0)