mod-build 4.0.68-beta.3 → 4.0.68

package/CHANGELOG.md

@@ -1,9 +1,13 @@
 # Changelog
 
-## 4.0.67
+## 4.0.68
 
 - Avoided overriding the control's step configuration during the merge with the variation's steps and the default form config.
 
+## 4.0.67
+
+- Pull `theme.json` into public folder instead of src.
+
 ## 4.0.66
 
 - Removed the `addVwoTestAttribute` flag. The `data-vwo-test` attribute will now always be added to the `body` tag if the current session is a variation.

package/package.json

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

package/tasks/grab-cdn.js

@@ -72,7 +72,7 @@ export default async function(config) {
 	const { isQSPage, isWhiteLabel, page } = config;
 	const themeFile = page?.themeFile;
 	const cssThemes = page?.cssThemes;
-	const isModWhiteLabel = isWhiteLabel && !isQSPage
+	const isModWhiteLabel = isWhiteLabel && !isQSPage;
 	const domainHasModernize = config?.domain?.indexOf('modernize') > -1 && !(config?.domain?.includes('bestcompany'));
 
 	let externalResources;
@@ -92,24 +92,24 @@ export default async function(config) {
 		'/quote/resources/shared-resources/templates/modals/contact-us/': [`${srcFolder}/resources/templates/modals/contact-us/`, 'index.html'],
 		'/quote/resources/shared-resources/templates/modals/faq/': [`${srcFolder}/resources/templates/modals/faq/`, 'index.html'],
 		'/quote/resources/shared-resources/templates/modals/e-sign-consent/': [`${srcFolder}/resources/templates/modals/e-sign-consent/`, 'index.html']
-	})
+	});
 
 	if (isModWhiteLabel || domainHasModernize) {
-		Object.assign(externalResources, {'/quote/resources/mod-site/templates/scripts/recaptcha.html': [`${publicFolder}/resources/scripts/`, 'recaptcha.html']});
+		Object.assign(externalResources, { '/quote/resources/mod-site/templates/scripts/recaptcha.html': [`${publicFolder}/resources/scripts/`, 'recaptcha.html'] });
 	}
 
 	if (cssThemes && cssThemes.length > 0) {
 		cssThemes.forEach(theme => {
 			const themeFileName = `_${theme}.scss`;
 			const themePath = `/quote/resources/shared-resources/styles/themes/${themeFileName}`;
-			Object.assign(externalResources, {[themePath]: [`${srcFolder}/resources/styles/themes/`, themeFileName]});
+			Object.assign(externalResources, { [themePath]: [`${srcFolder}/resources/styles/themes/`, themeFileName] });
 		});
 	}
 
 	// theme JSON
 	if (isQSPage && themeFile) {
 		Object.assign(externalResources, {
-			[`/quote/resources/data/themes/${themeFile}.json`]: [`${srcFolder}/data/`, 'theme.json']
+			[`/quote/resources/data/themes/${themeFile}.json`]: [`${publicFolder}/data/`, 'theme.json']
 		});
 	}
 

package/tasks/templates.js

@@ -58,7 +58,7 @@ function mergeDefaultFormFieldConfig(defaultConfig, config, parentConfig) {
 			if (item.fields) {
 				item.fields = item.fields.map(field => {
 					if (field.name && defaultConfig[field.name]) {
-						field = Object.assign(defaultConfig[field.name], field);
+						field = Object.assign(cloneDeep(defaultConfig[field.name]), field);
 					}
 					return field;
 				});