mod-build 4.0.0-beta.4g → 4.0.0-beta.5

package/package.json

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

package/tasks/grab-shared-scripts.js

@@ -12,10 +12,13 @@ import { getFileFromURL } from '../src/scripts/utils.js';
 
 let fileNames = {};
 let componentFolderPath = '';
+let replacementFunctions = [];
+
+let pathSubdirectory = '';
 
 function replaceModalyticsSrc(gulp, defaultSettings) {
 	const resourcePath = '/resources/scripts/mod-alytics/';
-	return new Promise((resolve, reject) => {
+	return new Promise((resolve) => {
 		gulp.src(`${defaultSettings.srcFolder}/${componentFolderPath}/head/head.html`)
 			.pipe(replace(/".*(modalytics).*"/, `"${resourcePath}${fileNames.modAlyticsFileName}"`))
 			.pipe(gulp.dest(`${defaultSettings.srcFolder}/${componentFolderPath}/head`))
@@ -25,7 +28,7 @@ function replaceModalyticsSrc(gulp, defaultSettings) {
 
 function replaceFootAssetScripts(gulp, defaultSettings) {
 	const resourcePath = '/resources/scripts';
-	return new Promise((resolve, reject) => {
+	return new Promise((resolve) => {
 		gulp.src(`${defaultSettings.srcFolder}/${componentFolderPath}/foot-assets/foot-assets.html`)
 			.pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"|"(?:(?!"|")[\s\S])+(callrail.*?)js"|"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"|"(?:(?!"|")[\s\S])+(mod-form\/form.*?)js"/g, function(match) {
 				if (match.includes('mod-form/form')) {
@@ -49,7 +52,7 @@ function replaceFootAssetScripts(gulp, defaultSettings) {
 function replaceAbandonmentJsCssSrc(gulp, defaultSettings) {
 	const jsResourcePath = '/resources/scripts/abandonment/';
 	const cssResourcePath = '/resources/styles/components/abandonment/';
-	return new Promise((resolve, reject) => {
+	return new Promise((resolve) => {
 		gulp.src(defaultSettings.srcFolder + '/templates/abandonment/*.html')
 			.pipe(replace(/"(?:(?!"|")[\s\S])+(abandonment\/abandonment.*?)js"/, `"${jsResourcePath}${fileNames.abandonmentJsFileName}"`))
 			.pipe(replace(/"(?:(?!"|")[\s\S])+(components\/abandonment\/abandonment.*?)css"/, `"${cssResourcePath}${fileNames.abandonmentStylesFileName}"`))
@@ -58,20 +61,40 @@ function replaceAbandonmentJsCssSrc(gulp, defaultSettings) {
 	});
 }
 
+function replaceFooterStylesReference(gulp, defaultSettings) {
+	if (pathSubdirectory.length > 0) {
+		return new Promise((resolve) => {
+			gulp.src(defaultSettings.publicFolder + '/resources/scripts/footer/' + fileNames.footerComponentJsFileName)
+				.pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/mod.*?)\)/, `concat("${pathSubdirectory}resources/styles/components/footer/` + fileNames.modFooterStylesFileName + '")'))
+				.pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/qs.*?)\)/, `concat("${pathSubdirectory}resources/styles/components/footer/` + fileNames.qsFooterStylesFileName + '")'))
+				.pipe(gulp.dest(defaultSettings.publicFolder + '/resources/scripts/footer'))
+				.on('finish', resolve);
+		});
+	} else {
+		return new Promise((resolve) => {
+			gulp.src(defaultSettings.publicFolder + '/resources/scripts/footer/' + fileNames.footerComponentJsFileName)
+				.pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/mod.*?)\)/, 'concat("/resources/styles/components/footer/' + fileNames.modFooterStylesFileName + '")'))
+				.pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/qs.*?)\)/, 'concat("/resources/styles/components/footer/' + fileNames.qsFooterStylesFileName + '")'))
+				.pipe(gulp.dest(defaultSettings.publicFolder + '/resources/scripts/footer'))
+				.on('finish', resolve);
+		});
+	}
+}
+
 const TASKS = {
 	copyModutils: {
-		url: 'shared-resources/scripts/callrail/callrail.min.js',
+		url: 'mod-utils/modutils.min.js',
 		config: {
-			fileName: 'callrailFileName',
-			dest: 'scripts/callrail',
+			fileName: 'modUtilsFileName',
+			dest: 'scripts/mod-utils',
 		},
 		srcReplaceFn: null,
 	},
 	copyCallrail: {
-		url: 'mod-utils/modutils.min.js',
+		url: 'shared-resources/scripts/callrail/callrail.min.js',
 		config: {
-			fileName: 'modUtilsFileName',
-			dest: 'scripts/mod-utils',
+			fileName: 'callrailFileName',
+			dest: 'scripts/callrail',
 		},
 		srcReplaceFn: null,
 	},
@@ -114,6 +137,22 @@ const TASKS = {
 			dest: 'scripts/abandonment',
 		},
 		srcReplaceFn: replaceAbandonmentJsCssSrc,
+	},
+	copyModFooterComponentStyles: {
+		url: 'shared-resources/styles/components/footer/mod-footer.min.css',
+		config: {
+			fileName: 'modFooterStylesFileName',
+			dest: 'styles/components/footer',
+		},
+		srcReplaceFn: null,
+	},
+	copyQsFooterComponentStyles: {
+		url: 'shared-resources/styles/components/footer/qs-footer.min.css',
+		config: {
+			fileName: 'qsFooterStylesFileName',
+			dest: 'styles/components/footer',
+		},
+		srcReplaceFn: replaceFooterStylesReference,
 	}
 };
 
@@ -172,15 +211,16 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 					})
 				});
 			})
-			.then(async () => {
+			.then(() => {
 				if (!srcReplaceFn) {
 					return false;
 				}
 
 				if (typeof srcReplaceFn === 'function') {
-					await srcReplaceFn(gulp, task.config.defaultSettings, task.config.config);
+					replacementFunctions.push(() => srcReplaceFn(gulp, task.config.defaultSettings, task.config.config));
 				}
-				return true
+
+				return true;
 			})
 			.then(() => {
 				resolve();
@@ -193,9 +233,12 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 }
 
 export default async function(config) {
+	const { isLocal } = defaultSettings;
 	const useAccessibleComponents = config.useAccessibleConfig;
 	componentFolderPath = useAccessibleComponents === true ? 'accessible-components' : 'shared-components';
 	const tasks = Object.values(TASKS);
+	const isPathSubdirectory = config.siteData?.pathSubdirectory || config.pathSubdirectory;
+	pathSubdirectory = isLocal === "false" && isPathSubdirectory ? isPathSubdirectory : '';
 
 	if (tasks.length) {
 		const getAllResources = tasks.map(async function(task) {
@@ -206,9 +249,15 @@ export default async function(config) {
 			await getResource(task, fileNames);
 		});
 
-		await Promise.all(getAllResources)
-		.then(() => {
-			console.log(`>> FILENAMES object = ${JSON.stringify(fileNames)}`);
-		})
+		await Promise.all(getAllResources);
+
+		console.log(`>> FILENAMES OBJECT: ${JSON.stringify(fileNames)}`);
+
+		await Promise.all(replacementFunctions.map(async function(fn) {
+			if (typeof fn === 'function') {
+				await fn();
+			}
+		}));
+		console.log('>> FINISHED replacing all resource paths');
 	}
 }