hacking build

Author: iliakan

.gitignore

@@ -36,7 +36,6 @@ out/*
 
 # Generated content
 public/*
-styles/sprites/*
 
 # Bower stuff.
 bower_components/

gulpfile.js

@@ -31,10 +31,7 @@ gulp.on('task_start', function(msg) {
 
 gulp.on('task_stop', function(msg) {
   gulp.executing.splice(gulp.executing.indexOf(msg.task), 1);
-  gulp.hasOnce = gulp.executing.filter(function(name) {
-    return name.match(/-once$/);
-  }).length > 0;
-  console.log(gulp.executing, gulp.hasOnce);
+  console.log(gulp.executing.join(','));
 });
 
 
@@ -47,29 +44,18 @@ function lazyRequireTask(path) {
 
   return function(callback) {
     var task = require(path).apply(this, args);
-
     return task(callback);
   };
 }
 
 function wrapWatch(watch, task) {
   return function(callback) {
     if (process.env.WATCH) {
-      gulp.watch(watch, function(cb) {
-        if (gulp.hasOnce) {
-          var wait = function() {
-            if (gulp.hasOnce) return;
-            gulp.removeListener('task_stop', wait);
-            gulp.start(task);
-          };
-          gulp.on('task_stop', wait);
-        } else {
-          gulp.start(task);
-        }
-      });
+      setTimeout(function() {
+        gulp.watch(watch, [task]);
+      }, 1000); // don't start watching too fast (node.js bug, see https://github.com/joyent/node/issues/8326)
     } else {
       callback(); // @see usage examples, wrapWatch only triggers watch, should depend on ['task']
-      // gulp.start(task, callback);
     }
   };
 }
@@ -78,7 +64,7 @@ gulp.task('lint-once', lazyRequireTask('./tasks/lint', { src: jsSources }));
 
 gulp.task('lint-or-die', lazyRequireTask('./tasks/lint', { src: jsSources, dieOnError: true }));
 
-gulp.task('lint', ['lint-once'], wrapWatch(jsSources, 'lint'));
+gulp.task('lint', wrapWatch(jsSources, 'lint-once'));
 
 // usage: gulp loaddb --db fixture/db
 gulp.task('loaddb', lazyRequireTask('./tasks/loadDb'));
@@ -89,21 +75,25 @@ gulp.task("nodemon", lazyRequireTask('./tasks/nodemon', {
   watch:  ["hmvc", "modules"]
 }));
 
-gulp.task("client:livereload", lazyRequireTask("./tasks/livereload", { watch: "public/{i,img,js,styles}/*.*" }));
+gulp.task("client:livereload", lazyRequireTask("./tasks/livereload", { watch: "public/{i,img,js,styles}/**/*.*" }));
 
 gulp.task('link-modules', lazyRequireTask('./tasks/linkModules', { src: ['client', 'modules/*', 'hmvc/*'] }));
 
-gulp.task("client:sync-resources", lazyRequireTask('./tasks/syncResources', {
+gulp.task("client:sync-resources-once", lazyRequireTask('./tasks/syncResources', {
   'assets/fonts': 'public/fonts',
   'assets/img':   'public/img'
 }));
 
+gulp.task("client:sync-resources",
+  wrapWatch('assets/{fonts,img}/**', 'client:sync-resources-once')
+);
+
 gulp.task("client:sync-css-images-once", lazyRequireTask('./tasks/syncCssImages', {
   src: 'styles/**/*.{png,svg,gif,jpg}',
   dst: 'public/i'
 }));
 
-gulp.task('client:sync-css-images', ['client:sync-css-images-once'],
+gulp.task('client:sync-css-images',
   wrapWatch('styles/**/*.{png,svg,gif,jpg}', 'client:sync-css-images-once')
 );
 
@@ -127,29 +117,31 @@ gulp.task('client:minify', lazyRequireTask('./tasks/minify', {
   root: './public'
 }));
 
-
-gulp.task('client:compile-css', ['client:compile-css-once'], wrapWatch(["styles/**/*.styl"], "client:compile-css-once"));
+gulp.task('client:compile-css', wrapWatch(["styles/**/*.styl"], "client:compile-css-once"));
 
 
 gulp.task("client:browserify:clean", lazyRequireTask('./tasks/browserifyClean', { dst: './public/js'}));
 
-gulp.task("client:browserify-once", ['link-modules', 'client:browserify:clean'], lazyRequireTask('./tasks/browserify'));
-gulp.task("client:browserify", ['client:browserify-once'], wrapWatch(['client/**', 'hmvc/**/client/**'], "client:browserify-once"));
+gulp.task("client:browserify-once", ['client:browserify:clean'], lazyRequireTask('./tasks/browserify'));
+gulp.task("client:browserify", wrapWatch(['client/**', 'hmvc/**/client/**'], "client:browserify-once"));
 
 // we depend on compile-css, because if build-md5-list-once works in parallel with client:compile-css,
 // then compile-css recreates files and build-md5-list-once misses them or errors when they are suddenly removed
 gulp.task("client:build-md5-list-once",
   lazyRequireTask('./tasks/buildMd5List', { cwd: 'public', src: './{fonts,js,styles}/**/*.*', dst: './public.md5.json' }));
 
-gulp.task("client:build-md5-list", ['client:build-md5-list-once'],
-  wrapWatch(['public/**'], 'client:build-md5-list-once')); // watch dirs only, not just files (to see new files)
+gulp.task("client:build-md5-list",
+  wrapWatch(['public/{fonts,js,styles}/**'], 'client:build-md5-list-once')); // watch dirs only, not just files (to see new files)
 
 
 gulp.task('build', function(callback) {
-  runSequence('link-modules', "client:sync-resources", 'client:compile-css', 'client:browserify', 'client:sync-css-images', 'client:build-md5-list', callback);
+  runSequence('link-modules', "client:sync-resources-once", 'client:compile-css-once', 'client:browserify-once', 'client:sync-css-images-once', 'client:build-md5-list-once', callback);
 });
 
-gulp.task('dev', ['nodemon', 'client:livereload', 'build']);
+gulp.task('dev', function(callback) {
+  runSequence('build', ["client:sync-resources", 'client:compile-css', 'client:browserify', 'client:sync-css-images', 'client:build-md5-list', 'nodemon', 'client:livereload'], callback);
+//  runSequence('build', ['nodemon', 'client:livereload', 'client:build-md5-list'], callback);
+});
 
 gulp.task('tutorial:import', ['link-modules'], lazyRequireTask('tutorial/tasks/import', {
   root:        'javascript-tutorial',

hmvc/profile/templates/account.jade

@@ -16,7 +16,7 @@ block content
 
 
 
-  script(src=addFileMd5("/js/profile.js"))
+  script(src=addAssetVersion("/js/profile.js"))
   script require('profile/client').init();
 
 

hmvc/tutorial/templates/article.jade

@@ -6,5 +6,5 @@ block sidebar
 block content
   != body
 
-  script(src=addFileMd5("/js/tutorial.js"))
+  script(src=addAssetVersion("/js/tutorial.js"))
   script require('tutorial/client').init();

modules/config/index.js

@@ -12,7 +12,6 @@ if (process.env.NODE_ENV == 'development' && process.env.DEV_TRACE) {
 
 require('lib/debug');
 
-
 var path = require('path');
 var fs = require('fs');
 

modules/lib/debug.js

@@ -23,12 +23,15 @@ if (process.env.NODE_ENV == 'development') {
  * When a code dies with a strange event error w/o trace
  * Here I try to see what actually died
  */
-if (process.env.DUMP_EVENT_ERRORS) {
+if (process.env.DEBUG_ERROR) {
   var proto = require('events').EventEmitter.prototype;
   var emit = proto.emit;
-  proto.emit = function(type) {
-    if (type == 'error') console.log(this, arguments);
-    emit.apply(this, arguments);
+  proto.emit = function(type, err) {
+    if (type == 'error') {
+      console.log(this.test, this.constructor.name, err.message, err.stack);
+      process.exit(1);
+    }
+    else emit.apply(this, arguments);
   };
 
 }

modules/setup/render.js

@@ -72,15 +72,15 @@ function addStandardHelpers(locals, ctx) {
 
   locals.bem = require('bem-jade')();
 
-  locals.addFileMd5 = function(publicPath) {
+  locals.addAssetVersion = function(publicPath) {
     if (publicPath[0] != '/') {
-      throw new Error("addFileMd5 needs an /absolute/path");
+      throw new Error("addAssetVersion needs an /absolute/path");
     }
     var md5 = getPublicMd5(publicPath);
     if (!md5) {
       throw new Error("No md5 for " + publicPath);
     }
-    return publicPath + '?r=' + md5;
+    return publicPath.replace('.', '.v' + md5 + '.');
   };
 
 //  locals.debug = true;

modules/setup/static.js

@@ -87,24 +87,38 @@ function* staticMiddleware(next) {
     this.throw(404);
   }
 
-  var ext = path.extname(filepath).slice(1);
+  // strip version
+  filepath = stripVersion(filepath);
 
-  if (~['jpg', 'png', 'gif'].indexOf(ext) && this.cookies.get('hires')) {
-    var try2x = filepath.slice(0, -ext.length-1) + '@2x.' + ext;
-    if (yield fs.exists(try2x)) {
-      filepath = try2x;
-    }
+  if (this.cookies.get('hires')) {
+    filepath = yield try2xImage(filepath);
   }
 
-
   // use mime-types module instead of send built-in mime
   // (which doesn't show encoding on application/javascript)
-  function onHeaders(res, filePath, stat) {
-    res.setHeader('Content-Type', mime.contentType(path.basename(filePath)));
+  function onHeaders(res, filepath, stat) {
+    res.setHeader('Content-Type', mime.contentType(path.basename(filepath)));
   }
 
   send(this.req, filepath, opts)
     .on('headers', onHeaders)
     .pipe(this.res);
 
 }
+
+function stripVersion(filepath) {
+  return filepath.replace(/\.v.*?\./, '.');
+}
+
+function* try2xImage(filepath) {
+  var ext = path.extname(filepath).slice(1);
+
+  if (~['jpg', 'png', 'gif'].indexOf(ext)) {
+    var try2x = filepath.slice(0, -ext.length-1) + '@2x.' + ext;
+    if (yield fs.exists(try2x)) {
+      filepath = try2x;
+    }
+  }
+
+  return filepath;
+}

package.json

@@ -25,6 +25,7 @@
     "event-stream": "*",
     "fs-extra": "*",
     "glob": "*",
+    "glob-stream": "^3.1.15",
     "gm": "*",
     "gulp-cache": "*",
     "gulp-concat": "*",
@@ -42,7 +43,6 @@
     "gulp-rimraf": "*",
     "gulp-stylus": "*",
     "gulp-util": "*",
-    "gulp.spritesmith": "*",
     "humane-js": "*",
     "humanize-number": "0.0.2",
     "image-size": "*",
@@ -103,10 +103,11 @@
     "stylus": "*",
     "svgutils": "*",
     "through": "^2.3.4",
-    "through2": "*",
+    "through2": "^0.6.1",
     "thunkify": "*",
     "uglify-js": "^2.4.15",
     "uglifyify": "^2.5.0",
+    "vinyl": "^0.4.3",
     "vinyl-fs": "*",
     "vinyl-source-stream": "*",
     "yargs": "*"
@@ -127,13 +128,13 @@
     "gulp-mocha": "*",
     "gulp-sourcemaps": "*",
     "gulp-streamify": "0.0.5",
-    "gulp-stylus-sprite": "*",
     "gulp-uglify": "^0.3.1",
     "lazypipe": "*",
     "mocha": "*",
     "node-notifier": "*",
     "nodemailer-stub-transport": "*",
     "requireify": "^0.2.1",
+    "run-sequence": "^0.3.6",
     "should": "*",
     "sinon": "*",
     "superagent": "*",

styles/base.styl

@@ -19,7 +19,6 @@ ie = false unless ie is defined
 @import 'nib/text'
 @import 'nib/size'
 
-@require "sprites/*"
 @require "blocks/variables/variables"
 @require "blocks/reset/reset"
 @require "blocks/placeholders/*"
@@ -63,7 +62,7 @@ ie = false unless ie is defined
 @require "blocks/submit-button/submit-button"
 // @require "blocks/secondary-button/secondary-button"
 @require "blocks/page-footer/page-footer"
-@require "blocks/soc-icon/soc-icon"
+/*@require "blocks/soc-icon/soc-icon"*/
 @require "blocks/social/social"
 // @require "blocks/user/user"
 // @require "blocks/user-menu/user-menu"
@@ -90,7 +89,7 @@ ie = false unless ie is defined
 // @require "blocks/select2/select2"
 // @require "blocks/full-phone/full-phone"
 // @require "blocks/confirm/confirm"
-@require "blocks/social-link/social-link"
+/*@require "blocks/social-link/social-link"*/
 // @require "blocks/text-compact-label/text-compact-label"
 // @require "blocks/course-search/course-search"
 // @require "blocks/header-note/header-note"