From f502cb96651aeaf59238e3d5ac80845928d582ba Mon Sep 17 00:00:00 2001 From: Peter Deltchev Date: Sat, 24 Oct 2015 19:43:37 -0700 Subject: [PATCH] Updated indents in the gulpfile. --- gulpfile.js | 290 +++++++++++++++++++++++++++------------------------- 1 file changed, 148 insertions(+), 142 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index d655858d..9775202d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,176 +3,182 @@ var gulp = require("gulp"), argv = require("yargs").argv; var plumberOptions = { - errorHandler: plug.notify.onError("Error: <%= error.message %>") + errorHandler: plug.notify.onError("Error: <%= error.message %>") }; -gulp.task("scripts-app", function() { - var paths = [ - "resources/assets/scripts/app/**/*.{coffee,js}", - "resources/assets/scripts/base/**/*.{coffee,js}", - "resources/assets/scripts/shared/**/*.{coffee,js}" - ]; +gulp.task("scripts-app", function () { + var paths = [ + "resources/assets/scripts/app/**/*.{coffee,js}", + "resources/assets/scripts/base/**/*.{coffee,js}", + "resources/assets/scripts/shared/**/*.{coffee,js}" + ]; - if (!argv.production) { - paths.push("resources/assets/scripts/debug/**/*.{coffee,js}"); + if (!argv.production) { + paths.push("resources/assets/scripts/debug/**/*.{coffee,js}"); - // we also want to add the embed stuff, since we're in development mode - // we want to watch embed files and re-compile them. However, we want - // to leave this path out in production so that embed files are not bloating - // the js file - paths.push("resources/assets/scripts/embed/**/*.{coffee,js}"); - } + // we also want to add the embed stuff, since we're in development mode + // we want to watch embed files and re-compile them. However, we want + // to leave this path out in production so that embed files are not bloating + // the js file + paths.push("resources/assets/scripts/embed/**/*.{coffee,js}"); + } - return argv.production - // Production pipeline - ? gulp.src(paths, {base: "resources/assets/scripts"}) - .pipe(plug.plumber(plumberOptions)) - .pipe(plug.order([ - "resources/assets/scripts/base/jquery-2.0.2.js", - "resources/assets/scripts/base/angular.js", - "resources/assets/scripts/base/*.{coffee,js}", - "resources/assets/scripts/shared/*.{coffee,js}", - "resources/assets/scripts/app/*.{coffee,js}", - "resources/assets/scripts/app/services/*.{coffee,js}", - "resources/assets/scripts/app/filters/*.{coffee,js}", - "resources/assets/scripts/app/directives/*.{coffee,js}", - "resources/assets/scripts/app/controllers/*.{coffee,js}", - "resources/assets/scripts/**/*.{coffee,js}" - ], {base: "."})) - .pipe(plug.if(/\.coffee/, plug.coffee())) - .pipe(plug.concat("app.js")) - .pipe(plug.uglify()) - .pipe(gulp.dest("public/build/scripts")) - // Development/watch pipeline - : gulp.src(paths, {base: "resources/assets/scripts"}) - .pipe(plug.plumber(plumberOptions)) - .pipe(plug.cached('scripts')) - .pipe(plug.sourcemaps.init()) - .pipe(plug.if(/\.coffee/, plug.coffee())) - .pipe(plug.sourcemaps.write({ - includeContent: false, - sourceRoot: "/dev-scripts/" - })) - .pipe(gulp.dest("public/build/scripts")); + return argv.production + // Production pipeline + ? gulp.src(paths, {base: "resources/assets/scripts"}) + .pipe(plug.plumber(plumberOptions)) + .pipe(plug.order([ + "resources/assets/scripts/base/jquery-2.0.2.js", + "resources/assets/scripts/base/angular.js", + "resources/assets/scripts/base/*.{coffee,js}", + "resources/assets/scripts/shared/*.{coffee,js}", + "resources/assets/scripts/app/*.{coffee,js}", + "resources/assets/scripts/app/services/*.{coffee,js}", + "resources/assets/scripts/app/filters/*.{coffee,js}", + "resources/assets/scripts/app/directives/*.{coffee,js}", + "resources/assets/scripts/app/controllers/*.{coffee,js}", + "resources/assets/scripts/**/*.{coffee,js}" + ], {base: "."})) + .pipe(plug.if(/\.coffee/, plug.coffee())) + .pipe(plug.concat("app.js")) + .pipe(plug.uglify()) + .pipe(gulp.dest("public/build/scripts")) + // Development/watch pipeline + : gulp.src(paths, {base: "resources/assets/scripts"}) + .pipe(plug.plumber(plumberOptions)) + .pipe(plug.cached('scripts')) + .pipe(plug.sourcemaps.init()) + .pipe(plug.if(/\.coffee/, plug.coffee())) + .pipe(plug.sourcemaps.write({ + includeContent: false, + sourceRoot: "/dev-scripts/" + })) + .pipe(gulp.dest("public/build/scripts")); }); -gulp.task("scripts-embed", function() { - // note that this task should really only ever be invoked for production - // since development-mode watches and builds include the embed scripts - // already +gulp.task("scripts-embed", function () { + // note that this task should really only ever be invoked for production + // since development-mode watches and builds include the embed scripts + // already - var includedScripts = [ - "resources/assets/scripts/base/jquery-2.0.2.js", - "resources/assets/scripts/base/jquery.viewport.js", - "resources/assets/scripts/base/underscore.js", - "resources/assets/scripts/base/moment.js", - "resources/assets/scripts/base/jquery.timeago.js", - "resources/assets/scripts/base/soundmanager2-nodebug.js", - "resources/assets/scripts/embed/*.coffee" - ]; + var includedScripts = [ + "resources/assets/scripts/base/jquery-2.0.2.js", + "resources/assets/scripts/base/jquery.viewport.js", + "resources/assets/scripts/base/underscore.js", + "resources/assets/scripts/base/moment.js", + "resources/assets/scripts/base/jquery.timeago.js", + "resources/assets/scripts/base/soundmanager2-nodebug.js", + "resources/assets/scripts/embed/*.coffee" + ]; - return gulp.src(includedScripts, {base: "resources/assets/scripts"}) - .pipe(plug.plumber(plumberOptions)) - .pipe(plug.if(/\.coffee/, plug.coffee())) - .pipe(plug.order(includedScripts, {base: "."})) - .pipe(plug.concat("embed.js")) - .pipe(plug.uglify()) - .pipe(gulp.dest("public/build/scripts")); + return gulp.src(includedScripts, {base: "resources/assets/scripts"}) + .pipe(plug.plumber(plumberOptions)) + .pipe(plug.if(/\.coffee/, plug.coffee())) + .pipe(plug.order(includedScripts, {base: "."})) + .pipe(plug.concat("embed.js")) + .pipe(plug.uglify()) + .pipe(gulp.dest("public/build/scripts")); }); -gulp.task("styles-app", function() { - var includedStyles = [ - "resources/assets/styles/base/jquery-ui.css", - "resources/assets/styles/base/colorbox.css", - "resources/assets/styles/app.less" - ]; +gulp.task("styles-app", function () { + var includedStyles = [ + "resources/assets/styles/base/jquery-ui.css", + "resources/assets/styles/base/colorbox.css", + "resources/assets/styles/app.less" + ]; - if (!argv.production) { - includedStyles.push("resources/assets/styles/profiler.less"); - includedStyles.push("resources/assets/styles/prettify.css"); + if (!argv.production) { + includedStyles.push("resources/assets/styles/profiler.less"); + includedStyles.push("resources/assets/styles/prettify.css"); - // we also want to add the embed stuff, since we're in development mode - // we want to watch embed files and re-compile them. However, we want - // to leave this path out in production so that embed files are not bloating - // the css file - includedStyles.push("resources/assets/styles/embed.css"); + // we also want to add the embed stuff, since we're in development mode + // we want to watch embed files and re-compile them. However, we want + // to leave this path out in production so that embed files are not bloating + // the css file + includedStyles.push("resources/assets/styles/embed.css"); - // Remove app.less from the cache so that it gets recompiled - var styleCache = plug.cached.caches.styles; - for (var file in styleCache) { - if (!styleCache.hasOwnProperty(file)) - continue; + // Remove app.less from the cache so that it gets recompiled + var styleCache = plug.cached.caches.styles; + for (var file in styleCache) { + if (!styleCache.hasOwnProperty(file)) + continue; - if (!endsWith(file, "app.less")) - continue; + if (!endsWith(file, "app.less")) + continue; - delete styleCache[file]; - } - } + delete styleCache[file]; + } + } - // note that we're not doing autoprefixer on dev builds for now to shave off roughly 600-700 milliseconds per - // build. It's already taking forever to recompile the less + // note that we're not doing autoprefixer on dev builds for now to shave off roughly 600-700 milliseconds per + // build. It's already taking forever to recompile the less - return argv.production - // Production pipeline - ? gulp.src(includedStyles, {base: "resources/assets/styles"}) - .pipe(plug.plumber(plumberOptions)) - .pipe(plug.if(/\.less/, plug.less())) - .pipe(plug.autoprefixer({browsers: ["last 2 versions"], cascade: false})) - .pipe(plug.concat("app.css")) - .pipe(plug.minifyCss()) - .pipe(gulp.dest("public/build/styles")) - // Development pipeline - : gulp.src(includedStyles, {base: "resources/assets/styles"}) - .pipe(plug.plumber(plumberOptions)) - .pipe(plug.cached("styles")) - .pipe(plug.sourcemaps.init()) - .pipe(plug.if(/\.less/, plug.less())) - .pipe(plug.sourcemaps.write({ - includeContent: false, - sourceRoot: "/dev-styles/" - })) - .pipe(gulp.dest("public/build/styles")) - .pipe(plug.livereload()); + return argv.production + // Production pipeline + ? gulp.src(includedStyles, {base: "resources/assets/styles"}) + .pipe(plug.plumber(plumberOptions)) + .pipe(plug.if(/\.less/, plug.less())) + .pipe(plug.autoprefixer({ + browsers: ["last 2 versions"], + cascade: false + })) + .pipe(plug.concat("app.css")) + .pipe(plug.minifyCss()) + .pipe(gulp.dest("public/build/styles")) + // Development pipeline + : gulp.src(includedStyles, {base: "resources/assets/styles"}) + .pipe(plug.plumber(plumberOptions)) + .pipe(plug.cached("styles")) + .pipe(plug.sourcemaps.init()) + .pipe(plug.if(/\.less/, plug.less())) + .pipe(plug.sourcemaps.write({ + includeContent: false, + sourceRoot: "/dev-styles/" + })) + .pipe(gulp.dest("public/build/styles")) + .pipe(plug.livereload()); }); -gulp.task("styles-embed", function() { - // note that this task should really only ever be invoked for production - // since development-mode watches and builds include the embed styles - // already +gulp.task("styles-embed", function () { + // note that this task should really only ever be invoked for production + // since development-mode watches and builds include the embed styles + // already - return gulp.src(["resources/assets/styles/embed.less"], {base: "resources/assets/styles"}) - .pipe(plug.less()) - .pipe(plug.autoprefixer({browsers: ["last 2 versions"], cascade: false})) - .pipe(plug.concat("embed.css")) - .pipe(plug.minifyCss()) - .pipe(gulp.dest("public/build/styles")); + return gulp.src(["resources/assets/styles/embed.less"], {base: "resources/assets/styles"}) + .pipe(plug.less()) + .pipe(plug.autoprefixer({ + browsers: ["last 2 versions"], + cascade: false + })) + .pipe(plug.concat("embed.css")) + .pipe(plug.minifyCss()) + .pipe(gulp.dest("public/build/styles")); }); -gulp.task('copy:templates', function() { - gulp.src([ - 'public/templates/**/*.html' - ]) - .pipe(plug.angularTemplatecache({ - module: "ponyfm", - root: "/templates" - })) - .pipe(gulp.dest('public/build/scripts')); +gulp.task('copy:templates', function () { + gulp.src([ + 'public/templates/**/*.html' + ]) + .pipe(plug.angularTemplatecache({ + module: "ponyfm", + root: "/templates" + })) + .pipe(gulp.dest('public/build/scripts')); }); gulp.task('build', [ - 'scripts-app', - 'styles-app', - 'scripts-embed', - 'styles-embed', + 'scripts-app', + 'styles-app', + 'scripts-embed', + 'styles-embed', ]); -gulp.task("watch", function() { - plug.livereload.listen(); - gulp.watch("resources/assets/scripts/**/*.{coffee,js}", ["scripts-app"]); - gulp.watch("resources/assets/styles/**/*.{css,less}", ["styles-app"]); +gulp.task("watch", function () { + plug.livereload.listen(); + gulp.watch("resources/assets/scripts/**/*.{coffee,js}", ["scripts-app"]); + gulp.watch("resources/assets/styles/**/*.{css,less}", ["styles-app"]); }); function endsWith(str, suffix) { - return str.indexOf(suffix, str.length - suffix.length) !== -1; -} \ No newline at end of file + return str.indexOf(suffix, str.length - suffix.length) !== -1; +}