mod-build 3.6.62 → 3.6.64-beta.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.6.64
+
+- Removing the massive amounts of console logs added in version `3.6.60`; I think the issue with our `grab-shared-scripts` task was that we are calling the `[replaceFooterStylesReference, replaceFooterStylesReferenceInMap]` twice. On the first go around, the QS footer styles are not yet laoded, & then once QS footer styles DID get loaded and we called the function a second time – it might have gotten hung up (we should only call these functions once).
+
+## 3.6.63
+
+- Adding conditional to check for `siteData` to exist before checking for the `useAccessibleConfig`.
+
 ## 3.6.62
 
 - Adding the accessible components to the `grab-shared-components` task; As well as pulling the accessible `defaultFormFieldConfig` for the new template.js configuration (& merging to the new template stucture appropriately); As well as updating the `grab-shared-scripts` to pull in / edit the necessary accessible components (including the accessible abandonment JS file);

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

@@ -22,24 +22,19 @@ var componentFolderPath = '';
 
 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}/${componentFolderPath}/head/head.html`)
     .pipe(replace(/".*(modalytics).*"/, `"${resourcePath}${fileNames.modAlyticsFileName}"`))
     .pipe(gulp.dest(`${siteSettings.srcFolder}/${componentFolderPath}/head`));
 }
 function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
-  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}/${componentFolderPath}/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}"`;
       }
     }))
@@ -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 + '`'))
@@ -135,7 +126,6 @@ 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();
         });
     });
@@ -219,7 +209,7 @@ const TASKS = {
       mapUrl: null,
     },
     srcReplaceFn: null,
-    additionalSrcReplaceFns: [replaceFooterStylesReference, replaceFooterStylesReferenceInMap]
+    additionalSrcReplaceFns: []
   },
   copyQsFooterComponentStyles: {
     url: 'shared-resources/styles/components/footer/qs-footer.min.css',
@@ -267,10 +257,6 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
       return Promise.all(getAllResources)
       .then(() => {
         console.log(`>> FILENAMES object = ${JSON.stringify(fileNames)}`);
-        return gulp.src(`${siteSettings.srcFolder}/${componentFolderPath}/foot-assets/foot-assets.html`)
-        .on('data', function (file) {
-          console.log(`>> FOOT ASSETS HTML = ${file.contents.toString()}`);
-        });
       })
     }());
   };

package/gulp-tasks/templates.js

@@ -248,7 +248,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	return async function() {
 		if (Object.keys(siteData).length > 0) {
 			if (!templatesData.doNotUseDefaultFieldConfig && !templatesData.defaultConfigCompleted) {
-				if (templatesData.siteData.useAccessibleConfig) {
+				if (templatesData.siteData && templatesData.siteData.useAccessibleConfig) {
 					await getDefaultFormFieldConfig('accessible-components');
 				} else {
 					await getDefaultFormFieldConfig('shared-components');

package/package.json

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