mod-build 3.7.6 → 3.7.8

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.7.8
+
+- removed race condition from grab-cdn task.
+
 ## 3.7.6
 
 - Removing all the `!window.Modalytics.privacyPreferencesDetected` conditionals (as we are no longer moving forward with this integration).

package/gulp-tasks/grab-cdn.js

@@ -1,16 +1,19 @@
+/* globals Promise */
 var request = require('request');
 var source = require('vinyl-source-stream');
 
 // helper to allow us to define an "end" event to multiple streams
-function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName) {
+async function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName, index) {
 	var url = `https://${siteSettings.nodeEnv}${inputPath}`;
-
-	return new Promise(resolve => { // eslint-disable-line no-undef
+	return await new Promise(async function(resolve) { // eslint-disable-line no-undef
+		console.time(`${index + 1} Finished after`);
+		console.log(`${index + 1} Starting:`, url);
 		request(url)
-			.on('response', resp => {
+			.on('response', async function(resp) {
 				if (resp.statusCode !== 200) {
 					throw new Error(`Error fetching ${url}`);
 				}
+				console.timeEnd(`${index + 1} Finished after`);
 			})
 			.pipe(source(fileName))
 			.pipe(gulp.dest(`${siteSettings.srcFolder}/${destPath}`))
@@ -19,7 +22,7 @@ function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName)
 }
 
 module.exports = function(gulp, _gulpPlugins, siteSettings, siteData) {
-	return function() {
+	return async function() {
 		const { nodeEnv, isLocal } = siteSettings;
 		const { isQSPage, isWhiteLabel, domain } = siteData;
 		const isModWhiteLabel = isWhiteLabel && !isQSPage;
@@ -43,7 +46,7 @@ module.exports = function(gulp, _gulpPlugins, siteSettings, siteData) {
 		});
 
 		if (isModWhiteLabel || domainHasModernize) {
-			Object.assign(externalResources, {'/quote/resources/mod-site/templates/scripts/recaptcha.html': ['/templates/scripts/', 'recaptcha.html']});
+			Object.assign(externalResources, { '/quote/resources/mod-site/templates/scripts/recaptcha.html': ['/templates/scripts/', 'recaptcha.html'] });
 		}
 
 		// local dev files
@@ -67,13 +70,19 @@ module.exports = function(gulp, _gulpPlugins, siteSettings, siteData) {
 			]
 		});
 
-		const filesPromiseMap = Object.keys(externalResources).map(key => {
-			const destinationPath = externalResources[key][0];
-			const fileName = externalResources[key][1];
-			return streamToDestination(gulp, siteSettings, key, destinationPath, fileName);
-		});
+		const totalRequests = Object.keys(externalResources).length;
+		return await new Promise(async function(resolve) {
+			const sequentialRequests = async function(key, index) {
+				if (index === totalRequests) {
+					resolve();
+					return;
+				}
+				const destinationPath = externalResources[key][0];
+				const fileName = externalResources[key][1];
+				return await streamToDestination(gulp, siteSettings, key, destinationPath, fileName, index).then(() => sequentialRequests(Object.keys(externalResources)[index + 1], index + 1));
+			};
 
-		// when Promise.all resolves, the streams are done and we can go to the next step
-		return Promise.all(filesPromiseMap); // eslint-disable-line no-undef
+			sequentialRequests(Object.keys(externalResources)[0], 0);
+		});
 	};
 };

package/package.json

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