mod-build 4.0.98-beta.4 → 4.0.99

package/CHANGELOG.md

@@ -1,9 +1,13 @@
 # Changelog
 
-## 4.0.98
+## 4.0.99
 
 - 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`
 
+## 4.0.98
+
+- 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
 
 - Added `HomeStories` to the default steps configuration in `get-default-trade-questions.js`. Also added support for `checkbox-group` fields (to support our HomeBuddy flows).

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mod-build",
-	"version": "4.0.98-beta.4",
+	"version": "4.0.99",
 	"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');
 };