mod-build 3.7.3 → 3.7.5

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.7.5
+
+- fixed trade directory name issue for section deals pages
+
+## 3.7.4
+
+- Added small enhancements in `grab-mhsadmin-data`
+
 ## 3.7.3
 
 - Added `grab-section-deals-components` and `grab-mhsadmin-data` tasks for section deals pages.

package/gulp-tasks/grab-mhsadmin-data.js

@@ -97,7 +97,8 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 					featured: [],
 					top: [],
 					recent: []
-				}
+				},
+				defaultHomePage: 'home-services'
 			};
 			resolve();
 		});
@@ -111,7 +112,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			}
 			const { page, sitemap } = siteData;
 			const { articlesConfig } = page;
-			const { siteDetails } = articlesConfig;
+			const { siteDetails, defaultHomePage } = articlesConfig;
 			return request(siteSettings.endpoints.GET_SITE_DETAILS, async function(_xhr, response, body) {
 				if (response.statusCode === 200) {
 					let result = await JSON.parse(body);
@@ -122,9 +123,9 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 					siteDetails.vertical = await siteDetails?.data?.homepage?.hero?.heading;
 					siteDetails.costCalculatorTheme = siteData.costCalculatorTheme ? siteData.costCalculatorTheme : siteDetails?.slug;
 					siteDetails.domain = await siteDetails?.data?.domain?.replace(/\/*?$/, '');
-					siteDetails.homepage = await siteDetails?.data?.homepage?.slug;
+					siteDetails.homepage = await siteDetails?.data?.homepage?.slug ? siteDetails?.data?.homepage?.slug : defaultHomePage;
 					siteDetails.canonicalURL = await `${siteDetails?.domain}/${siteDetails?.homepage}/`;
-					if (siteDetails.data.favicon && Object.keys(siteDetails.data.favicon).length) {
+					if (siteDetails?.data?.favicon && Object.keys(siteDetails.data.favicon).length) {
 						page.headConfig.faviconPath = siteDetails.data.favicon.url ? siteDetails.data.favicon.url : page.headConfig.faviconPath;
 					}
 
@@ -193,7 +194,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 
 		const _insertTrade = function(htmlString) {
 			const markup = gulpPlugins.htmlParser.parse(htmlString);
-			markup.querySelector('.btn--zip').setAttribute('data-service', trade.slug);
+			markup.querySelector('.btn--zip').setAttribute('data-service', trade.slug.toLowerCase().replaceAll(/[-|\s]/ig, '_'));
 			markup.querySelector('.trade').textContent = trade.displayName;
 			return markup;
 		};
@@ -246,20 +247,20 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 						trade = '${trade}'
 					}}{{/page.articlesConfig.articlesWithContractors.${trade}.${pageName}}}`;
 						// make the directory by trade name
-						fs.mkdir(`${templatesPath}/${siteDetails.homepage}/${trade}/`, { recursive: true }, async function(error) {
+						fs.mkdir(`${templatesPath}/${siteDetails.homepage}/${articleData.data.trade.slug}/`, { recursive: true }, async function(error) {
 							if (error) {
 								throw error;
 							}
-							fs.writeFile(`${templatesPath}/${siteDetails.homepage}/${trade}/index.html`, tradeHubFileContent, function(err) {
+							fs.writeFile(`${templatesPath}/${siteDetails.homepage}/${articleData.data.trade.slug}/index.html`, tradeHubFileContent, function(err) {
 								if (err) {
 									throw err;
 								}
-								fs.writeFile(`${templatesPath}/${siteDetails.homepage}/${trade}/${fileName}.html`, fileContent, function($err) {
+								fs.writeFile(`${templatesPath}/${siteDetails.homepage}/${articleData.data.trade.slug}/${fileName}.html`, fileContent, function($err) {
 									if ($err) {
 										throw $err;
 									}
 									templatesCount++;
-									log.info(`Article template ${templatesCount?.toString()?.padStart(2, '0')}: ${templatesPath}${trade}/${siteDetails.homepage}/${fileName}.html`);
+									log.info(`Article template ${templatesCount?.toString()?.padStart(2, '0')}: ${templatesPath}${articleData.data.trade.slug}/${siteDetails.homepage}/${fileName}.html`);
 									if (articleConfigsCount === templatesCount) {
 										siteData.page.lastMod = formatDate(new Date().toLocaleDateString(dateLocalString, lastModDateOptions));
 										done();

package/package.json

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