mod-build 3.6.23-beta.2 → 3.6.24

package/gulp-tasks/build.js

@@ -10,7 +10,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			if (siteData.isQSPage) {
 				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'grab-theme-json', 'combine-files', 'grab-images', 'copy-json', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'copy-files-to-build-path', 'cache-bust', 'grab-tooltips-json', 'build-stat'];
 			} else {
-				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'combine-files', 'grab-images', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'grab-tooltips-json', 'build-stat'];
+				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'combine-files', 'grab-images', 'js-lint', 'html-min','grab-global-images', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'grab-tooltips-json', 'build-stat'];
 			}
 		} else {
 			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'build-stat'];

package/gulp-tasks/grab-global-images.js

@@ -0,0 +1,102 @@
+var fs = require('fs');
+var request = require('request');
+var source = require('vinyl-source-stream');
+var replace = require('gulp-replace');
+
+var images = [];
+
+function streamToDestination(gulp, siteSettings, url, fileName) {
+	var finalDestination;
+
+	if (!fs.existsSync(siteSettings.distFolder)) {
+		finalDestination = siteSettings.srcFolder;
+	} else {
+		finalDestination = siteSettings.distFolder;
+	}
+
+	return new Promise(resolve => { // eslint-disable-line no-undef
+		request(url)
+			.on('response', resp => {
+				if (resp.statusCode !== 200 && resp.statusCode !== 206) {
+					throw new Error(`${resp.statusCode} Error while fetching ${fileName}`);
+				} else {
+					images.push(fileName);
+				}
+			})
+			.pipe(source(fileName))
+			.pipe(gulp.dest(`${finalDestination}/resources/images/`))
+			.on('finish', resolve);
+	});
+}
+
+function replaceImagePath(gulp, siteSettings) {
+  var finalDestination;
+
+	if (!fs.existsSync(siteSettings.distFolder)) {
+		finalDestination = siteSettings.tmpFolder;
+	} else {
+		finalDestination = siteSettings.distFolder;
+  }
+
+  var stream = gulp.src(`${finalDestination}/index.html`);
+
+	if (images.length) {
+		images.forEach(function(image) {
+			stream = stream.pipe(replace(new RegExp(`"(?:(?!"|")[\\s\\S])+(${image})"`, 'gm'), '"/resources/images/' + image + '"'))
+		});
+	}
+	return stream.pipe(gulp.dest(finalDestination))
+}
+
+const getTags = (string) => {
+	const regExs = [/<img.*?src="(.*?)"[^\>]+>/g, /<use.*?href="(.*?)".*?>/g, /<source.*?srcset="(.*?)".*?>/g, /url\('#{\$path}.*?'\)/g];
+	let tags = [];
+
+	regExs.forEach((regEx) => {
+		const match = string.match(regEx);
+
+		if (match) {
+			tags = [...tags, ...match];
+		}
+	});
+
+	return tags;
+};
+
+const getUrls = (tags) => {
+	const urls = [];
+
+	tags.forEach((tag) => {
+		if (tag) {
+			let url = tag;
+			url = url.match(/(https?:\/\/[^\s]+)/gim);
+			if (url) {
+				url = url[0];
+				url = url.replace(/"/g, "")
+				urls.push(url)
+			}
+		}
+	});
+
+	return [...new Set(urls)]; // eslint-disable-line no-undef
+};
+
+const parseImageSources = (gulp, siteSettings) => {
+	const text = fs.readFileSync(`${siteSettings.tmpFolder}/index.html`, 'utf8');
+	const textMatches = getTags(text);
+	return getUrls(textMatches);
+};
+
+module.exports = function(gulp, siteSettings, siteData) {
+	return async function() {
+		const urls = parseImageSources(gulp, siteSettings);
+		const urlsPromises = urls.map(async(url) => {
+			const fileName = await url.slice(url.lastIndexOf('/') + 1);
+			return await streamToDestination(gulp, siteSettings, url, fileName);
+		});
+
+		return await Promise.all(urlsPromises).then(function() {  // eslint-disable-line no-undef
+			replaceImagePath(gulp, siteSettings)
+		})
+	};
+};

package/gulp-tasks/serve.js

@@ -8,7 +8,7 @@ module.exports.src = function(gulp, gulpPlugins, siteSettings, siteData) {
 		} else if (siteData.isQSPage) {
 			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'grab-theme-json', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
 		} else {
-			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'grab-tooltips-json', 'combine-files', 'grab-images','grab-global-images', 'js-lint'];
 		}
 		runSequence(...sequenceOpts, () => {
 			// Run a BrowserSync server
@@ -36,7 +36,13 @@ module.exports.src = function(gulp, gulpPlugins, siteSettings, siteData) {
 			]).on('change', gulpPlugins.browserSync.reload);
 
 			// If templates changed, rerun templates task
-			gulp.watch(siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/**/*.html', ['templates']);
+			if (!siteData.useTypescript && !siteData.isQSPage) {
+				gulp.watch(siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/**/*.html', function() {
+					runSequence('templates','grab-global-images')
+				});
+			} else {
+				gulp.watch(siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/**/*.html', ['templates'])
+			}
 
 			// If styles changed, rerun styles task
 			gulp.watch(siteSettings.srcFolder + '/' + siteSettings.stylesSubfolder + '/**/*.scss', ['styles']);

package/gulp-tasks/tasks.js

@@ -346,6 +346,18 @@ module.exports = function() {
 
 				return require(opts.gulpTasksFolderPath + '/grab-images')(opts.gulp, opts.gulpSettings, opts.siteData);
 			}
+    },
+
+		// Get global images
+		'grab-global-images': {
+			subtasks: [],
+			func: function(opts) {
+				if ('undefined' === typeof opts.gulpTasksFolderPath) {
+					opts.gulpTasksFolderPath = '.';
+				}
+
+				return require(opts.gulpTasksFolderPath + '/grab-global-images')(opts.gulp, opts.gulpSettings, opts.siteData);
+			}
 		},
 
 		// Copy json files to dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.23-beta.2",
+  "version": "3.6.24",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/data/seasons.js

@@ -1,6 +1,6 @@
 var seasons = {
 	"warmerWeather": {
-		"firstDay": "03-14",
+		"firstDay": "04-14",
 		"lastDay": "09-25"
 	}
 }