mod-build 3.6.67-beta.1 → 3.6.68-beta.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.67
+
+- Adjusting the `grab-theme-json` task conditional to also check for `opts.siteData.page` to exist as well as the `themeFile` before running the task!
+
 ## 3.6.66
 
 - Adjusting the `mergeDefaultFormFieldConfig()` for the accessible configuration so it merges the values correctly.

package/gulp-tasks/settings.js

@@ -6,7 +6,7 @@ module.exports = function() {
 	return {
 		tmpFolder: '.tmp',
 		srcFolder: 'src',
-		browserSyncServeFolders: ['.tmp', 'src', 'node_modules/mod-style-bootstrap/src', 'node_modules/mod-base/src'],
+		browserSyncServeFolders: ['.tmp', 'src', 'node_modules/mod-style-bootstrap/src'],
 		distFolder: 'dist',
 		fontsSubfolder: 'fonts',
 		imagesSubfolder: 'images',

package/gulp-tasks/tasks.js

@@ -402,7 +402,7 @@ module.exports = function() {
 					opts.gulpTasksFolderPath = '.';
 				}
 
-				if (opts.siteData.page.themeFile) {
+				if (opts.siteData.page && opts.siteData.page.themeFile) {
 					return require(opts.gulpTasksFolderPath + '/grab-theme-json')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
 				}
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.67-beta.1",
+  "version": "3.6.68-beta.1",
   "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
+    }
 }