Merge pull request #27 from thegecko/d/fixes

Minor fixes
This commit is contained in:
Rob Moran
2018-03-17 10:33:39 +00:00
committed by GitHub
2 changed files with 7 additions and 11 deletions

View File

@@ -2,13 +2,12 @@ var path = require("path");
var browserify = require("browserify");
var del = require("del");
var merge = require("merge2");
var tslint = require("tslint");
var buffer = require("vinyl-buffer");
var source = require("vinyl-source-stream");
var gulp = require("gulp");
var sourcemaps = require("gulp-sourcemaps");
var gulpTs = require("gulp-typescript");
var gulpTslint = require("gulp-tslint");
var typescript = require("gulp-typescript");
var tslint = require("gulp-tslint");
var uglify = require("gulp-uglify");
// Source
@@ -39,19 +38,16 @@ gulp.task("setWatch", () => {
// Clear built directories
gulp.task("clean", () => {
return del([nodeDir, typesDir, bundleDir]);
if (!watching) del([nodeDir, typesDir, bundleDir]);
});
// Lint the source
gulp.task("lint", () => {
var program = tslint.Linter.createProgram("./");
return gulp.src(srcFiles)
.pipe(gulpTslint({
program: program,
.pipe(tslint({
formatter: "stylish"
}))
.pipe(gulpTslint.report({
.pipe(tslint.report({
emitError: !watching
}))
});
@@ -60,7 +56,7 @@ gulp.task("lint", () => {
gulp.task("compile", ["clean"], () => {
var tsResult = gulp.src(srcFiles)
.pipe(sourcemaps.init())
.pipe(gulpTs.createProject("tsconfig.json")())
.pipe(typescript.createProject("tsconfig.json")())
.on("error", handleError);
return merge([

View File

@@ -49,6 +49,6 @@
"typescript": "^2.6.2",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0",
"webbluetooth": "^1.0.2"
"webbluetooth": "^1.0.4"
}
}