mod-build 4.0.0-alpha.10 → 4.0.0-alpha.11

package/package.json

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

package/tasks/grab-shared-scripts.js

@@ -240,7 +240,7 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 export default async function(config) {
 	const { isLocal } = defaultSettings;
 	const isQuotePage = config.siteData?.isQuotePage || config.isQuotePage;
-	const useAccessibleComponents = config.siteData?.useAccessibleConfig || config.useAccessibleConfig;
+	const useAccessibleComponents = config.useAccessibleConfig;
 	const useRelativePathForResources = config.siteData?.useRelativePathForResources || config.useRelativePathForResources;
 	componentFolderPath = useAccessibleComponents === true ? 'accessible-components' : 'shared-components';
 	isQuotePageOrUseRelativePath = isQuotePage === true || useRelativePathForResources === true;
@@ -250,11 +250,9 @@ export default async function(config) {
 	const tasks = Object.values(TASKS);
 	if (tasks.length) {
 		const getAllResources = tasks.map(async function(task) {
-			if (useAccessibleComponents === true) {
-				if (task.url.includes('abandonment.min.js')) {
-					task.url = 'shared-resources/scripts/abandonment/accessible/abandonment.min.js';
-					task.config.mapUrl = 'shared-resources/scripts/abandonment/accessible/abandonment.min.js.map';
-				}
+			if (useAccessibleComponents && task.url.includes('abandonment.min.js')) {
+				task.url = 'shared-resources/scripts/abandonment/accessible/abandonment.min.js';
+				task.config.mapUrl = 'shared-resources/scripts/abandonment/accessible/abandonment.min.js.map';
 			}
 			Object.assign(task.config, { defaultSettings, config });
 			await getResource(task, fileNames);

package/tasks/templates.js

@@ -6,7 +6,9 @@ import merge from 'lodash.merge';
 import { defaultSettings } from '../src/data/config.js';
 import { getActiveSeasons } from '../src/scripts/utils.js';
 
-function mergeDefaultFormFieldConfig(steps, defaultConfig, config) {
+function mergeDefaultFormFieldConfig(defaultConfig, config) {
+	const { steps } = config;
+
 	if (!steps.items) {
 		console.error('No items[ ] found in steps{}!');
 		return steps;
@@ -50,14 +52,14 @@ const getDefaultFormFieldConfig = async (config, folder = 'accessible-components
 				}
 				const defaultConfig = resp.data;
 				if (config.steps) {
-					config.steps = await mergeDefaultFormFieldConfig(config.steps, defaultConfig);
+					config.steps = await mergeDefaultFormFieldConfig(defaultConfig, config);
 				}
 				resolve();
 			}).catch(error => {
 				console.error(error);
 				resolve();
 			});
-		});
+	});
 	
 };
 
@@ -93,24 +95,24 @@ const fetchTcpaFromSitegenie = async (config) => {
 };
 
 export default async function(config) {
-	const { isLocal, resourceDomain, buildPath } = defaultSettings;
+	const { isLocal, nodeEnv, buildPath } = defaultSettings;
 	const { isWhiteLabel } = config;
-	const assetsPath = isWhiteLabel ? '' : (isLocal ? '/temp/assets' : `https://${resourceDomain}/quote/resources/assets`);
+	const assetsPath = isWhiteLabel ? '' : (isLocal ? '/temp/assets' : `https://${nodeEnv}/quote/resources/assets`);
 	const tempConfigCreated = fs.existsSync(`${defaultSettings.srcFolder}/${defaultSettings.tmpFolder}/config.json`);
 
 	const activeSeason = getActiveSeasons();
 
-	config = {
+	let tempConfig = {
 		...config,
 		...footer(config),
-		...{ isLocal, resourceDomain, assetsPath, buildPath },
+		...{ isLocal, nodeEnv, assetsPath, buildPath },
 	};
 
 	if (activeSeason.length) {
 		if (config.seasonalVariations) {
 			activeSeason.forEach(season => {
 				if (season in config.seasonalVariations) {
-					config = { ...config, ...config.seasonalVariations[season] };
+					tempConfig = { ...tempConfig, ...config.seasonalVariations[season] };
 				}
 			});
 		}
@@ -133,6 +135,6 @@ export default async function(config) {
 		fs.mkdirSync(`${defaultSettings.srcFolder}/${defaultSettings.tmpFolder}`, { recursive: true });
 	}
 
-	fs.writeFileSync(`${defaultSettings.srcFolder}/${defaultSettings.tmpFolder}/config.json`, JSON.stringify(config, null, 2));
+	fs.writeFileSync(`${defaultSettings.srcFolder}/${defaultSettings.tmpFolder}/config.json`, JSON.stringify(tempConfig, null, 2));
 
 }