Skip to content

Commit

Permalink
Merge pull request #188 from inversify/dc/dependencies
Browse files Browse the repository at this point in the history
update dependencies
  • Loading branch information
dcavanagh authored Aug 24, 2019
2 parents 6f9fcdc + 64cef5e commit f75f0c7
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 61 deletions.
97 changes: 50 additions & 47 deletions gulpfile.js
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 tsAmdProject = tsc.createProject("tsconfig.json", {
module: "amd"
});

gulp.task("build-amd", function() {
gulp.task("build-amd", function () {
return gulp.src([
"src/**/*.ts"
])
"src/**/*.ts"
])
.pipe(tsAmdProject())
.on("error", function(err) {
.on("error", function (err) {
process.exit(1);
})
.js.pipe(gulp.dest("amd/"));
Expand All @@ -66,12 +66,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 @@ -82,12 +82,12 @@ var tsDtsProject = tsc.createProject("tsconfig.json", {
noResolve: 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 @@ -99,66 +99,69 @@ 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", { rootDir: "./" });

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("test", gulp.series("istanbul:hook", "mocha"));

gulp.task("build", function(cb) {
runSequence(
"lint", ["build-src", "build-es", "build-lib", "build-amd", "build-dts"], // tests + build es and lib
gulp.task("build",
gulp.series(
"lint",
gulp.parallel(
"build-src",
"build-es",
"build-lib",
"build-amd",
"build-dts"
),
"build-test",
cb);
});
)
);

//******************************************************************************
//* DEFAULT
//******************************************************************************
gulp.task("default", function(cb) {
runSequence(
"build",
"test",
cb);
});
gulp.task("default", gulp.series(
"build",
"test",
));
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,23 @@
"homepage": "https://github.com/inversify/inversify-binding-decorators#readme",
"dependencies": {},
"devDependencies": {
"@types/chai": "4.1.4",
"@types/mocha": "5.2.6",
"@types/sinon": "7.0.5",
"chai": "4.1.2",
"gulp": "3.9.1",
"@types/chai": "4.2.0",
"@types/mocha": "5.2.7",
"@types/sinon": "7.0.13",
"chai": "4.2.0",
"gulp": "4.0.2",
"gulp-istanbul": "1.1.3",
"gulp-mocha": "6.0.0",
"gulp-tslint": "8.1.3",
"gulp-mocha": "7.0.1",
"gulp-tslint": "8.1.4",
"gulp-typescript": "5.0.1",
"inversify": "5.0.1",
"mocha": "5.2.0",
"publish-please": "5.4.3",
"mocha": "6.2.0",
"publish-please": "5.5.1",
"reflect-metadata": "0.1.13",
"run-sequence": "2.2.1",
"sinon": "7.2.3",
"tslint": "5.9.1",
"typescript": "2.9.1"
"sinon": "7.4.1",
"tslint": "5.19.0",
"typescript": "3.5.3",
"updates": "^8.5.3"
}
}
}
2 changes: 1 addition & 1 deletion test/decorator/provide.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe("provide", () => {
class Ninja { }
provide("Ninja")(Ninja);
const bindingSpy = sandbox.spy();
const bindSpy = sandbox.spy(() => { return { to: bindingSpy }; });
const bindSpy: any = sandbox.spy(() => { return { to: bindingSpy }; });

let bindingMetadata: interfaces.ProvideSyntax = Reflect.getMetadata(METADATA_KEY.provide, Reflect)[0];
bindingMetadata.constraint(bindSpy, Ninja);
Expand Down

0 comments on commit f75f0c7

Please sign in to comment.