mod-build 3.6.56 → 3.6.58-beta.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.58
+
+- removing the copying of mod-form & qs-form JS files out of `grab-shared-scripts` gulp task, now that all S3 sites have been migrated over to use homeowner.min.js
+
 ## 3.6.56
 
 - `noheap` + `nogtm` conditionals no longer needed (those variables will & have been set to "true" for all sites in our shared components / configs)

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

@@ -13,8 +13,6 @@ const fileNames = {
   footerComponentJsFileName: '',
   modFooterStylesFileName: '',
   qsFooterStylesFileName: '',
-  modFormFileName: '',
-  qsFormFileName: '',
   homeownerFormFileName: ''
 };
 var isQuotePageOrUseRelativePath = false;
@@ -31,15 +29,9 @@ 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 + '/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.*?)js"/g, function(match) {
-      if (match.includes('mod-form')) {
-        if (match.includes('mod-form/form')) {
-          return `"${resourcePath}/mod-form/form/${fileNames.homeownerFormFileName}"`;
-        } else if (match.includes('qs-form')) {
-          return `"${resourcePath}/mod-form/${fileNames.qsFormFileName}"`;
-        } else {
-          return `"${resourcePath}/mod-form/${fileNames.modFormFileName}"`;
-        }
+  .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')) {
+        return `"${resourcePath}/mod-form/form/${fileNames.homeownerFormFileName}"`;
       } else if (match.includes('modutils') || match.includes('mod-utils')) {
         return `"${resourcePath}/mod-utils/${fileNames.modUtilsFileName}"`;
       } else if (match.includes('footer-component')) {
@@ -167,26 +159,6 @@ const TASKS = {
     srcReplaceFn: null,
     additionalSrcReplaceFns: []
   },
-  copyModForm: {
-    url: 'mod-form/mod-form.min.js',
-    config: {
-      fileName: 'modFormFileName',
-      dest: 'scripts/mod-form',
-      mapUrl: 'mod-form/mod-form.min.js.map',
-    },
-    srcReplaceFn: null,
-    additionalSrcReplaceFns: []
-  },
-  copyQsForm: {
-    url: 'mod-form/qs-form.min.js',
-    config: {
-      fileName: 'qsFormFileName',
-      dest: 'scripts/mod-form',
-      mapUrl: 'mod-form/qs-form.min.js.map',
-    },
-    srcReplaceFn: null,
-    additionalSrcReplaceFns: []
-  },
   copyHomeownerForm: {
     url: 'mod-form/form/homeowner.min.js',
     config: {

package/gulp-tasks/templates.js

@@ -231,7 +231,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 					throw new Error(`${xhr.statusCode}: Error while fetching TCPA`);
 				}
 				const responseJson = await JSON.parse(response);
-				const finalTCPA = await company === 'Modernize' ? responseJson.tcpa.replace(/QuinStreet/g, 'Modernize') : responseJson.tcpa;
+				const finalTCPA = await (company === 'Modernize' || templatesData.useModernizeInTCPA) ? responseJson.tcpa.replace(/QuinStreet/g, 'Modernize') : responseJson.tcpa;
 
 				templatesData.tcpaText = await finalTCPA;
 
@@ -246,7 +246,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			if (!templatesData.doNotUseDefaultFieldConfig && !templatesData.defaultConfigCompleted) {
 				await getDefaultFormFieldConfig();
 			}
-	
+
 			if (!templatesData.tcpaText && templatesData.primary_trade) {
 				await fetchTcpaFromSitegenie();
 			}

package/package.json

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