diff --git a/.eslintrc b/.eslintrc index af736ed..bef0096 100644 --- a/.eslintrc +++ b/.eslintrc @@ -13,7 +13,8 @@ "semi": [ 2, "always" - ] + ], + "no-useless-escape": "off" }, "env": { "browser": true, diff --git a/gulpfile.js b/gulpfile.js index 702a162..061aaf0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -22,48 +22,49 @@ var banner = ["/**", " */", ""].join("\n"); -gulp.task("prettify-js", [], function() { +gulp.task("prettify-js", function(done) { return gulp.src("./src/js/simplemde.js") .pipe(prettify({js: {brace_style: "collapse", indent_char: "\t", indent_size: 1, max_preserve_newlines: 3, space_before_conditional: false}})) .pipe(gulp.dest("./src/js")); }); -gulp.task("prettify-css", [], function() { +gulp.task("prettify-css", function() { return gulp.src("./src/css/simplemde.css") .pipe(prettify({css: {indentChar: "\t", indentSize: 1}})) .pipe(gulp.dest("./src/css")); }); -gulp.task("lint", ["prettify-js"], function() { +gulp.task("lint", gulp.series("prettify-js", function(done) { gulp.src("./src/js/**/*.js") .pipe(debug()) .pipe(eslint()) .pipe(eslint.format()) .pipe(eslint.failAfterError()); -}); + done(); +})); function taskBrowserify(opts) { return browserify("./src/js/simplemde.js", opts) .bundle(); } -gulp.task("browserify:debug", ["lint"], function() { +gulp.task("browserify:debug", gulp.series("lint", function() { return taskBrowserify({debug:true, standalone:"SimpleMDE"}) .pipe(source("simplemde.debug.js")) .pipe(buffer()) .pipe(header(banner, {pkg: pkg})) .pipe(gulp.dest("./debug/")); -}); +})); -gulp.task("browserify", ["lint"], function() { +gulp.task("browserify", gulp.series("lint", function() { return taskBrowserify({standalone:"SimpleMDE"}) .pipe(source("simplemde.js")) .pipe(buffer()) .pipe(header(banner, {pkg: pkg})) .pipe(gulp.dest("./debug/")); -}); +})); -gulp.task("scripts", ["browserify:debug", "browserify", "lint"], function() { +gulp.task("scripts", gulp.series("browserify:debug", "browserify", "lint", function() { var js_files = ["./debug/simplemde.js"]; return gulp.src(js_files) @@ -72,9 +73,9 @@ gulp.task("scripts", ["browserify:debug", "browserify", "lint"], function() { .pipe(buffer()) .pipe(header(banner, {pkg: pkg})) .pipe(gulp.dest("./dist/")); -}); +})); -gulp.task("styles", ["prettify-css"], function() { +gulp.task("styles", gulp.series("prettify-css", function() { var css_files = [ "./node_modules/codemirror/lib/codemirror.css", "./src/css/*.css", @@ -91,6 +92,6 @@ gulp.task("styles", ["prettify-css"], function() { .pipe(buffer()) .pipe(header(banner, {pkg: pkg})) .pipe(gulp.dest("./dist/")); -}); +})); -gulp.task("default", ["scripts", "styles"]); +gulp.task("default", gulp.series("scripts", "styles"));