faster development public versions, asset versions

Author: iliakan

.gitignore

@@ -23,7 +23,7 @@
 Thumbs.db
 
 # generated content
-public.md5.json
+public.versions.json
 
 # NPM packages folder.
 node_modules/

client/head/fontTest.js

@@ -11,6 +11,7 @@
  Можно убрать класс .no-icons и показать иконки.
  */
 
+
 module.exports = function() {
   var elem = document.createElement('span');
   document.body.appendChild(elem);

gulpfile.js

@@ -8,7 +8,6 @@ const path = require('path');
 const fs = require('fs');
 const assert = require('assert');
 const runSequence = require('run-sequence');
-const gulpWatcher = require('./tasks/gulpWatcher');
 
 //Error.stackTraceLimit = Infinity;
 //require('trace');
@@ -20,25 +19,12 @@ process.on('uncaughtException', function(err) {
   process.exit(255);
 });
 
-gulp.executing = [];
-
-gulp.on('task_start', function(msg) {
-  gulp.executing.push(msg.task);
-});
-
-gulp.on('task_stop', function(msg) {
-  gulp.executing.splice(gulp.executing.indexOf(msg.task), 1);
- // console.log(gulp.executing.join(','));
-});
-
-
 const jsSources = [
   'hmvc/**/*.js', 'modules/**/*.js', 'tasks/**/*.js', '*.js'
 ];
 
 function lazyRequireTask(path) {
   var args = [].slice.call(arguments, 1);
-
   return function(callback) {
     var task = require(path).apply(this, args);
     return task(callback);
@@ -62,18 +48,39 @@ gulp.task("client:livereload", lazyRequireTask("./tasks/livereload", { watch: "p
 
 gulp.task('link-modules', lazyRequireTask('./tasks/linkModules', { src: ['client', 'modules/*', 'hmvc/*'] }));
 
-gulp.task('watch', function(callback) {
-  gulpWatcher({ root: __dirname });
-});
-
+gulp.task('watch', lazyRequireTask('./tasks/watch', {
+  root:        __dirname,
+  taskMapping: [
+    {
+      watch: 'assets/{fonts,img}/**',
+      task:  'client:sync-resources'
+    },
+    {
+      watch: 'styles/**/*.{png,svg,gif,jpg}',
+      task:  'client:sync-css-images'
+    },
+    {
+      watch: "styles/**/*.styl",
+      task:  'client:compile-css'
+    },
+    {
+      watch: ['client/**', 'hmvc/**/client/**'],
+      task:  "client:browserify"
+    },
+    {
+      watch: 'public/{fonts,js,styles}/**',
+      task:  'client:build-public-versions'
+    }
+  ]
+}));
 
-gulp.task("client:sync-resources-once", lazyRequireTask('./tasks/syncResources', {
+gulp.task("client:sync-resources", lazyRequireTask('./tasks/syncResources', {
   'assets/fonts': 'public/fonts',
   'assets/img':   'public/img'
 }));
 
 
-gulp.task("client:sync-css-images-once", lazyRequireTask('./tasks/syncCssImages', {
+gulp.task("client:sync-css-images", lazyRequireTask('./tasks/syncCssImages', {
   src: 'styles/**/*.{png,svg,gif,jpg}',
   dst: 'public/i'
 }));
@@ -86,7 +93,7 @@ gulp.task('client:clean-compiled-css', function(callback) {
 });
 
 // Show errors if encountered
-gulp.task('client:compile-css-once',
+gulp.task('client:compile-css',
   ['client:clean-compiled-css'],
   lazyRequireTask('./tasks/compileCss', {
     src: './styles/base.styl',
@@ -100,15 +107,15 @@ gulp.task('client:minify', lazyRequireTask('./tasks/minify', {
 
 gulp.task("client:browserify:clean", lazyRequireTask('./tasks/browserifyClean', { dst: './public/js'}));
 
-gulp.task("client:browserify-once", ['client:browserify:clean'], lazyRequireTask('./tasks/browserify'));
+gulp.task("client:browserify", ['client:browserify:clean'], lazyRequireTask('./tasks/browserify'));
 
-// 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' }));
+// we depend on compile-css, because if build-md5-list works in parallel with client:compile-css,
+// then compile-css recreates files and build-md5-list misses them or errors when they are suddenly removed
+gulp.task("client:build-public-versions",
+  lazyRequireTask('./tasks/buildPublicVersions', { cwd: 'public', src: './{fonts,js,styles}/**/*.*', dst: './public.versions.json' }));
 
 gulp.task('build', function(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);
+  runSequence('link-modules', "client:sync-resources", 'client:compile-css', 'client:browserify', 'client:sync-css-images', 'client:build-public-versions', callback);
 });
 
 gulp.task('dev', function(callback) {

modules/setup/render.js

@@ -12,17 +12,17 @@ const _ = require('lodash');
 const assert = require('assert');
 const JadeParserMultipleDirs = require('lib/jadeParserMultipleDirs');
 
-// public.md5.json is regenerated and THEN node is restarted on redeploy
+// public.versions.json is regenerated and THEN node is restarted on redeploy
 // so it loads a new version.
-var publicMd5;
+var publicVersions;
 
-function getPublicMd5(publicPath) {
-  if (!publicMd5) {
+function getPublicVersion(publicPath) {
+  if (!publicVersions) {
     // don't include at module top, let the generating task to finish
-    publicMd5 = require(path.join(config.projectRoot, 'public.md5.json'));
+    publicVersions = require(path.join(config.projectRoot, 'public.versions.json'));
   }
   var busterPath = publicPath.slice(1);
-  return publicMd5[busterPath];
+  return publicVersions[busterPath];
 }
 
 function addStandardHelpers(locals, ctx) {
@@ -76,7 +76,7 @@ function addStandardHelpers(locals, ctx) {
     if (publicPath[0] != '/') {
       throw new Error("addAssetVersion needs an /absolute/path");
     }
-    var md5 = getPublicMd5(publicPath);
+    var md5 = getPublicVersion(publicPath);
     if (!md5) {
       throw new Error("No md5 for " + publicPath);
     }

modules/stylusAsset.js

@@ -4,7 +4,13 @@ var fs = require('fs'),
     nodes = require('stylus').nodes,
     utils = require('stylus').utils;
 
-module.exports = function() {
+module.exports = function(options) {
+
+  var getVersion = options.getVersion || function(file) {
+    var buf = fs.readFileSync(file);
+    return crypto.createHash('md5').update(buf).digest('hex').substring(0, 8);
+  };
+
   return function(style) {
     var paths = style.options.paths || [];
 
@@ -19,13 +25,7 @@ module.exports = function() {
         throw new Error('File ' + literal + ' not be found');
       }
 
-      var version;
-      if (process.env.NODE_ENV == 'development') {
-        version = fs.statSync(file).mtime.getTime();
-      } else {
-        var buf = fs.readFileSync(file);
-        version = crypto.createHash('md5').update(buf).digest('hex').substring(0, 8);
-      }
+      var version = getVersion(file);
 
       var ext = path.extname(url.val);
       var filepath = url.val.slice(0, url.val.length - ext.length);