mod-build 4.0.83-beta.3 → 4.0.83-beta.4

package/package.json

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

package/tasks/grab-global-fonts.js

@@ -11,16 +11,22 @@ import addFilesToGitignore from './add-files-to-gitignore.js';
 // Font variants and extensions to download for each font
 const fontVariants = ['regular', 'bold'];
 const fontExtensions = ['ttf', 'woff2'];
+const finished = promisify(stream.finished);
 
 const axiosInstance = axios.create();
 responseInterceptor(axiosInstance);
 
+const getFontPath = (...parts) => path.join(
+	defaultSettings.publicFolder,
+	defaultSettings.fontsSubfolder,
+	...parts
+);
+
 const directoryHasItems = (dirPath) => {
 	if (!fs.existsSync(dirPath)) {
 		return false;
 	}
-	const items = fs.readdirSync(dirPath);
-	return items.length > 0;
+	return fs.readdirSync(dirPath).length > 0;
 };
 
 const getFontDownloadUrls = async (fontName) => {
@@ -29,21 +35,17 @@ const getFontDownloadUrls = async (fontName) => {
 		const response = await axiosInstance.get(url);
 		const fontData = response.data;
 		
-		if (!fontData || !fontData.variants) {
+		if (!fontData?.variants) {
 			throw new Error('Invalid font data received');
 		}
 		
 		const downloadUrls = {};
-		
 		const targetWeights = ['400', '700'];
 		
 		fontData.variants.forEach(variant => {
 			if (variant.fontStyle === 'normal' && targetWeights.includes(variant.fontWeight)) {
 				const variantName = variant.fontWeight === '400' ? 'regular' : 'bold';
-				
-				if (!downloadUrls[variantName]) {
-					downloadUrls[variantName] = {};
-				}
+				downloadUrls[variantName] = downloadUrls[variantName] || {};
 				
 				if (variant.ttf) {
 					downloadUrls[variantName].ttf = variant.ttf;
@@ -53,7 +55,7 @@ const getFontDownloadUrls = async (fontName) => {
 				}
 			}
 		});
-		
+
 		return downloadUrls;
 	} catch (error) {
 		console.error(`Error fetching font data for ${fontName}:`, error.message);
@@ -61,61 +63,44 @@ const getFontDownloadUrls = async (fontName) => {
 	}
 };
 
-const downloadFontFile = async (defaultSettings, fontName, variant, extension, downloadUrl) => {
-	const finished = promisify(stream.finished);
-
-	return new Promise((resolve, reject) => {
-		const fileName = `${fontName}-${variant}.${extension}`;
-		const filePath = path.join(
-			defaultSettings.publicFolder,
-			defaultSettings.fontsSubfolder,
-			fontName,
-			fileName
-		);
-		const folderPath = path.dirname(filePath);
-
-		if (!fs.existsSync(folderPath)) {
-			fs.mkdirSync(folderPath, { recursive: true });
-		}
+const downloadFontFile = async (fontName, variant, extension, downloadUrl) => {
+	const fileName = `${fontName}-${variant}.${extension}`;
+	const filePath = getFontPath(fontName, fileName);
+	const folderPath = path.dirname(filePath);
 
-		if (fs.existsSync(filePath)) {
-			console.log(`${filePath} already exists, skipping...`);
-			resolve();
-			return;
-		}
+	if (!fs.existsSync(folderPath)) {
+		fs.mkdirSync(folderPath, { recursive: true });
+	}
 
-		const writer = createWriteStream(filePath);
+	if (fs.existsSync(filePath)) {
+		console.log(`${filePath} already exists, skipping...`);
+		return;
+	}
 
-		axiosInstance({
+	try {
+		const resp = await axiosInstance({
 			url: downloadUrl,
 			method: 'get',
 			responseType: 'stream'
-		})
-			.then(resp => {
-				if (resp.status !== 200) {
-					throw new Error(`${resp.status}: Error while fetching ${downloadUrl}`);
-				}
-				console.log(`Downloading ${filePath}...`);
-				resp.data.pipe(writer);
-				return finished(writer);
-			})
-			.then(() => {
-				console.log(`${filePath} downloaded successfully`);
-				resolve();
-			})
-			.catch(error => {
-				console.error(`Error downloading ${filePath} from ${downloadUrl}:`, error.message);
-				reject(new Error(`Failed to download ${filePath}: ${error.message}`));
-			});
-	});
+		});
+
+		if (resp.status !== 200) {
+			throw new Error(`${resp.status}: Error while fetching ${downloadUrl}`);
+		}
+
+		console.log(`Downloading ${filePath}...`);
+		const writer = createWriteStream(filePath);
+		resp.data.pipe(writer);
+		await finished(writer);
+		console.log(`${filePath} downloaded successfully`);
+	} catch (error) {
+		console.error(`Error downloading ${filePath} from ${downloadUrl}:`, error.message);
+		throw new Error(`Failed to download ${filePath}: ${error.message}`);
+	}
 };
 
-const downloadFont = async (defaultSettings, fontName) => {
-	const fontDir = path.join(
-		defaultSettings.publicFolder,
-		defaultSettings.fontsSubfolder,
-		fontName
-	);
+const downloadFont = async (fontName) => {
+	const fontDir = getFontPath(fontName);
 
 	if (directoryHasItems(fontDir)) {
 		console.log(`Font directory ${fontDir} already has items, skipping ${fontName}...`);
@@ -130,45 +115,35 @@ const downloadFont = async (defaultSettings, fontName) => {
 		throw new Error(`Could not find download URLs for ${fontName}`);
 	}
 
-	const downloadPromises = fontVariants.flatMap(variant => {
-		return fontExtensions.map(ext => {
-			const url = downloadUrls[variant]?.[ext];
-			if (!url) {
-				console.warn(`Warning: No ${ext} URL found for ${fontName} ${variant}, skipping...`);
-				return Promise.resolve();
-			}
-			return downloadFontFile(defaultSettings, fontName, variant, ext, url);
-		});
-	});
-
-	await Promise.all(downloadPromises);
+	await Promise.all(
+		fontVariants.flatMap(variant =>
+			fontExtensions.map(ext => {
+				const url = downloadUrls[variant]?.[ext];
+				if (!url) {
+					console.warn(`Warning: No ${ext} URL found for ${fontName} ${variant}, skipping...`);
+					return Promise.resolve();
+				}
+				return downloadFontFile(fontName, variant, ext, url);
+			})
+		)
+	);
 };
 
-const updateGitignore = async (defaultSettings, fontNames) => {
-	const fontEntries = fontNames.map(fontName => 
-		`${defaultSettings.publicFolder}/${defaultSettings.fontsSubfolder}/${fontName}/`
-	);
-	
+const updateGitignore = async (fontNames) => {
+	const fontEntries = fontNames.map(fontName => `${getFontPath(fontName)}/`);
 	await addFilesToGitignore(fontEntries, 'Global fonts');
 };
 
 // If a site has a branded font that is outside of this API - we should add it to /public/fonts/branded/{fontName}/*
-export default function(config) {
+export default async function(config) {
 	// Download fonts from config.fontsToDownload or will default to ['roboto']
-	const fontNames = config?.fontsToDownload && Array.isArray(config.fontsToDownload) && config.fontsToDownload.length > 0
-		? config.fontsToDownload
-		: ['roboto'];
+	const fontNames = config?.fontsToDownload?.length > 0 ? config.fontsToDownload : ['roboto'];
 
-	const fontsPath = path.join(defaultSettings.publicFolder, defaultSettings.fontsSubfolder);
+	const fontsPath = getFontPath();
 	if (!fs.existsSync(fontsPath)) {
 		fs.mkdirSync(fontsPath, { recursive: true });
 	}
 
-	const fontPromises = fontNames.map(fontName => {
-		return downloadFont(defaultSettings, fontName);
-	});
-
-	return Promise.all(fontPromises).then(async () => {
-		await updateGitignore(defaultSettings, fontNames);
-	});
+	await Promise.all(fontNames.map(downloadFont));
+	await updateGitignore(fontNames);
 }