Merge branch 'release/4.1.0'

Author: Marco Solazzi

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "wok",
-  "version": "4.0.3",
+  "version": "4.1.0",
   "authors": [
     "Marco Solazzi <[email protected]>",
     "Matteo Guidotto <[email protected]>",

build/gulp-config/paths.js

@@ -2,23 +2,23 @@
 
 const srcRoot = 'application';
 const distRoot = 'public';
+const assetsPath = 'assets';
 
 const paths = {
 
     src: {
         root: srcRoot,
-        assets: srcRoot + '/assets',
+        assets: srcRoot + '/' + assetsPath,
         fixtures: srcRoot + '/fixtures',
         documents: srcRoot + '/documents',
         views: srcRoot + '/views'
     },
 
     dist: {
         root: distRoot, //where static files are to be saved
-        assets: distRoot + '/assets',
-        views: distRoot, //when working on with CMS, views may be stored in a diffrent folder
-        revmap: 'assets/assets-map.json', //map of revved files
-        usemin: distRoot  //path to views to be processed by usemin/htmlrefs
+        assets: distRoot + '/' + assetsPath,
+        views: distRoot, //when working on with CMS, views may be stored in a different folder
+        revmap: assetsPath + '/assets-map.json' //map of revved files
     },
 
     js: 'javascripts',

build/gulp-tasks/modernizr.js

@@ -6,14 +6,16 @@
 module.exports = function (gulp, $, options) {
 
     const defaultConfig = require('../gulp-config/modernizr.conf.json');
+    const paths = options.paths;
+    const tmpPath = options.assetsPath('dist.vendors').replace(paths.dist.root, paths.tmp);
 
     const distConfig = {
 
         cache: true,
 
         devFile: false,
 
-        dest: options.paths.tmp + '/assets/vendors/modernizr/modernizr.js',
+        dest: tmpPath + '/modernizr/modernizr.js',
 
         // Based on default settings on http://modernizr.com/download/
         options: defaultConfig.options,

build/gulp-tasks/views.js

@@ -18,7 +18,7 @@ module.exports = function (gulp, $, options) {
     const fixturesPath = path.join(process.cwd(), options.paths.src.fixtures);
 
 
-    var userRefPipe; //eslint-disable-line no-var
+    var useRef; //eslint-disable-line no-var
 
 
     baseData.PRODUCTION = options.production;
@@ -59,15 +59,16 @@ module.exports = function (gulp, $, options) {
 
         const styleFilter = $.filter('**/*.min.css', { restore: true });
         const jsFilter = $.filter('**/*.min.js', { restore: true });
+        const assetsFilter = $.filter(['**/*.*', '!**/' + options.viewmatch], { restore: true });
 
-        userRefPipe = require('lazypipe')()
+        useRef = require('lazypipe')()
             .pipe($.useref, {
                 types: ['css', 'js', 'replace', 'remove'],
                 searchPath: [paths.dist.root, paths.tmp],
                 //just replace src
-                replace: function (blockContent, target, attbs) {
-                    if (attbs) {
-                        return '<script src="' + target + '" ' + attbs + '></script>';
+                replace: function (blockContent, target, attrs) {
+                    if (attrs) {
+                        return '<script src="' + target + '" ' + attrs + '></script>';
                     }
                     return '<script src="' + target + '"></script>';
                 }
@@ -89,15 +90,20 @@ module.exports = function (gulp, $, options) {
             .pipe(() => {
                 const vendorRegexp = new RegExp(paths.vendors);
                 return $.if(vendorRegexp, $.header(options.banners.vendors, { pkg: options.pkg }));
-            });
+            })
+            .pipe(() => assetsFilter)
+            .pipe(gulp.dest, paths.dist.root)
+            .pipe(() => assetsFilter.restore);
 
     } else {
-        userRefPipe = $.util.noop;
+        useRef = $.util.noop;
     }
 
     gulp.task('views', () => {
 
         const data = {};
+        const htmlFilter = $.filter('**/' + options.viewmatch, { restore: true });
+
 
         glob.sync('{,*/}*.json', { cwd: fixturesPath }).forEach((filename) => {
             const id = _.camelCase(filename.toLowerCase().replace('.json', ''));
@@ -109,11 +115,13 @@ module.exports = function (gulp, $, options) {
                 errorHandler: $.notify.onError('Error: <%= error.message %>')
             }))
             .pipe(map((code) => env.renderString(code, Object.assign({}, baseData, data || {}))))
-            .pipe(userRefPipe())
+            .pipe(useRef())
             .pipe($.rename((filepath) => {
                 filepath.basename = filepath.basename.replace('.nunj', ''); //eslint-disable-line no-param-reassign
             }))
+            .pipe(htmlFilter)
             .pipe(gulp.dest(paths.dist.views))
+            .pipe(htmlFilter.restore)
             .pipe($.if(options.production, $.rev.manifest(path.join(paths.dist.root, paths.dist.revmap), { merge: true })))
             .pipe($.if(options.production, gulp.dest('.')))
             .pipe($.if(options.isWatching, $.notify({ message: 'Views rendered', onLast: true })));

package.json

@@ -1,7 +1,7 @@
 {
   "name": "wok",
   "description": "A Static Website Boilerplate",
-  "version": "4.0.3",
+  "version": "4.1.0",
   "license": "MIT",
   "repository": {
     "type": "git",