Skip to content

Commit

Permalink
Migrated from typings to @types (#361)
Browse files Browse the repository at this point in the history
* Implemented #357

* [WIP] #330

* [WIP] #330

* Auto generate dts files

* Updated docs

* [WIP] trying to fix 'Cannot find global type Array'

* Removed tsify

* Migrated from typings to @types

* Removed typings

* preparing for rc.14
  • Loading branch information
remojansen authored Sep 9, 2016
1 parent a762e2b commit 11fb12f
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 42 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"test/**/*.js": true,
"**/es": true,
"**/lib": true,
"**/dts": true,
"**/temp": true,
"**/coverage": true,
"**/dist": true,
Expand Down
14 changes: 2 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
2 changes: 0 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 0 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"
])
Expand All @@ -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"
])
Expand All @@ -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"
])
Expand All @@ -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"
])
Expand All @@ -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"
])
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion test/kernel/kernel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion test/middleware/middleware.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion test/planning/planner.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion test/resolution/resolver.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion test/syntax/binding_in_when_on_syntax.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion test/syntax/binding_when_on_syntax.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
7 changes: 3 additions & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"compilerOptions": {
"target": "es5",
"lib": ["es6", "dom"],
"types": ["mocha"],
"module": "commonjs",
"moduleResolution": "node",
"jsx": "react",
Expand All @@ -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/**"
]
}
9 changes: 0 additions & 9 deletions typings.json

This file was deleted.

0 comments on commit 11fb12f

Please sign in to comment.