Merge branch 'develop'

.travis.yml

@@ -1,16 +1,10 @@
-dist: trusty
-sudo: false
-
-language: node_js
-node_js:
-  - "10"
+dist: bionic
 
 addons:
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
+  chrome: stable
+
+node_js:
+  - "12"
 
 cache:
   directories:
@@ -21,5 +15,5 @@ install:
   - yarn install
 
 script:
-  - yarn test --no-watch --no-progress --code-coverage --browsers=ChromeHeadlessCI
+  - yarn test_lib --no-watch --no-progress --code-coverage --browsers=ChromeHeadlessCI
   - codecov

README.MD

@@ -98,6 +98,8 @@ export interface HttpClientBusyConfig {
 
 ## Release History
 
+- 0.5.0
+  - update @angular/cli and @angular/core to v9
 - 0.4.0
   - update @angular/cli and @angular/core to v8
 - 0.3.0

angular.json

@@ -15,7 +15,12 @@
             "tsConfig": "projects/ngx-httpclient-busy/tsconfig.lib.json",
             "project": "projects/ngx-httpclient-busy/ng-package.json"
           }
-        },
+        ,          "configurations": {
+            "production": {
+              "tsConfig": "projects/ngx-httpclient-busy/tsconfig.lib.prod.json"
+            }
+          }
+},
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-httpclient-busy",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "author": {
     "name": "Oliver Sahner",
     "email": "[email protected]",
@@ -23,42 +23,40 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~8.0.0",
-    "@angular/common": "~8.0.0",
-    "@angular/compiler": "~8.0.0",
-    "@angular/core": "~8.0.0",
-    "@angular/forms": "~8.0.0",
-    "@angular/platform-browser": "~8.0.0",
-    "@angular/platform-browser-dynamic": "~8.0.0",
-    "@angular/router": "~8.0.0",
-    "core-js": "^2.5.4",
-    "rxjs": "~6.5.2",
-    "tslib": "^1.9.0",
-    "zone.js": "~0.9.1"
+    "@angular/animations": "~9.0.4",
+    "@angular/common": "~9.0.4",
+    "@angular/compiler": "~9.0.4",
+    "@angular/core": "~9.0.4",
+    "@angular/forms": "~9.0.4",
+    "@angular/platform-browser": "~9.0.4",
+    "@angular/platform-browser-dynamic": "~9.0.4",
+    "@angular/router": "~9.0.4",
+    "core-js": "^3.6.4",
+    "rxjs": "~6.5.4",
+    "tslib": "^1.11.1",
+    "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.800.2",
-    "@angular-devkit/build-ng-packagr": "~0.800.2",
-    "@angular/cli": "~8.0.2",
-    "@angular/compiler-cli": "~8.0.0",
-    "@angular/language-service": "~8.0.0",
-    "@types/node": "~8.9.4",
-    "@types/jasmine": "~2.8.8",
-    "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "^5.0.1",
-    "jasmine-core": "~2.99.1",
+    "@angular-devkit/build-angular": "~0.900.4",
+    "@angular-devkit/build-ng-packagr": "~0.900.4",
+    "@angular/cli": "~9.0.4",
+    "@angular/compiler-cli": "~9.0.4",
+    "@angular/language-service": "~9.0.4",
+    "@types/node": "^12.11.1",
+    "@types/jasmine": "~3.5.7",
+    "@types/jasminewd2": "~2.0.8",
+    "codelyzer": "^5.2.1",
+    "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.0.0",
-    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "ng-packagr": "^5.1.0",
-    "protractor": "~5.4.0",
+    "karma": "~4.4.1",
+    "karma-chrome-launcher": "~3.1.0",
+    "karma-coverage-istanbul-reporter": "~2.1.1",
+    "karma-jasmine": "~3.1.1",
+    "karma-jasmine-html-reporter": "^1.5.2",
+    "ng-packagr": "^9.0.2",
+    "protractor": "~5.4.3",
     "ts-node": "~7.0.0",
-    "tsickle": "^0.35.0",
-    "tslib": "^1.9.0",
     "tslint": "~5.11.0",
-    "typescript": "~3.4.5"
+    "typescript": "~3.7.5"
   }
 }

projects/ngx-httpclient-busy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-httpclient-busy",
-  "version": "0.4.0",
+  "version": "0.5.0",
 
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/osahner/ngx-httpclient-busy#readme",
   "peerDependencies": {
-    "@angular/common": "^8.0.0",
-    "@angular/core": "^8.0.0"
+    "@angular/common": "^9",
+    "@angular/core": "^9"
   }
 }

projects/ngx-httpclient-busy/src/lib/httpclient-busy.module.ts

@@ -11,7 +11,7 @@ import { HttpClientBusyDirective } from './httpclient-busy.directive';
   providers: [{ provide: HTTP_INTERCEPTORS, useClass: HttpClientBusyInterceptor, multi: true }]
 })
 export class HttpClientBusyModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<HttpClientBusyModule> {
     return {
       ngModule: HttpClientBusyModule
     };

projects/ngx-httpclient-busy/src/test.ts

@@ -1,6 +1,5 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
-import 'core-js/es7/reflect';
 import 'zone.js/dist/zone';
 import 'zone.js/dist/zone-testing';
 import { getTestBed } from '@angular/core/testing';

projects/ngx-httpclient-busy/tsconfig.lib.json

@@ -18,7 +18,6 @@
     ]
   },
   "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,

projects/ngx-httpclient-busy/tsconfig.lib.prod.json

@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.lib.json",
+  "angularCompilerOptions": {
+    "enableIvy": false
+  }
+}