Merge pull request #65 from mpalourdio/ng6

Angular 6 / RxJS 6 support. Fixes #62 #63

Author: mpalourdio

.angular-cli.json

@@ -9,7 +9,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 end_of_line = lf
 
-[{package.json,.angular-cli.json,tslint.json,karma.conf.js,tsconfig*.json}]
+[{package.json,angular.json,tslint.json,karma.conf.js,tsconfig*.json,test.ts,main.ts,polyfills.ts}]
 indent_style = space
 indent_size = 2
 

.editorconfig

@@ -5,7 +5,7 @@ src
 tmp
 dist
 coverage
-.angular-cli.json
+angular.json
 .editorconfig
 .gitignore
 .npmignore

.npmignore

@@ -1,6 +1,5 @@
 sudo: required
 language: node_js
 node_js:
-  - 6.14.1
   - lts/*
   - node

.travis.yml

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.0.0
+
+This release introduces full support for angular 6 & RxJS 6.
+
 ## v0.9.1
 
 This release fixes a bug on the SpinKit Sk-Wave component that only appeared after template inlining.

CHANGELOG.md

@@ -25,11 +25,15 @@ $ npm install ng-http-loader --save
 This package provides an HTTP Interceptor, and a spinner component (All from [SpinKit](https://github.com/tobiasahlin/SpinKit) at the moment).
 The HTTP interceptor listens to all HTTP requests and shows a spinner / loader indicator during pending http requests.
 
-## Angular 4 / Angular 5
+## Angular 4 / Angular 5 / Angular 6
 
-The latest module version compatible with angular 4 is **``0.3.4``**.
+The latest compatible version with angular 4 is **``0.3.4``**.
 If you want to use Angular 5, use versions **``0.4.0``** and above.
 
+The latest compatible version with angular 5 is version **``0.9.1``**.
+
+Versions above **``0.9.1``** are angular 6 / RxJS 6 compatible only.
+
 If you experience errors like below, **please double check the version you use.**
 
 ``ERROR in Error: Metadata version mismatch for module [...]/angular/node_modules/ng-http-loader/ng-http-loader

README.md

@@ -0,0 +1,34 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "ng-http-loader": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "library",
+      "architect": {
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "./test.ts",
+            "karmaConfig": "./karma.conf.js",
+            "polyfills": "./polyfills.ts",
+            "tsConfig": "./tsconfig.spec.json",
+            "watch": false
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "ng-http-loader",
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": null,
+      "styleext": "css"
+    },
+    "@schematics/angular:directive": {
+      "prefix": null
+    }
+  }
+}

angular.json

@@ -4,19 +4,20 @@
 module.exports = function (config) {
   config.set({
     basePath: 'test',
-    frameworks: ['jasmine', '@angular/cli'],
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
     plugins: [
       require('karma-jasmine'),
       require('karma-phantomjs-launcher'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('karma-coverage-istanbul-reporter'),
-      require('@angular/cli/plugins/karma')
+      require('@angular-devkit/build-angular/plugins/karma')
     ],
     client: {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
+      dir: require('path').join(__dirname, 'coverage'),
       reports: ['html', 'lcovonly'],
       fixWebpackSourcePaths: true
     },

karma.conf.js

@@ -1,9 +1,9 @@
 {
   "name": "ng-http-loader",
-  "version": "0.9.1",
+  "version": "1.0.0",
   "scripts": {
     "prepare-deploy": "gulp inline-templates && gulp clean-dist && ngc -p tsconfig.ngc.json && gulp clean-tmp && gulp copy-all",
-    "test": "ng test --watch false"
+    "test": "ng test"
   },
   "repository": {
     "type": "git",
@@ -29,41 +29,46 @@
     "url": "https://github.com/mpalourdio/ng-http-loader/issues"
   },
   "peerDependencies": {
-    "@angular/common": "^5.2.0",
-    "@angular/core": "^5.2.0",
-    "rxjs": "^5.5.6"
+    "@angular/common": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "rxjs": "^6.0.0"
   },
   "devDependencies": {
-    "@angular/cli": "^1.7.0",
-    "@angular/common": "^5.2.0",
-    "@angular/compiler": "^5.2.0",
-    "@angular/compiler-cli": "^5.2.0",
-    "@angular/core": "^5.2.0",
-    "@angular/language-service": "^5.2.0",
-    "@angular/platform-browser": "^5.2.0",
-    "@angular/platform-browser-dynamic": "^5.2.0",
-    "@types/jasmine": "~2.8.3",
-    "@types/jasminewd2": "~2.0.2",
-    "@types/node": "~6.0.60",
-    "codelyzer": "^4.0.1",
-    "core-js": "^2.4.1",
+    "@angular-devkit/build-angular": "~0.6.0",
+    "@angular/cli": "^6.0.0",
+    "@angular/common": "^6.0.0",
+    "@angular/compiler": "^6.0.0",
+    "@angular/compiler-cli": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "@angular/language-service": "^6.0.0",
+    "@angular/platform-browser": "^6.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.0",
+    "@types/jasmine": "~2.8.6",
+    "@types/jasminewd2": "~2.0.3",
+    "@types/node": "~8.9.4",
+    "codelyzer": "~4.2.1",
+    "core-js": "^2.5.4",
     "gulp": "^3.9.1",
     "gulp-clean": "^0.3.2",
     "gulp-inline-ng2-template": "^4.0.0",
-    "jasmine-core": "~2.8.0",
+    "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~2.0.0",
     "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "^1.2.1",
-    "karma-jasmine": "~1.1.0",
+    "karma-coverage-istanbul-reporter": "~1.4.2",
+    "karma-jasmine": "~1.1.1",
     "karma-jasmine-html-reporter": "^0.2.2",
     "karma-phantomjs-launcher": "^1.0.4",
     "phantomjs-prebuilt": "^2.1.14",
-    "protractor": "~5.1.2",
-    "rxjs": "^5.5.6",
-    "ts-node": "~4.1.0",
+    "protractor": "~5.3.0",
+    "rxjs": "^6.0.0",
+    "ts-node": "~5.0.1",
     "tslint": "~5.9.1",
-    "typescript": "~2.5.3",
-    "zone.js": "^0.8.19"
+    "typescript": "2.7.2",
+    "zone.js": "^0.8.26"
+  },
+  "engines": {
+    "node": ">= 8.9.0",
+    "npm": ">= 5.5.1"
   }
 }

package.json

@@ -7,11 +7,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { HttpClientModule } from '@angular/common/http';
-import { SpinnerComponent } from './spinner/spinner.component';
+import { NgModule } from '@angular/core';
 import { SPINKIT_COMPONENTS } from '../spinkits';
+import { SpinnerComponent } from './spinner/spinner.component';
 
 @NgModule({
     declarations: [