mod-build 3.7.35 → 3.7.36

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.7.36
+
+- Fix issues with templates.js due to last version updates.
+
 ## 3.7.35
 
 - Add 'grab-b2b-data' task to build/serve

package/gulp-tasks/templates.js

@@ -45,7 +45,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 								field.options[0] = lastOption;
 								field.options[field.options.length - 1] = firstOption;
 							}
-		
+
 							field.options.some(function(option) {
 								if (option.checked) {
 									option.checked = false;
@@ -100,6 +100,8 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	// Apply seasonal updates
 	applySeasonalUpdates();
 
+	var templatesData = Object.assign(commonData(), qsFooterData(siteData), quoteFooterData(siteData), siteData, { isLocal, nodeEnv, assetsPath, buildPath });
+
 	// This is helper function to evaluate JS expressions
 	// in Handlebars, e.g. for conditions
 	var handlebarsX = function(expression, context) {
@@ -329,7 +331,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		return steps;
 	};
 
-	var getDefaultFormFieldConfig = async function(folder, templatesData) {
+	var getDefaultFormFieldConfig = async function(folder) {
 		console.time('Finished fetch-default-form-config after');
 		console.log('Starting fetch-default-form-config: ');
 		await new Promise((resolve) => {
@@ -352,7 +354,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		console.timeEnd('Finished fetch-default-form-config after');
 	};
 
-	var fetchTcpaFromSitegenie = async function(templatesData) {
+	var fetchTcpaFromSitegenie = async function() {
 		const website = templatesData.website_name;
 		const c_level = templatesData.cLevel ? templatesData.cLevel : 'default';
 		const affiliateKey = templatesData.affiliateKey ? templatesData.affiliateKey : 0;
@@ -389,7 +391,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		console.timeEnd('Finished fetch-tcpa-from-sitegenie after');
 	};
 
-	var getConsentCaptureLanguage = async function(templatesData) {
+	var getConsentCaptureLanguage = async function() {
 		const requestPromise = (url) => {
 			return new Promise((resolve, reject) => {
 				request(url, (error, xhr, response) => {
@@ -454,8 +456,6 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	};
 
 	return async function() {
-		var templatesData = Object.assign(commonData(), qsFooterData(siteData), quoteFooterData(siteData), siteData, { isLocal, nodeEnv, assetsPath, buildPath });
-
 		// Ensure B2B data is explicitly included in templatesData
 		if (siteData.leadForm) {
 			templatesData.leadForm = siteData.leadForm;
@@ -467,18 +467,18 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		if (Object.keys(siteData).length > 0) {
 			if (!templatesData.doNotUseDefaultFieldConfig && !templatesData.defaultConfigCompleted) {
 				if (templatesData.siteData && templatesData.siteData.useAccessibleConfig) {
-					await getDefaultFormFieldConfig('accessible-components', templatesData);
+					await getDefaultFormFieldConfig('accessible-components');
 				} else {
-					await getDefaultFormFieldConfig('shared-components', templatesData);
+					await getDefaultFormFieldConfig('shared-components');
 				}
 			}
 
 			if (!templatesData.tcpaText && templatesData.primary_trade) {
-				await fetchTcpaFromSitegenie(templatesData);
+				await fetchTcpaFromSitegenie();
 			}
 
 			if (!templatesData.consentCapture) {
-				await getConsentCaptureLanguage(templatesData);
+				await getConsentCaptureLanguage();
 			}
 		}
 

package/package.json

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