mod-build 3.6.61 → 3.6.63

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.6.63
+
+- Adding conditional to check for `siteData` to exist before checking for the `useAccessibleConfig`.
+
+## 3.6.62
+
+- 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); As well as updating the `grab-shared-scripts` to pull in / edit the necessary accessible components (including the accessible abandonment JS file);
+
 ## 3.6.61
 
 - added functionality to increase the fileInclude maxRecursion value from site level

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,18 +18,19 @@ 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/';
   console.log(`>> VARIABLE modAlyticsFileName = ${fileNames.modAlyticsFileName}`)
-  return gulp.src(siteSettings.srcFolder + '/shared-components/head/head.html')
+  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');
   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}`);
@@ -42,7 +43,7 @@ function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
         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');
     });
@@ -234,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) {
@@ -246,8 +250,15 @@ 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)
         });
@@ -256,7 +267,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
       return Promise.all(getAllResources)
       .then(() => {
         console.log(`>> FILENAMES object = ${JSON.stringify(fileNames)}`);
-        return gulp.src(siteSettings.srcFolder + '/shared-components/foot-assets/foot-assets.html')
+        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

@@ -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 && templatesData.siteData.useAccessibleConfig) {
+					await getDefaultFormFieldConfig('accessible-components');
+				} else {
+					await getDefaultFormFieldConfig('shared-components');
+				}
 			}
 
 			if (!templatesData.tcpaText && templatesData.primary_trade) {

package/package.json

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