mod-build 3.6.38 → 3.6.39--beta.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.39
+
+- implementing a buffer to our `grab-shared-scripts` task, which fixes the hashing issue we were facing for our larger files. updated the hashing algorithm to MD5, so it matches our CircleCI CLI hash. updated `mod-form-beta.min.js` to `homeowner.min.js`
+
 ## 3.6.38
 
 - when we removed the mod-form-beta functionality in 3.6.37 — we needed to also remove the replace search in the function.

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

@@ -4,6 +4,7 @@ var replace = require('gulp-replace');
 var hash = require('gulp-hash');
 var tap = require('gulp-tap');
 var path = require('path');
+var buffer = require('gulp-buffer');
 
 const fileNames = {
   modAlyticsFileName: '',
@@ -14,7 +15,7 @@ const fileNames = {
   qsFooterStylesFileName: '',
   modFormFileName: '',
   qsFormFileName: '',
-  newModFormFileName: ''
+  homeownerFormFileName: ''
 };
 var isQuotePageOrUseRelativePath = false;
 var resourceURL = '';
@@ -28,10 +29,10 @@ function replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData) {
 function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
   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"/g, function(match) {
+  .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')) {
         if (match.includes('mod-form/form')) {
-          return `"${resourcePath}/mod-form/form/${fileNames.newModFormFileName}"`;
+          return `"${resourcePath}/mod-form/form/${fileNames.homeownerFormFileName}"`;
         } else if (match.includes('qs-form')) {
           return `"${resourcePath}/mod-form/${fileNames.qsFormFileName}"`;
         } else {
@@ -95,9 +96,11 @@ function getResource(url, config = {}, fn, fnArray) {
           throw new Error(`${resp.statusCode} Error while fetching ${file}`);
         }
       })
-      .pipe(source(`${file}`))
+      .pipe(source(file))
+      .pipe(buffer())
       .pipe(hash({
         hashLength: 20,
+        algorithm: 'md5',
         template: file.replace(/^([^.]*)\.(.*)$/, '$1-<%= hash %>.$2')
       }))
       .pipe(tap(function(file, t) {
@@ -120,7 +123,7 @@ function getResource(url, config = {}, fn, fnArray) {
               }
             }
           })
-          .pipe(source(`${file}`))
+          .pipe(source(file))
           .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
           .on('finish', resolve);
       });
@@ -137,27 +140,27 @@ function getResource(url, config = {}, fn, fnArray) {
 }
 const TASKS = {
   copyModalytics: {
-    url: `mod-alytics/modalytics.min.js`,
+    url: 'mod-alytics/modalytics.min.js',
     config: {
       fileName: 'modAlyticsFileName',
       dest: 'scripts/mod-alytics',
-      mapUrl: `mod-alytics/modalytics.min.js.map`,
+      mapUrl: 'mod-alytics/modalytics.min.js.map',
     },
     srcReplaceFn: replaceModalyticsSrc,
     additionalSrcReplaceFns: []
   },
   copyModutils: {
-    url: `mod-utils/modutils.min.js`,
+    url: 'mod-utils/modutils.min.js',
     config: {
       fileName: 'modUtilsFileName',
       dest: 'scripts/mod-utils',
-      mapUrl: `mod-utils/modutils.min.js.map`,
+      mapUrl: 'mod-utils/modutils.min.js.map',
     },
     srcReplaceFn: null,
     additionalSrcReplaceFns: []
   },
   copyAbandonmentComponentStyles: {
-    url: `shared-resources/styles/components/abandonment/abandonment.min.css`,
+    url: 'shared-resources/styles/components/abandonment/abandonment.min.css',
     config: {
       fileName: 'abandonmentStylesFileName',
       dest: 'styles/components/abandonment',
@@ -167,47 +170,57 @@ const TASKS = {
     additionalSrcReplaceFns: []
   },
   copyAbandonmentJs: {
-    url: `shared-resources/scripts/abandonment/abandonment.min.js`,
+    url: 'shared-resources/scripts/abandonment/abandonment.min.js',
     config: {
       fileName: 'abandonmentJsFileName',
       dest: 'scripts/abandonment',
-      mapUrl: `shared-resources/scripts/abandonment/abandonment.min.js.map`,
+      mapUrl: 'shared-resources/scripts/abandonment/abandonment.min.js.map',
     },
     srcReplaceFn: replaceAbandonmentJsCssSrc,
     additionalSrcReplaceFns: []
   },
   copyFooterComponentJs: {
-    url: `shared-resources/scripts/footer/footer-component.min.js`,
+    url: 'shared-resources/scripts/footer/footer-component.min.js',
     config: {
       fileName: 'footerComponentJsFileName',
       dest: 'scripts/footer',
-      mapUrl: `shared-resources/scripts/footer/footer-component.min.js.map`,
+      mapUrl: 'shared-resources/scripts/footer/footer-component.min.js.map',
     },
     srcReplaceFn: null,
     additionalSrcReplaceFns: []
   },
   copyModForm: {
-    url: `mod-form/mod-form.min.js`,
+    url: 'mod-form/mod-form.min.js',
     config: {
       fileName: 'modFormFileName',
       dest: 'scripts/mod-form',
-      mapUrl: `mod-form/mod-form.min.js.map`,
+      mapUrl: 'mod-form/mod-form.min.js.map',
     },
     srcReplaceFn: null,
     additionalSrcReplaceFns: []
   },
   copyQsForm: {
-    url: `mod-form/qs-form.min.js`,
+    url: 'mod-form/qs-form.min.js',
     config: {
       fileName: 'qsFormFileName',
       dest: 'scripts/mod-form',
-      mapUrl: `mod-form/qs-form.min.js.map`,
+      mapUrl: 'mod-form/qs-form.min.js.map',
     },
     srcReplaceFn: replaceFootAssetScripts,
     additionalSrcReplaceFns: []
   },
+  copyHomeownerForm: {
+    url: 'mod-form/form/homeowner.min.js',
+    config: {
+      fileName: 'homeownerFormFileName',
+      dest: 'scripts/mod-form/form',
+      mapUrl: 'mod-form/form/homeowner.min.js.map',
+    },
+    srcReplaceFn: null,
+    additionalSrcReplaceFns: []
+  },
   copyModFooterComponentStyles: {
-    url: `shared-resources/styles/components/footer/mod-footer.min.css`,
+    url: 'shared-resources/styles/components/footer/mod-footer.min.css',
     config: {
       fileName: 'modFooterStylesFileName',
       dest: 'styles/components/footer',
@@ -217,7 +230,7 @@ const TASKS = {
     additionalSrcReplaceFns: [replaceFooterStylesReference, replaceFooterStylesReferenceInMap]
   },
   copyQsFooterComponentStyles: {
-    url: `shared-resources/styles/components/footer/qs-footer.min.css`,
+    url: 'shared-resources/styles/components/footer/qs-footer.min.css',
     config: {
       fileName: 'qsFooterStylesFileName',
       dest: 'styles/components/footer',

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "mod-build",
-  "version": "3.6.38",
+  "version": "3.6.39--beta.1",
   "description": "Share components for S3 sites.",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "serve": "node --max-old-space-size=4096 gulp grab-shared-scripts"
   },
   "author": "",
   "license": "ISC",
@@ -17,6 +18,7 @@
     "gulp": "^3.9.1",
     "gulp-autoprefixer": "^3.1.1",
     "gulp-babel": "^8.0.0",
+    "gulp-buffer": "0.0.2",
     "gulp-clean-css": "^3.0.4",
     "gulp-concat": "^2.6.1",
     "gulp-cssmin": "^0.1.7",

package/src/scripts/mod-form-contractor.js

@@ -17,7 +17,7 @@
  */
 
 modForm.getTradeFromUrl = function() {
-	var trades = ['solar', 'roofing', 'windows', 'hvac', 'siding', 'gutters', 'bathrooms', 'kitchen-remodeling', 'cabinets', 'home-security', 'home-warranty', 'medical-alerts', 'stair-lifts', 'walk-in-tubs', 'hot-tubs', 'flooring'],
+	var trades = ['solar', 'roofing', 'windows', 'hvac', 'siding', 'gutters', 'bathrooms', 'kitchen-remodeling', 'cabinets', 'home-security', 'home-warranty', 'medical-alerts', 'stair-lifts', 'walk-in-tubs', 'hot-tubs', 'flooring', 'tree-services'],
 		queryParamString = (location.search.slice(1) !== '') ? location.search.slice(1) : '',
 		params = queryParamString.toLowerCase(),
 		filteredTrades = trades.filter(function(trade) {