fix: variable paths including square brackets (#782)

fontsource · Aug 2, 2023 · c10ed68 · c10ed68
1 parent e0d9de8
commit c10ed68
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 24 deletions.
diff --git a/packages/cli/src/google/packager-v2.ts b/packages/cli/src/google/packager-v2.ts
@@ -21,9 +21,6 @@ const packagerV2 = async (id: string, opts: BuildOptions) => {
 			const cssStyle: string[] = [];
 
 			for (const subset of unicodeKeys) {
-				// Remove brackets from unicode subset
-				const cleanedSubset = subset.replace('[', '').replace(']', '');
-
 				// Some fonts may have variants 400, 400i, 700 but not 700i.
 				if (style in variants[weight]) {
 					const fontObj = {
@@ -34,17 +31,11 @@ const packagerV2 = async (id: string, opts: BuildOptions) => {
 						unicodeRange: unicodeRange[subset],
 						src: [
 							{
-								url: makeFontFilePath(
-									id,
-									cleanedSubset,
-									weight,
-									style,
-									'woff2'
-								),
+								url: makeFontFilePath(id, subset, weight, style, 'woff2'),
 								format: 'woff2' as const,
 							},
 							{
-								url: makeFontFilePath(id, cleanedSubset, weight, style, 'woff'),
+								url: makeFontFilePath(id, subset, weight, style, 'woff'),
 								format: 'woff' as const,
 							},
 						],

diff --git a/packages/cli/src/google/packager-variable.ts b/packages/cli/src/google/packager-variable.ts
@@ -34,9 +34,6 @@ const packagerVariable = async (id: string, opts: BuildOptions) => {
 			const cssStyle: string[] = [];
 
 			for (const subset of Object.keys(variant[style])) {
-				// Remove brackets from unicode subset
-				const cleanedSubset = subset.replace('[', '').replace(']', '');
-
 				const fontObj: FontObject = {
 					family: font.family,
 					style,
@@ -46,12 +43,7 @@ const packagerVariable = async (id: string, opts: BuildOptions) => {
 					variable: variableOpts,
 					src: [
 						{
-							url: makeVariableFontFilePath(
-								id,
-								cleanedSubset,
-								axesLower,
-								style
-							),
+							url: makeVariableFontFilePath(id, subset, axesLower, style),
 							format: 'woff2-variations',
 						},
 					],

diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
@@ -1,3 +1,6 @@
+const cleanPaths = (str: string): string =>
+	str.replace('[', '').replace(']', '');
+
 // Used to determine where the downloader should save the files
 const makeFontDownloadPath = (
 	fontDir: string,
@@ -7,7 +10,9 @@ const makeFontDownloadPath = (
 	style: string,
 	extension: string
 ): string =>
-	`${fontDir}/files/${fontId}-${subset}-${weight}-${style}.${extension}`;
+	cleanPaths(
+		`${fontDir}/files/${fontId}-${subset}-${weight}-${style}.${extension}`
+	);
 
 // Some axes are all uppercase making packages inconsistent
 const makeVariableFontDownloadPath = (
@@ -17,7 +22,9 @@ const makeVariableFontDownloadPath = (
 	axes: string,
 	style: string
 ): string =>
-	`${fontDir}/files/${fontId}-${subset}-${axes.toLowerCase()}-${style}.woff2`;
+	cleanPaths(
+		`${fontDir}/files/${fontId}-${subset}-${axes.toLowerCase()}-${style}.woff2`
+	);
 
 // Used for the src urls in CSS files
 const makeFontFilePath = (
@@ -26,14 +33,15 @@ const makeFontFilePath = (
 	weight: number,
 	style: string,
 	extension: string
-): string => `./files/${fontId}-${subset}-${weight}-${style}.${extension}`;
+): string =>
+	cleanPaths(`./files/${fontId}-${subset}-${weight}-${style}.${extension}`);
 
 const makeVariableFontFilePath = (
 	fontId: string,
 	subset: string,
 	axes: string,
 	style: string
-): string => `./files/${fontId}-${subset}-${axes}-${style}.woff2`;
+): string => cleanPaths(`./files/${fontId}-${subset}-${axes}-${style}.woff2`);
 
 // Insert a weight array to find the closest number given num - used for index.css gen
 const findClosest = (arr: number[], num: number): number => {