@@ -7,7 +7,8 @@
     "url": "https://github.com/angular/universal-starter.git"
   },
   "scripts": {
-    "postinstall": "./node_modules/.bin/tsd install node express --save",
+    "clean:ng2": "./node_modules/.bin/rimraf node_modules/angular2/manual_typings",
+    "postinstall": "./node_modules/.bin/typings install && npm run clean:ng2",
     "watch": "./node_modules/.bin/webpack --watch",
     "build": "./node_modules/.bin/webpack",
     "prestart": "npm run build",
@@ -37,9 +38,11 @@
   },
   "devDependencies": {
     "nodemon": "^1.8.1",
+    "rimraf": "^2.5.0",
     "ts-loader": "^0.7.2",
     "tsd": "^0.6.5",
     "typescript": "^1.7.3",
+    "typings": "^0.6.2",
     "webpack": "^1.12.10",
     "webpack-dev-server": "^1.14.0",
     "webpack-merge": "^0.7.1"
 
@@ -8,7 +8,7 @@
     "sourceMap": true
   },
   "files": [
-    "typings/tsd.d.ts",
+    "typings/main.d.ts",
     "src/client.ts",
     "src/server.ts"
   ]
 
@@ -0,0 +1,11 @@
+{
+  "ambientDependencies": {
+    "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#6697d6f7dadbf5773cb40ecda35a76027e0783b2",
+    "express": "github:DefinitelyTyped/DefinitelyTyped/express/express.d.ts#2e7a477ac2b6471055aa6e0e56b333e8f327d6b7",
+    "mime": "github:DefinitelyTyped/DefinitelyTyped/mime/mime.d.ts#2e7a477ac2b6471055aa6e0e56b333e8f327d6b7",
+    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#2e7a477ac2b6471055aa6e0e56b333e8f327d6b7",
+    "serve-static": "github:DefinitelyTyped/DefinitelyTyped/serve-static/serve-static.d.ts#2e7a477ac2b6471055aa6e0e56b333e8f327d6b7",
+    "zone": "github:angular/DefinitelyTyped/zone/zone.d.ts#31e7317c9a0793857109236ef7c7f223305a8aa9",
+    "ng2": "github:gdi2290/typings-ng2/ng2.d.ts#32998ff5584c0eab0cd9dc7704abb1c5c450701c"
+  }
+}
@@ -10,15 +10,6 @@ var common = {
       {
         test: /\.ts$/,
         loader: 'ts-loader',
-        query: {
-          'ignoreDiagnostics': [
-            2403, // 2403 -> Subsequent variable declarations
-            2420, // 2420 -> Class incorrectly implements interface
-            2300, // 2300 -> Duplicate identifier
-            2374, // 2374 -> Duplicate number index signature
-            2375  // 2375 -> Duplicate string index signature
-          ]
-        },
         exclude: [ /node_modules/ ]
       }
     ]
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"sourceMap": true`
`9`	`9`	`},`
`10`	`10`	`"files": [`
`11`		`- "typings/tsd.d.ts",`
	`11`	`+ "typings/main.d.ts",`
`12`	`12`	`"src/client.ts",`
`13`	`13`	`"src/server.ts"`
`14`	`14`	`]`
Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,6 @@ var common = {`
`10`	`10`	`{`
`11`	`11`	`test: /\.ts$/,`
`12`	`12`	`loader: 'ts-loader',`
`13`		`- query: {`
`14`		`- 'ignoreDiagnostics': [`
`15`		`- 2403, // 2403 -> Subsequent variable declarations`
`16`		`- 2420, // 2420 -> Class incorrectly implements interface`
`17`		`- 2300, // 2300 -> Duplicate identifier`
`18`		`- 2374, // 2374 -> Duplicate number index signature`
`19`		`- 2375 // 2375 -> Duplicate string index signature`
`20`		`- ]`
`21`		`- },`
`22`	`13`	`exclude: [ /node_modules/ ]`
`23`	`14`	`}`
`24`	`15`	`]`