Merge branch 'bonejon-master'

Author: ghidoz

package.json

@@ -3,14 +3,12 @@
   "version": "3.1.1",
   "description": "A lightweight Angular 2 adapter for JSON API",
   "scripts": {
-    "build": "rm -rf dist && tsc",
+    "build": "rimraf dist && tsc",
     "lint": "tslint src/**/*.ts",
     "pretest": "npm run build",
     "test": "karma start",
-    "postinstall": "typings install",
     "prepublish": "tsc",
-    "tsc": "tsc",
-    "typings": "typings"
+    "tsc": "tsc"
   },
   "repository": {
     "type": "git",
@@ -32,21 +30,26 @@
     "url": "https://github.com/ghidoz/angular2-jsonapi/issues"
   },
   "main": "./dist/index.js",
-  "typings": "./dist/index.d.ts",
   "dependencies": {
     "@angular/common": "2.0.0",
     "@angular/compiler": "2.0.0",
     "@angular/core": "2.0.0",
     "@angular/http": "2.0.0",
     "@angular/platform-browser": "2.0.0",
-    "rxjs": "5.0.0-beta.12",
-    "zone.js": "0.6.23",
+    "@types/es6-shim": "^0.31.32",
+    "@types/jasmine": "^2.2.34",
+    "@types/reflect-metadata": "0.0.4",
+    "@types/selenium-webdriver": "^2.53.30",
+    "@types/underscore": "^1.7.33",
     "reflect-metadata": "0.1.3",
-    "underscore": "^1.8.3"
+    "rxjs": "5.0.0-beta.12",
+    "underscore": "^1.8.3",
+    "zone.js": "0.6.23"
   },
   "devDependencies": {
     "@angular/platform-browser-dynamic": "2.0.0",
     "codelyzer": "^0.0.25",
+    "rimraf": "^2.5.4",
     "jasmine-core": "2.4.1",
     "karma": "1.3.0",
     "karma-chrome-launcher": "^2.0.0",
@@ -60,7 +63,6 @@
     "ts-loader": "^0.8.2",
     "tslint": "^3.13.0",
     "typescript": "2.0.2",
-    "typings": "^1.3.1",
     "webpack": "1.13.2"
   },
   "engines": {

src/services/json-api-datastore.service.ts

@@ -145,7 +145,7 @@ export class JsonApiDatastore {
     return model;
   }
 
-  protected handleError(error: any) {
+  protected handleError(error: any): ErrorObservable {
     let errMsg: string = (error.message) ? error.message :
         error.status ? `${error.status} - ${error.statusText}` : 'Server error';
     console.error(errMsg);

tsconfig.json

@@ -7,14 +7,26 @@
     "experimentalDecorators": true,
     "sourceMap": true,
     "declaration": true,
-    "outDir": "./dist"
+    "outDir": "./dist",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "types": [
+      "jasmine",
+      "selenium-webdriver",
+      "es6-shim",
+      "underscore",
+      "reflect-metadata"
+    ]
   },
   "files": [
-    "typings/index.d.ts",
     "src/index.ts"
   ],
   "exclude": [
     "node_modules",
     "dist"
+  ],
+  "include": [
+    "node_modules/@types"
   ]
 }