mod-build 3.6.36-beta.1 → 3.6.36-beta.3

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

@@ -4,6 +4,8 @@ var replace = require('gulp-replace');
 var hash = require('gulp-hash');
 var tap = require('gulp-tap');
 var path = require('path');
+var size = require('gulp-size');
+var buffer = require('gulp-buffer');
 
 const fileNames = {
   modAlyticsFileName: '',
@@ -28,7 +30,7 @@ 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"|"(?:(?!"|")[\s\S])+(mod-form\/form\/mod-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.homeownerFormFileName}"`;
@@ -89,21 +91,23 @@ function getResource(url, config = {}, fn, fnArray) {
 
   return new Promise(resolve => {
     const file = getFileFromURL(url);
-    const doNotAddHash = ['mod-form-beta.min.js']
-    let stream = request(`${resourceURL}/${url}`)
+    request(`${resourceURL}/${url}`)
       .on('response', resp => {
         if (resp.statusCode !== 200) {
           throw new Error(`${resp.statusCode} Error while fetching ${file}`);
         }
       })
       .pipe(source(`${file}`))
-      if (!doNotAddHash.includes(file)) {
-        stream = stream.pipe(hash({
-          hashLength: 20,
-          template: file.replace(/^([^.]*)\.(.*)$/, '$1-<%= hash %>.$2')
-        }))
-      }
-      stream.pipe(tap(function(file, t) {
+      .pipe(size())
+      .pipe(hash({
+        hashLength: 20,
+        algorithm: 'md5',
+        template: file.replace(/^([^.]*)\.(.*)$/, '$1-<%= hash %>.$2')
+      }))
+      .on('data', function(chunk) {
+        console.log(chunk);
+      })
+      .pipe(tap(function(file, t) {
         fileNames[config.fileName] = path.basename(file.path);
       }))
       .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
@@ -259,7 +263,9 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
         });
       }
 
-      return Promise.all(getAllResources);
+      return Promise.all(getAllResources).then(function() {
+        console.log('ALL DONE!!!');
+      })
     }());
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.36-beta.1",
+  "version": "3.6.36-beta.3",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -19,6 +19,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",
@@ -64,7 +65,6 @@
     "run-sequence": "^2.2.1",
     "sass": "^1.49.9",
     "should": "^11.2.1",
-    "through2": "^4.0.2",
     "vinyl-source-stream": "^2.0.0",
     "webpack-stream": "^5.2.1"
   },