From 4fef496698ad6fb0b8fc894474569b0cfbaea746 Mon Sep 17 00:00:00 2001 From: Dmitriy Schekhovtsov Date: Wed, 21 Sep 2016 23:10:17 +0300 Subject: [PATCH] feat(package): updated to typescript 2 --- package.json | 17 +++++++++-------- tsconfig.json | 20 ++++++++++++++++---- tsconfig.publish.json | 18 +++++++++++++++--- typings.json | 10 ---------- 4 files changed, 40 insertions(+), 25 deletions(-) delete mode 100644 typings.json diff --git a/package.json b/package.json index 0a2737b..79296b7 100644 --- a/package.json +++ b/package.json @@ -3,12 +3,11 @@ "version": "1.0.3", "description": "angular2 file upload directives", "scripts": { - "flow.install:typings": "./node_modules/.bin/typings install", - "flow.compile": "npm run flow.install:typings && npm run flow.compile:common && npm run flow.compile:system", + "flow.compile": "npm run flow.compile:common && npm run flow.compile:system", "flow.compile:common": "./node_modules/.bin/tsc -p tsconfig.publish.json", "flow.compile:system": "./.config/bundle-system.js", "flow.copy:src": "./node_modules/.bin/cpy ng2-file-upload.ts \"components/*.ts\" ts --parents", - "flow.clean": "./node_modules/.bin/del bundles coverage demo-build typings \"components/**/*.+(js|d.ts|js.map)\" dist \"ng2-file-upload.+(js|d.ts|js.map)\"", + "flow.clean": "./node_modules/.bin/del bundles coverage demo-build \"components/**/*.+(js|d.ts|js.map)\" dist \"ng2-file-upload.+(js|d.ts|js.map)\"", "flow.deploy:gh-pages": "npm run flow.build:prod && ./node_modules/.bin/gh-pages -d demo-build", "flow.eslint": "./node_modules/.bin/eslint --ignore-path .gitignore --ext js --fix . .config", "flow.tslint": "./node_modules/.bin/gulp lint", @@ -63,6 +62,9 @@ "@angular/forms": "2.0.0", "@angular/platform-browser": "2.0.0", "@angular/platform-browser-dynamic": "2.0.0", + "@types/jasmine": "2.2.34", + "@types/node": "6.0.39", + "@types/webpack": "1.12.34", "async": "2.0.1", "bootstrap": "3.3.7", "codecov": "1.0.1", @@ -81,8 +83,8 @@ "gulp-tslint": "6.1.1", "lite-server": "2.2.2", "marked": "0.3.6", - "ng2-bootstrap": "1.1.3", - "ng2-webpack-config": "0.0.4", + "ng2-bootstrap": "1.1.5", + "ng2-webpack-config": "0.0.5", "pre-commit": "1.1.3", "prismjs": "1.5.1", "prismjs-loader": "0.0.3", @@ -91,9 +93,8 @@ "rxjs": "5.0.0-beta.12", "systemjs-builder": "0.15.31", "tslint-config-valorsoft": "1.1.1", - "typescript": "1.8.10", - "typings": "1.3.3", - "zone.js": "0.6.23" + "typescript": "2.0.2", + "zone.js": "0.6.25" }, "contributors": [ { diff --git a/tsconfig.json b/tsconfig.json index ce9889d..a7b9104 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,14 +10,26 @@ "listFiles": false, "noLib": false, "noImplicitAny": true, - "suppressImplicitAnyIndexErrors": true + "suppressImplicitAnyIndexErrors": true, + "skipLibCheck": true, + "stripInternal": true, + "lib": [ + "dom", + "es6" + ], + "types": [ + "jasmine", + "node", + "webpack" + ] }, "exclude": [ - "node_modules" + "node_modules", + "bundles", + "dist" ], "files": [ "./ng2-file-upload.ts", - "./demo/custom-typings.d.ts", - "./typings/index.d.ts" + "./demo/custom-typings.d.ts" ] } diff --git a/tsconfig.publish.json b/tsconfig.publish.json index fe329c5..e6a5112 100644 --- a/tsconfig.publish.json +++ b/tsconfig.publish.json @@ -8,13 +8,25 @@ "sourceMap": false, "noEmitHelpers": false, "noImplicitAny": true, - "declaration": true + "declaration": true, + "skipLibCheck": true, + "stripInternal": true, + "lib": [ + "dom", + "es6" + ], + "types": [ + "jasmine", + "node", + "webpack" + ] }, "exclude": [ - "node_modules" + "node_modules", + "bundles", + "dist" ], "files": [ - "./typings/index.d.ts", "./demo/custom-typings.d.ts", "./ng2-file-upload.ts" ] diff --git a/typings.json b/typings.json deleted file mode 100644 index 797944f..0000000 --- a/typings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "globalDependencies": { - "es6-shim": "registry:dt/es6-shim#0.31.2+20160602141504", - "jasmine": "registry:dt/jasmine#2.2.0+20160621224255", - "require": "registry:dt/require#2.1.20+20160316155526" - }, - "dependencies": { - "webpack": "registry:npm/webpack#1.12.9+20160418172948" - } -}