Replace typings with node_modules/@types

.gitignore

@@ -48,8 +48,3 @@ bower_components
 .bower-cache
 .bower-registry
 .bower-tmp
-
-
-### Typings ###
-## Ignore downloaded typings
-typings

package.json

@@ -6,10 +6,9 @@
   "main": "index.js",
   "scripts": {
     "test": "tsc && concurrently \"npm run tsc:w\" \"live-server --open=tests.html\"",
-    "typings": "typings",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
-    "prepublish": "typings install && tsc"
+    "prepublish": "tsc"
   },
   "files": [
     "index.d.ts",
@@ -33,12 +32,16 @@
     "@angular/compiler": "^2.0.0",
     "@angular/platform-browser-dynamic": "^2.0.0",
     "concurrently": "^2.2.0",
-    "es6-shim": "^0.35.1",
+    "core-js": "^2.4.1",
     "jasmine-core": "2.4.1",
     "live-server": "1.0.0",
     "reflect-metadata": "^0.1.3",
     "systemjs": "^0.19.27",
     "typescript": "^2.0.2",
-    "typings": "^1.3.2"
+
+    "@types/core-js": "^0.9.34",
+    "@types/node": "^6.0.46",
+    "@types/jasmine": "^2.5.36",
+    "@types/selenium-webdriver": "^2.53.33"
   }
 }

tsconfig.json

@@ -9,12 +9,13 @@
     "experimentalDecorators": true,
     "removeComments": false,
     "noImplicitAny": false,
-    "suppressImplicitAnyIndexErrors": true
+    "suppressImplicitAnyIndexErrors": true,
+    "typeRoots": [
+      "./node_modules/@types/"
+    ]
   },
   "exclude": [
     "bower_components",
-    "node_modules",
-    "typings/main",
-    "typings/main.d.ts"
+    "node_modules"
   ]
 }