mod-build 3.6.35 → 3.6.36-beta.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.36
+
+- implementing fix needed for grabbing SVG sprites in our `grab-global-images` task. also removed consoles running in `grab-shared-scripts`
+
 ## 3.6.35
 
 - trying one replace pipe for `replaceFootAssetScripts` function inside our `grab-shared-scripts` task. also added some console logs so within build.sh in circleci — you will be able to see it complete all the replacements.

package/gulp-tasks/grab-global-images.js

@@ -16,7 +16,7 @@ function getFilePathFromURL(url) {
 
 function streamToDestination(gulp, siteSettings, url) {
 	let finalDestination;
-	const fileName = path.basename(url);
+	let fileName = path.basename(url);
 	const filePath = getFilePathFromURL(url);
 
 	if (!fs.existsSync(siteSettings.distFolder)) {
@@ -25,6 +25,13 @@ function streamToDestination(gulp, siteSettings, url) {
 		finalDestination = siteSettings.distFolder;
 	}
 
+	// fix for svg sprites
+	if (fileName.includes(".svg#")) {
+		const hashIndex = fileName.indexOf("#");
+		const strippedFileName = fileName.substring(0, hashIndex);
+		fileName = strippedFileName;
+	}
+
 	return new Promise(resolve => { // eslint-disable-line no-undef
 		request(url)
 			.on('response', resp => {

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

@@ -14,7 +14,7 @@ const fileNames = {
   qsFooterStylesFileName: '',
   modFormFileName: '',
   qsFormFileName: '',
-  newModFormFileName: ''
+  homeownerFormFileName: ''
 };
 var isQuotePageOrUseRelativePath = false;
 var resourceURL = '';
@@ -28,23 +28,18 @@ 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')) {
-          console.log('replaced modular mod-form');
-          return `"${resourcePath}/mod-form/form/${fileNames.newModFormFileName}"`;
+          return `"${resourcePath}/mod-form/form/${fileNames.homeownerFormFileName}"`;
         } else if (match.includes('qs-form')) {
-          console.log('replaced qs-form');
           return `"${resourcePath}/mod-form/${fileNames.qsFormFileName}"`;
         } else {
-          console.log('replaced mod-form');
           return `"${resourcePath}/mod-form/${fileNames.modFormFileName}"`;
         }
       } else if (match.includes('modutils') || match.includes('mod-utils')) {
-        console.log('replaced modutils');
         return `"${resourcePath}/mod-utils/${fileNames.modUtilsFileName}"`;
       } else if (match.includes('footer-component')) {
-        console.log('replaced footer component');
         return `"${resourcePath}/footer/${fileNames.footerComponentJsFileName}"`;
       } 
     }))
@@ -94,21 +89,18 @@ 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(hash({
+        hashLength: 20,
+        template: file.replace(/^([^.]*)\.(.*)$/, '$1-<%= hash %>.$2')
+      }))
+      .pipe(tap(function(file, t) {
         fileNames[config.fileName] = path.basename(file.path);
       }))
       .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
@@ -204,12 +196,12 @@ const TASKS = {
     srcReplaceFn: null,
     additionalSrcReplaceFns: []
   },
-  copyNewModForm: {
-    url: `mod-form/form/mod-form-beta.min.js`,
-    mapUrl: `mod-form/form/mod-form-beta.min.js.map`,
+  copyHomeownerForm: {
+    url: `mod-form/form/homeowner.min.js`,
     config: {
-      fileName: 'newModFormFileName',
-      dest: 'scripts/mod-form/form'
+      fileName: 'homeownerFormFileName',
+      dest: 'scripts/mod-form/form',
+      mapUrl: `mod-form/form/homeowner.min.js.map`,
     },
     srcReplaceFn: null,
     additionalSrcReplaceFns: []
@@ -264,6 +256,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
         });
       }
 
+      console.log('calling this')
       return Promise.all(getAllResources);
     }());
   };

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "mod-build",
-  "version": "3.6.35",
+  "version": "3.6.36-beta.2",
   "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",
@@ -14,6 +15,8 @@
     "bootstrap-sass": "^3.4.3",
     "browser-sync": "^2.18.6",
     "del": "^3.0.0",
+    "es6-promise": "^2.1.1",
+    "fancy-log": "^2.0.0",
     "gulp": "^3.9.1",
     "gulp-autoprefixer": "^3.1.1",
     "gulp-babel": "^8.0.0",
@@ -31,6 +34,7 @@
     "gulp-imagemin": "^3.2.0",
     "gulp-insert": "^0.5.0",
     "gulp-load-plugins": "^0.10.0",
+    "gulp-md5": "^0.1.3",
     "gulp-minify": "0.0.14",
     "gulp-mocha-phantomjs": "^0.12.1",
     "gulp-plumber": "^1.1.0",
@@ -53,13 +57,18 @@
     "imagemin-webp": "^5.1.0",
     "jquery": "^3.2.1",
     "lodash": "^4.17.15",
+    "lodash.assign": "^2.4.1",
     "lodash.merge": "^4.6.2",
+    "lodash.template": "^2.4.1",
     "nouislider": "^10.1.0",
     "path": "^0.12.7",
+    "plugin-error": "^2.0.1",
     "request": "^2.88.0",
     "run-sequence": "^2.2.1",
     "sass": "^1.49.9",
     "should": "^11.2.1",
+    "through2": "^2.0.0",
+    "vinyl": "^2.2.1",
     "vinyl-source-stream": "^2.0.0",
     "webpack-stream": "^5.2.1"
   },