mod-build 3.6.61-beta.6 → 3.6.61-beta.8

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/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;
 				});
 			}
@@ -198,13 +201,13 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 				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();

package/package.json

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