mod-build 3.6.60-beta.4 → 3.6.61-beta.1

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.6.61
+
+- added functionality to increase the fileInclude maxRecursion value from site level
+- fixed bug in `templates` task. It was not completing as expected.
+
 ## 3.6.59
 
 - adding `srcset` to the `add-path-subdirectories` gulp task to update relative paths in `<picture>` tags

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

@@ -5,7 +5,6 @@ var hash = require('gulp-hash');
 var tap = require('gulp-tap');
 var path = require('path');
 var buffer = require('gulp-buffer');
-var fetch = require('node-fetch');
 
 const fileNames = {
   modAlyticsFileName: '',
@@ -22,30 +21,26 @@ var pathSubdirectory = '';
 
 function replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData) {
   const resourcePath = isQuotePageOrUseRelativePath ? `${pathSubdirectory}{{#if this.src}}{{this.src}}{{/if}}resources/scripts/mod-alytics/` : '/resources/scripts/mod-alytics/';
-  console.log(`>> VARIABLE modAlyticsFileName = ${fileNames.modAlyticsFileName}`)
   return gulp.src(siteSettings.srcFolder + '/shared-components/head/head.html')
     .pipe(replace(/".*(modalytics).*"/, `"${resourcePath}${fileNames.modAlyticsFileName}"`))
     .pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/head'));
 }
 function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
-  console.log('>> STARTING replacing foot asset scripts');
+  console.log('>> STARTING Replacing Foot Asset Scripts');
   const resourcePath = isQuotePageOrUseRelativePath ? `${pathSubdirectory}{{#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\/form.*?)js"/g, function(match) {
       if (match.includes('mod-form/form')) {
-        console.log(`>> VARIABLE homeownerFormFileName = ${fileNames.homeownerFormFileName}`);
         return `"${resourcePath}/mod-form/form/${fileNames.homeownerFormFileName}"`;
       } else if (match.includes('modutils') || match.includes('mod-utils')) {
-        console.log(`>> VARIABLE modUtilsFileName = ${fileNames.modUtilsFileName}`)
         return `"${resourcePath}/mod-utils/${fileNames.modUtilsFileName}"`;
       } else if (match.includes('footer-component')) {
-        console.log(`>> VARIABLE footerComponentJsFileName = ${fileNames.footerComponentJsFileName}`)
         return `"${resourcePath}/footer/${fileNames.footerComponentJsFileName}"`;
       }
     }))
     .pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/foot-assets'))
     .on('end', function() {
-      console.log('>> FINISHED replacing foot asset scripts');
+      console.log('>> FINISHED Replacing Foot Asset Scripts');
     });
 }
 function replaceAbandonmentJsCssSrc(gulp, gulpPlugins, siteSettings, siteData) {
@@ -57,8 +52,6 @@ function replaceAbandonmentJsCssSrc(gulp, gulpPlugins, siteSettings, siteData) {
     .pipe(gulp.dest(siteSettings.srcFolder + '/templates/abandonment'));
 }
 function replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData) {
-  console.log(`>> VARIABLE modFooterStylesFileName (main styles) = ${fileNames.modFooterStylesFileName}`)
-  console.log(`>> VARIABLE qsFooterStylesFileName (main styles) = ${fileNames.qsFooterStylesFileName}`)
   if (siteData.siteData && siteData.siteData.useRelativePathForResources === true) {
     return gulp.src(siteSettings.srcFolder + '/resources/scripts/footer/' + fileNames.footerComponentJsFileName)
       .pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/mod.*?)\)/, `concat("${pathSubdirectory}resources/styles/components/footer/` + fileNames.modFooterStylesFileName + '")'))
@@ -72,8 +65,6 @@ function replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData)
   }
 }
 function replaceFooterStylesReferenceInMap(gulp, gulpPlugins, siteSettings, siteData) {
-  console.log(`>> VARIABLE modFooterStylesFileName (map styles) = ${fileNames.modFooterStylesFileName}`)
-  console.log(`>> VARIABLE qsFooterStylesFileName (map styles) = ${fileNames.qsFooterStylesFileName}`)
   if (siteData.siteData && siteData.siteData.useRelativePathForResources === true) {
     return gulp.src(siteSettings.srcFolder + '/resources/scripts/footer/footer-component.min.js.map')
       .pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/mod.*?)\`/, '`' + pathSubdirectory + 'resources/styles/components/footer/' + fileNames.modFooterStylesFileName + '`'))
@@ -134,10 +125,7 @@ function getResource(url, config = {}, fn, fnArray) {
         })
         .pipe(source(file))
         .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
-        .on('finish', function(){
-          console.log(`>> SUCCESSFULLY copied map file = ${file}`);
-          resolve();
-        });
+        .on('finish', resolve);
     });
   })
   .then(() => {
@@ -254,11 +242,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
         });
       }
 
-      
-      return Promise.all(getAllResources)
-      .then(() => {
-        console.log(`>>FILENAMES object = ${JSON.stringify(fileNames)}`);
-      });
+      return Promise.all(getAllResources);
     }());
   };
 };

package/gulp-tasks/templates.js

@@ -252,14 +252,20 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			}
 		}
 
-		return gulp.src([
-			siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/**/*.html',
-			'!' + siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/_partials/**/*.html'
-		])
-			.pipe(gulpPlugins.handlebarsFileInclude(templatesData, {
-				maxRecursion: 500,
-				handlebarsHelpers: handlebarsHelpers
-			}))
-			.pipe(gulp.dest(siteSettings.tmpFolder));
+		return new Promise(function(resolve) {
+			return gulp.src([
+				siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/**/*.html',
+				'!' + siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/_partials/**/*.html'
+			])
+				.pipe(gulpPlugins.handlebarsFileInclude(templatesData, {
+					maxRecursion: siteData.fileIncludeMaxRecursion ? siteData.fileIncludeMaxRecursion : 500,
+					handlebarsHelpers: handlebarsHelpers
+				}))
+				.pipe(gulp.dest(siteSettings.tmpFolder))
+				.on('finish', function() {
+					resolve();
+					console.log('Templates completed')
+				});
+		});
 	};
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.60-beta.4",
+  "version": "3.6.61-beta.1",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -56,7 +56,6 @@
     "jquery": "^3.2.1",
     "lodash": "^4.17.15",
     "lodash.merge": "^4.6.2",
-    "node-fetch": "^3.3.2",
     "nouislider": "^10.1.0",
     "path": "^0.12.7",
     "request": "^2.88.0",