mod-build 3.6.2 → 3.6.3--beta.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.3
+
+- Updating `cache-bust` gulp task to use dashes instead of a period. For example, cached files will now be `home-51fbcbac.js` instead of `home.51fbcbac.js`
+
 ## 3.6.2
 
 - Adding `check-seasonal-variations` to grab seasons json; loop through the siteData for `seasonalVariations: {}`; find any active seasons; merge the json objects and adjust json content accordingly;

package/gulp-tasks/cache-bust.js

@@ -1,9 +1,14 @@
 module.exports = function(gulp, gulpPlugins, siteSettings) {
+	var path = require('path');
 	return function() {
 		return gulp.src(siteSettings.distFolder + '/**')
 			.pipe(gulpPlugins.revAll.revision({
 				dontRenameFile: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g],
-				dontUpdateReference: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g]
+				dontUpdateReference: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g],
+				transformFilename: function (file, hash) {
+					var ext = path.extname(file.path);
+					return path.basename(file.path, ext) + '-' + hash.substr(0, 8) + ext;
+				}
 			}))
 			.pipe(gulpPlugins.revDeleteOriginal())
 			.pipe(gulp.dest(siteSettings.distFolder))

package/gulp-tasks/grab-cdn.js

@@ -3,7 +3,7 @@ var source = require('vinyl-source-stream');
 
 // helper to allow us to define an "end" event to multiple streams
 function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName) {
-	var url = `https://${siteSettings.nodeEnv}/quote/resources/mod-site${inputPath}`;
+	var url = `https://${siteSettings.nodeEnv}/quote/resources${inputPath}`;
 
 	return new Promise(resolve => { // eslint-disable-line no-undef
 		request(url)
@@ -30,21 +30,23 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		// key: inputPath, value: destPath
 
 		externalResources = {
-			'/templates/scripts/trusted-form.html': ['/templates/scripts/', 'trusted-form.html']
+			'/mod-site/templates/scripts/trusted-form.html': ['/templates/scripts/', 'trusted-form.html'],
+			'/mod-alytics/modalytics.min.js': ['/scripts/resources/', 'modalytics.min.js'],
+			'/mod-utils/modutils.min.js': ['/scripts/resources/', 'modutils.min.js']
 		};
 
-		Object.assign(externalResources, {'/templates/scripts/jornaya.html': ['/templates/scripts/', 'jornaya.html']});
+		Object.assign(externalResources, {'/mod-site/templates/scripts/jornaya.html': ['/templates/scripts/', 'jornaya.html']});
 
 		if (isModWhiteLabel || domainHasModernize) {
-			Object.assign(externalResources, {'/templates/scripts/recaptcha.html': ['/templates/scripts/', 'recaptcha.html']});
+			Object.assign(externalResources, {'/mod-site/templates/scripts/recaptcha.html': ['/templates/scripts/', 'recaptcha.html']});
 		}
 
 		// local dev files
 		const remoteFilesForLocalDev = {
-			'/scripts/mod-form.js': ['/temp/scripts/', 'mod-form.js'],
-			'/scripts/mod-utils.js': ['/temp/scripts/', 'mod-utils.js'],
-			'/scripts/qs-form.js': ['/temp/scripts/', 'qs-form.js'],
-			'/scripts/vendor/maxmind-geoip2.js': ['/temp/scripts/', 'maxmind-geoip2.js']
+			'/mod-site/scripts/mod-form.js': ['/temp/scripts/', 'mod-form.js'],
+			'/mod-site/scripts/mod-utils.js': ['/temp/scripts/', 'mod-utils.js'],
+			'/mod-site/scripts/qs-form.js': ['/temp/scripts/', 'qs-form.js'],
+			'/mod-site/scripts/vendor/maxmind-geoip2.js': ['/temp/scripts/', 'maxmind-geoip2.js']
 		};
 
 		if (!nodeEnv) {

package/gulp-tasks/js-lint.js

@@ -14,6 +14,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings) {
 			'gulpfile.babel.js',
 			'gulp-tasks/*.js',
 			'!' + siteSettings.srcFolder + '/' + siteSettings.scriptsSubfolder + '/vendor/**/*.js', // do not lint 3rd party scripts,
+			'!' + siteSettings.srcFolder + '/' + siteSettings.scriptsSubfolder + '/resources/**/*.js', // do not lint copied shared resource scripts,
 			'!' + siteSettings.srcFolder + '/' + siteSettings.scriptsCompiledFolder + '**/*.js' // do not lint compiled scripts
 		])
 			.pipe(gulpPlugins.eslint(siteSettings.jsLint))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.2",
+  "version": "3.6.3--beta.1",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -53,6 +53,7 @@
     "lodash": "^4.17.15",
     "lodash.merge": "^4.6.2",
     "nouislider": "^10.1.0",
+    "path": "^0.12.7",
     "request": "^2.88.0",
     "run-sequence": "^2.2.1",
     "sass": "^1.49.9",

package/src/scripts/thankyou.js

@@ -1,58 +0,0 @@
-/* global modUtils locationStr */
-
-/**
- * Link this file into a TY page to render generic TYP and fire pixels
- */
-
-var thankyouPage = (function($) {
-	var getVars = modUtils.getUrlParamsToObject(),
-		apiUrl = modUtils.getApiDomain() + '/v1/';
-
-	/**
-	 * Starts TY page
-	 */
-	var init = function() {
-		// Personalized intro copy (/thankyou page)
-		if (getVars.fName && getVars.lName) {
-			$('#intro').text(getVars.fName + ' ' + getVars.lName + ', thanks for your request.');
-		}
-
-		// Location
-		if (getVars.city && getVars.state) {
-			locationStr = getVars.city + ', ' + getVars.state;
-		}
-		if (locationStr) {
-			$('[data-bind="location"]').text(locationStr);
-		}
-
-		// leadToken
-		if (getVars.leadToken) {
-			$('#leadid_token').val(getVars.leadToken);
-		}
-
-		// Grab and fire the affiliate pixel if one exists and not a duplicate.
-		if (getVars.projectId && !getVars.isDupe) {
-			$.ajax({
-				url: apiUrl + 'tracking/get-typ-pixel/' + getVars.projectId,
-				type: 'GET',
-				dataType: 'json',
-				crossDomain: true,
-				success: function(response) {
-					if (!response || !response.data.pixel) {
-						return;
-					}
-
-					$('body').append(response.data.pixel);
-				}
-			});
-		}
-	};
-
-	return {
-		init: init
-	};
-})(jQuery);
-
-$(document).ready(function() {
-	thankyouPage.init();
-});