mod-build 4.0.51-beta.4 → 4.0.51-beta.6

package/package.json

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

package/src/scripts/plugins.js

@@ -43,6 +43,7 @@ export const updateConfig = async (config) => {
 		...footer(config),
 		...{ isLocal, nodeEnv, buildPath }
 	};
+	await addSeasonalchanges(mergedConfig);
 
 	const checkForTempConfig = () => {
 		return new Promise((resolve) => {
@@ -60,7 +61,6 @@ export const updateConfig = async (config) => {
 		name: 'update-config',
 		async configResolved({ configFileDependencies }) {
 			await checkForTempConfig();
-			await addSeasonalchanges(mergedConfig);
 
 			configFileDependencies.forEach((file) => {
 				if (file.endsWith('siteconfig.js') || file.endsWith('template.js')) {
@@ -93,6 +93,7 @@ export const updateHandlebarsOnWatch = async (config) => {
 		...footer(config),
 		...{ isLocal, nodeEnv, buildPath }
 	};
+	await addSeasonalchanges(mergedConfig);
 
 	const checkForTempConfig = () => {
 		return new Promise((resolve) => {
@@ -111,7 +112,6 @@ export const updateHandlebarsOnWatch = async (config) => {
 		enforce: 'pre',
 		async configResolved({ configFileDependencies }) {
 			await checkForTempConfig();
-			await addSeasonalchanges(mergedConfig);
 
 			configFileDependencies.forEach((file) => {
 				if (file.endsWith('siteconfig.js') || file.endsWith('template.js')) {

package/tasks/addSeasonalchanges.js

@@ -22,7 +22,8 @@ export default async function(tempConfig) {
 				// Find and reverse the required words in the string using regex group capture
 				const processedData = data.replaceAll(regex, '$3 $2 $1');
 				// Convert data into JSON
-				tempConfig = JSON.parse(processedData);
+				const parsed = JSON.parse(processedData);
+				Object.assign(tempConfig, parsed);
 				// Find the HVACInterest step and reverse the options array
 				if (tempConfig.steps && (tempConfig.steps.items && tempConfig.steps.items.length)) {
 					tempConfig.steps.items.forEach(function(step) {

package/tasks/templates.js

@@ -3,7 +3,6 @@ import footer from '../src/data/footer.js';
 import fs from 'node:fs';
 import merge from 'lodash.merge';
 import { responseInterceptor } from '../src/scripts/retry-axios.js';
-import addSeasonalchanges from './addSeasonalchanges.js';
 
 import { defaultSettings } from '../src/data/config.js';
 
@@ -263,8 +262,6 @@ export default async function(config) {
 		...{ isLocal, nodeEnv, assetsPath, buildPath },
 	};
 
-	// await addSeasonalchanges(tempConfig);
-
 	if (Object.keys(config).length > 0) {
 		if (!config.doNotUseDefaultFieldConfig && !tempConfigCreated) {
 			if (config.useAccessibleConfig) {
@@ -288,7 +285,7 @@ export default async function(config) {
 		if (!fs.existsSync(`${defaultSettings.srcFolder}/${defaultSettings.tmpFolder}`)) {
 			fs.mkdirSync(`${defaultSettings.srcFolder}/${defaultSettings.tmpFolder}`, { recursive: true });
 		}
-
+		Object.assign(config, tempConfig);
 		fs.writeFileSync(`${defaultSettings.srcFolder}/${defaultSettings.tmpFolder}/config.json`, JSON.stringify(tempConfig, null, 2));
 	}
 }