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

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.
+- 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 }}`;
 
 ## 3.6.60
 

package/gulp-tasks/templates.js

@@ -64,21 +64,8 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		{
 			name: 'xif',
 			fn: function(expression, options) {
-				const result = handlebarsX(expression, this, options);
-				if (result) {
-					return options.fn(this);
-				} else {
-					return options.inverse(this);
-				}
+				return handlebarsX(expression, this, options) ? options.fn(this) : options.inverse(this);
 			},
-			inverse: function(expression, options) {
-				const result = handlebarsX(expression, this, options);
-				if (result) {
-					return options.inverse(this);
-				} else {
-					return options.fn(this);
-				}
-			}
 		},
 		// Reverse array
 		{
@@ -180,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;
@@ -188,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;
 				});
 			}
@@ -209,15 +199,16 @@ 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);
+					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;
@@ -279,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.5",
+  "version": "3.6.61-beta.7",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",