mod-build 4.0.1-beta.8b → 4.0.1

package/CHANGELOG.md

@@ -1,6 +1,8 @@
 ## 4.0.1
 
 - Add footAssetsConfig to additionalAssets
+- Updated Handlebars HMR to compile the templates when partials are changed
+- Added a `clean` task to delete directories created on build for easier testing
 
 ## 4.0.0-beta.5
 

package/package.json

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

package/src/scripts/plugins.js

@@ -33,10 +33,21 @@ export const STATIC_COPY_TARGETS = [
 	},
 ];
 
-export const updateConfig = async (config) => {
+// 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) => {
 	const { isLocal, nodeEnv, buildPath } = defaultSettings;
-	// eslint-disable-next-line no-unused-vars
-	let tempConfigExists;
 
 	let mergedConfig = { 
 		...config,
@@ -44,33 +55,23 @@ export const updateConfig = async (config) => {
 		...{ isLocal, nodeEnv, buildPath }
 	};
 
-	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 = () => {
-		return new Promise((resolve) => {
-			tempConfigExists = fs.existsSync(`src/.tmp/config.json`);
-	
+	return new Promise((resolve) => {
+		tempConfigExists = fs.existsSync(`src/.tmp/config.json`);
+		if (tempConfigExists) {
 			const configData = fs.readFileSync('src/.tmp/config.json', 'utf8');
 			const parsedConfig = JSON.parse(configData);
 			mergedConfig = mergeWith(parsedConfig, mergedConfig, customizer);
+		}
+		resolve(mergedConfig);
+	});
+};
 
-			resolve();
-		});
-	};
+export const updateConfig = async (config) => {
+	const mergedConfig = await checkForTempConfig(config);
 
 	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');
@@ -93,6 +94,8 @@ export const updateConfig = async (config) => {
 }
 
 export const updateHandlebarsOnWatch = async (config) => {
+	const mergedConfig = await checkForTempConfig(config);
+
 	return {
 		name: 'update-handlebars-reload',
 		enforce: 'pre',
@@ -105,7 +108,7 @@ export const updateHandlebarsOnWatch = async (config) => {
 			}
 		},
 		transformIndexHtml: () => {
-			gulpHandlebarsFileInclude(config, { maxRecursion: 500 });
+			gulpHandlebarsFileInclude(mergedConfig, { maxRecursion: 500 });
 		}
 	}
 }

package/tasks/clean.js

@@ -7,6 +7,6 @@ foldersToDelete.forEach(async (folder) => {
 		await fs.promises.rm(folder, { recursive: true });
 		console.log(`Folder ${folder} deleted successfully`);
 	} catch (err) {
-		console.error(`Failed to delete folder ${folder}: ${err}`);
+		// fail silently
 	}
 });