mod-build 3.7.22 → 3.7.23-beta.1

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 3.7.23
+- Added `geolocation.min.js` to the `grab-shared-scripts` task to grab & hash that file during build (and removed it from being pulled down during the `grab-cdn` task).
+
 ## 3.7.22
 - Added extra conditions for `addTcpaAboveCta` and `addTcpaBelowCta` helper functions to not break when required data is not passed.
 

package/gulp-tasks/grab-cdn.js

@@ -65,13 +65,6 @@ module.exports = function(gulp, _gulpPlugins, siteSettings, siteData) {
 			externalResources = { ...externalResources, ...remoteFilesForLocalDev };
 		}
 
-		// Geolocation js
-		Object.assign(externalResources, {
-			'/quote/resources/shared-resources/scripts/geolocation/geolocation.min.js': [
-				'resources/scripts/geolocation/', 'geolocation.min.js'
-			]
-		});
-
 		const totalRequests = Object.keys(externalResources).length;
 		return await new Promise(async function(resolve) {
 			const sequentialRequests = async function(key, index) {

package/gulp-tasks/grab-shared-scripts.js

@@ -7,6 +7,7 @@ var path = require('path');
 var buffer = require('gulp-buffer');
 
 const fileNames = {
+  geolocationFileName: '',
   modAlyticsFileName: '',
   modUtilsFileName: '',
   abandonmentJsFileName: '',
@@ -22,12 +23,20 @@ var resourceURL = '';
 var pathSubdirectory = '';
 var componentFolderPath = '';
 
-function replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData) {
-  const doNotIncludeSrc = siteData.siteData && siteData.siteData.isPathSubdirectory || siteData && siteData.isPathSubdirectory;
-  const resourcePath = isQuotePageOrUseRelativePath ? `${doNotIncludeSrc ? '' : '{{#if this.src}}{{this.src}}{{/if}}'}resources/scripts/mod-alytics/` : '/resources/scripts/mod-alytics/';
+function replaceHeadScripts(gulp, gulpPlugins, siteSettings, siteData) {
+  const resourcePath = isQuotePageOrUseRelativePath ? '{{#if this.src}}{{this.src}}{{/if}}resources/scripts' : '/resources/scripts';
   return gulp.src(`${siteSettings.srcFolder}/${componentFolderPath}/head/head.html`)
-    .pipe(replace(/".*(modalytics).*"/, `"${resourcePath}${fileNames.modAlyticsFileName}"`))
-    .pipe(gulp.dest(`${siteSettings.srcFolder}/${componentFolderPath}/head`));
+  .pipe(replace(/"(?:(?!"|")[\s\S])+(modalytics.*?)js"|"(?:(?!"|")[\s\S])+(geolocation.*?)js"/g, function(match) {
+    if (match.includes('modalytics')) {
+        return `"${resourcePath}/mod-alytics/${fileNames.modAlyticsFileName}"`;
+      } else if (match.includes('geolocation')) {
+        return `"${resourcePath}/geolocation/${fileNames.geolocationFileName}"`;
+      }
+    }))
+    .pipe(gulp.dest(`${siteSettings.srcFolder}/${componentFolderPath}/head`))
+    .on('end', function() {
+      console.log('>> FINISHED replacing foot asset scripts');
+    });
 }
 function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
   const resourcePath = isQuotePageOrUseRelativePath ? '{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts' : '/resources/scripts';
@@ -187,6 +196,16 @@ const TASKS = {
     srcReplaceFn: replaceFootAssetScripts,
     additionalSrcReplaceFns: []
   },
+  copyGeolocation: {
+    url: 'shared-resources/scripts/geolocation/geolocation.min.js',
+    config: {
+      fileName: 'geolocationFileName',
+      dest: 'scripts/geolocation',
+      mapUrl: 'shared-resources/scripts/geolocation/geolocation.min.js.map',
+    },
+    srcReplaceFn: null,
+    additionalSrcReplaceFns: []
+  },
   copyModalytics: {
     url: 'mod-alytics/modalytics.min.js',
     config: {
@@ -194,7 +213,7 @@ const TASKS = {
       dest: 'scripts/mod-alytics',
       mapUrl: 'mod-alytics/modalytics.min.js.map',
     },
-    srcReplaceFn: replaceModalyticsSrc,
+    srcReplaceFn: replaceHeadScripts,
     additionalSrcReplaceFns: []
   },
   copyAbandonmentComponentStyles: {

package/package.json

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