mod-build 4.0.51-beta.1 → 4.0.51-beta.2

package/package.json

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

package/src/scripts/plugins.js

@@ -4,6 +4,7 @@ import gulpHandlebarsFileInclude from "gulp-handlebars-file-include";
 import { defaultSettings } from "../data/config.js";
 import footer from '../data/footer.js';
 import { handlebarsHelpers } from "./utils.js";
+import { addSeasonalchanges } from "../../tasks/addSeasonalchanges.js";
 
 export const STATIC_COPY_TARGETS = [
 	{
@@ -59,6 +60,7 @@ export const updateConfig = async (config) => {
 		name: 'update-config',
 		async configResolved({ configFileDependencies }) {
 			await checkForTempConfig();
+			await addSeasonalchanges(mergedConfig);
 
 			configFileDependencies.forEach((file) => {
 				if (file.endsWith('siteconfig.js') || file.endsWith('template.js')) {
@@ -109,6 +111,7 @@ export const updateHandlebarsOnWatch = async (config) => {
 		enforce: 'pre',
 		async configResolved({ configFileDependencies }) {
 			await checkForTempConfig();
+			await addSeasonalchanges(mergedConfig);
 
 			configFileDependencies.forEach((file) => {
 				if (file.endsWith('siteconfig.js') || file.endsWith('template.js')) {

package/tasks/addSeasonalchanges.js

@@ -0,0 +1,61 @@
+import { getActiveSeasons } from '../src/scripts/utils.js';
+
+export default async function(tempConfig) {
+	await new Promise(async (resolve) => {
+		console.log('Satrted Seasonal Updates');
+		const activeSeason = getActiveSeasons();
+		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;
+										}
+									});
+								});
+							}
+						}
+					});
+				}
+				resolve();
+			}
+		}
+	}).then(() => {
+		console.log('Finished Seasonal Updates');
+	})
+}

package/tasks/templates.js

@@ -3,9 +3,9 @@ import footer from '../src/data/footer.js';
 import fs from 'node:fs';
 import merge from 'lodash.merge';
 import { responseInterceptor } from '../src/scripts/retry-axios.js';
+import { addSeasonalchanges } from './addSeasonalchanges.js';
 
 import { defaultSettings } from '../src/data/config.js';
-import { getActiveSeasons } from '../src/scripts/utils.js';
 
 import setupDevOpsTrackingId from './setupDevOpsTrackingId.js';
 
@@ -257,64 +257,13 @@ export default async function(config) {
 	const isPathSubdirectory = typeof config.pathSubdirectory !== 'undefined';
 	const pathSubdirectory = !isLocal && isPathSubdirectory ? isPathSubdirectory : '';
 
-	const activeSeason = getActiveSeasons();
-
 	let tempConfig = {
 		...config,
 		...footer(config),
 		...{ isLocal, nodeEnv, assetsPath, buildPath },
 	};
 
-	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;
-									}
-								});
-							});
-						}
-					}
-				});
-			}
-		}
-	}
+	// await addSeasonalchanges(tempConfig);
 
 	if (Object.keys(config).length > 0) {
 		if (!config.doNotUseDefaultFieldConfig && !tempConfigCreated) {
@@ -339,7 +288,7 @@ export default async function(config) {
 		if (!fs.existsSync(`${defaultSettings.srcFolder}/${defaultSettings.tmpFolder}`)) {
 			fs.mkdirSync(`${defaultSettings.srcFolder}/${defaultSettings.tmpFolder}`, { recursive: true });
 		}
-		Object.assign(config, tempConfig);
+
 		fs.writeFileSync(`${defaultSettings.srcFolder}/${defaultSettings.tmpFolder}/config.json`, JSON.stringify(tempConfig, null, 2));
 	}
 }