mod-build 3.6.40-beta.4 → 3.6.40-beta.6

package/gulp-tasks/cache-bust.js

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

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

@@ -27,7 +27,8 @@ function replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData) {
     .pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/head'));
 }
 function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
-  const resourcePath = isQuotePageOrUseRelativePath ? '{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts' : '/resources/scripts';
+  console.log('>> STARTING Replacing Foot Asset Scripts');
+	const resourcePath = isQuotePageOrUseRelativePath ? '{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts' : '/resources/scripts';
   return gulp.src(siteSettings.srcFolder + '/shared-components/foot-assets/foot-assets.html')
   .pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"|"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"|"(?:(?!"|")[\s\S])+(mod-form\/mod-form.*?)js"|"(?:(?!"|")[\s\S])+(qs-form.*?)js"|"(?:(?!"|")[\s\S])+(mod-form\/form.*?)js"/g, function(match) {
       if (match.includes('mod-form')) {
@@ -42,9 +43,12 @@ function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
         return `"${resourcePath}/mod-utils/${fileNames.modUtilsFileName}"`;
       } else if (match.includes('footer-component')) {
         return `"${resourcePath}/footer/${fileNames.footerComponentJsFileName}"`;
-      } 
+      }
     }))
-    .pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/foot-assets'));
+    .pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/foot-assets'))
+    .on('end', function() {
+			console.log('>> FINISHED Replacing Foot Asset Scripts');
+		});
 }
 function replaceAbandonmentJsCssSrc(gulp, gulpPlugins, siteSettings, siteData) {
   const jsResourcePath = isQuotePageOrUseRelativePath ? 'resources/scripts/abandonment/' : '/resources/scripts/abandonment/';
@@ -107,48 +111,41 @@ function getResource(url, config = {}, fn, fnArray) {
         fileNames[config.fileName] = path.basename(file.path);
       }))
       .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
-      .on('finish', resolve);
+      .on('finish', function(){
+				console.log(fileNames[config.fileName]);
+				resolve();
+			});
   })
-    .then(() => {
-      if (!config.mapUrl) { return false };
-      const file = getFileFromURL(config.mapUrl);
-      return new Promise((resolve) => {
-        request(`${resourceURL}/${config.mapUrl}`)
-          .on('response', (resp) => {
-            if (resp.statusCode !== 200) {
-              throw new Error(`${resp.statusCode} Error while fetching ${file}`);
-            } else {
-              if (typeof fn === 'function') {
-                fn.call(null, config.gulp, config.gulpSettings, config.siteSettings, config.siteData);
-              }
+  .then(() => {
+    if (!config.mapUrl) { return false };
+    const file = getFileFromURL(config.mapUrl);
+    return new Promise((resolve) => {
+      request(`${resourceURL}/${config.mapUrl}`)
+        .on('response', (resp) => {
+          if (resp.statusCode !== 200) {
+            throw new Error(`${resp.statusCode} Error while fetching ${file}`);
+          } else {
+            if (typeof fn === 'function') {
+              fn.call(null, config.gulp, config.gulpSettings, config.siteSettings, config.siteData);
             }
-          })
-          .pipe(source(file))
-          .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
-          .on('finish', resolve);
-      });
-    })
-    .then(() => {
-      if (fnArray && fnArray.length) {
-        fnArray.map(function(fn) {
-          if (typeof fn === 'function') {
-            fn.call(null, config.gulp, config.gulpSettings, config.siteSettings, config.siteData)
           }
-        });
-      }
+        })
+        .pipe(source(file))
+        .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
+        .on('finish', resolve);
     });
+  })
+  .then(() => {
+    if (fnArray && fnArray.length) {
+      fnArray.map(function(fn) {
+        if (typeof fn === 'function') {
+          fn.call(null, config.gulp, config.gulpSettings, config.siteSettings, config.siteData)
+        }
+      });
+    }
+  });
 }
 const TASKS = {
-  copyModalytics: {
-    url: 'mod-alytics/modalytics.min.js',
-    config: {
-      fileName: 'modAlyticsFileName',
-      dest: 'scripts/mod-alytics',
-      mapUrl: 'mod-alytics/modalytics.min.js.map',
-    },
-    srcReplaceFn: replaceModalyticsSrc,
-    additionalSrcReplaceFns: []
-  },
   copyModutils: {
     url: 'mod-utils/modutils.min.js',
     config: {
@@ -159,26 +156,6 @@ const TASKS = {
     srcReplaceFn: null,
     additionalSrcReplaceFns: []
   },
-  copyAbandonmentComponentStyles: {
-    url: 'shared-resources/styles/components/abandonment/abandonment.min.css',
-    config: {
-      fileName: 'abandonmentStylesFileName',
-      dest: 'styles/components/abandonment',
-      mapUrl: null,
-    },
-    srcReplaceFn: null,
-    additionalSrcReplaceFns: []
-  },
-  copyAbandonmentJs: {
-    url: 'shared-resources/scripts/abandonment/abandonment.min.js',
-    config: {
-      fileName: 'abandonmentJsFileName',
-      dest: 'scripts/abandonment',
-      mapUrl: 'shared-resources/scripts/abandonment/abandonment.min.js.map',
-    },
-    srcReplaceFn: replaceAbandonmentJsCssSrc,
-    additionalSrcReplaceFns: []
-  },
   copyFooterComponentJs: {
     url: 'shared-resources/scripts/footer/footer-component.min.js',
     config: {
@@ -206,7 +183,7 @@ const TASKS = {
       dest: 'scripts/mod-form',
       mapUrl: 'mod-form/qs-form.min.js.map',
     },
-    srcReplaceFn: replaceFootAssetScripts,
+    srcReplaceFn: null,
     additionalSrcReplaceFns: []
   },
   copyHomeownerForm: {
@@ -216,9 +193,39 @@ const TASKS = {
       dest: 'scripts/mod-form/form',
       mapUrl: 'mod-form/form/homeowner.min.js.map',
     },
+    srcReplaceFn: replaceFootAssetScripts,
+    additionalSrcReplaceFns: []
+  },
+	copyModalytics: {
+    url: 'mod-alytics/modalytics.min.js',
+    config: {
+      fileName: 'modAlyticsFileName',
+      dest: 'scripts/mod-alytics',
+      mapUrl: 'mod-alytics/modalytics.min.js.map',
+    },
+    srcReplaceFn: replaceModalyticsSrc,
+    additionalSrcReplaceFns: []
+  },
+	copyAbandonmentComponentStyles: {
+    url: 'shared-resources/styles/components/abandonment/abandonment.min.css',
+    config: {
+      fileName: 'abandonmentStylesFileName',
+      dest: 'styles/components/abandonment',
+      mapUrl: null,
+    },
     srcReplaceFn: null,
     additionalSrcReplaceFns: []
   },
+  copyAbandonmentJs: {
+    url: 'shared-resources/scripts/abandonment/abandonment.min.js',
+    config: {
+      fileName: 'abandonmentJsFileName',
+      dest: 'scripts/abandonment',
+      mapUrl: 'shared-resources/scripts/abandonment/abandonment.min.js.map',
+    },
+    srcReplaceFn: replaceAbandonmentJsCssSrc,
+    additionalSrcReplaceFns: []
+  },
   copyModFooterComponentStyles: {
     url: 'shared-resources/styles/components/footer/mod-footer.min.css',
     config: {

package/package.json

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