mod-build 3.6.94-beta.7 → 3.6.94-beta.9

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 3.6.94
 
-- Fixed bugs in seasonal updates
+- Updating the `gulp-uglify` package to use a newer version of `gulp-uglify-es` as we have had issues with `gulp-uglify` in the past
 
 ## 3.6.93
 

package/gulp-tasks/js-lint.js

@@ -1,4 +1,4 @@
-module.exports = function(gulp, _gulpPlugins, siteSettings) {
+module.exports = function(gulp, gulpPlugins, siteSettings) {
 	var fs = require('fs');
 	var gulpESLintNew = require('gulp-eslint-new');
 

package/gulp-tasks/minify.js

@@ -1,3 +1,5 @@
+let uglify = require('gulp-uglify-es').default;
+
 const babelOpts = {
 	presets: ['@babel/preset-env']
 };
@@ -12,7 +14,7 @@ module.exports.html = function(gulp, gulpPlugins, siteSettings) {
 				searchPath: [siteSettings.tmpFolder, './']
 			}))
 			.pipe(gulpPlugins.if('*.js', gulpPlugins.babel(babelOpts)))
-			.pipe(gulpPlugins.if('*.js', gulpPlugins.uglify()))
+			.pipe(gulpPlugins.if('*.js', uglify()))
 			.pipe(gulpPlugins.if('*.css', gulpPlugins.cleanCss(cleanCssOpts)))
 			.pipe(gulpPlugins.if('*.css', gulpPlugins.csso()))
 			.pipe(gulpPlugins.revReplace())
@@ -39,7 +41,7 @@ module.exports.js = function(gulp, gulpPlugins, siteSettings) {
 	return function() {
 		return gulp.src([siteSettings.srcFolder + '/**/*.js', '!' + siteSettings.srcFolder + '/data/**/*.js'])
 			.pipe(gulpPlugins.babel(babelOpts))
-			.pipe(gulpPlugins.uglify())
+			.pipe(uglify())
 			.on('error', function(err) {
 				console.log(err);
 				this.end();

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]);
+				}
+			});
 		}
 	}
 
@@ -255,7 +214,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`);
 				}
@@ -294,7 +253,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(reqConfig, async function(_err, xhr, response) {
+			request(reqConfig, async function(err, xhr, response) {
 				if (xhr.statusCode !== 200) {
 					throw new Error(`${xhr.statusCode}: Error while fetching TCPA`);
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mod-build",
-	"version": "3.6.94-beta.7",
+	"version": "3.6.94-beta.9",
 	"description": "Share components for S3 sites.",
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1",
@@ -50,7 +50,7 @@
 		"gulp-size": "^2.1.0",
 		"gulp-sourcemaps": "^2.6.0",
 		"gulp-tap": "^2.0.0",
-		"gulp-uglify": "^2.1.2",
+		"gulp-uglify-es": "^3.0.0",
 		"gulp-useref": "^5.0.0",
 		"husky": "^1.3.1",
 		"imagemin-mozjpeg": "^7.0.0",