diff --git a/package.json b/package.json index e179913..addbaa0 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,10 @@ "main": "src/js-restful-express.js", "typings": "./src/js-restful-express.d.ts", "scripts": { - "install_typings": "typings install", - "pretest": "typings install && tsc", - "test": "istanbul cover node_modules/mocha/bin/_mocha --report lcov -x '*.spec.*' -- -c --check-leaks --require ts-node/register --recursive --reporter spec src/**/*.spec.ts", + "pretest": "tsc", + "test": "istanbul cover node_modules/mocha/bin/_mocha --report lcov -x '*.spec.*' -- -c --check-leaks --require ts-node/register --require core-js --recursive --reporter spec src/**/*.spec.ts", "quicktest": "mocha -c --check-leaks --require ts-node/register --recursive --reporter spec src/**/*.spec.ts", - "prepublish": "typings install && tsc", + "prepublish": "tsc", "docs": "jsdoc -c config/jsdoc-conf.json -r src" }, "repository": { @@ -30,19 +29,29 @@ ], "author": "Michael Seemann", "license": "MIT", - "peerDependencies": { - "reflect-metadata": "0.1.2" - }, + "peerDependencies": {}, "dependencies": { - "es6-promise": "^3.1.2", "express": "^4.13.4", - "js-restful": "^1.1.7", - "winston": "^2.2.0", - "reflect-metadata": "0.1.2" + "js-restful": "^2.0.0", + "winston": "^2.2.0" }, "devDependencies": { + "@types/body-parser": "0.0.33", + "@types/chai": "^3.4.34", + "@types/express": "^4.0.33", + "@types/express-serve-static-core": "^4.0.36", + "@types/method-override": "0.0.28", + "@types/mime": "0.0.29", + "@types/mocha": "^2.2.32", + "@types/node": "^6.0.41", + "@types/reflect-metadata": "0.0.4", + "@types/serve-static": "^1.7.31", + "@types/superagent": "^2.0.34", + "@types/supertest": "^1.1.31", + "@types/winston": "0.0.28", "chai": "^3.5.0", "codeclimate-test-reporter": "^0.3.1", + "core-js": "^2.4.1", "istanbul": "^0.4.3", "jsdoc": "^3.4.0", "mocha": "^2.4.5", @@ -50,9 +59,9 @@ "pug": "^2.0.0-alpha6", "supertest": "^1.2.0", "ts-node": "^0.7.2", - "tslint": "3.8.1", - "typescript": "1.8.10", - "typings": "0.8.1" + "tslint": "3.15.1", + "typescript": "2.0.3", + "typings": "1.4.0" }, "bugs": { "url": "https://github.com/mseemann/js-restful-express/issues" diff --git a/src/express/decorators.ts b/src/express/decorators.ts index 3e67cfa..3127b22 100644 --- a/src/express/decorators.ts +++ b/src/express/decorators.ts @@ -1,5 +1,4 @@ import * as namings from './namings'; -import 'reflect-metadata'; import { ExpressContextType } from './descriptions'; import { DecoratorUtil } from 'js-restful'; diff --git a/src/express/registry-promis.spec.ts b/src/express/registry-promis.spec.ts index 0788df7..2ed37e2 100644 --- a/src/express/registry-promis.spec.ts +++ b/src/express/registry-promis.spec.ts @@ -4,7 +4,6 @@ import {expect} from 'chai'; import * as request from 'supertest'; import { Path, GET } from 'js-restful'; import * as util from './test-util.spec'; -import {Promise} from 'es6-promise'; let anyBook = {a:'b'}; diff --git a/src/express/renderers.ts b/src/express/renderers.ts index 223affc..68b9c48 100644 --- a/src/express/renderers.ts +++ b/src/express/renderers.ts @@ -1,5 +1,4 @@ import * as express from 'express'; -import 'reflect-metadata'; import * as namings from './namings'; import { MethodDescription, ParamDescription, ContextTypes } from 'js-restful'; diff --git a/tsconfig.json b/tsconfig.json index 1d16ab9..3d441d7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,35 +3,19 @@ "target": "es5", "module": "commonjs", "moduleResolution": "node", + "lib": ["es6", "dom"], "sourceMap": true, "emitDecoratorMetadata": true, "experimentalDecorators": true, "removeComments": false, "noImplicitAny": false, - "declaration": true - }, - "files":[ - "typings/main.d.ts", - "src/js-restful-express.ts", - "src/express/decorators.spec.ts", - "src/express/decorators.ts", - "src/express/descriptions.ts", - "src/express/namings.ts", - "src/express/path-util.ts", - "src/express/path-util.spec.ts", - "src/express/registry-context.spec.ts", - "src/express/registry-delete.spec.ts", - "src/express/registry-get.spec.ts", - "src/express/registry-post.spec.ts", - "src/express/registry-promis.spec.ts", - "src/express/registry-put.spec.ts", - "src/express/registry-sec.spec.ts", - "src/express/registry.spec.ts", - "src/express/registry.ts", - "src/express/renderers.spec.ts", - "src/express/renderers.ts", - "src/express/service-registry.spec.ts", - "src/express/service-registry.ts", - "src/express/test-util.spec.ts" - ] + "declaration": true, + "typeRoots": [ + "../node_modules/@types" + ], + "types": [ + "mocha", + "reflect-metadata" // the typings for core-js are limited - es7.reflect is missing :( use reflect-metadata typings insted + ] + } } \ No newline at end of file diff --git a/typings.json b/typings.json deleted file mode 100644 index 26ea32e..0000000 --- a/typings.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": false, - "ambientDependencies": { - "body-parser": "registry:dt/body-parser#0.0.0+20160317120654", - "es6-promise": "registry:dt/es6-promise#0.0.0+20160423074304", - "express": "registry:dt/express#4.0.0+20160317120654", - "express-serve-static-core": "registry:dt/express-serve-static-core#0.0.0+20160322035842", - "method-override": "registry:dt/method-override#0.0.0+20160317120654", - "mime": "registry:dt/mime#0.0.0+20160316155526", - "node": "registry:dt/node#4.0.0+20160412142033", - "reflect-metadata": "github:rbuckton/ReflectDecorators/reflect-metadata.d.ts#1affc8fcd1301caac47602e3738b057ecfd88830", - "serve-static": "registry:dt/serve-static#0.0.0+20160317120654", - "winston": "registry:dt/winston#0.0.0+20160417152829" - }, - "ambientDevDependencies": { - "chai": "registry:dt/chai#3.4.0+20160317120654", - "mocha": "registry:dt/mocha#2.2.5+20160317120654", - "superagent": "registry:dt/superagent#1.4.0+20160317120654", - "supertest": "registry:dt/supertest#1.1.0+20160317120654" - } -}