mod-build 4.0.98-beta.4 → 4.0.98

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 4.0.98
 
-- Added `grab-bbb-logo` task to fetch the updated BBB logo and replace existing `bbb.svg` and/or `<symbol id="bbb">` in the sprite. Also updates current `BBB Accredited Business` alt text in `.html` / `template.js`
+- Allow `fontsToDownload` entries to specify custom weights via `fontVariants` (e.g. `{ montserrat: { fontVariants: [{ medium: '500' }, { bold: '700' }] } }`); plain font names still default to regular + bold
 
 ## 4.0.97
 

package/package.json

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

package/tasks/grab-global-fonts.js

@@ -27,7 +27,7 @@ const directoryHasItems = (dirPath) => {
 	return fs.readdirSync(dirPath).length > 0;
 };
 
-const getFontDownloadUrls = async (fontName) => {
+const getFontDownloadUrls = async (fontName, weightMap = { regular: '400', bold: '700' }) => {
 	try {
 		const url = `https://gwfh.mranftl.com/api/fonts/${fontName}?subsets=latin`;
 		const response = await fetchWithRetry(url);
@@ -38,11 +38,11 @@ const getFontDownloadUrls = async (fontName) => {
 		}
 		
 		const downloadUrls = {};
-		const targetWeights = ['400', '700'];
+		const targetWeights = Object.values(weightMap);
 		
 		fontData.variants.forEach(variant => {
 			if (variant.fontStyle === 'normal' && targetWeights.includes(variant.fontWeight)) {
-				const variantName = variant.fontWeight === '400' ? 'regular' : 'bold';
+				const variantName = Object.keys(weightMap).find(name => weightMap[name] === variant.fontWeight);
 				downloadUrls[variantName] = downloadUrls[variantName] || {};
 				if (variant.ttf) {
 					downloadUrls[variantName].ttf = variant.ttf;
@@ -92,7 +92,23 @@ const downloadFontFile = async (fontName, variant, extension, downloadUrl) => {
 	}
 };
 
-const downloadFont = async (fontName) => {
+const downloadFont = async (fontEntry) => {
+	// Plain name uses defaults; object shape supports custom weights:
+	// { montserrat: { fontVariants: [{ medium: '500' }, { bold: '700' }] } }
+	let fontName = fontEntry;
+	let weightMap = { regular: '400', bold: '700' };
+	let variants = fontVariants;
+
+	if (typeof fontEntry === 'object') {
+		fontName = Object.keys(fontEntry)[0];
+		const customVariants = fontEntry[fontName]?.fontVariants;
+
+		if (Array.isArray(customVariants) && customVariants.length > 0) {
+			weightMap = Object.assign({}, ...customVariants);
+			variants = Object.keys(weightMap);
+		}
+	}
+
 	const fontDir = getFontPath(fontName);
 
 	if (directoryHasItems(fontDir)) {
@@ -102,14 +118,14 @@ const downloadFont = async (fontName) => {
 
 	console.log(`Downloading font: ${fontName}`);
 
-	const downloadUrls = await getFontDownloadUrls(fontName);
+	const downloadUrls = await getFontDownloadUrls(fontName, weightMap);
 	
 	if (!downloadUrls || Object.keys(downloadUrls).length === 0) {
 		throw new Error(`Could not find download URLs for ${fontName}`);
 	}
 
 	await Promise.all(
-		fontVariants.flatMap(variant =>
+		variants.flatMap(variant =>
 			fontExtensions.map(ext => {
 				const url = downloadUrls[variant]?.[ext];
 				if (!url) {
@@ -122,8 +138,10 @@ const downloadFont = async (fontName) => {
 	);
 };
 
+const getFontName = (fontEntry) => typeof fontEntry === 'string' ? fontEntry : Object.keys(fontEntry)[0];
+
 const updateGitignore = async (fontNames) => {
-	const fontEntries = fontNames.map(fontName => `${getFontPath(fontName)}/`);
+	const fontEntries = fontNames.map(fontEntry => `${getFontPath(getFontName(fontEntry))}/`);
 	await addFilesToGitignore(fontEntries, 'Downloaded fonts');
 };
 

package/tasks/serve.js

@@ -4,7 +4,6 @@ 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';
-import grabBbbLogo from './grab-bbb-logo.js';
 import grabB2BData from './grab-b2b-data.js';
 import getDefaultTradeQuestions from './get-default-trade-questions.js';
 import grabFormHelpers from './grab-form-helpers.js';
@@ -19,7 +18,6 @@ export async function startModBuild(config) {
 	await grabGlobalFonts(config);
 	await grabB2BData(config);
 	await grabCdn(config);
-	await grabBbbLogo();
 	await getDefaultTradeQuestions(config);
 	await Promise.all([
 		grabSharedComponents(config),

package/tasks/grab-bbb-logo.js

@@ -1,108 +0,0 @@
-import { defaultSettings } from '../src/data/config.js';
-import { createRetryFetch } from '../src/scripts/retry-fetch.js';
-import fs from 'node:fs';
-import path from 'node:path';
-
-const bbbResourcePath = '/quote/resources/assets/images/logos/misc/bbb.svg';
-const bbbAltText = 'BBB Accredited Business';
-const bbbAltTextUpdated = 'Better Business Bureau Accredited Business';
-const bbbSymbolRegex = /<symbol\b[^>]*\bid\s*=\s*["']bbb["'][^>]*>[\s\S]*?<\/symbol>/i;
-const skipDirs = new Set(['node_modules', 'dist', '.git', '.tmp']);
-
-const fetchWithRetry = createRetryFetch();
-
-function walkFiles(dir, matcher, results = []) {
-	if (!fs.existsSync(dir)) {
-		return results;
-	}
-
-	for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-		const fullPath = path.join(dir, entry.name);
-
-		if (entry.isDirectory()) {
-			if (!skipDirs.has(entry.name)) {
-				walkFiles(fullPath, matcher, results);
-			}
-			continue;
-		}
-
-		if (entry.isFile() && matcher(fullPath, entry.name)) {
-			results.push(fullPath);
-		}
-	}
-
-	return results;
-}
-
-async function fetchBbbSvgMarkup() {
-	const url = `https://${defaultSettings.nodeEnv}${bbbResourcePath}`;
-	const response = await fetchWithRetry(url);
-
-	if (response.status !== 200) {
-		throw new Error(`${response.status}: Error while fetching ${url}`);
-	}
-
-	return (await response.text()).trim();
-}
-
-function buildBbbSymbol(svgMarkup) {
-	const symbol = svgMarkup.replace(/^[\s\S]*?<svg\b/i, '<symbol').replace(/<\/svg>\s*$/i, '</symbol>');
-
-	if (/^<symbol\b[^>]*\bid\s*=/i.test(symbol)) {
-		return symbol;
-	}
-
-	return symbol.replace(/^<symbol\b/i, '<symbol id="bbb"');
-}
-
-async function updateBbbLogo(svgMarkup) {
-	const existingLogos = walkFiles(process.cwd(), (_fullPath, fileName) => fileName === 'bbb.svg');
-
-	for (const logoPath of existingLogos) {
-		fs.writeFileSync(logoPath, `${svgMarkup}\n`, 'utf8');
-		console.log(`Updated BBB logo: ${logoPath}`);
-	}
-}
-
-async function updateAccreditedBusinessText() {
-	const files = walkFiles(process.cwd(), (_fullPath, fileName) => (
-		fileName.endsWith('.html') || fileName === 'template.js'
-	));
-
-	for (const filePath of files) {
-		const contents = fs.readFileSync(filePath, 'utf8');
-
-		if (!contents.includes(bbbAltText)) {
-			continue;
-		}
-
-		const updated = contents.replaceAll(bbbAltText, bbbAltTextUpdated);
-		fs.writeFileSync(filePath, updated, 'utf8');
-		console.log(`Updated BBB accredited text in: ${filePath}`);
-	}
-}
-
-async function updateBbbInSprite(svgMarkup) {
-	const spriteFiles = walkFiles(process.cwd(), (_fullPath, fileName) => fileName === 'sprite.svg');
-	const updatedSymbol = buildBbbSymbol(svgMarkup);
-
-	for (const spritePath of spriteFiles) {
-		const contents = fs.readFileSync(spritePath, 'utf8');
-
-		if (!bbbSymbolRegex.test(contents)) {
-			continue;
-		}
-
-		const updatedContents = contents.replace(bbbSymbolRegex, updatedSymbol);
-		fs.writeFileSync(spritePath, updatedContents, 'utf8');
-		console.log(`Updated BBB symbol in sprite: ${spritePath}`);
-	}
-}
-
-export default async function() {
-	const svgMarkup = await fetchBbbSvgMarkup();
-
-	await updateBbbLogo(svgMarkup);
-	await updateAccreditedBusinessText();
-	await updateBbbInSprite(svgMarkup);
-}