mod-build 4.0.1 → 4.0.2

package/package.json

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

package/src/scripts/plugins.js

@@ -1,5 +1,4 @@
 import fs from "node:fs";
-import mergeWith from "lodash.mergewith";
 import merge from "lodash.merge";
 import gulpHandlebarsFileInclude from "gulp-handlebars-file-include";
 import { defaultSettings } from "../data/config.js";
@@ -33,21 +32,10 @@ export const STATIC_COPY_TARGETS = [
 	},
 ];
 
-// eslint-disable-next-line no-unused-vars
-let tempConfigExists;
-
-const customizer = (objValue, srcValue) => {
-	// If the key exists in parsedConfig but not in mergedConfig, drop it from the merged result
-	if (srcValue === undefined) {
-		return undefined;
-	}
-
-	// Otherwise, use the default merging behavior
-	return merge(objValue, srcValue); // or you can return merge(objValue, srcValue) to merge nested objects
-};
-
-const checkForTempConfig = (config) => {
+export const updateConfig = async (config) => {
 	const { isLocal, nodeEnv, buildPath } = defaultSettings;
+	// eslint-disable-next-line no-unused-vars
+	let tempConfigExists;
 
 	let mergedConfig = { 
 		...config,
@@ -55,23 +43,23 @@ const checkForTempConfig = (config) => {
 		...{ isLocal, nodeEnv, buildPath }
 	};
 
-	return new Promise((resolve) => {
-		tempConfigExists = fs.existsSync(`src/.tmp/config.json`);
-		if (tempConfigExists) {
+	const checkForTempConfig = () => {
+		return new Promise((resolve) => {
+			tempConfigExists = fs.existsSync(`src/.tmp/config.json`);
+	
 			const configData = fs.readFileSync('src/.tmp/config.json', 'utf8');
 			const parsedConfig = JSON.parse(configData);
-			mergedConfig = mergeWith(parsedConfig, mergedConfig, customizer);
-		}
-		resolve(mergedConfig);
-	});
-};
+			mergedConfig = merge(parsedConfig, mergedConfig);
 
-export const updateConfig = async (config) => {
-	const mergedConfig = await checkForTempConfig(config);
+			resolve();
+		});
+	};
 
 	return {
 		name: 'update-config',
 		async configResolved({ configFileDependencies }) {
+			await checkForTempConfig();
+
 			configFileDependencies.forEach((file) => {
 				if (file.endsWith('siteconfig.js') || file.endsWith('template.js')) {
 					console.log('siteconfig or template changed');
@@ -94,11 +82,46 @@ export const updateConfig = async (config) => {
 }
 
 export const updateHandlebarsOnWatch = async (config) => {
-	const mergedConfig = await checkForTempConfig(config);
+	const { isLocal, nodeEnv, buildPath } = defaultSettings;
+	// eslint-disable-next-line no-unused-vars
+	let tempConfigExists;
+
+	let mergedConfig = { 
+		...config,
+		...footer(config),
+		...{ isLocal, nodeEnv, buildPath }
+	};
+
+	const checkForTempConfig = () => {
+		return new Promise((resolve) => {
+			tempConfigExists = fs.existsSync(`src/.tmp/config.json`);
+	
+			const configData = fs.readFileSync('src/.tmp/config.json', 'utf8');
+			const parsedConfig = JSON.parse(configData);
+			mergedConfig = merge(parsedConfig, mergedConfig);
+
+			resolve();
+		});
+	};
 
 	return {
 		name: 'update-handlebars-reload',
 		enforce: 'pre',
+		async configResolved({ configFileDependencies }) {
+			await checkForTempConfig();
+
+			configFileDependencies.forEach((file) => {
+				if (file.endsWith('siteconfig.js') || file.endsWith('template.js')) {
+					console.log('siteconfig or template changed');
+					try {
+						// overwrite the config file with new data
+						fs.writeFileSync('src/.tmp/config.json', JSON.stringify(mergedConfig, null, 2));
+					} catch (error) {
+						console.error(`Error reading config file: ${error}`);
+					}
+				}
+			});
+		},
 		async handleHotUpdate({ server, file }) {
 			if (file.endsWith('.hbs') || file.endsWith('.html')) {
 				server.ws.send({