mod-build 3.6.99 → 3.7.0-beta.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.7.0
+
+- Updating `templates.js` gulp task to grab the O&O Consent Capture TCPA language.
+
+## 3.6.100
+
+- JSLint failure is back! *(needed a brief pause while implementing modernize consent)*
+
 ## 3.6.99
 
 - Updating final TCPA text from `fetchTcpaFromSitegenie()` with the Modernize consent checkbox + Privacy & Terms of Use modal links.

package/gulp-tasks/js-lint.js

@@ -20,7 +20,7 @@ module.exports = function(gulp, _gulpPlugins, siteSettings) {
 		])
 			.pipe(gulpESLintNew(siteSettings.jsLint))
 			.pipe(gulpESLintNew.format())
-			.pipe(gulpESLintNew.format('junit', fs.createWriteStream('eslint-results.xml')));
-			//.pipe(gulpESLintNew.failAfterError()); // Will turn back on after Modernize Consent has been added across S3
+			.pipe(gulpESLintNew.format('junit', fs.createWriteStream('eslint-results.xml')))
+			.pipe(gulpESLintNew.failAfterError());
 	};
 };

package/gulp-tasks/templates.js

@@ -319,6 +319,19 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		console.timeEnd('Finished fetch-tcpa-from-sitegenie after');
 	};
 
+	var getConsentCaptureLanguage = async function() {
+		await new Promise(function(resolve) {
+			request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/consent-capture/tcpa.json`, async function(_err, xhr, response) {
+				if (xhr.statusCode !== 200) {
+					throw new Error(`${xhr.statusCode}: Error while fetching Consent Capture Language`);
+				}
+				const consentCapture = await JSON.parse(response);
+				Object.assign(templatesData, consentCapture);
+				resolve();
+			});
+		});
+	};
+
 	return async function() {
 		if (Object.keys(siteData).length > 0) {
 			if (!templatesData.doNotUseDefaultFieldConfig && !templatesData.defaultConfigCompleted) {
@@ -332,6 +345,10 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			if (!templatesData.tcpaText && templatesData.primary_trade) {
 				await fetchTcpaFromSitegenie();
 			}
+
+			if (!templatesData.consentCapture) {
+				await getConsentCaptureLanguage();
+			}
 		}
 
 		return new Promise(function(resolve) {

package/package.json

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