diff --git a/.travis.yml b/.travis.yml index 9834dafdf..82e1b05f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ node_js: - 5.1.1 - 4.4.6 before_install: -- npm install -g typings - npm install -g codeclimate-test-reporter -- typings install after_success: - codeclimate-test-reporter < coverage/lcov.info \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 585d1bdac..9684fe901 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,6 +6,7 @@ "test/**/*.js": true, "**/es": true, "**/lib": true, + "**/dts": true, "**/temp": true, "**/coverage": true, "**/dist": true, diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3350b8eea..82722363e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,22 +7,12 @@ $ git clone https://github.com/YOUR_USERNAME/InversifyJS.git ``` -2 - Install typings: -``` -$ npm install -g typings -``` - -3 - Install type definitions: -``` -$ typings install -``` - -4 - Install npm dependencies: +2 - Install npm dependencies: ``` $ npm install ``` -5 - Run build process +3 - Run build process ``` $ gulp ``` diff --git a/appveyor.yml b/appveyor.yml index aa4a1e40c..c70af9fa2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,10 +26,8 @@ branches: install: - ps: Install-Product node $env:nodejs_version - npm install -g npm - - npm install -g typings - npm config set progress=false - npm install - - typings install # Fix line endings on Windows init: diff --git a/gulpfile.js b/gulpfile.js index 6aa43ae8c..36b96b16e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -43,7 +43,6 @@ var tsLibProject = tsc.createProject("tsconfig.json", { module : "commonjs", typ gulp.task("build-lib", function() { return gulp.src([ - "typings/index.d.ts", "node_modules/reflect-metadata/reflect-metadata.d.ts", "src/**/*.ts" ]) @@ -58,7 +57,6 @@ var tsEsProject = tsc.createProject("tsconfig.json", { module : "es2015", typesc gulp.task("build-es", function() { return gulp.src([ - "typings/index.d.ts", "node_modules/reflect-metadata/reflect-metadata.d.ts", "src/**/*.ts" ]) @@ -77,7 +75,6 @@ var tsDtsProject = tsc.createProject("tsconfig.json", { gulp.task("build-dts", function() { return gulp.src([ - "typings/index.d.ts", "node_modules/reflect-metadata/reflect-metadata.d.ts", "src/**/*.ts" ]) @@ -96,7 +93,6 @@ var tstProject = tsc.createProject("tsconfig.json", { typescript: require("types gulp.task("build-src", function() { return gulp.src([ - "typings/index.d.ts", "node_modules/reflect-metadata/reflect-metadata.d.ts", "src/**/*.ts" ]) @@ -111,7 +107,6 @@ var tsTestProject = tsc.createProject("tsconfig.json", { typescript: require("ty gulp.task("build-test", function() { return gulp.src([ - "typings/index.d.ts", "node_modules/reflect-metadata/reflect-metadata.d.ts", "test/**/*.ts" ]) diff --git a/package.json b/package.json index 703b6eb52..98c1bc792 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "inversify", - "version": "2.0.0-rc.13", + "version": "2.0.0-rc.14", "description": "A powerful and lightweight inversion of control container for JavaScript and Node.js apps powered by TypeScript.", "main": "lib/inversify.js", "jsnext:main": "es/inversify.js", @@ -35,6 +35,10 @@ "homepage": "http://inversify.io", "engines": {}, "devDependencies": { + "@types/chai": "^3.4.32", + "@types/harmony-proxy": "^1.0.27", + "@types/mocha": "^2.2.31", + "@types/sinon": "^1.16.29", "bluebird": "^3.4.1", "browserify": "^13.0.0", "chai": "^3.4.1", @@ -69,7 +73,6 @@ "sinon": "^1.17.3", "tslint": "^3.12.0", "typescript": "^2.0.2", - "typings": "^1.0.4", "vinyl-buffer": "^1.0.0", "vinyl-source-stream": "^1.1.0" } diff --git a/test/kernel/kernel.test.ts b/test/kernel/kernel.test.ts index 6fdaf47f1..cf2e3b9d9 100644 --- a/test/kernel/kernel.test.ts +++ b/test/kernel/kernel.test.ts @@ -8,7 +8,7 @@ import KernelModule from "../../src/kernel/kernel_module"; describe("Kernel", () => { - let sandbox: Sinon.SinonSandbox; + let sandbox: sinon.SinonSandbox; beforeEach(() => { sandbox = sinon.sandbox.create(); diff --git a/test/middleware/middleware.test.ts b/test/middleware/middleware.test.ts index ac7399bbc..e1d4a68cd 100644 --- a/test/middleware/middleware.test.ts +++ b/test/middleware/middleware.test.ts @@ -7,7 +7,7 @@ import * as ERROR_MSGS from "../../src/constants/error_msgs"; describe("Middleware", () => { - let sandbox: Sinon.SinonSandbox; + let sandbox: sinon.SinonSandbox; beforeEach(() => { sandbox = sinon.sandbox.create(); diff --git a/test/planning/planner.test.ts b/test/planning/planner.test.ts index 1ee189886..fa051c269 100644 --- a/test/planning/planner.test.ts +++ b/test/planning/planner.test.ts @@ -17,7 +17,7 @@ import multiInject from "../../src/annotation/multi_inject"; describe("Planner", () => { - let sandbox: Sinon.SinonSandbox; + let sandbox: sinon.SinonSandbox; beforeEach(() => { sandbox = sinon.sandbox.create(); diff --git a/test/resolution/resolver.test.ts b/test/resolution/resolver.test.ts index 91eb616e3..4434529cf 100644 --- a/test/resolution/resolver.test.ts +++ b/test/resolution/resolver.test.ts @@ -20,7 +20,7 @@ import * as Proxy from "harmony-proxy"; describe("Resolver", () => { - let sandbox: Sinon.SinonSandbox; + let sandbox: sinon.SinonSandbox; beforeEach(() => { sandbox = sinon.sandbox.create(); diff --git a/test/syntax/binding_in_when_on_syntax.test.ts b/test/syntax/binding_in_when_on_syntax.test.ts index 22cb3a483..e2f101285 100644 --- a/test/syntax/binding_in_when_on_syntax.test.ts +++ b/test/syntax/binding_in_when_on_syntax.test.ts @@ -7,7 +7,7 @@ import injectable from "../../src/annotation/injectable"; describe("BindingInWhenOnSyntax", () => { - let sandbox: Sinon.SinonSandbox; + let sandbox: sinon.SinonSandbox; beforeEach(() => { sandbox = sinon.sandbox.create(); diff --git a/test/syntax/binding_when_on_syntax.test.ts b/test/syntax/binding_when_on_syntax.test.ts index 82c40cc4e..40d4f4868 100644 --- a/test/syntax/binding_when_on_syntax.test.ts +++ b/test/syntax/binding_when_on_syntax.test.ts @@ -7,7 +7,7 @@ import injectable from "../../src/annotation/injectable"; describe("BindingWhenOnSyntax", () => { - let sandbox: Sinon.SinonSandbox; + let sandbox: sinon.SinonSandbox; beforeEach(() => { sandbox = sinon.sandbox.create(); diff --git a/tsconfig.json b/tsconfig.json index 7a29d5f71..961eb3506 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,6 +2,7 @@ "compilerOptions": { "target": "es5", "lib": ["es6", "dom"], + "types": ["mocha"], "module": "commonjs", "moduleResolution": "node", "jsx": "react", @@ -13,9 +14,7 @@ "suppressImplicitAnyIndexErrors": false, "noResolve": false }, - "files": [ - "./typings/index.d.ts", - "./node_modules/reflect-metadata/reflect-metadata.d.ts", - "./src/inversify.ts" + "exclude": [ + "./node_modules/karma/**" ] } \ No newline at end of file diff --git a/typings.json b/typings.json deleted file mode 100644 index a2091537d..000000000 --- a/typings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "inversify", - "globalDependencies": { - "chai": "registry:dt/chai#3.4.0+20160601211834", - "harmony-proxy": "registry:dt/harmony-proxy#1.0.0+20160317120654", - "mocha": "registry:dt/mocha#2.2.5+20160720003353", - "sinon": "registry:dt/sinon#1.16.0+20160517064723" - } -}