mod-build 3.6.60-beta.1 → 3.6.60-beta.2

package/CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## 3.6.60
-
-- added functionality to increase the fileInclude maxRecursion value from site level
-
 ## 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

@@ -21,26 +21,30 @@ 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(`modAlyticsFileName variable = ${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(`homeownerFormFileName variable = ${fileNames.homeownerFormFileName}`);
         return `"${resourcePath}/mod-form/form/${fileNames.homeownerFormFileName}"`;
       } else if (match.includes('modutils') || match.includes('mod-utils')) {
+        console.log(`modUtilsFileName variable = ${fileNames.modUtilsFileName}`)
         return `"${resourcePath}/mod-utils/${fileNames.modUtilsFileName}"`;
       } else if (match.includes('footer-component')) {
+        console.log(`footerComponentJsFileName variable = ${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) {
@@ -52,6 +56,8 @@ function replaceAbandonmentJsCssSrc(gulp, gulpPlugins, siteSettings, siteData) {
     .pipe(gulp.dest(siteSettings.srcFolder + '/templates/abandonment'));
 }
 function replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData) {
+  console.log(`modFooterStylesFileName variable (main styles) = ${fileNames.modFooterStylesFileName}`)
+  console.log(`qsFooterStylesFileName variable (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 + '")'))
@@ -65,6 +71,8 @@ function replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData)
   }
 }
 function replaceFooterStylesReferenceInMap(gulp, gulpPlugins, siteSettings, siteData) {
+  console.log(`modFooterStylesFileName variable (map styles) = ${fileNames.modFooterStylesFileName}`)
+  console.log(`qsFooterStylesFileName variable (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 + '`'))
@@ -106,6 +114,7 @@ function getResource(url, config = {}, fn, fnArray) {
       .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
       .on('finish', function(){
         console.log(fileNames[config.fileName]);
+        console.log(`full fileNames array = ${fileNames}`)
         resolve();
       });
   })
@@ -125,7 +134,10 @@ function getResource(url, config = {}, fn, fnArray) {
         })
         .pipe(source(file))
         .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
-        .on('finish', resolve);
+        .on('finish', function(){
+          console.log('finished copying map file');
+          resolve();
+        });
     });
   })
   .then(() => {
@@ -136,7 +148,15 @@ function getResource(url, config = {}, fn, fnArray) {
         }
       });
     }
-  });
+  })
+  .then(() => {
+    console.log('FOOT ASSETS content:')
+    fetch(`${siteSettings.srcFolder} + '/shared-components/foot-assets/foot-assets.html`)
+    .then(response => response.text())
+    .then(html => {
+      console.log(html);
+    })
+  })
 }
 const TASKS = {
   copyModutils: {

package/gulp-tasks/templates.js

@@ -257,7 +257,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			'!' + siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/_partials/**/*.html'
 		])
 			.pipe(gulpPlugins.handlebarsFileInclude(templatesData, {
-				maxRecursion: siteData.fileIncludeMaxRecursion ? siteData.fileIncludeMaxRecursion : 500,
+				maxRecursion: 500,
 				handlebarsHelpers: handlebarsHelpers
 			}))
 			.pipe(gulp.dest(siteSettings.tmpFolder));

package/package.json

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