ASSET_VERSIONING=query|file|none instead of env (ebook uses prod, but none)

iliakan · iliakan · commit 5baff31e329a · 2015-01-15T12:13:54.000+03:00
diff --git a/client/footer/index.js b/client/footer/index.js
@@ -5,4 +5,4 @@ exports.init = function() {
   showLinkType();
 };
 
-window.footer = module.exports;
+//window.footer = module.exports;
diff --git a/client/head/index.js b/client/head/index.js
@@ -18,4 +18,4 @@ require('./runDemo');
 // to ensure that other modules use exactly this (initialized) client/notify
 require('client/notification').init();
 
-window.head = module.exports;
+//window.head = module.exports;
diff --git a/dev b/dev
@@ -2,4 +2,4 @@
 #export SITE_HOST=http://javascript.in
 #export STATIC_HOST=http://javascript.in
 
-NODE_ENV=development WATCH=1 ./gulp dev | bunyan -o short -l debug
+ASSET_VERSIONING=query NODE_ENV=development WATCH=1 ./gulp dev | bunyan -o short -l debug
diff --git a/ebook b/ebook
@@ -1,5 +1,7 @@
 #!/bin/bash
 
-# CSS_NO_HASH disables hash in CSS, need for ebook
-CSS_NO_HASH=1 NODE_ENV=production gulp edit --harmony
+export ASSET_VERSIONING=none
+export NODE_ENV=production
 
+gulp client:compile-css --harmony
+node ./bin/server --harmony
diff --git a/ecosystem.json b/ecosystem.json
@@ -15,7 +15,8 @@
       "env_production": {
         "NODE_ENV":    "production",
         "SITE_HOST":   "http://nightly.javascript.ru",
-        "STATIC_HOST": "http://static-nightly.javascript.ru"
+        "STATIC_HOST": "http://static-nightly.javascript.ru",
+        "ASSET_VERSION":  "file"
       }
     }
   ],
diff --git a/edit b/edit
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-NODE_ENV=production gulp edit --harmony
+TUTORIAL_ROOT=/js/javascript-tutorial NODE_ENV=production gulp edit --harmony
 
diff --git a/gulpfile.js b/gulpfile.js
@@ -68,7 +68,7 @@ gulp.task("client:livereload", lazyRequireTask("./tasks/livereload", {
 }));
 
 gulp.task("tutorial:import:watch", lazyRequireTask('tutorial/tasks/importWatch', {
-  root: "/js/javascript-tutorial"
+  root: process.env.TUTORIAL_ROOT
 }));
 
 gulp.task("test", lazyRequireTask('./tasks/test', {
@@ -112,7 +112,8 @@ gulp.task('client:compile-css',
     src: './styles/base.styl',
     dst: './public/styles',
     publicDst: config.server.staticHost + '/styles/',  // from browser point of view
-    manifest: path.join(config.manifestRoot, 'styles.versions.json')
+    manifest: path.join(config.manifestRoot, 'styles.versions.json'),
+    assetVersioning: config.assetVersioning
   })
 );
 
diff --git a/hmvc/tutorial/client/index.js b/hmvc/tutorial/client/index.js
@@ -48,4 +48,4 @@ function initFolderList() {
   });
 }
 
-window.tutorial = module.exports;
+//window.tutorial = module.exports;
diff --git a/hmvc/tutorial/tasks/importWatch.js b/hmvc/tutorial/tasks/importWatch.js
@@ -9,8 +9,17 @@ const log = require('log')();
 module.exports = function(options) {
 
   return function(callback) {
+
+    if (!options.root) {
+      throw new Error("Import watch root is not provided");
+    }
+
     var root = fs.realpathSync(options.root);
 
+    if (!root) {
+      throw new Error("Import watch root does not exist " + options.root);
+    }
+
     var importer = new Importer({
       root:     root,
       onchange: function(path) {
diff --git a/modules/config/index.js b/modules/config/index.js
@@ -41,6 +41,9 @@ module.exports = {
 
   plnkrAuthId: secret.plnkrAuthId,
 
+  assetVersioning: env.ASSET_VERSIONING == 'file' ? 'file' :
+                   env.ASSET_VERSIONING == 'query' ? 'query' : null,
+
   mailer:       require('./mailer'),
   jade:         {
     basedir: path.join(process.cwd(), 'templates'),
diff --git a/modules/config/webpack.js b/modules/config/webpack.js
@@ -10,20 +10,26 @@ var ngAnnotatePlugin = require('ng-annotate-webpack-plugin');
 
 var del = require('del');
 
+function filenameTemplate(name) {
+  return config.assetVersioning == 'query' ? name + ".js?[hash]" :
+    config.assetVersioning == 'file' ? name + ".[hash].js" : name + ".js";
+}
+
 var webpackConfig = {
   output:     {
     // fs path
-    path:          './public/js',
+    path:       './public/js',
     // path as js sees it
-    publicPath:    '/js/',
+    publicPath: '/js/',
     // в dev-режиме файлы будут вида [name].js, но обращения - через [name].js?[hash], т.е. версия учтена
     // в prod-режиме не можем ?, т.к. CDN его обрезают, поэтому [hash] в имени
     //  (какой-то [hash] здесь необходим, иначе к chunk'ам типа 3.js, которые генерируются require.ensure,
     //  будет обращение без хэша при загрузке внутри сборки. при изменении - барузерный кеш их не подхватит)
-    filename:      isDevelopment ? "[name].js?[hash]" : "[name].[hash].js",
-    chunkFilename: isDevelopment ? "[id].js?[hash]" : "[id].[hash].js"
+    filename:   filenameTemplate("[name]"),
+
+    chunkFilename: filenameTemplate("[id]"),
     // the setting below does not work with CommonsChunkPlugin
-    //library:       '[name]'
+    library:       '[name]'
   },
   cache:      isDevelopment,
   watchDelay: 10,
@@ -82,7 +88,7 @@ var webpackConfig = {
       _: 'lodash'
     }),
     // any common chunks from entries go to head
-    new CommonsChunkPlugin("head", isDevelopment ? "head.js?[hash]" : "head.[hash].js"),
+    new CommonsChunkPlugin("head", filenameTemplate("head")),
     new WriteVersionsPlugin(path.join(config.manifestRoot, "js.versions.json")),
   ]
 };
@@ -109,9 +115,9 @@ if (isProduction) {
     new webpack.optimize.UglifyJsPlugin({
       compress: {
         // don't show unreachable variables etc
-        warnings: false,
+        warnings:     false,
         drop_console: true,
-        unsafe: true
+        unsafe:       true
       }
     })
   );
diff --git a/modules/lib/stylusAsset.js b/modules/lib/stylusAsset.js
@@ -14,7 +14,6 @@ module.exports = function(options) {
   return function(style) {
     var paths = style.options.paths || [];
 
-    var renderer = this;
     style.define('asset', function(url) {
       var literal = new nodes.Literal('url("' + url.val + '")');
 
@@ -30,9 +29,9 @@ module.exports = function(options) {
       var ext = path.extname(url.val);
       var filepath = url.val.slice(0, url.val.length - ext.length);
 
-      var newUrl = process.env.CSS_NO_HASH ? url.val :
-        (process.env.NODE_ENV == 'development') ? (url.val + '?' + version) :
-        filepath + '.v' + version + ext;
+      var newUrl = options.assetVersioning == 'query' ? (url.val + '?' + version) :
+        options.assetVersioning == 'file' ? (filepath + '.v' + version + ext) :
+          url.val;
 
       literal = new nodes.Literal('url("../i/' + newUrl + '")');
 
diff --git a/modules/setup/render.js b/modules/setup/render.js
@@ -73,7 +73,11 @@ function addStandardHelpers(locals, ctx) {
       version = Math.random().toString().slice(2);
       log.error("No version for " + publicPath);
     }
-    return config.server.staticHost + publicPath.replace('.', '.v' + version + '.');
+
+    var versionedPath = (config.assetVersioning == 'file') ? publicPath.replace('.', '.v' + version + '.') :
+      config.assetVersioning == 'query' ? (publicPath + '?' + version) : publicPath;
+
+    return config.server.staticHost + versionedPath;
   };
 
 
diff --git a/styles/blocks/font/font-icons.styl b/styles/blocks/font/font-icons.styl
@@ -1,5 +1,6 @@
 @font-face
 	font-family 'FontIcons'
+	//src asset('icons.otf');
 	src asset('icons.woff') format('woff'), asset('icons.otf') format("opentype");
 	font-weight normal
 	font-style normal
diff --git a/tasks/compileCss.js b/tasks/compileCss.js
@@ -24,7 +24,8 @@ module.exports = function(options) {
 
     var nib = require('nib')();
     var asset = require('lib/stylusAsset')({
-      getVersion: getAssetVersion
+      getVersion: getAssetVersion,
+      assetVersioning : options.assetVersioning
     });
 
     del.sync(options.dst + '/*');
@@ -50,12 +51,15 @@ module.exports = function(options) {
           var version = crypto.createHash('md5').update(file.contents).digest('hex').substring(0, 8);
           var name = path.basename(file.path).slice(0, -4);
 
-          if (process.env.NODE_ENV == 'production') {
+          if (options.assetVersioning == 'file') {
             file.path = file.path.replace(/\.css$/, '.' + version + '.css');
             versions[name] = options.publicDst + path.basename(file.path);
-          } else {
+          } else if (options.assetVersioning == 'query') {
             versions[name] = options.publicDst + path.basename(file.path) + '?' + version;
+          } else {
+            versions[name] = options.publicDst + path.basename(file.path);
           }
+
           //console.log(versions);
           cb(null, file);
         }))

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@`
`15`	`15`	`"env_production": {`
`16`	`16`	`"NODE_ENV": "production",`
`17`	`17`	`"SITE_HOST": "http://nightly.javascript.ru",`
`18`		`- "STATIC_HOST": "http://static-nightly.javascript.ru"`
	`18`	`+ "STATIC_HOST": "http://static-nightly.javascript.ru",`
	`19`	`+ "ASSET_VERSION": "file"`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`
`3`		`-NODE_ENV=production gulp edit --harmony`
	`3`	`+TUTORIAL_ROOT=/js/javascript-tutorial NODE_ENV=production gulp edit --harmony`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,4 @@ function initFolderList() {`
`48`	`48`	`});`
`49`	`49`	`}`
`50`	`50`
`51`		`-window.tutorial = module.exports;`
	`51`	`+//window.tutorial = module.exports;`