mod-build 4.0.19 → 4.0.20-beta.2

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.20
+
+- Seasonal updates enhancements
+
 ## 4.0.18
 
 - Add `stylelint` plugin and default settings to show CSS warnings during build
@@ -65,13 +69,13 @@
 ## 4.0.0-beta.5
 
 - Updated the `transformIndexHtml` hook to use the `writeBundle` hook in the ViteConfig.
-	- This change ensures that all assets are transformed before adding the `pathSubdirectory` to the assets and local resources.
+ 	- This change ensures that all assets are transformed before adding the `pathSubdirectory` to the assets and local resources.
 
 - Updated the `grab-shared-scripts` task to run more sequentially.
-	- All files are now downloaded and hashed before going through the functions to replace local paths.
+ 	- All files are now downloaded and hashed before going through the functions to replace local paths.
 
 - Changed global resources to download to the site's `/public` folder instead of inside `/src`.
-	- This prevents Vite from bundling them during the build process as they are static JS files.
+ 	- This prevents Vite from bundling them during the build process as they are static JS files.
 
 ## 4.0.0-beta.3
 
@@ -82,8 +86,8 @@
 
 ## 4.0.0-beta.1
 
-See https://quinstreet.atlassian.net/wiki/spaces/FEE/pages/8100970716/Mod-build+Vite+Version+4
+See <https://quinstreet.atlassian.net/wiki/spaces/FEE/pages/8100970716/Mod-build+Vite+Version+4>
 
 ## 4.0.0-alpha.1
 
-Brand new build process using Vite 5, Node 18+. Gulp 4 is used as a task runner to grab shared assets.
+Brand new build process using Vite 5, Node 18+. Gulp 4 is used as a task runner to grab shared assets.

package/gulp-tasks/templates.js

@@ -19,13 +19,54 @@ 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();
-	if (activeSeason.length !== 0){
-		if (siteData.seasonalVariations) {
-			activeSeason.forEach(season => {
-				if (season in siteData.seasonalVariations) {
-					siteData = merge(siteData, siteData.seasonalVariations[season]);
-				}
-			});
+	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;
+									}
+								});
+							});
+						}
+					}
+				});
+			}
 		}
 	}
 
@@ -203,7 +244,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		console.time('Finished fetch-default-form-config after');
 		console.log('Starting fetch-default-form-config: ');
 		await new Promise((resolve) => {
-			request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/${folder}/steps/defaultFormFieldConfig.json`, async function(err, xhr, response) {
+			request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/${folder}/steps/defaultFormFieldConfig.json`, async function(_err, xhr, response) {
 				if (xhr.statusCode !== 200) {
 					throw new Error(`${xhr.statusCode}: Error while fetching ${folder}/defaultFormFieldConfig.json`);
 				}
@@ -239,7 +280,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		console.time('Finished fetch-tcpa-from-sitegenie after');
 		console.log('Starting fetch-tcpa-from-sitegenie: ',url);
 		await new Promise(function(resolve) {
-			request(url, async function(err, xhr, response) {
+			request(url, async function(_err, xhr, response) {
 				if (xhr.statusCode !== 200) {
 					throw new Error(`${xhr.statusCode}: Error while fetching TCPA`);
 				}

package/package.json

@@ -1,34 +1,34 @@
 {
-  "name": "mod-build",
-  "version": "4.0.19",
-  "description": "Share components for S3 sites.",
-  "type": "module",
-  "scripts": {
-    "dev": "export NODE_ENV=qa.modernize.com IS_LOCAL=true && vite",
-    "build": "export NODE_ENV=modernize.com && vite build",
-    "preview": "export NODE_ENV=modernize.com && vite build && vite preview"
-  },
-  "dependencies": {
-    "@namics/stylelint-bem": "^10.0.0",
-    "@vituum/vite-plugin-handlebars": "^1.1.0",
-    "axios": "^1.6.2",
-    "eslint": "^8.57.0",
-    "glob": "^10.3.10",
-    "gulp": "^4.0.2",
-    "gulp-handlebars-file-include": "^1.0.0",
-    "gulp-hash": "^4.2.2",
-    "gulp-replace": "^1.1.4",
-    "gulp-tap": "^2.0.0",
-    "lodash.merge": "^4.6.2",
-    "lodash.mergewith": "^4.6.2",
-    "sass": "^1.69.5",
-    "stylelint": "^16.6.1",
-    "stylelint-config-standard-scss": "^13.1.0",
-    "stylelint-order": "^6.0.4",
-    "vite": "^5.0.0",
-    "vite-plugin-eslint": "^1.8.1",
-    "vite-plugin-static-copy": "^1.0.0",
-    "vite-plugin-stylelint": "^5.3.1",
-    "vituum": "^1.1.0"
-  }
+	"name": "mod-build",
+	"version": "4.0.20-beta.2",
+	"description": "Share components for S3 sites.",
+	"type": "module",
+	"scripts": {
+		"dev": "export NODE_ENV=qa.modernize.com IS_LOCAL=true && vite",
+		"build": "export NODE_ENV=modernize.com && vite build",
+		"preview": "export NODE_ENV=modernize.com && vite build && vite preview"
+	},
+	"dependencies": {
+		"@namics/stylelint-bem": "^10.0.0",
+		"@vituum/vite-plugin-handlebars": "^1.1.0",
+		"axios": "^1.6.2",
+		"eslint": "^8.57.0",
+		"glob": "^10.3.10",
+		"gulp": "^4.0.2",
+		"gulp-handlebars-file-include": "^1.0.0",
+		"gulp-hash": "^4.2.2",
+		"gulp-replace": "^1.1.4",
+		"gulp-tap": "^2.0.0",
+		"lodash.merge": "^4.6.2",
+		"lodash.mergewith": "^4.6.2",
+		"sass": "^1.69.5",
+		"stylelint": "^16.6.1",
+		"stylelint-config-standard-scss": "^13.1.0",
+		"stylelint-order": "^6.0.4",
+		"vite": "^5.0.0",
+		"vite-plugin-eslint": "^1.8.1",
+		"vite-plugin-static-copy": "^1.0.0",
+		"vite-plugin-stylelint": "^5.3.1",
+		"vituum": "^1.1.0"
+	}
 }

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}`)) {