From c2bad1843c4dc7f1cdbf561c844e3908cf5669c0 Mon Sep 17 00:00:00 2001 From: Dan Mindru Date: Fri, 19 Aug 2016 19:42:23 +0200 Subject: [PATCH] #12 Get rid of wrench in favor of fs & fs-extra --- .nvmrc | 1 + gulpfile.js | 6 +-- package.json | 11 ++--- tasks/build.js | 129 +++++++++++++++++++++++++++---------------------- 4 files changed, 79 insertions(+), 68 deletions(-) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..34ae020 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v5 \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 9ba6135..d003295 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,7 +1,7 @@ 'use strict'; var gulp = require('gulp'), - wrench = require('wrench'), + fs = require('fs'), plumber = require('gulp-plumber'); var options = { @@ -17,8 +17,8 @@ var options = { * Look for .js & .coffee files. * Each file should correspond to a task. */ -wrench - .readdirSyncRecursive('./tasks') +fs + .readdirSync('./tasks') .filter(function readJSFiles(file) { return (/\.(js|coffee)$/i).test(file); }) diff --git a/package.json b/package.json index 18c98e3..2679a01 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "responsive-html-email-signature", - "version": "4.0.0-rc.1", + "version": "4.0.0-rc.2", "description": "Responsive template for email signatures", "main": "index.js", "scripts": { @@ -22,9 +22,10 @@ "url": "https://github.com/fadeit/responsive-html-email-signature/issues" }, "homepage": "https://github.com/fadeit/responsive-html-email-signature#readme", - "devDependencies": { + "dependencies": { "autoprefixer": "^6.3.6", "del": "^2.2.0", + "fs-extra": "^0.30.0", "gulp": "~3.9.1", "gulp-autoprefixer": "^3.1.0", "gulp-david": "~0.4.2", @@ -38,8 +39,6 @@ "gulp-preprocess": "~2.0.0", "gulp-rename": "^1.2.2", "gulp-sass": "^2.3.1", - "q": "~1.4.1", - "wrench": "~1.5.8" - }, - "dependencies": {} + "q": "~1.4.1" + } } diff --git a/tasks/build.js b/tasks/build.js index 5370640..bbde09b 100644 --- a/tasks/build.js +++ b/tasks/build.js @@ -6,83 +6,94 @@ var gulp = require('gulp'), minifyInline = require('gulp-minify-inline'), preprocess = require('gulp-preprocess'), rename = require('gulp-rename'), - wrench = require('wrench'), + fsx = require('fs-extra'), + fs = require('fs'), Q = require('q'), del = require('del'), inlineimg = require('gulp-inline-image-html'); function buildTask(options){ gulp.task('build', ['dupe', 'less', 'sass', 'postcss'], function build() { - var promises = []; - /** Makes templates for a given directory & its configurations. * @function makeTemplates * @param {String} dir Directory to make templates from. * @param {Array} confItems A list of configurations objects (usually persons) to make templates from. */ function makeTemplates(dir, confItems){ - confItems - .forEach(function handleConf(conf){ - var cwd = options.workingDir + '/' + dir; + confItems.forEach(function handleConf(conf){ + var cwd = options.workingDir + '/' + dir; + var stylesheets = []; - /** - * Find stylesheets relative to the CWD & generate tags. - * This way we can automagically inject them into . - */ - conf.stylesheets = wrench - .readdirSyncRecursive(cwd) - .filter(function filterFiles(file) { - /* Read only CSS files. */ - return (file.match(/.*\.css/)) ? file : false; - }) - .reduce(function(prev, current, index, acc){ - return prev += ''; - }, ''); + /** + * Find stylesheets relative to the CWD & generate tags. + * This way we can automagically inject them into . + */ + fsx + .walk(cwd) + .on('readable', function walkTemplateDir() { + var stylesheet; - options - .src([cwd + '/**/*.html', '!' + cwd + '/**/*.inc.html']) - .pipe(preprocess({ - context: conf - })) - .pipe(inlineimg(cwd)) - .pipe(inlineCss({ - applyTableAttributes: true, - applyWidthAttributes: true, - preserveMediaQueries: true, - removeStyleTags: false - })) - .pipe(minifyHTML({quotes: true})) - .pipe(minifyInline()) - .pipe(rename(function rename(path){ - path.dirname = dir; - path.basename += '-' + conf.id; - return path; - })) - .pipe(gulp.dest(options.dist)); - }); + while (stylesheet = this.read()) { + var relativePath = __dirname.substring(0, __dirname.lastIndexOf('/')) + '/tmp/' + dir; + stylesheets.push(stylesheet.path.replace(relativePath, '')); + } + }) + .on('end', function finishedTemplateDirWalk() { + conf.stylesheets = stylesheets + .filter(function filterFiles(file) { + /* Read only CSS files. */ + return (file.match(/.*\.css/)) ? true : false; + }) + .reduce(function(prev, current, index, acc){ + return prev += ''; + }, ''); + + options + .src([cwd + '/**/*.html', '!' + cwd + '/**/*.inc.html']) + .pipe(preprocess({ + context: conf + })) + .pipe(inlineimg(cwd)) + .pipe(inlineCss({ + applyTableAttributes: true, + applyWidthAttributes: true, + preserveMediaQueries: true, + removeStyleTags: false + })) + .pipe(minifyHTML({quotes: true})) + .pipe(minifyInline()) + .pipe(rename(function rename(path){ + path.dirname = dir; + path.basename += '-' + conf.id; + return path; + })) + .pipe(gulp.dest(options.dist)); + }) + }); } /** Clean up & then read 'src' to generate templates (build entry point). */ - del(options.dist).then(function buildStart(){ - /** - * Loop through dirs and load their conf files. - * Promisify all 'makeTemplate' calls and when resolved, make a call to the task `cb` to let gulp know we're done. - */ - wrench - .readdirSyncRecursive('./' + options.workingDir) - .filter(function filterFiles(file) { - /* Read only folders, skip files. */ - return (!file.match('/') && !file.match(/^\.+/g)) ? file : false; - }) - .forEach(function readConfigurations(dir){ - /** NB: For 'watch' to properly work, the cache needs to be deleted before each require. */ - var confPath = './../' + options.workingDir + '/' + dir + '/conf.js'; - delete require.cache[require.resolve(confPath)]; - promises.push(makeTemplates(dir, require(confPath))); - }); + del(options.dist) + .then(function buildStart(){ + /** + * Loop through dirs and load their conf files. + * Promisify all 'makeTemplate' calls and when resolved, make a call to the task (`cb`) to let gulp know we're done. + */ + var files = []; + var promises = []; - Q.all(promises); - }); + fs + .readdirSync('./' + options.workingDir) + .forEach(function readConfigurations(dir){ + /** NB: For 'watch' to properly work, the cache needs to be deleted before each require. */ + var confPath = '../tmp/' + dir + '/conf.js'; + delete require.cache[require.resolve(confPath)]; + promises.push(makeTemplates(dir, require(confPath))); + }); + + + Q.all(promises); + }); }); }