mod-build 3.6.61-beta.1 → 3.6.61-beta.10

package/CHANGELOG.md

@@ -2,8 +2,11 @@
 
 ## 3.6.61
 
-- added functionality to increase the fileInclude maxRecursion value from site level
-- fixed bug in `templates` task. It was not completing as expected.
+- Adding the accessible components to the `grab-shared-components` task; As well as pulling the accessible `defaultFormFieldConfig` for the new template.js configuration (& merging to the new template stucture appropriately);
+
+## 3.6.60
+
+- Adding consoles allllll throughout the `grab-shared-scripts` task. It is still breaking down somewhere; and the first step to trying to force-fail our builds is figure out where the issue is
 
 ## 3.6.59
 
@@ -19,6 +22,7 @@
 - adding `!window.Modalytics.privacyPreferencesDetected` conditional to check privacy settings to not load Heap for modernize.com
 
 ## 3.6.55
+
 - Added conditional to check if `siteData` is empty — so our  `fetchTcpaFromSitegenie()` and `getDefaultFormFieldConfig()` functions won't try to run on modify.modernize.com
 
 ## 3.6.54

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

@@ -1,31 +1,33 @@
 var request = require('request');
 var source = require('vinyl-source-stream');
 
-function streamSharedCompsToDestination(gulp, siteSettings, fileName) {
-	return new Promise(resolve => { // eslint-disable-line no-undef
-		request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/shared-components/${fileName}`)
+function streamSharedCompsToDestination(gulp, siteSettings, folder, fileName) {
+	return new Promise(resolve => {
+		request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/${folder}/${fileName}`)
 			.on('response', resp => {
 				if (resp.statusCode !== 200) {
 					throw new Error(`${resp.statusCode} Error while fetching ${fileName}`);
 				}
 			})
 			.pipe(source(fileName))
-			.pipe(gulp.dest(`${siteSettings.srcFolder}/shared-components/`))
+			.pipe(gulp.dest(`${siteSettings.srcFolder}/${folder}/`))
 			.on('finish', resolve);
 	});
 }
 
-function getListOfSharedComponents(gulp, gulpPlugins, siteSettings) {
-	return new Promise(resolve => { // eslint-disable-line no-undef
-		request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/shared-components/all.json`, function(err, resp, body) {
-			if (resp.statusCode !== 200) {
-				throw new Error(`${resp.statusCode}: Error while fetching shared-components/all.json`);
-			}
-			var listOfComponents = JSON.parse(body);
-			const componentPromises = listOfComponents.map(function(resource) {
-				return streamSharedCompsToDestination(gulp, siteSettings, `${resource}`);
+function getListOfSharedComponents(gulp, gulpPlugins, siteSettings, componentFolders) {
+	return componentFolders.map(folder => {
+		return new Promise(resolve => {
+			request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/${folder}/all.json`, function(err, resp, body) {
+				if (resp.statusCode !== 200) {
+					throw new Error(`${resp.statusCode}: Error while fetching ${folder}/all.json`);
+				}
+				var listOfComponents = JSON.parse(body);
+				const componentPromises = listOfComponents.map(function(resource) {
+					return streamSharedCompsToDestination(gulp, siteSettings, folder, `${resource}`);
+				});
+				resolve(Promise.all(componentPromises));
 			});
-			resolve(Promise.all(componentPromises)); // eslint-disable-line no-undef
 		});
 	});
 }
@@ -37,6 +39,8 @@ module.exports = function(gulp, gulpPlugins, siteSettings) {
 			throw new Error('Missing environment variables. Did you start with gulp instead of npm run...?');
 		}
 
-		return getListOfSharedComponents(gulp, gulpPlugins, siteSettings); // eslint-disable-line no-undef
+		const componentFolders = ['shared-components', 'accessible-components']
+
+		return getListOfSharedComponents(gulp, gulpPlugins, siteSettings, componentFolders);
 	};
 };

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

@@ -18,29 +18,34 @@ const fileNames = {
 var isQuotePageOrUseRelativePath = false;
 var resourceURL = '';
 var pathSubdirectory = '';
+var componentFolderPath = '';
 
 function replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData) {
   const resourcePath = isQuotePageOrUseRelativePath ? `${pathSubdirectory}{{#if this.src}}{{this.src}}{{/if}}resources/scripts/mod-alytics/` : '/resources/scripts/mod-alytics/';
-  return gulp.src(siteSettings.srcFolder + '/shared-components/head/head.html')
+  console.log(`>> VARIABLE modAlyticsFileName = ${fileNames.modAlyticsFileName}`)
+  return gulp.src(`${siteSettings.srcFolder}/${componentFolderPath}/head/head.html`)
     .pipe(replace(/".*(modalytics).*"/, `"${resourcePath}${fileNames.modAlyticsFileName}"`))
-    .pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/head'));
+    .pipe(gulp.dest(`${siteSettings.srcFolder}/${componentFolderPath}/head`));
 }
 function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
-  console.log('>> STARTING Replacing Foot Asset Scripts');
+  console.log('>> STARTING replacing foot asset scripts');
   const resourcePath = isQuotePageOrUseRelativePath ? `${pathSubdirectory}{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts` : '/resources/scripts';
-  return gulp.src(siteSettings.srcFolder + '/shared-components/foot-assets/foot-assets.html')
+  return gulp.src(`${siteSettings.srcFolder}/${componentFolderPath}/foot-assets/foot-assets.html`)
   .pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"|"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"|"(?:(?!"|")[\s\S])+(mod-form\/form.*?)js"/g, function(match) {
       if (match.includes('mod-form/form')) {
+        console.log(`>> VARIABLE homeownerFormFileName = ${fileNames.homeownerFormFileName}`);
         return `"${resourcePath}/mod-form/form/${fileNames.homeownerFormFileName}"`;
       } else if (match.includes('modutils') || match.includes('mod-utils')) {
+        console.log(`>> VARIABLE modUtilsFileName = ${fileNames.modUtilsFileName}`)
         return `"${resourcePath}/mod-utils/${fileNames.modUtilsFileName}"`;
       } else if (match.includes('footer-component')) {
+        console.log(`>> VARIABLE footerComponentJsFileName = ${fileNames.footerComponentJsFileName}`)
         return `"${resourcePath}/footer/${fileNames.footerComponentJsFileName}"`;
       }
     }))
-    .pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/foot-assets'))
+    .pipe(gulp.dest(`${siteSettings.srcFolder}/${componentFolderPath}/foot-assets`))
     .on('end', function() {
-      console.log('>> FINISHED Replacing Foot Asset Scripts');
+      console.log('>> FINISHED replacing foot asset scripts');
     });
 }
 function replaceAbandonmentJsCssSrc(gulp, gulpPlugins, siteSettings, siteData) {
@@ -52,6 +57,8 @@ function replaceAbandonmentJsCssSrc(gulp, gulpPlugins, siteSettings, siteData) {
     .pipe(gulp.dest(siteSettings.srcFolder + '/templates/abandonment'));
 }
 function replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData) {
+  console.log(`>> VARIABLE modFooterStylesFileName (main styles) = ${fileNames.modFooterStylesFileName}`)
+  console.log(`>> VARIABLE qsFooterStylesFileName (main styles) = ${fileNames.qsFooterStylesFileName}`)
   if (siteData.siteData && siteData.siteData.useRelativePathForResources === true) {
     return gulp.src(siteSettings.srcFolder + '/resources/scripts/footer/' + fileNames.footerComponentJsFileName)
       .pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/mod.*?)\)/, `concat("${pathSubdirectory}resources/styles/components/footer/` + fileNames.modFooterStylesFileName + '")'))
@@ -65,6 +72,8 @@ function replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData)
   }
 }
 function replaceFooterStylesReferenceInMap(gulp, gulpPlugins, siteSettings, siteData) {
+  console.log(`>> VARIABLE modFooterStylesFileName (map styles) = ${fileNames.modFooterStylesFileName}`)
+  console.log(`>> VARIABLE qsFooterStylesFileName (map styles) = ${fileNames.qsFooterStylesFileName}`)
   if (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.*?)\`/, '`' + pathSubdirectory + 'resources/styles/components/footer/' + fileNames.modFooterStylesFileName + '`'))
@@ -125,7 +134,10 @@ function getResource(url, config = {}, fn, fnArray) {
         })
         .pipe(source(file))
         .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
-        .on('finish', resolve);
+        .on('finish', function(){
+          console.log(`>> SUCCESSFULLY copied map file = ${file}`);
+          resolve();
+        });
     });
   })
   .then(() => {
@@ -223,11 +235,14 @@ const TASKS = {
 module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
   const { isLocal } = siteSettings
   const isQuotePage = siteData.siteData && siteData.siteData.isQuotePage || siteData && siteData.isQuotePage;
+  const useAccessibleComponents = siteData.siteData && siteData.siteData.useAccessibleConfig || siteData && siteData.useAccessibleConfig;
   const useRelativePathForResources = siteData.siteData && siteData.siteData.useRelativePathForResources || siteData && siteData.useRelativePathForResources;
+  componentFolderPath = useAccessibleComponents === true ? 'accessible-components' : 'shared-components';
   isQuotePageOrUseRelativePath = isQuotePage === true || useRelativePathForResources === true;
   resourceURL = `https://${siteSettings.nodeEnv}/quote/resources`;
   const isPathSubdirectory = siteData.siteData && siteData.siteData.pathSubdirectory || siteData && siteData.pathSubdirectory;
   pathSubdirectory = !isLocal && isPathSubdirectory ? isPathSubdirectory : '';
+
   return function() {
     const { nodeEnv } = siteSettings;
     if (!nodeEnv) {
@@ -235,14 +250,28 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
     }
     return (function() {
       const tasks = Object.values(TASKS)
+
       if (tasks.length) {
         var getAllResources = tasks.map(function(task) {
+          if (useAccessibleComponents === true) {
+            if (task.url.includes('abandonment.min.js')) {
+              task.url = 'shared-resources/scripts/abandonment/accessible/abandonment.min.js';
+              task.config.mapUrl = 'shared-resources/scripts/abandonment/accessible/abandonment.min.js.map';
+            }
+          }
           Object.assign(task.config, { gulp, gulpPlugins, siteSettings, siteData });
           return getResource(task.url, task.config, task.srcReplaceFn, task.additionalSrcReplaceFns)
         });
       }
 
-      return Promise.all(getAllResources);
+      return Promise.all(getAllResources)
+      .then(() => {
+        console.log(`>> FILENAMES object = ${JSON.stringify(fileNames)}`);
+        return gulp.src(`${siteSettings.srcFolder}/${componentFolderPath}/foot-assets/foot-assets.html`)
+        .on('data', function (file) {
+          console.log(`>> FOOT ASSETS HTML = ${file.contents.toString()}`);
+        });
+      })
     }());
   };
 };

package/gulp-tasks/templates.js

@@ -65,7 +65,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			name: 'xif',
 			fn: function(expression, options) {
 				return handlebarsX(expression, this, options) ? options.fn(this) : options.inverse(this);
-			}
+			},
 		},
 		// Reverse array
 		{
@@ -167,7 +167,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		}
 	];
 
-	var mergeDefaultFormFieldConfig = function(steps, defaultConfig) {
+	var mergeDefaultFormFieldConfig = function(steps, defaultConfig, folder) {
 		if (!steps.items) {
 			console.error('No items[ ] found in steps{}!');
 			return steps;
@@ -175,9 +175,12 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		steps.items.forEach(item => {
 			if (item.fields) {
 				item.fields = item.fields.map(field => {
-					if (field.name && defaultConfig[field.name]) {
+					if (folder === 'shared-components' && field.name && defaultConfig[field.name]) {
 						field = Object.assign(defaultConfig[field.name], field);
 					}
+					if (folder === 'accessible-components' && field.attributes && field.attributes.name && defaultConfig[field.attributes.name]) {
+						field = merge(defaultConfig[field.attributes.name], field);
+					}
 					return field;
 				});
 			}
@@ -186,25 +189,25 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		return steps;
 	};
 
-	var getDefaultFormFieldConfig = async function() {
+	var getDefaultFormFieldConfig = async function(folder) {
 		console.time('Finished fetch-default-form-config after');
 		console.log('Starting fetch-default-form-config: ');
 		await new Promise((resolve) => {
-			request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/shared-components/steps/defaultFormFieldConfig.json`, async function(err, xhr, response) {
+			request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/${folder}/steps/defaultFormFieldConfig.json`, async function(err, xhr, response) {
 				if (xhr.statusCode !== 200) {
-					throw new Error(`${xhr.statusCode}: Error while fetching shared-components/defaultFormFieldConfig.json`);
+					throw new Error(`${xhr.statusCode}: Error while fetching ${folder}/defaultFormFieldConfig.json`);
 				}
 
 				const defaultConfig = await JSON.parse(response);
 
 				if (templatesData.steps) {
-					templatesData.steps = await mergeDefaultFormFieldConfig(templatesData.steps, defaultConfig);
+					templatesData.steps = await mergeDefaultFormFieldConfig(templatesData.steps, defaultConfig, folder);
 				}
 				if (templatesData.qsSteps) {
-					templatesData.qsSteps = await mergeDefaultFormFieldConfig(templatesData.qsSteps, defaultConfig);
+					templatesData.qsSteps = await mergeDefaultFormFieldConfig(templatesData.qsSteps, defaultConfig, folder);
 				}
 				if (templatesData.modSteps) {
-					templatesData.modSteps = await mergeDefaultFormFieldConfig(templatesData.modSteps, defaultConfig);
+					templatesData.modSteps = await mergeDefaultFormFieldConfig(templatesData.modSteps, defaultConfig, folder);
 				}
 
 				templatesData.defaultConfigCompleted = true;
@@ -231,8 +234,9 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 					throw new Error(`${xhr.statusCode}: Error while fetching TCPA`);
 				}
 				const responseJson = await JSON.parse(response);
-				const finalTCPA = await (company === 'Modernize' || templatesData.useModernizeInTCPA) ? responseJson.tcpa.replace(/QuinStreet/g, 'Modernize') : responseJson.tcpa;
-
+				let finalTCPA = await (company === 'Modernize' || templatesData.useModernizeInTCPA) ? responseJson.tcpa.replace(/QuinStreet/g, 'Modernize') : responseJson.tcpa;
+				const removeInlineStyleRegex = / style="[^"]*"/g;
+				finalTCPA = finalTCPA.replace(removeInlineStyleRegex, '');
 				templatesData.tcpaText = await finalTCPA;
 
 				resolve();
@@ -244,7 +248,11 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	return async function() {
 		if (Object.keys(siteData).length > 0) {
 			if (!templatesData.doNotUseDefaultFieldConfig && !templatesData.defaultConfigCompleted) {
-				await getDefaultFormFieldConfig();
+				if (templatesData.siteData.useAccessibleConfig) {
+					await getDefaultFormFieldConfig('accessible-components');
+				} else {
+					await getDefaultFormFieldConfig('shared-components');
+				}
 			}
 
 			if (!templatesData.tcpaText && templatesData.primary_trade) {
@@ -252,20 +260,14 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			}
 		}
 
-		return new Promise(function(resolve) {
-			return gulp.src([
-				siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/**/*.html',
-				'!' + siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/_partials/**/*.html'
-			])
-				.pipe(gulpPlugins.handlebarsFileInclude(templatesData, {
-					maxRecursion: siteData.fileIncludeMaxRecursion ? siteData.fileIncludeMaxRecursion : 500,
-					handlebarsHelpers: handlebarsHelpers
-				}))
-				.pipe(gulp.dest(siteSettings.tmpFolder))
-				.on('finish', function() {
-					resolve();
-					console.log('Templates completed')
-				});
-		});
+		return gulp.src([
+			siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/**/*.html',
+			'!' + siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/_partials/**/*.html'
+		])
+			.pipe(gulpPlugins.handlebarsFileInclude(templatesData, {
+				maxRecursion: 500,
+				handlebarsHelpers: handlebarsHelpers
+			}))
+			.pipe(gulp.dest(siteSettings.tmpFolder));
 	};
 };

package/package.json

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