mod-build 4.0.33-beta.1 → 4.0.33

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.33
+
+- Adding current logic for appending the Modernize consent checkbox in the TCPA for sites using Vite
+
 ## 4.0.32
 
 - Updating the `grab-form-helpers.js` task to not have a double slash when copying files over

package/gulp-tasks/templates.js

@@ -247,15 +247,8 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 				let finalTCPA = await (company === 'Modernize' || templatesData.useModernizeInTCPA) ? responseJson.tcpa.replace(/QuinStreet/g, 'Modernize') : responseJson.tcpa;
 				const removeInlineStyleRegex = / style="[^"]*"/g;
 				finalTCPA = finalTCPA.replace(removeInlineStyleRegex, '');
-
-				// Adjustments for Modernize Consent Capture (will be adjusted with O&O Consent Implementation)
-				if (finalTCPA.includes('Modernize and up to ')) {
-					finalTCPA = finalTCPA.replace('Modernize', '<label><input class="consent-capture" type="checkbox" data-name="Modernize" data-key="33940610" checked /> Modernize</label>');
-					const tcpaPrivacyAndTerms = ` Please see our <a id="tcpaPrivacy" href="/?modal=tcpaPrivacy" data-load="${pathSubdirectory ? pathSubdirectory : '/'}resources/templates/modals/privacy/" data-bind="modal-page">Privacy Notice</a> and our <a id="tcpaTerms" href="/?modal=tcpaTerms" data-load="${pathSubdirectory ? pathSubdirectory : '/'}resources/templates/modals/terms/" data-bind="modal-page">Terms of Use</a>.`;
-					finalTCPA += tcpaPrivacyAndTerms;
-				}
-
 				templatesData.tcpaText = await finalTCPA;
+
 				resolve();
 			});
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mod-build",
-	"version": "4.0.33-beta.1",
+	"version": "4.0.33",
 	"description": "Share components for S3 sites.",
 	"type": "module",
 	"scripts": {

package/tasks/templates.js

@@ -70,7 +70,7 @@ const getDefaultFormFieldConfig = async (config, folder = 'accessible-components
 	});
 };
 
-const fetchTcpaFromSitegenie = async (config, tempConfig) => {
+const fetchTcpaFromSitegenie = async (config, tempConfig, pathSubdirectory) => {
 	const company = config.company_name;
 	const companyPlaceholder = "<%=company_name%>";
 	const website = config.website_name;
@@ -104,6 +104,14 @@ const fetchTcpaFromSitegenie = async (config, tempConfig) => {
 				if (finalTCPA.includes(companyPlaceholder)) {
 					finalTCPA = finalTCPA.replace(new RegExp(companyPlaceholder, 'g'), company);
 				}
+
+				// Adjustments for Modernize Consent Capture (will be adjusted with O&O Consent Implementation)
+				if (finalTCPA.includes('Modernize and up to ')) {
+					finalTCPA = finalTCPA.replace('Modernize', '<label><input class="consent-capture" type="checkbox" data-name="Modernize" data-key="33940610" checked /> Modernize</label>');
+					const tcpaPrivacyAndTerms = ` Please see our <a id="tcpaPrivacy" href="/?modal=tcpaPrivacy" data-load="${pathSubdirectory ? pathSubdirectory : '/'}resources/templates/modals/privacy/" data-bind="modal-page">Privacy Notice</a> and our <a id="tcpaTerms" href="/?modal=tcpaTerms" data-load="${pathSubdirectory ? pathSubdirectory : '/'}resources/templates/modals/terms/" data-bind="modal-page">Terms of Use</a>.`;
+					finalTCPA += tcpaPrivacyAndTerms;
+				}
+
 				tempConfig.tcpaText = finalTCPA;
 				resolve(finalTCPA);
 		})
@@ -115,6 +123,21 @@ const fetchTcpaFromSitegenie = async (config, tempConfig) => {
 			}
 
 			let defaultTcpa = JSON.parse(fs.readFileSync('src/resources/data/tcpa.json', 'utf8'));
+			defaultTcpa.tcpaText.replace(/QuinStreet/g, 'Modernize');
+
+			const removeInlineStyleRegex = / style="[^"]*"/g;
+			defaultTcpa.tcpaText = finalTCPA.replace(removeInlineStyleRegex, '');
+			if (defaultTcpa.tcpaText.includes(companyPlaceholder)) {
+				defaultTcpa.tcpaText = defaultTcpa.tcpaText.replace(new RegExp(companyPlaceholder, 'g'), company);
+			}
+
+			// Adjustments for Modernize Consent Capture (will be adjusted with O&O Consent Implementation)
+			if (defaultTcpa.tcpaText.includes('Modernize and up to ')) {
+				defaultTcpa.tcpaText = defaultTcpa.tcpaText.replace('Modernize', '<label><input class="consent-capture" type="checkbox" data-name="Modernize" data-key="33940610" checked /> Modernize</label>');
+				const tcpaPrivacyAndTerms = ` Please see our <a id="tcpaPrivacy" href="/?modal=tcpaPrivacy" data-load="${pathSubdirectory ? pathSubdirectory : '/'}resources/templates/modals/privacy/" data-bind="modal-page">Privacy Notice</a> and our <a id="tcpaTerms" href="/?modal=tcpaTerms" data-load="${pathSubdirectory ? pathSubdirectory : '/'}resources/templates/modals/terms/" data-bind="modal-page">Terms of Use</a>.`;
+				defaultTcpa.tcpaText += tcpaPrivacyAndTerms;
+			}
+
 			tempConfig.tcpaText = defaultTcpa.tcpaText;
 			resolve(error);
 		}).finally(() => {
@@ -128,6 +151,8 @@ export default async function(config) {
 	const { isWhiteLabel } = config;
 	const assetsPath = isWhiteLabel ? '' : (isLocal ? '/temp/assets' : `https://${nodeEnv}/quote/resources/assets`);
 	const tempConfigCreated = fs.existsSync(`${defaultSettings.srcFolder}/${defaultSettings.tmpFolder}/config.json`);
+	const isPathSubdirectory = typeof config.pathSubdirectory !== 'undefined';
+	const pathSubdirectory = !isLocal && isPathSubdirectory ? isPathSubdirectory : '';
 
 	const activeSeason = getActiveSeasons();
 
@@ -197,7 +222,7 @@ export default async function(config) {
 			}
 		}
 		if (!config.tcpaText && config.primary_trade && !tempConfigCreated) {
-			await fetchTcpaFromSitegenie(config, tempConfig);
+			await fetchTcpaFromSitegenie(config, tempConfig, pathSubdirectory);
 		}
 	}