mod-build 4.0.0-alpha.20d → 4.0.0-alpha.20f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "4.0.0-alpha.20d",
+  "version": "4.0.0-alpha.20f",
   "description": "Share components for S3 sites.",
   "type": "module",
   "scripts": {

package/src/scripts/utils.js

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import { seasons } from "../data/seasons.js";
 import gulpHandlebarsFileInclude from "gulp-handlebars-file-include";
+import merge from "lodash.merge";
 
 export function getFileFromURL(url) {
 	return url.split('/').pop();
@@ -181,10 +182,7 @@ export const updateConfig = (config) => {
 						const configData = fs.readFileSync('src/.tmp/config.json', 'utf8');
 						const parsedConfig = JSON.parse(configData);
 
-						mergedConfig = {
-							...parsedConfig,
-							...mergedConfig,
-						};
+						mergedConfig = merge(mergedConfig, parsedConfig);
 
 						// overwrite the config file with new data
 						fs.writeFileSync('src/.tmp/config.json', JSON.stringify(mergedConfig, null, 2));

package/tasks/templates.js

@@ -75,22 +75,18 @@ const fetchTcpaFromSitegenie = async (config, tempConfig) => {
 
 	console.log('Starting fetch-tcpa-from-sitegenie: ', url);
 
-	await new Promise(function(resolve) {
-		axios.get(url).then(async resp => {
-			if (resp.status !== 200) {
-				throw new Error(`${resp.status}: Error while fetching TCPA`);
-			}
+	axios.get(url).then(async resp => {
+		if (resp.status !== 200) {
+			throw new Error(`${resp.status}: Error while fetching TCPA`);
+		}
 
-			const responseJson = resp.data;
-			let finalTCPA = await (company === 'Modernize' || config.useModernizeInTCPA) ? responseJson.tcpa.replace(/QuinStreet/g, 'Modernize') : responseJson.tcpa;
-			const removeInlineStyleRegex = / style="[^"]*"/g;
-			finalTCPA = finalTCPA.replace(removeInlineStyleRegex, '');
-			tempConfig.tcpaText = await finalTCPA;
-			resolve();
-		}).catch(error => {
-			console.error(error);
-			resolve();
-		});
+		const responseJson = resp.data;
+		let finalTCPA = await (company === 'Modernize' || config.useModernizeInTCPA) ? responseJson.tcpa.replace(/QuinStreet/g, 'Modernize') : responseJson.tcpa;
+		const removeInlineStyleRegex = / style="[^"]*"/g;
+		finalTCPA = finalTCPA.replace(removeInlineStyleRegex, '');
+		tempConfig.tcpaText = await finalTCPA;
+	}).catch(error => {
+		console.error(error);
 	});
 };