From 4d0a220b32508f1f3283c8c633bd59150fb5a939 Mon Sep 17 00:00:00 2001 From: Eli Van Zoeren Date: Sat, 27 May 2017 19:44:45 -0400 Subject: [PATCH 1/4] Use revved asset filenames in all template filetypes, not only .html --- gulpfile.js/tasks/rev/update-html.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js/tasks/rev/update-html.js b/gulpfile.js/tasks/rev/update-html.js index 5146ef688..560392376 100644 --- a/gulpfile.js/tasks/rev/update-html.js +++ b/gulpfile.js/tasks/rev/update-html.js @@ -7,7 +7,7 @@ var path = require('path') // 5) Update asset references in HTML gulp.task('update-html', function(){ var manifest = gulp.src(path.resolve(process.env.PWD, PATH_CONFIG.dest, "rev-manifest.json")) - return gulp.src(path.resolve(process.env.PWD, PATH_CONFIG.dest, PATH_CONFIG.html.dest, '**/*.html')) + return gulp.src(path.resolve(process.env.PWD, PATH_CONFIG.dest, PATH_CONFIG.html.dest, '**/*.{' + TASK_CONFIG.html.extensions + '}')) .pipe(revReplace({ manifest: manifest })) .pipe(gulp.dest(path.resolve(process.env.PWD, PATH_CONFIG.dest, PATH_CONFIG.html.dest))) }) From 52c22626db99ab103c40b2a127270d735c6b1bfb Mon Sep 17 00:00:00 2001 From: Eli Van Zoeren Date: Sun, 28 May 2017 08:20:00 -0400 Subject: [PATCH 2/4] Run "update-html" task on Twig and Handlebars files, as well as html --- gulpfile.js/tasks/rev/rev-assets.js | 2 +- gulpfile.js/tasks/rev/update-html.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gulpfile.js/tasks/rev/rev-assets.js b/gulpfile.js/tasks/rev/rev-assets.js index 12efbb844..9c331960a 100644 --- a/gulpfile.js/tasks/rev/rev-assets.js +++ b/gulpfile.js/tasks/rev/rev-assets.js @@ -6,7 +6,7 @@ var revNapkin = require('gulp-rev-napkin'); // 1) Add md5 hashes to assets referenced by CSS and JS files gulp.task('rev-assets', function() { // Ignore files that may reference assets. We'll rev them next. - var ignoreThese = '!' + path.resolve(process.env.PWD, PATH_CONFIG.dest,'**/*+(css|js|map|json|html)') + var ignoreThese = '!' + path.resolve(process.env.PWD, PATH_CONFIG.dest,'**/*+(css|js|map|json|html|hbs|twig)') return gulp.src([path.resolve(process.env.PWD, PATH_CONFIG.dest,'**/*'), ignoreThese]) .pipe(rev()) diff --git a/gulpfile.js/tasks/rev/update-html.js b/gulpfile.js/tasks/rev/update-html.js index 560392376..87b71b2b8 100644 --- a/gulpfile.js/tasks/rev/update-html.js +++ b/gulpfile.js/tasks/rev/update-html.js @@ -7,7 +7,10 @@ var path = require('path') // 5) Update asset references in HTML gulp.task('update-html', function(){ var manifest = gulp.src(path.resolve(process.env.PWD, PATH_CONFIG.dest, "rev-manifest.json")) - return gulp.src(path.resolve(process.env.PWD, PATH_CONFIG.dest, PATH_CONFIG.html.dest, '**/*.{' + TASK_CONFIG.html.extensions + '}')) - .pipe(revReplace({ manifest: manifest })) + return gulp.src(path.resolve(process.env.PWD, PATH_CONFIG.dest, PATH_CONFIG.html.dest, '**/*')) + .pipe(revReplace({ + manifest: manifest, + replaceInExtensions: ['.js', '.css', '.html', '.hbs', '.twig'] + })) .pipe(gulp.dest(path.resolve(process.env.PWD, PATH_CONFIG.dest, PATH_CONFIG.html.dest))) }) From f327f4107afc5bba089944047d65ad08b75bacfc Mon Sep 17 00:00:00 2001 From: Eli Van Zoeren Date: Sun, 28 May 2017 08:24:35 -0400 Subject: [PATCH 3/4] Adjust default gulp-rev-replace extensions whitelist to only template file types --- gulpfile.js/tasks/rev/update-html.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js/tasks/rev/update-html.js b/gulpfile.js/tasks/rev/update-html.js index 87b71b2b8..4d196db4b 100644 --- a/gulpfile.js/tasks/rev/update-html.js +++ b/gulpfile.js/tasks/rev/update-html.js @@ -10,7 +10,7 @@ gulp.task('update-html', function(){ return gulp.src(path.resolve(process.env.PWD, PATH_CONFIG.dest, PATH_CONFIG.html.dest, '**/*')) .pipe(revReplace({ manifest: manifest, - replaceInExtensions: ['.js', '.css', '.html', '.hbs', '.twig'] + replaceInExtensions: ['.html', '.hbs', '.twig', '.json'] })) .pipe(gulp.dest(path.resolve(process.env.PWD, PATH_CONFIG.dest, PATH_CONFIG.html.dest))) }) From 0291458ed268cb873b018024adc3ecdc84f23d40 Mon Sep 17 00:00:00 2001 From: Eli Van Zoeren Date: Tue, 19 Dec 2017 11:18:03 -0500 Subject: [PATCH 4/4] Include PHP files to support WordPress templates # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. --- gulpfile.js/tasks/rev/rev-assets.js | 2 +- gulpfile.js/tasks/rev/update-html.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gulpfile.js/tasks/rev/rev-assets.js b/gulpfile.js/tasks/rev/rev-assets.js index 9c331960a..b8a9b6a85 100644 --- a/gulpfile.js/tasks/rev/rev-assets.js +++ b/gulpfile.js/tasks/rev/rev-assets.js @@ -6,7 +6,7 @@ var revNapkin = require('gulp-rev-napkin'); // 1) Add md5 hashes to assets referenced by CSS and JS files gulp.task('rev-assets', function() { // Ignore files that may reference assets. We'll rev them next. - var ignoreThese = '!' + path.resolve(process.env.PWD, PATH_CONFIG.dest,'**/*+(css|js|map|json|html|hbs|twig)') + var ignoreThese = '!' + path.resolve(process.env.PWD, PATH_CONFIG.dest,'**/*+(css|js|map|json|html|php|hbs|twig)') return gulp.src([path.resolve(process.env.PWD, PATH_CONFIG.dest,'**/*'), ignoreThese]) .pipe(rev()) diff --git a/gulpfile.js/tasks/rev/update-html.js b/gulpfile.js/tasks/rev/update-html.js index a85a0baf0..ff33225e3 100644 --- a/gulpfile.js/tasks/rev/update-html.js +++ b/gulpfile.js/tasks/rev/update-html.js @@ -10,7 +10,7 @@ gulp.task('update-html', function(){ return gulp.src(path.resolve(process.env.PWD, PATH_CONFIG.dest, PATH_CONFIG.html.dest, '**/*')) .pipe(revReplace({ manifest: manifest, - replaceInExtensions: ['.html', '.hbs', '.twig', '.json'] + replaceInExtensions: ['.json', '.html', '.php', '.hbs', '.twig'] })) .pipe(gulp.dest(path.resolve(process.env.PWD, PATH_CONFIG.dest, PATH_CONFIG.html.dest))) })