mod-build 3.6.61-beta.7 → 3.6.61-beta.9

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 3.6.61
 
-- Adding the accessible components to the `grab-shared-components` task; As well as pulling the accessible `defaultFormFieldConfig` for the new template.js configuration; As well as adding the ability to add an `{{else}}` block when using `{{#xif }}`;
+- 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
 

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,7 +235,9 @@ 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;
@@ -246,6 +249,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
     }
     return (function() {
       const tasks = Object.values(TASKS)
+      console.log(`****COMPONENT FOLDER PATH = ${componentFolderPath}`)
       if (tasks.length) {
         var getAllResources = tasks.map(function(task) {
           Object.assign(task.config, { gulp, gulpPlugins, siteSettings, siteData });
@@ -256,7 +260,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

@@ -199,7 +199,6 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 				}
 
 				const defaultConfig = await JSON.parse(response);
-				console.log(defaultConfig)
 
 				if (templatesData.steps) {
 					templatesData.steps = await mergeDefaultFormFieldConfig(templatesData.steps, defaultConfig, folder);
@@ -235,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();
@@ -248,7 +248,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	return async function() {
 		if (Object.keys(siteData).length > 0) {
 			if (!templatesData.doNotUseDefaultFieldConfig && !templatesData.defaultConfigCompleted) {
-				if (templatesData.siteData.useAccessibleFormConfig) {
+				if (templatesData.siteData.useAccessibleConfig) {
 					await getDefaultFormFieldConfig('accessible-components');
 				} else {
 					await getDefaultFormFieldConfig('shared-components');
@@ -270,4 +270,4 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			}))
 			.pipe(gulp.dest(siteSettings.tmpFolder));
 	};
-};
+};

package/package.json

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