mod-build 4.0.20-beta.1 → 4.0.20

package/gulp-tasks/templates.js

@@ -19,54 +19,13 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	// Checking for seasonal variations in the template.js + updating content
 	var checkSeasonalVariations = require('./check-seasonal-variations.js');
 	const activeSeason = checkSeasonalVariations();
-	const HVAC_INTEREST = 'HVACInterest';
-	const SEASON = 'warmerWeather';
-	const CENTRAL_AC = 'Central AC';
-	const CENTRAL_HEATING = 'Central Heating';
-	siteData.isWarmWeather = false; // will use this variable in site level to update the hero title/subtitle wherever required
 	if (activeSeason.length !== 0) {
-		if (activeSeason.includes(SEASON)) {
-			siteData.isWarmWeather = true;
-			const data = JSON.stringify(siteData, null, 4);
-			const heating = '(Heating|heating|calentadores|Calentadores|calefactores|Calefactores)';
-			const and = '(\\s&\\s|\\sand\\s|and|\\sy\\s)'; // eslint-disable-line no-useless-escape
-			const ac = '(AC|Cooling|cooling|aires.*?acondicionados|Aires.*?Acondicionados)';
-			const spaces = '.*?';
-
-			const regex = new RegExp(`${heating}${spaces}${and}${spaces}${ac}`, 'gm');
-			// Find and reverse the required words in the string using regex group capture
-			const processedData = data.replaceAll(regex, '$3 $2 $1');
-			// Convert data into JSON
-			siteData = JSON.parse(processedData);
-			// Find the HVACInterest step and reverse the options array
-			if (siteData.steps && (siteData.steps.items && siteData.steps.items.length)) {
-				siteData.steps.items.forEach(function(step) {
-					const isHvacInterestStep = step && (step.stepName && step.stepName === HVAC_INTEREST) || (step.attributes && step.attributes.data && step.attributes.data['step-name'] === HVAC_INTEREST);
-					if (isHvacInterestStep) {
-						const stepFields = step.fields || step.stepContent.fields;
-						if (stepFields && stepFields.length) {
-							stepFields.forEach(function(field) {
-								const firstOption = field.options[0];
-								const lastOption = field.options[field.options.length - 1];
-								const firstOptionIsCentralHeating = (firstOption.attributes && firstOption.attributes.value === CENTRAL_HEATING) || firstOption.value === CENTRAL_HEATING;
-								const lastOptionIsCentralAC = (lastOption.attributes && lastOption.attributes.value === CENTRAL_AC) || lastOption.value === CENTRAL_AC;
-								// if the first option is central heating & last option is central ac then only swap those options
-								if (firstOptionIsCentralHeating && lastOptionIsCentralAC) {
-									field.options[0] = lastOption;
-									field.options[field.options.length - 1] = firstOption;
-								}
-
-								field.options.some(function(option) {
-									if (option.checked) {
-										option.checked = false;
-										field.options[0].checked = true;
-									}
-								});
-							});
-						}
-					}
-				});
-			}
+		if (siteData.seasonalVariations) {
+			activeSeason.forEach(season => {
+				if (season in siteData.seasonalVariations) {
+					siteData = merge(siteData, siteData.seasonalVariations[season]);
+				}
+			});
 		}
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mod-build",
-	"version": "4.0.20-beta.1",
+	"version": "4.0.20",
 	"description": "Share components for S3 sites.",
 	"type": "module",
 	"scripts": {

package/tasks/templates.js

@@ -113,7 +113,7 @@ const fetchTcpaFromSitegenie = async (config, tempConfig) => {
 			} else {
 				console.log('Response error...using default TCPA language');
 			}
-			
+
 			let defaultTcpa = JSON.parse(fs.readFileSync('src/resources/data/tcpa.json', 'utf8'));
 			tempConfig.tcpaText = defaultTcpa.tcpaText;
 			resolve(error);
@@ -137,13 +137,54 @@ export default async function(config) {
 		...{ isLocal, nodeEnv, assetsPath, buildPath },
 	};
 
-	if (activeSeason.length) {
-		if (config.seasonalVariations) {
-			activeSeason.forEach(season => {
-				if (season in config.seasonalVariations) {
-					tempConfig = { ...tempConfig, ...config.seasonalVariations[season] };
-				}
-			});
+	const HVAC_INTEREST = 'HVACInterest';
+	const SEASON = 'warmerWeather';
+	const CENTRAL_AC = 'Central AC';
+	const CENTRAL_HEATING = 'Central Heating';
+	tempConfig.isWarmWeather = false; // will use this variable in site level to update the hero title/subtitle wherever required
+	if (activeSeason.length !== 0) {
+		if (activeSeason.includes(SEASON)) {
+			tempConfig.isWarmWeather = true;
+			const data = JSON.stringify(tempConfig, null, 4);
+			const heating = '(Heating|heating|calentadores|Calentadores|calefactores|Calefactores)';
+			const and = '(\\s&\\s|\\sand\\s|and|\\sy\\s)'; // eslint-disable-line no-useless-escape
+			const ac = '(AC|Cooling|cooling|aires.*?acondicionados|Aires.*?Acondicionados)';
+			const spaces = '.*?';
+
+			const regex = new RegExp(`${heating}${spaces}${and}${spaces}${ac}`, 'gm');
+			// Find and reverse the required words in the string using regex group capture
+			const processedData = data.replaceAll(regex, '$3 $2 $1');
+			// Convert data into JSON
+			tempConfig = JSON.parse(processedData);
+			// Find the HVACInterest step and reverse the options array
+			if (tempConfig.steps && (tempConfig.steps.items && tempConfig.steps.items.length)) {
+				tempConfig.steps.items.forEach(function(step) {
+					const isHvacInterestStep = step && (step.stepName && step.stepName === HVAC_INTEREST) || (step.attributes && step.attributes.data && step.attributes.data['step-name'] === HVAC_INTEREST);
+					if (isHvacInterestStep) {
+						const stepFields = step.fields || step.stepContent.fields;
+						if (stepFields && stepFields.length) {
+							stepFields.forEach(function(field) {
+								const firstOption = field.options[0];
+								const lastOption = field.options[field.options.length - 1];
+								const firstOptionIsCentralHeating = (firstOption.attributes && firstOption.attributes.value === CENTRAL_HEATING) || firstOption.value === CENTRAL_HEATING;
+								const lastOptionIsCentralAC = (lastOption.attributes && lastOption.attributes.value === CENTRAL_AC) || lastOption.value === CENTRAL_AC;
+								// if the first option is central heating & last option is central ac then only swap those options
+								if (firstOptionIsCentralHeating && lastOptionIsCentralAC) {
+									field.options[0] = lastOption;
+									field.options[field.options.length - 1] = firstOption;
+								}
+
+								field.options.some(function(option) {
+									if (option.checked) {
+										option.checked = false;
+										field.options[0].checked = true;
+									}
+								});
+							});
+						}
+					}
+				});
+			}
 		}
 	}
 
@@ -158,7 +199,7 @@ export default async function(config) {
 		if (!config.tcpaText && config.primary_trade && !tempConfigCreated) {
 			await fetchTcpaFromSitegenie(config, tempConfig);
 		}
-	}  
+	}
 
 	if (!tempConfigCreated) {
 		if (!fs.existsSync(`${defaultSettings.srcFolder}/${defaultSettings.tmpFolder}`)) {