mod-build 3.6.69 → 3.6.70

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.6.70
+
+- Removed qa environment heap integration
+
+## 3.6.70-beta.1
+
+- Implemented copy-font gulp task based on configuration . Also update cache-bust task to not to include font files.
+
 ## 3.6.69
 
 - Adjusting the `browserSyncServeFolders` to include the `mod-base/src`

package/gulp-tasks/build.js

@@ -16,6 +16,10 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'grab-form-helpers', 'templates', 'styles', 'copy-videos', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'cache-bust', 'add-path-subdirectories', 'copy-resources-to-dist', 'build-stat'];
 		}
 
+		if (siteData.isFontPresent) {
+			sequenceOpts.push('copy-fonts');
+		}
+
 		runSequence(...sequenceOpts, function() {
 			console.log('\x1b[42m%s\x1b[0m', '✔ Build completed!');
 			console.log('You can run \'gulp serve:dist\' to see production version.');

package/gulp-tasks/cache-bust.js

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

package/gulp-tasks/copy-fonts.js

@@ -0,0 +1,6 @@
+module.exports = function(gulp, siteSettings) {
+	return function() {
+		return gulp.src(siteSettings.srcFolder + '/fonts' + '/*.{otf,woff,woff2,ttf}')
+			.pipe(gulp.dest(siteSettings.distFolder + '/fonts'));
+	};
+};

package/gulp-tasks/tasks.js

@@ -453,6 +453,18 @@ module.exports = function() {
 
 				return require(opts.gulpTasksFolderPath + '/build')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
 			}
+		},
+
+		// Copy fonts
+		'copy-fonts': {
+			subtasks: [],
+			func: function(opts) {
+				if ('undefined' === typeof opts.gulpTasksFolderPath) {
+					opts.gulpTasksFolderPath = '.';
+				}
+
+				return require(opts.gulpTasksFolderPath + '/copy-fonts')(opts.gulp, opts.gulpSettings);
+			}
 		}
 	};
 

package/package.json

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

package/src/scripts/vendor/heap-tracking.js

@@ -1,7 +1,9 @@
 if (window.Modalytics && !window.Modalytics.privacyPreferencesDetected) {
-    window.heap=window.heap||[],heap.load=function(e,t){window.heap.appid=e,window.heap.config=t=t||{};var r=t.forceSSL||"https:"===document.location.protocol,a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src=(r?"https:":"http:")+"//cdn.heapanalytics.com/js/heap-"+e+".js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n);for(var o=function(e){return function(){heap.push([e].concat(Array.prototype.slice.call(arguments,0)))}},p=["addEventProperties","addUserProperties","clearEventProperties","identify","resetIdentity","removeEventProperty","setEventProperties","track","unsetEventProperty"],c=0;c<p.length;c++)heap[p[c]]=o(p[c])};
-
     var heapIsDevEnv = window.location.host.match(new RegExp('(' + ['qa.', 'staging.', 'localhost', '.local', '[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'].join('|') + ')', 'i'));
+    // dev env id "3986615799"
+    if (!heapIsDevEnv) {
+        window.heap = window.heap || [], heap.load = function(e, t) { window.heap.appid = e, window.heap.config = t = t || {}; var r = t.forceSSL || "https:" === document.location.protocol, a = document.createElement("script"); a.type = "text/javascript", a.async = !0, a.src = (r ? "https:" : "http:") + "//cdn.heapanalytics.com/js/heap-" + e + ".js"; var n = document.getElementsByTagName("script")[0]; n.parentNode.insertBefore(a, n); for (var o = function(e) { return function() { heap.push([e].concat(Array.prototype.slice.call(arguments, 0))) } }, p = ["addEventProperties", "addUserProperties", "clearEventProperties", "identify", "resetIdentity", "removeEventProperty", "setEventProperties", "track", "unsetEventProperty"], c = 0; c < p.length; c++)heap[p[c]] = o(p[c]) };
 
-    heap.load(heapIsDevEnv ? "3986615799" : "3246578271"); // dynamic tracker ID based on env
+        heap.load("3246578271"); // dynamic tracker ID based on env
+    }
 }

package/src/scripts/vendor/heap-vwo.js

@@ -20,7 +20,7 @@ _vis_opt_queue.push(function() {
 			// Use the _vis_data object created above to fetch the data,
 			// key of the object is the Test ID and the value is Variation Name
 			if (_vis_counter) {
-				if (window.Modalytics && !window.Modalytics.privacyPreferencesDetected) {
+				if (window.Modalytics && !window.Modalytics.privacyPreferencesDetected && window.heap && window.heap.appid) {
 					heap.addUserProperties(window._vis_data);
 				}
 			}