mod-build 3.6.56-beta.1 → 3.6.56

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.6.56
+
+- `noheap` + `nogtm` conditionals no longer needed (those variables will & have been set to "true" for all sites in our shared components / configs)
+- adding `!window.Modalytics.privacyPreferencesDetected` conditional to check privacy settings to not load Heap for modernize.com
+
 ## 3.6.55
 - Added conditional to check if `siteData` is empty — so our  `fetchTcpaFromSitegenie()` and `getDefaultFormFieldConfig()` functions won't try to run on modify.modernize.com
 

package/gulp-tasks/templates.js

@@ -231,7 +231,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 					throw new Error(`${xhr.statusCode}: Error while fetching TCPA`);
 				}
 				const responseJson = await JSON.parse(response);
-				const finalTCPA = await (company === 'Modernize' || templatesData.useModernizeInTCPA) ? responseJson.tcpa.replace(/QuinStreet/g, 'Modernize') : responseJson.tcpa;
+				const finalTCPA = await company === 'Modernize' ? responseJson.tcpa.replace(/QuinStreet/g, 'Modernize') : responseJson.tcpa;
 
 				templatesData.tcpaText = await finalTCPA;
 
@@ -246,7 +246,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			if (!templatesData.doNotUseDefaultFieldConfig && !templatesData.defaultConfigCompleted) {
 				await getDefaultFormFieldConfig();
 			}
-
+	
 			if (!templatesData.tcpaText && templatesData.primary_trade) {
 				await fetchTcpaFromSitegenie();
 			}

package/package.json

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

package/src/scripts/vendor/google-tag-manager-head.js

@@ -1,6 +1,6 @@
 var gtm_container_ID = (window.isQSPage && '{{qs_gtm_container_ID}}'.length > 0) ? '{{qs_gtm_container_ID}}' : '{{gtm_container_ID}}';
 (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-		j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-		'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+	new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+	j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+	'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
 })(window,document,'script','dataLayer',gtm_container_ID);

package/src/scripts/vendor/heap-addeventproperties-identify.js

@@ -256,5 +256,7 @@
 		}
 	};
 
-	heapUserTracking.init();
+	if (window.Modalytics && !window.Modalytics.privacyPreferencesDetected) {
+		heapUserTracking.init();
+	}
 })();

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

@@ -1,5 +1,7 @@
-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])};
+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'));
+    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'));
 
-heap.load(heapIsDevEnv ? "3986615799" : "3246578271"); // dynamic tracker ID based on env
+    heap.load(heapIsDevEnv ? "3986615799" : "3246578271"); // dynamic tracker ID based on env
+}

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

@@ -20,8 +20,10 @@ _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) {
-				heap.addUserProperties(window._vis_data);
+				if (window.Modalytics && !window.Modalytics.privacyPreferencesDetected) {
+					heap.addUserProperties(window._vis_data);
+				}
 			}
 		}
 	} catch (err) {};
-});
+});

package/src/templates/_partials/scripts/analytics.html

@@ -1,16 +1,4 @@
 <script>
   {{ fileInclude 'node_modules/mod-build/src/scripts/has-qs-params.js' }}
   {{ fileInclude 'node_modules/mod-build/src/scripts/url-cleaner.js' }}
-  {{#unless noheap}}
-    {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-tracking.js' }}
-    if(window.Modalytics) {
-      Modalytics.init();
-    } else {
-      {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-addeventproperties-identify.js' }}
-    }
-  {{/unless}}
-
-  {{#unless nogtm}}
-    {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/google-tag-manager-head.js' }}
-  {{/unless}}
 </script>

package/src/templates/_partials/scripts/vwo-redirect-callback.html

@@ -32,19 +32,6 @@
 				try {
 					// flag to call Modalytics.initHeapVwo() method in site level js
 					window.initHeapVwo = true;
-
-					{{#unless noheap}}
-						{{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-tracking.js' }}
-						{{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-vwo.js' }}
-						if(window.Modalytics) {
-							Modalytics.init();
-						} else {
-							{{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-addeventproperties-identify.js' }}
-						}
-					{{/unless}}
-					{{#unless nogtm}}
-						{{ fileInclude 'node_modules/mod-build/src/scripts/vendor/google-tag-manager-head.js' }}
-					{{/unless}}
 				} catch (e) {}
 				return;
 			}