mod-build 3.6.65 → 3.6.66-beta.2

package/gulp-tasks/templates.js

@@ -167,24 +167,35 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		}
 	];
 
-	var mergeDefaultFormFieldConfig = function(steps, defaultConfig, folder) {
+	var mergeDefaultFormFieldConfig = function(steps, defaultConfig) {
 		if (!steps.items) {
 			console.error('No items[ ] found in steps{}!');
 			return steps;
 		}
-		steps.items.forEach(item => {
-			if (item.fields) {
-				item.fields = item.fields.map(field => {
-					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;
-				});
-			}
-		});
+		if (templatesData.siteData && templatesData.siteData.useAccessibleConfig) {
+			console.log('MERGING ACCESSIBLE CONFIG');
+			steps.items.forEach(item => {
+				if (item.stepContent.fields) {
+					item.stepContent.fields = item.stepContent.fields.map(field => {
+						if (field.attributes && field.attributes.name && defaultConfig[field.attributes.name]) {
+							field = merge(defaultConfig[field.attributes.name], field);
+						}
+						return field;
+					});
+				}
+			});
+		} else {
+			steps.items.forEach(item => {
+				if (item.fields) {
+					item.fields = item.fields.map(field => {
+						if (field.name && defaultConfig[field.name]) {
+							field = Object.assign(defaultConfig[field.name], field);
+						}
+						return field;
+					});
+				}
+			});
+		}
 
 		return steps;
 	};
@@ -201,13 +212,13 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 				const defaultConfig = await JSON.parse(response);
 
 				if (templatesData.steps) {
-					templatesData.steps = await mergeDefaultFormFieldConfig(templatesData.steps, defaultConfig, folder);
+					templatesData.steps = await mergeDefaultFormFieldConfig(templatesData.steps, defaultConfig);
 				}
 				if (templatesData.qsSteps) {
-					templatesData.qsSteps = await mergeDefaultFormFieldConfig(templatesData.qsSteps, defaultConfig, folder);
+					templatesData.qsSteps = await mergeDefaultFormFieldConfig(templatesData.qsSteps, defaultConfig);
 				}
 				if (templatesData.modSteps) {
-					templatesData.modSteps = await mergeDefaultFormFieldConfig(templatesData.modSteps, defaultConfig, folder);
+					templatesData.modSteps = await mergeDefaultFormFieldConfig(templatesData.modSteps, defaultConfig);
 				}
 
 				templatesData.defaultConfigCompleted = true;

package/package.json

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