From 19ca4183a68fca64dbe1b5a65f82e88a2364b9a5 Mon Sep 17 00:00:00 2001 From: Philippe Bernard Date: Mon, 8 Aug 2016 11:02:13 +0200 Subject: [PATCH] Fix in HTML globbing, see https://github.com/RealFaviconGenerator/grunt-real-favicon/issues/30 --- Gruntfile.js | 4 ++-- README.md | 4 ++++ tasks/real_favicon.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index b1bc795..733685a 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -63,7 +63,7 @@ module.exports = function(grunt) { src: 'test/fixtures/sample_picture_2.png', dest: 'tmp/scenario_1', options: { - html: ['tmp/scenario_1/page1.html', 'tmp/scenario_1/page2.html', 'tmp/scenario_1/standalone.txt'], + html: ['tmp/scenario_1/page*.html', 'tmp/scenario_1/standalone.txt'], design: { desktopBrowser: {}, ios: { @@ -105,7 +105,7 @@ module.exports = function(grunt) { dest: 'tmp/scenario_2', options: { iconsPath: undefined, - html: ['tmp/scenario_2/page1.html', 'tmp/scenario_2/page2.html'], + html: ['tmp/scenario_2/page*.html'], settings: { scalingAlgorithm: 'NearestNeighbor' } diff --git a/README.md b/README.md index dcc9a95..f498e4a 100755 --- a/README.md +++ b/README.md @@ -21,6 +21,10 @@ In lieu of a formal styleguide, take care to maintain the existing coding style. ## Release History +### 0.1.7 + +- Fix in HTML globbing, see https://github.com/RealFaviconGenerator/grunt-real-favicon/issues/30 + ### 0.1.6 - Update peerDependencies to support Grunt 1.0. diff --git a/tasks/real_favicon.js b/tasks/real_favicon.js index 4782814..2f10c3a 100755 --- a/tasks/real_favicon.js +++ b/tasks/real_favicon.js @@ -97,7 +97,7 @@ module.exports = function(grunt) { throw error; } - async.each(html_files, function(file, callback) { + async.each(grunt.file.expand({nonull: true}, html_files), function(file, callback) { grunt.log.writeln("Process " + file); if (! grunt.file.exists(file)) {