Skip to content

Commit

Permalink
Merge pull request #132 from inversify/dc/dependencies
Browse files Browse the repository at this point in the history 
update dependencies
  • Loading branch information
@dcavanagh
dcavanagh committed Aug 24, 2019
2 parents 89e7d40 + 7f09f85 commit fb6525f
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 65 deletions.
95 changes: 51 additions & 44 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ var gulp = require("gulp"),
//******************************************************************************
//* LINT
//******************************************************************************
gulp.task("lint", function() {
gulp.task("lint", function () {

var config = {
fornatter: "verbose",
emitError: (process.env.CI) ? true : false
};

return gulp.src([
"src/**/**.ts",
"test/**/**.test.ts"
])
"src/**/**.ts",
"test/**/**.test.ts"
])
.pipe(tslint(config))
.pipe(tslint.report());
});
Expand All @@ -35,12 +35,12 @@ var tsLibProject = tsc.createProject("tsconfig.json", {
module: "commonjs"
});

gulp.task("build-lib", function() {
gulp.task("build-lib", function () {
return gulp.src([
"src/**/*.ts"
])
"src/**/*.ts"
])
.pipe(tsLibProject())
.on("error", function(err) {
.on("error", function (err) {
process.exit(1);
})
.js.pipe(gulp.dest("lib/"));
Expand All @@ -50,12 +50,12 @@ var tsEsProject = tsc.createProject("tsconfig.json", {
module: "es2015"
});

gulp.task("build-es", function() {
gulp.task("build-es", function () {
return gulp.src([
"src/**/*.ts"
])
"src/**/*.ts"
])
.pipe(tsEsProject())
.on("error", function(err) {
.on("error", function (err) {
process.exit(1);
})
.js.pipe(gulp.dest("es/"));
Expand All @@ -66,12 +66,12 @@ var tsDtsProject = tsc.createProject("tsconfig.json", {
nolResolve: false
});

gulp.task("build-dts", function() {
gulp.task("build-dts", function () {
return gulp.src([
"src/**/*.ts"
])
"src/**/*.ts"
])
.pipe(tsDtsProject())
.on("error", function(err) {
.on("error", function (err) {
process.exit(1);
})
.dts.pipe(gulp.dest("dts"));
Expand All @@ -83,65 +83,72 @@ gulp.task("build-dts", function() {
//******************************************************************************
var tstProject = tsc.createProject("tsconfig.json");

gulp.task("build-src", function() {
gulp.task("build-src", function () {
return gulp.src([
"src/**/*.ts"
])
"src/**/*.ts"
])
.pipe(tstProject())
.on("error", function(err) {
.on("error", function (err) {
process.exit(1);
})
.js.pipe(gulp.dest("src/"));
});

var tsTestProject = tsc.createProject("tsconfig.json");

gulp.task("build-test", function() {
gulp.task("build-test", function () {
return gulp.src([
"test/**/*.ts"
])
"test/**/*.ts"
])
.pipe(tsTestProject())
.on("error", function(err) {
.on("error", function (err) {
process.exit(1);
})
.js.pipe(gulp.dest("test/"));
});

gulp.task("mocha", function() {
gulp.task("mocha", function () {
return gulp.src([
"node_modules/reflect-metadata/Reflect.js",
"test/**/*.test.js"
])
"node_modules/reflect-metadata/Reflect.js",
"test/**/*.test.js"
])
.pipe(mocha({
ui: "bdd"
}))
.pipe(istanbul.writeReports());
});

gulp.task("istanbul:hook", function() {
gulp.task("istanbul:hook", function () {
return gulp.src(["src/**/*.js"])
// Covering files
.pipe(istanbul())
// Force `require` to return covered files
.pipe(istanbul.hookRequire());
});

gulp.task("test", function(cb) {
runSequence("istanbul:hook", "mocha", cb);
});

gulp.task("build", function(cb) {
runSequence(
"lint", ["build-src", "build-test", "build-es", "build-lib", "build-dts"],
cb);
});
gulp.task("test", gulp.series(
"istanbul:hook",
"mocha",
));

gulp.task("build",
gulp.series(
"lint",
gulp.parallel(
"build-src"
, "build-test"
, "build-es"
, "build-lib"
, "build-dts"
),

)
);

//******************************************************************************
//* DEFAULT
//******************************************************************************
gulp.task("default", function(cb) {
runSequence(
"build",
"test",
cb);
});
gulp.task("default", gulp.series(
"build",
"test",
));
29 changes: 16 additions & 13 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,32 @@
"test": "test"
},
"dependencies": {
"inversify": "4.14.0"
"inversify": "5.0.1"
},
"devDependencies": {
"chai": "4.1.2",
"@types/chai": "4.1.4",
"@types/mocha": "5.2.6",
"gulp": "3.9.1",
"@types/chai": "4.2.0",
"@types/mocha": "5.2.7",
"chai": "4.2.0",
"gulp": "4.0.2",
"gulp-istanbul": "1.1.3",
"gulp-mocha": "6.0.0",
"gulp-tslint": "8.1.2",
"gulp-mocha": "7.0.1",
"gulp-tslint": "8.1.4",
"gulp-typescript": "5.0.1",
"inversify-inject-decorators": "3.1.0",
"mocha": "6.1.3",
"publish-please": "5.4.3",
"mocha": "6.2.0",
"publish-please": "5.5.1",
"reflect-metadata": "0.1.13",
"run-sequence": "2.2.1",
"tslint": "5.9.0",
"typescript": "2.6.2"
"tslint": "5.19.0",
"typescript": "3.5.3",
"updates": "^8.5.3"
},
"scripts": {
"test": "gulp",
"publish-please": "publish-please",
"prepublish": "publish-please guard"
"prepublish": "publish-please guard",
"update": "updates --update --minor && npm install",
"postupdate": "git diff-files --quiet package-lock.json || npm test"
},
"repository": {
"type": "git",
Expand All @@ -48,4 +51,4 @@
"url": "https://github.com/inversify/inversify-vanillajs-helpers/issues"
},
"homepage": "https://github.com/inversify/inversify-vanillajs-helpers#readme"
}
}
2 changes: 1 addition & 1 deletion test/annotate.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ describe("Annotate Helper", () => {
[
{ tagged: { key: "throwable", value: false }, type: "Weapon" },
{ tagged: { key: "throwable", value: true }, type: "Weapon" }
]
] as any
);
container.bind<Katana>("Weapon").to(Katana).whenTargetTagged("throwable", false);
container.bind<Shuriken>("Weapon").to(Shuriken).whenTargetTagged("throwable", true);
Expand Down
13 changes: 7 additions & 6 deletions test/constraints.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ describe("Register helper constraints", () => {
[
{ tagged: { key: "throwable", value: false }, type: TYPE.Weapon },
{ tagged: { key: "throwable", value: true }, type: TYPE.Weapon }
]
] as any
)(Ninja);

let ninja = container.get<Ninja>(TYPE.Warrior);
Expand Down Expand Up @@ -318,7 +318,8 @@ describe("Register helper constraints", () => {
register<Warrior>("Warrior", [
{ tagged: { key: "throwable", value: false }, type: "Weapon" },
{ tagged: { key: "throwable", value: true }, type: "Weapon" }
])(Ninja);
] as any
)(Ninja);

let ninja = container.get<Warrior>("Warrior");
expect(ninja.katana.name).to.eql("Katana");
Expand Down Expand Up @@ -490,7 +491,7 @@ describe("Register helper constraints", () => {
[
{ tagged: { key: "throwable", value: false }, type: "Weapon" },
{ tagged: { key: "throwable", value: true }, type: "Weapon" }
]
] as any
)(Ninja);


Expand Down Expand Up @@ -572,7 +573,7 @@ describe("Register helper constraints", () => {
[
{ tagged: { key: "throwable", value: false }, type: "Factory<Weapon>" },
{ tagged: { key: "throwable", value: true }, type: "Factory<Weapon>" }
]
] as any
)(Ninja);

let ninja1 = container.get<Ninja>("Ninja");
Expand Down Expand Up @@ -655,7 +656,7 @@ describe("Register helper constraints", () => {
[
{ tagged: { key: "throwable", value: false }, type: "Factory<Weapon>" },
{ tagged: { key: "throwable", value: true }, type: "Factory<Weapon>" }
]
] as any
)(Ninja);

let ninja1 = container.get<Ninja>("Ninja");
Expand Down Expand Up @@ -760,7 +761,7 @@ describe("Register helper constraints", () => {
[
{ tagged: { key: "throwable", value: false }, type: "Provider<Katana>" },
{ tagged: { key: "not-throwable", value: true }, type: "Provider<Shuriken>" }
]
] as any
)(Ninja);

let ninja1 = container.get<Ninja>("Ninja");
Expand Down
2 changes: 1 addition & 1 deletion test/decorators.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe("Register helper as a decorator", () => {
[
{ tagged: { key: "throwable", value: false }, type: TYPE.Weapon },
{ tagged: { key: "throwable", value: true }, type: TYPE.Weapon }
]
] as any
)
class Ninja {
public primaryWeapon: Weapon;
Expand Down

0 comments on commit fb6525f

Please sign in to comment.