mod-build 3.6.1--beta.18 → 3.6.1--beta.20

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.2
+
+- Adding `ifSeason` handlebar helper to make seasonal updates with JSON
+
 ## 3.5.7
 
 - Making `maxRecursion` for our file include plugin in template.js a lot higher

package/gulp-tasks/build.js

@@ -5,15 +5,15 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		var sequenceOpts;
 
 		if (siteData.useTypescript) {
-			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'templates', 'styles', 'compile-prod', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'build-stat'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'check-seasonal-variations', 'templates', 'styles', 'compile-prod', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'build-stat'];
 		} else if (siteData.isWhiteLabel) {
 			if (siteData.isQSPage) {
-				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'templates', 'styles', 'grab-theme-json', 'combine-files', 'grab-images', 'copy-json', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'copy-files-to-build-path', 'cache-bust', 'grab-tooltips-json', 'build-stat'];
+				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'check-seasonal-variations', 'templates', 'styles', 'grab-theme-json', 'combine-files', 'grab-images', 'copy-json', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'copy-files-to-build-path', 'cache-bust', 'grab-tooltips-json', 'build-stat'];
 			} else {
-				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'templates', 'styles', 'combine-files', 'grab-images', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'grab-tooltips-json', 'build-stat'];
+				sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'check-seasonal-variations', 'templates', 'styles', 'combine-files', 'grab-images', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'grab-tooltips-json', 'build-stat'];
 			}
 		} else {
-			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'templates', 'styles', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'build-stat'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'check-seasonal-variations', 'templates', 'styles', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'build-stat'];
 		}
 
 		runSequence(...sequenceOpts, function() {

package/gulp-tasks/check-seasonal-variations.js

@@ -0,0 +1,52 @@
+var request = require('request');
+var source = require('vinyl-source-stream');
+
+function getDefinedSeasons(gulp, gulpPlugins, siteSettings) {
+	return {
+		"warmerWeather": {
+			"firstDay": "03-14",
+			"lastDay": "09-25"
+		},
+		"spookySeason": {
+			"startDate": "10-01",
+			"endDate": "10-31"
+		}
+	}
+}
+
+function getActiveSeasons() {
+	var seasons = getDefinedSeasons();
+	const today = new Date();
+	const year = today.getFullYear();
+	let activeSeason = [];
+	
+	for (const key in seasons) {
+		var seasonName = key;
+		var dateRanges = seasons[key];
+		var startDate = new Date(`${Object.values(dateRanges)[0]}-${year}`);
+		var endDate = new Date(`${Object.values(dateRanges)[1]}-${year}`);
+
+		if (startDate < today && today < endDate) {
+			activeSeason.push(seasonName)
+		}
+	}
+	return activeSeason;
+}
+
+module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
+	const activeSeason = getActiveSeasons();
+	if (activeSeason !== ''){
+		if (activeSeason in siteData.seasonalVariations) {
+			siteData = {...siteData, ...siteData.seasonalVariations[activeSeason]};
+		}
+	}
+
+	console.log(siteData);
+
+	return function() {
+		const { nodeEnv } = siteSettings;
+		if (!nodeEnv) {
+			throw new Error('Missing environment variables. Did you start with gulp instead of npm run...?');
+		}
+	};
+};

package/gulp-tasks/serve.js

@@ -4,11 +4,11 @@ module.exports.src = function(gulp, gulpPlugins, siteSettings, siteData) {
 		var runSequence = require('run-sequence');
 		var sequenceOpts;
 		if (siteData.useTypescript) {
-			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'templates', 'styles', 'compile', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'check-seasonal-variations', 'templates', 'styles', 'compile', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
 		} else if (siteData.isQSPage) {
-			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'templates', 'styles', 'grab-theme-json', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'check-seasonal-variations', 'templates', 'styles', 'grab-theme-json', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
 		} else {
-			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'templates', 'styles', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
+			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'check-seasonal-variations', 'templates', 'styles', 'grab-tooltips-json', 'combine-files', 'grab-images', 'js-lint'];
 		}
 		runSequence(...sequenceOpts, () => {
 			// Run a BrowserSync server

package/gulp-tasks/tasks.js

@@ -56,6 +56,20 @@ module.exports = function() {
 			}
 		},
 
+		// Check seasons defined on CDN & update seasonal variations accordingly
+		'check-seasonal-variations': {
+			subtasks: [],
+			func: function(opts) {
+				if ('undefined' === typeof opts.gulpTasksFolderPath) {
+					opts.gulpTasksFolderPath = '.';
+				}
+
+				if (opts.siteData.useCDN) {
+					return require(opts.gulpTasksFolderPath + '/check-seasonal-variations')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
+				}
+			}
+		},
+
 		// Link scss files
 		'sass-lint': {
 			subtasks: [],

package/gulp-tasks/templates.js

@@ -66,24 +66,6 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 				}
 			}
 		},
-		// Check to see if seasonal changes should be made
-		{
-			name: 'ifSeason',
-			fn: function(season, block) {
-				const today = new Date();
-				const year = today.getFullYear();
-				const startOfSpring = new Date(`03-14-${year}`);
-				const startOfFall = new Date(`09-25-${year}`);
-				let isSeason = false;
-
-				switch(season) {
-					case 'coolerWeather':
-						isSeason = !(today > startOfSpring && today < startOfFall);
-						break
-				}
-				return isSeason ? block.fn(this) : block.inverse(this);
-			}
-		},
 		// Convert string to uppercase
 		{
 			name: 'uppercase',

package/package.json

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

package/src/scripts/components/make-seasonal-updates.js

@@ -1,19 +0,0 @@
-/**
- * Set Default Season Range
- * @returns {Boolean} - if true = update verbiage
-*/
-
-var makeSeasonalUpdates = function(trade) {
-	var trade = siteData.primary_trade;
-	const today = new Date();
-	const year = today.getFullYear();
-	if (trade === 'HVAC') {
-			
-	}
-
-	/* Default Hightlight Cooling Services; Highlight Heating Services from September 25 to March 14 */
-	const springDate = new Date(`03-14-${year}`);
-	const fallDate = new Date(`09-25-${year}`);
-
-	return !(today > springDate && today < fallDate);
-}