mod-build 3.6.8 → 3.6.9--beta.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.9
+
+- Adding `footer-component` JS + CSS & `abandonment` JS + CSS to the `grab-shared-scripts` gulp task. It will copy local versions into the site's `resources/` folder & then update the src or href as needed. `cache-bust` will also ignore the entire resources folder.
+
 ## 3.6.8
 
 - Adding a new `useRelativePathForResources` parameter for special use-cases that need to use a relative path for shared scripts (ie. the improvementcenter pages)

package/gulp-tasks/cache-bust.js

@@ -3,8 +3,8 @@ module.exports = function(gulp, gulpPlugins, siteSettings) {
 	return function() {
 		return gulp.src(siteSettings.distFolder + '/**')
 			.pipe(gulpPlugins.revAll.revision({
-				dontRenameFile: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g, /.*modalytics.*/],
-				dontUpdateReference: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g, /.*modalytics.*/],
+				dontRenameFile: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g, /(resources)\/.*/],
+				dontUpdateReference: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g, /(resources)\/.*/],
 				transformFilename: function (file, hash) {
 					var ext = path.extname(file.path);
 					return path.basename(file.path, ext) + '-' + hash.substr(0, 8) + ext;

package/gulp-tasks/grab-shared-scripts.js

@@ -6,8 +6,13 @@ var tap = require('gulp-tap');
 var path = require('path');
 
 var modAlyticsFileName = '';
+var modUtilsFileName = '';
+var abandonmentJsFileName = '';
+var footerComponentJsFileName = '';
+var modFooterStylesFileName = '';
+var qsFooterStylesFileName = '';
 
-function replaceModalyticsSrcInHead(gulp, gulpPlugins, siteSettings, siteData) {
+function replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData) {
 	if (siteData.siteData && siteData.siteData.isQuotePage === true || siteData.siteData && siteData.siteData.useRelativePathForResources === true) {
 		return gulp.src(siteSettings.srcFolder + '/shared-components/head/head.html')
 		.pipe(replace(/".*(modalytics).*"/, '"resources/scripts/mod-alytics/' + modAlyticsFileName + '"'))
@@ -19,7 +24,71 @@ function replaceModalyticsSrcInHead(gulp, gulpPlugins, siteSettings, siteData) {
 	}
 }
 
-function copyCurrentModalytics(gulp, gulpPlugins, siteSettings, siteData) {
+function replaceModutilsSrc(gulp, gulpPlugins, siteSettings, siteData) {
+	if (siteData.siteData && siteData.siteData.isQuotePage === true || siteData.siteData && siteData.siteData.useRelativePathForResources === true) {
+		return gulp.src(siteSettings.srcFolder + '/shared-components/foot-assets/foot-assets.html')
+		.pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"/, '"resources/scripts/mod-utils/' + modUtilsFileName + '"'))
+		.pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/foot-assets'));
+	} else {
+		return gulp.src(siteSettings.srcFolder + '/shared-components/foot-assets/foot-assets.html')
+		.pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"/, '"/resources/scripts/mod-utils/' + modUtilsFileName + '"'))
+		.pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/foot-assets'));
+	}
+}
+
+function replaceAbandonmentJsSrc(gulp, gulpPlugins, siteSettings, siteData) {
+	if (siteData.siteData && siteData.siteData.isQuotePage === true || siteData.siteData && siteData.siteData.useRelativePathForResources === true) {
+		return gulp.src(siteSettings.srcFolder + '/templates/abandonment/*.html')
+		.pipe(replace(/"(?:(?!"|")[\s\S])+(abandonment\/abandonment.*?)js"/, '"resources/scripts/abandonment/' + abandonmentJsFileName + '"'))
+		.pipe(gulp.dest(siteSettings.srcFolder + '/templates/abandonment'));
+	} else {
+		return gulp.src(siteSettings.srcFolder + '/templates/abandonment/*.html')
+		.pipe(replace(/"(?:(?!"|")[\s\S])+(abandonment\/abandonment.*?)js"/, '"/resources/scripts/abandonment/' + abandonmentJsFileName + '"'))
+		.pipe(gulp.dest(siteSettings.srcFolder + '/templates/abandonment'));
+	}
+}
+
+function replaceFooterComponentJsSrc(gulp, gulpPlugins, siteSettings, siteData) {
+	if (siteData.siteData && siteData.siteData.isQuotePage === true || siteData.siteData && siteData.siteData.useRelativePathForResources === true) {
+		return gulp.src(siteSettings.srcFolder + '/shared-components/foot-assets/foot-assets.html')
+		.pipe(replace(/"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"/, '"resources/scripts/footer/' + footerComponentJsFileName + '"'))
+		.pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/foot-assets'));
+	} else {
+		return gulp.src(siteSettings.srcFolder + '/shared-components/foot-assets/foot-assets.html')
+		.pipe(replace(/"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"/, '"/resources/scripts/footer/' + footerComponentJsFileName + '"'))
+		.pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/foot-assets'));
+	}
+}
+
+function replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData) {
+	if (siteData.siteData && siteData.siteData.isQuotePage === true || siteData.siteData && siteData.siteData.useRelativePathForResources === true) {
+		return gulp.src(siteSettings.srcFolder + '/resources/scripts/footer/' + footerComponentJsFileName)
+		.pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/mod.*?)\)/, 'concat("resources/styles/components/footer/' + modFooterStylesFileName + '")'))
+		.pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/qs.*?)\)/, 'concat("resources/styles/components/footer/' + qsFooterStylesFileName + '")'))
+		.pipe(gulp.dest(siteSettings.srcFolder + '/resources/scripts/footer'));
+	} else {
+		return gulp.src(siteSettings.srcFolder + '/resources/scripts/footer/' + footerComponentJsFileName)
+		.pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/mod.*?)\)/, 'concat("/resources/styles/components/footer/' + modFooterStylesFileName + '")'))
+		.pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/qs.*?)\)/, 'concat("/resources/styles/components/footer/' + qsFooterStylesFileName + '")'))
+		.pipe(gulp.dest(siteSettings.srcFolder + '/resources/scripts/footer'))
+	}
+}
+
+function replaceFooterStylesReferenceInMap(gulp, gulpPlugins, siteSettings, siteData) {
+	if (siteData.siteData && siteData.siteData.isQuotePage === true || siteData.siteData && siteData.siteData.useRelativePathForResources === true) {
+		return gulp.src(siteSettings.srcFolder + '/resources/scripts/footer/footer-component.min.js.map')
+		.pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/mod.*?)\`/, '`resources/styles/components/footer/' + modFooterStylesFileName + '`'))
+		.pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/qs.*?)\`/, '`resources/styles/components/footer/' + qsFooterStylesFileName + '`'))
+		.pipe(gulp.dest(siteSettings.srcFolder + '/resources/scripts/footer'));
+	} else {
+		return gulp.src(siteSettings.srcFolder + '/resources/scripts/footer/footer-component.min.js.map')
+		.pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/mod.*?)\`/, '`/resources/styles/components/footer/' + modFooterStylesFileName + '`'))
+		.pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/mod.*?)\`/, '`/resources/styles/components/footer/' + qsFooterStylesFileName + '`'))
+		.pipe(gulp.dest(siteSettings.srcFolder + '/resources/scripts/footer'));
+	}
+}
+
+function copyModalytics(gulp, gulpPlugins, siteSettings, siteData) {
 	return new Promise(resolve => {
 		request(`https://${siteSettings.nodeEnv}/quote/resources/mod-alytics/modalytics.min.js`)
 			.on('response', resp => {
@@ -45,7 +114,7 @@ function copyCurrentModalytics(gulp, gulpPlugins, siteSettings, siteData) {
 					if (resp.statusCode !== 200) {
 						throw new Error(`${resp.statusCode} Error while fetching modalytics.min.js.map`);
 					} else {
-						replaceModalyticsSrcInHead(gulp, gulpPlugins, siteSettings, siteData);
+						replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData);
 					}
 				})
 				.pipe(source('modalytics.min.js.map'))
@@ -54,6 +123,160 @@ function copyCurrentModalytics(gulp, gulpPlugins, siteSettings, siteData) {
 		});
 	});
 }
+
+function copyModutils(gulp, gulpPlugins, siteSettings, siteData) {
+	return new Promise(resolve => {
+		request(`https://${siteSettings.nodeEnv}/quote/resources/mod-utils/modutils.min.js`)
+			.on('response', resp => {
+				if (resp.statusCode !== 200) {
+					throw new Error(`${resp.statusCode} Error while fetching modutils.min.js`);
+				}
+			})
+			.pipe(source('modutils.min.js'))
+			.pipe(hash({
+				hashLength: 20,
+				template: 'modutils-<%= hash %>.min.js'
+			}))
+			.pipe(tap(function(file, t){
+				modUtilsFileName = path.basename(file.path);
+			}))
+			.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/mod-utils`))
+			.on('finish', resolve);
+	})
+	.then(() => {
+		return new Promise(resolve => {
+			request(`https://${siteSettings.nodeEnv}/quote/resources/mod-utils/modutils.min.js.map`)
+				.on('response', resp => {
+					if (resp.statusCode !== 200) {
+						throw new Error(`${resp.statusCode} Error while fetching modutils.min.js.map`);
+					} else {
+						replaceModutilsSrc(gulp, gulpPlugins, siteSettings, siteData);
+					}
+				})
+				.pipe(source('modutils.min.js.map'))
+				.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/mod-utils`))
+				.on('finish', resolve);
+		});
+	});
+}
+
+function copyAbandonmentJs(gulp, gulpPlugins, siteSettings, siteData) {
+	return new Promise(resolve => {
+		request(`https://${siteSettings.nodeEnv}/quote/resources/shared-resources/scripts/abandonment/abandonment.min.js`)
+			.on('response', resp => {
+				if (resp.statusCode !== 200) {
+					throw new Error(`${resp.statusCode} Error while fetching abandonment.min.js`);
+				}
+			})
+			.pipe(source('abandonment.min.js'))
+			.pipe(hash({
+				hashLength: 20,
+				template: 'abandonment-<%= hash %>.min.js'
+			}))
+			.pipe(tap(function(file, t){
+				abandonmentJsFileName = path.basename(file.path);
+			}))
+			.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/abandonment`))
+			.on('finish', resolve);
+	})
+	.then(() => {
+		return new Promise(resolve => {
+			request(`https://${siteSettings.nodeEnv}/quote/resources/shared-resources/scripts/abandonment/abandonment.min.js.map`)
+				.on('response', resp => {
+					if (resp.statusCode !== 200) {
+						throw new Error(`${resp.statusCode} Error while fetching abandonment.min.js.map`);
+					} else {
+						replaceAbandonmentJsSrc(gulp, gulpPlugins, siteSettings, siteData);
+					}
+				})
+				.pipe(source('abandonment.min.js.map'))
+				.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/abandonment`))
+				.on('finish', resolve);
+		});
+	});
+}
+
+function copyFooterComponentJs(gulp, gulpPlugins, siteSettings, siteData) {
+	return new Promise(resolve => {
+		request(`https://${siteSettings.nodeEnv}/quote/resources/shared-resources/scripts/footer/footer-component.min.js`)
+			.on('response', resp => {
+				if (resp.statusCode !== 200) {
+					throw new Error(`${resp.statusCode} Error while fetching footer-component.min.js`);
+				}
+			})
+			.pipe(source('footer-component.min.js'))
+			.pipe(hash({
+				hashLength: 20,
+				template: 'footer-component-<%= hash %>.min.js'
+			}))
+			.pipe(tap(function(file, t){
+				footerComponentJsFileName = path.basename(file.path);
+			}))
+			.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/footer`))
+			.on('finish', resolve);
+	})
+	.then(() => {
+		return new Promise(resolve => {
+			request(`https://${siteSettings.nodeEnv}/quote/resources/shared-resources/scripts/footer/footer-component.min.js.map`)
+				.on('response', resp => {
+					if (resp.statusCode !== 200) {
+						throw new Error(`${resp.statusCode} Error while fetching footer-component.min.js.map`);
+					} else {
+						replaceFooterComponentJsSrc(gulp, gulpPlugins, siteSettings, siteData);
+					}
+				})
+				.pipe(source('footer-component.min.js.map'))
+				.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/footer`))
+				.on('finish', resolve);
+		});
+	});
+}
+
+function copyFooterComponentStyles(gulp, gulpPlugins, siteSettings, siteData) {
+	return new Promise(resolve => {
+		request(`https://${siteSettings.nodeEnv}/quote/resources/shared-resources/styles/components/footer/mod-footer.min.css`)
+			.on('response', resp => {
+				if (resp.statusCode !== 200) {
+					throw new Error(`${resp.statusCode} Error while fetching mod-footer.min.css`);
+				}
+			})
+			.pipe(source('mod-footer.min.css'))
+			.pipe(hash({
+				hashLength: 20,
+				template: 'mod-footer-<%= hash %>.min.css'
+			}))
+			.pipe(tap(function(file, t){
+				modFooterStylesFileName = path.basename(file.path);
+			}))
+			.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/styles/components/footer`))
+			.on('finish', resolve);
+	})
+	.then(() => {
+		return new Promise(resolve => {
+			request(`https://${siteSettings.nodeEnv}/quote/resources/shared-resources/styles/components/footer/qs-footer.min.css`)
+				.on('response', resp => {
+					if (resp.statusCode !== 200) {
+						throw new Error(`${resp.statusCode} Error while fetching qs-footer.min.css`);
+					}
+				})
+				.pipe(source('qs-footer.min.css'))
+				.pipe(hash({
+					hashLength: 20,
+					template: 'qs-footer-<%= hash %>.min.css'
+				}))
+				.pipe(tap(function(file, t){
+					qsFooterStylesFileName = path.basename(file.path);
+				}))
+				.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/styles/components/footer`))
+				.on('finish', resolve);
+		});
+	})
+	.then(() => {
+		replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData);
+		replaceFooterStylesReferenceInMap(gulp, gulpPlugins, siteSettings, siteData);
+	});
+}
+
 module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	return function() {
 		const { nodeEnv } = siteSettings;
@@ -61,6 +284,6 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			throw new Error('Missing environment variables. Did you start with gulp instead of npm run...?');
 		}
 
-		return copyCurrentModalytics(gulp, gulpPlugins, siteSettings, siteData);
+		return copyModalytics(gulp, gulpPlugins, siteSettings, siteData) && copyAbandonmentJs(gulp, gulpPlugins, siteSettings, siteData) && copyFooterComponentJs(gulp, gulpPlugins, siteSettings, siteData) && copyFooterComponentStyles(gulp, gulpPlugins, siteSettings, siteData) && copyModutils(gulp, gulpPlugins, siteSettings, siteData);
 	};
 };

package/package.json

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