mod-build 3.6.10 → 3.6.11

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.11
+
+- Adding `mod-form` & `qs-form` to the `grab-shared-scripts` gulp task. It will copy these files into the site's `resources/scripts/mod-form` folder & then update the src for both in the `foot-assets` shared component.
+
 ## 3.6.10
 
 - Adding `modutils` JS to the `grab-shared-scripts` gulp task. It will copy this version into the site's `resources/scripts/mod-utils` folder & then update the src in the `foot-assets` shared component.

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

@@ -11,11 +11,13 @@ var abandonmentJsFileName = '';
 var footerComponentJsFileName = '';
 var modFooterStylesFileName = '';
 var qsFooterStylesFileName = '';
+var modFormFileName = '';
+var qsFormFileName = '';
 
 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 + '"'))
+		.pipe(replace(/".*(modalytics).*"/, '"{{#if this.src}}{{this.src}}{{/if}}resources/scripts/mod-alytics/' + modAlyticsFileName + '"'))
 		.pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/head'));
 	} else {
 		return gulp.src(siteSettings.srcFolder + '/shared-components/head/head.html')
@@ -24,14 +26,20 @@ function replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData) {
 	}
 }
 
-function replaceModutilsSrc(gulp, gulpPlugins, siteSettings, siteData) {
+function replaceFootAssetScripts(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(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"/, '"{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts/mod-utils/' + modUtilsFileName + '"'))
+		.pipe(replace(/"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"/, '"{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts/footer/' + footerComponentJsFileName + '"'))
+		.pipe(replace(/"(?:(?!"|")[\s\S])+(mod-form.*?)js"/, '"{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts/mod-form/' + modFormFileName + '"'))
+		.pipe(replace(/"(?:(?!"|")[\s\S])+(qs-form.*?)js"/, '"{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts/mod-form/' + qsFormFileName + '"'))
 		.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(replace(/"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"/, '"/resources/scripts/footer/' + footerComponentJsFileName + '"'))
+		.pipe(replace(/"(?:(?!"|")[\s\S])+(mod-form.*?)js"/, '"/resources/scripts/mod-form/' + modFormFileName + '"'))
+		.pipe(replace(/"(?:(?!"|")[\s\S])+(qs-form.*?)js"/, '"/resources/scripts/mod-form/' + qsFormFileName + '"'))
 		.pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/foot-assets'));
 	}
 }
@@ -48,18 +56,6 @@ function replaceAbandonmentJsSrc(gulp, gulpPlugins, siteSettings, siteData) {
 	}
 }
 
-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)
@@ -149,8 +145,6 @@ function copyModutils(gulp, gulpPlugins, siteSettings, siteData) {
 				.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'))
@@ -221,8 +215,6 @@ function copyFooterComponentJs(gulp, gulpPlugins, siteSettings, siteData) {
 				.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'))
@@ -232,6 +224,76 @@ function copyFooterComponentJs(gulp, gulpPlugins, siteSettings, siteData) {
 	});
 }
 
+function copyModForm(gulp, gulpPlugins, siteSettings, siteData) {
+	return new Promise(resolve => {
+		request(`https://${siteSettings.nodeEnv}/quote/resources/mod-form/mod-form.min.js`)
+			.on('response', resp => {
+				if (resp.statusCode !== 200) {
+					throw new Error(`${resp.statusCode} Error while fetching mod-form.min.js`);
+				}
+			})
+			.pipe(source('mod-form.min.js'))
+			.pipe(hash({
+				hashLength: 20,
+				template: 'mod-form-<%= hash %>.min.js'
+			}))
+			.pipe(tap(function(file, t){
+				modFormFileName = path.basename(file.path);
+			}))
+			.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/mod-form`))
+			.on('finish', resolve);
+	})
+	.then(() => {
+		return new Promise(resolve => {
+			request(`https://${siteSettings.nodeEnv}/quote/resources/mod-form/mod-form.min.js.map`)
+				.on('response', resp => {
+					if (resp.statusCode !== 200) {
+						throw new Error(`${resp.statusCode} Error while fetching mod-form.min.js.map`);
+					}
+				})
+				.pipe(source('mod-form.min.js.map'))
+				.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/mod-form`))
+				.on('finish', resolve);
+		});
+	});
+}
+
+function copyQsForm(gulp, gulpPlugins, siteSettings, siteData) {
+	return new Promise(resolve => {
+		request(`https://${siteSettings.nodeEnv}/quote/resources/mod-form/qs-form.min.js`)
+			.on('response', resp => {
+				if (resp.statusCode !== 200) {
+					throw new Error(`${resp.statusCode} Error while fetching qs-form.min.js`);
+				}
+			})
+			.pipe(source('qs-form.min.js'))
+			.pipe(hash({
+				hashLength: 20,
+				template: 'qs-form-<%= hash %>.min.js'
+			}))
+			.pipe(tap(function(file, t){
+				qsFormFileName = path.basename(file.path);
+			}))
+			.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/mod-form`))
+			.on('finish', resolve);
+	})
+	.then(() => {
+		return new Promise(resolve => {
+			request(`https://${siteSettings.nodeEnv}/quote/resources/mod-form/qs-form.min.js.map`)
+				.on('response', resp => {
+					if (resp.statusCode !== 200) {
+						throw new Error(`${resp.statusCode} Error while fetching qs-form.min.js.map`);
+					} else {
+						replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData);
+					}
+				})
+				.pipe(source('qs-form.min.js.map'))
+				.pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/mod-form`))
+				.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`)
@@ -284,6 +346,12 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			throw new Error('Missing environment variables. Did you start with gulp instead of npm run...?');
 		}
 
-		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);
+		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) &&
+		copyModForm(gulp, gulpPlugins, siteSettings, siteData) &&
+		copyQsForm(gulp, gulpPlugins, siteSettings, siteData);
 	};
 };

package/package.json

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