mod-build 4.0.80 → 4.0.82-beta.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 4.0.82
+
+- Added `grab-global-fonts` task to grab Roboto + Montserrat font files from mod-site
+- Added `add-files-to-gitignore` helper task so we can call it whenever needed
+
+## 4.0.81
+
+- Updated `grab-shared-scripts.js` to pull growthbook js globally
+
 ## 4.0.80
 
 - Add `grab-jsdoc` task to serve process

package/package.json

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

package/tasks/{add-jsdocs-to-gitignore.js → add-files-to-gitignore.js}

@@ -1,16 +1,16 @@
 import fs from 'node:fs';
 import path from 'node:path';
 
-const entriesToAdd = [
-	'jsdoc-types/',
-	'modform.jsdoc.js'
-];
-
-export default async function addJsdocsToGitignore() {
+/**
+ * Adds entries to .gitignore file (always appends to bottom)
+ * @param {string[]} entries - Array of entries to add to .gitignore
+ * @param {string} comment - Optional comment to add before the entries
+ * @returns {Promise<void>}
+ */
+export default async function addFilesToGitignore(entries, comment) {
 	const gitignorePath = path.join(process.cwd(), '.gitignore');
-	
-	let content = '';
 
+	let content = '';
 	try {
 		content = await fs.promises.readFile(gitignorePath, 'utf8');
 	} catch (err) {
@@ -20,10 +20,10 @@ export default async function addJsdocsToGitignore() {
 	}
 
 	const existingEntries = new Set(content.split('\n').map(line => line.trim()));
-	const entriesToAppend = entriesToAdd.filter(entry => !existingEntries.has(entry));
+	const entriesToAppend = entries.filter(entry => !existingEntries.has(entry));
 
 	if (entriesToAppend.length === 0) {
-		console.log('.gitignore already contains jsdoc entries');
+		console.log('.gitignore already contains all entries');
 		return;
 	}
 
@@ -32,9 +32,12 @@ export default async function addJsdocsToGitignore() {
 		? (content.endsWith('\n') ? '\n' : '\n\n')
 		: '';
 
-	contentToAppend += '# JSDoc generated files\n';
+	if (comment) {
+		contentToAppend += `# ${comment}\n`;
+	}
 	contentToAppend += entriesToAppend.join('\n') + '\n';
 
 	await fs.promises.appendFile(gitignorePath, contentToAppend, 'utf8');
 	console.log(`Added to .gitignore: ${entriesToAppend.join(', ')}`);
 }
+

package/tasks/clean.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 
-const foldersToDelete = ['./src/resources', './src/accessible-components', './src/shared-components', './src/.tmp', './src/temp', './public/resources', './jsdoc-types'];
+const foldersToDelete = ['./src/resources', './src/accessible-components', './src/shared-components', './src/.tmp', './src/temp', './public/resources', './jsdoc-types', './public/fonts/montserrat', './public/fonts/roboto'];
 
 const filesToDelete = ['./modform.jsdoc.js'];
 

package/tasks/grab-global-fonts.js

@@ -0,0 +1,97 @@
+import { defaultSettings } from '../src/data/config.js';
+import axios from 'axios';
+import { createWriteStream } from 'node:fs';
+import * as stream from 'node:stream';
+import { promisify } from 'node:util';
+import fs from 'node:fs';
+import { responseInterceptor } from '../src/scripts/retry-axios.js';
+import addFilesToGitignore from './add-files-to-gitignore.js';
+
+const resourcePath = 'quote/resources/mod-site/fonts';
+
+// Global font names
+const fontNames = [
+	'roboto',
+	'montserrat'
+];
+
+// Font variants and extensions to download for each font
+const fontVariants = ['regular', 'bold'];
+const fontExtensions = ['ttf', 'woff2'];
+
+// Generate array of all font files needed for download
+const fontFiles = fontNames.flatMap(fontName => {
+	return fontVariants.flatMap(variant => {
+		return fontExtensions.map(ext => {
+			return `${fontName}/${fontName}-${variant}.${ext}`;
+		});
+	});
+});
+
+const axiosInstance = axios.create();
+responseInterceptor(axiosInstance);
+
+const streamFontToDestination = (defaultSettings, fontPath) => {
+	const finished = promisify(stream.finished);
+
+	return new Promise(resolve => {
+		const filePath = `${defaultSettings.publicFolder}/${defaultSettings.fontsSubfolder}/${fontPath}`;
+		const folderPath = filePath.split('/').slice(0, -1).join('/');
+
+		// Create directory if it doesn't exist
+		if (!fs.existsSync(folderPath)) {
+			fs.mkdirSync(folderPath, { recursive: true });
+		}
+
+		// if file exists, do not create it again
+		if (fs.existsSync(filePath)) {
+			resolve();
+		} else {
+			const writer = createWriteStream(filePath);
+			const options = {
+				url: `https://${defaultSettings.nodeEnv}/${resourcePath}/${fontPath}`,
+				method: 'get',
+				responseType: 'stream'
+			};
+
+			axios(options).then(resp => {
+				if (resp.status !== 200) {
+					throw new Error(`${resp.status}: Error while fetching ${options.url}`);
+				}
+				console.log(`${filePath} copied...`);
+				resp.data.pipe(writer);
+				return finished(writer);
+			}).then(() => {
+				resolve();
+			}).catch(error => {
+				console.error(error);
+				throw new Error(`${error?.response?.statusText} [${error?.status}]: Error while fetching ${options.url}`);
+			});
+		}
+	});
+};
+
+const updateGitignore = async () => {
+	const fontEntries = fontNames.map(fontName => 
+		`${defaultSettings.publicFolder}/${defaultSettings.fontsSubfolder}/${fontName}/`
+	);
+	
+	await addFilesToGitignore(fontEntries, 'Global fonts');
+};
+
+export default function() {
+	const fontsPath = `${defaultSettings.publicFolder}/${defaultSettings.fontsSubfolder}`;
+	if (!fs.existsSync(fontsPath)) {
+		fs.mkdirSync(fontsPath, { recursive: true });
+	}
+
+	// Download all font files
+	const fontPromises = fontFiles.map(fontPath => {
+		return streamFontToDestination(defaultSettings, fontPath);
+	});
+
+	return Promise.all(fontPromises).then(async () => {
+		// Update .gitignore after fonts are downloaded
+		await updateGitignore();
+	});
+}

package/tasks/grab-jsdoc.js

@@ -5,7 +5,7 @@ import * as stream from 'node:stream';
 import { promisify } from 'node:util';
 import path from 'node:path';
 import { responseInterceptor } from '../src/scripts/retry-axios.js';
-import addJSDocsToGitignore from './add-jsdocs-to-gitignore.js';
+import addFilesToGitignore from './add-files-to-gitignore.js';
 
 const resourcePath = 'quote/resources/mod-form/form';
 const axiosInstance = axios.create();
@@ -106,6 +106,11 @@ export default async function grabJSDoc() {
 	const files = await getJSDocFiles();
 	const filesPromiseMap = files.map(filePath => streamToDestination(filePath));
 	await Promise.all(filesPromiseMap);
-	await addJSDocsToGitignore();
+	
+	const gitIgnoreFiles = [
+		'jsdoc-types/',
+		'modform.jsdoc.js'
+	];
+	await addFilesToGitignore(gitIgnoreFiles, 'JSDoc generated files');
 }
 

package/tasks/grab-shared-scripts.js

@@ -41,15 +41,17 @@ function replaceFootAssetScripts(gulp, defaultSettings) {
 	const resourcePath = '/resources/scripts';
 	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) {
+			.pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"|"(?:(?!"|js")[\s\S])+(growthbook.*?)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/homeowner')) {
 					return `"${resourcePath}/mod-form/form/${fileNames.homeownerFormFileName}"`;
 				} else if (match.includes('mod-form/form/contractor')) {
 					return `"${resourcePath}/mod-form/form/${fileNames.contractorFormFileName}"`;
 				} else if (match.includes('callrail')) {
 					return `"${resourcePath}/callrail/${fileNames.callrailFileName}"`;
-				} else if (match.includes('modutils') || match.includes('mod-utils')) {
+				} else if ((match.includes('modutils') || match.includes('mod-utils')) && !match.includes('growthbook')) {
 					return `"${resourcePath}/mod-utils/${fileNames.modUtilsFileName}"`;
+				} else if (match.includes('mod-utils') && match.includes('growthbook')) {
+					return `"${resourcePath}/mod-utils/${fileNames.growthBookFileName}"`;
 				} else if (match.includes('footer-component')) {
 					return `"${resourcePath}/footer/${fileNames.footerComponentJsFileName}"`;
 				}
@@ -105,6 +107,15 @@ const TASKS = {
 		},
 		srcReplaceFn: null
 	},
+	copyGrowthBook: {
+		url: 'mod-utils/growthbook.min.js',
+		config: {
+			fileName: 'growthBookFileName',
+			dest: 'scripts/mod-utils',
+			hasMapFile: true
+		},
+		srcReplaceFn: null
+	},
 	copyCallrail: {
 		url: 'shared-resources/scripts/callrail/callrail.min.js',
 		config: {
@@ -250,7 +261,7 @@ function getResource(task, fileNames, resourcePath = 'quote/resources') {
 				});
 			})
 			.then(() => {
-				if (!config.hasMapFile) { 
+				if (!config.hasMapFile) {
 					return false;
 				}
 

package/tasks/serve.js

@@ -1,4 +1,5 @@
 import addEditorConfig from './add-editorconfig.js';
+import grabGlobalFonts from './grab-global-fonts.js';
 import grabSharedComponents from './grab-shared-components.js';
 import grabSharedScripts from './grab-shared-scripts.js';
 import grabCdn from './grab-cdn.js';
@@ -12,6 +13,7 @@ import { createStylelintFile, updateConfig } from '../src/scripts/plugins.js';
 export async function startModBuild(config) {
 	addEditorConfig();
 	createStylelintFile();
+	grabGlobalFonts();
 	await grabB2BData(config);
 	await grabCdn(config);
 	await getDefaultTradeQuestions(config);