diff --git a/.gitignore b/.gitignore index a4027376..d510b4da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ node_modules npm-debug.log -typings .vscode build bundle diff --git a/package.json b/package.json index 10c4e179..38faa17d 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "stylelint": "^7.0.3", "ts-loader": "^0.8.2", "tslint": "^3.14.0", - "typings": "^1.3.2", "webpack": "^1.13.1", "webpack-dev-server": "^1.14.1", "webpack-stream": "^3.2.0", @@ -34,6 +33,9 @@ "@angular/platform-browser": "2.0.0-rc.5", "@angular/platform-browser-dynamic": "2.0.0-rc.5", "@angular/router": "^3.0.0-rc.1", + "@types/es6-shim": "0.0.29", + "@types/jquery": "1.10.29", + "@types/node": "6.0.33", "bootstrap": "^3.3.7", "browser-stdout": "^1.3.0", "es6-shim": "^0.35.1", @@ -46,16 +48,14 @@ "rxjs": "5.0.0-beta.6", "select2": "^4.0.3", "sortablejs": "^1.4.2", - "typescript": "1.9.0-dev.20160626-1.0", + "typescript": "2.0.0", "xml-loader": "^1.1.0", "zone.js": "^0.6.12" }, "scripts": { - "postinstall": "typings install", "tslint": "tslint \"src/**/*.ts\" \"config-serializer/**/*.ts\"", "stylelint": "stylelint \"src/**/*.scss\" \"sass/**/*.scss\" --syntax scss", "lint": "run-s -scn tslint stylelint", - "typings": "typings", "build": "gulp", "build:test": "webpack --config \"config-serializer/webpack.config.js\"", "webpack": "webpack", diff --git a/tsconfig.json b/tsconfig.json index 1082aa6d..44f364db 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,12 +8,17 @@ "experimentalDecorators": true, "removeComments": false, "noImplicitAny": true, - "suppressImplicitAnyIndexErrors": true + "suppressImplicitAnyIndexErrors": true, + "baseUrl": "./src", + "types": [ + "node", + "jquery", + "es6-shim", + "select2" + ] }, "exclude": [ "node_modules", - "typings/main", - "typings/main.d.ts", "config-serializer" ] } \ No newline at end of file diff --git a/typings.json b/typings.json deleted file mode 100644 index 732e73e8..00000000 --- a/typings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "globalDependencies": { - "es6-shim": "registry:dt/es6-shim#0.31.2+20160602141504", - "jquery": "registry:dt/jquery#1.10.0+20160704162008", - "node": "registry:dt/node#6.0.0+20160728152422" - } -}