style: handle font family extraction in extractFontFaceData

nuxt · Mar 11, 2024 · cdce965 · cdce965
1 parent cf23e20
commit cdce965
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/css/parse.ts b/src/css/parse.ts
@@ -13,9 +13,14 @@ const extractableKeyMap: Record<string, keyof NormalizedFontFaceData> = {
   'unicode-range': 'unicodeRange',
 }
 
-export function extractFontFaceData (css: string): NormalizedFontFaceData[] {
+export function extractFontFaceData (css: string, family?: string): NormalizedFontFaceData[] {
   const fontFaces: NormalizedFontFaceData[] = []
 
+  if (family) {
+    const fontFaceRegex = new RegExp(`@font-face\\s*{[^}]*font-family:\\s*["']${family.toLowerCase()}["'][^}]*}`, 'g');
+    css = css.match(fontFaceRegex)!.join('\n')
+  }
+
   for (const node of findAll(parse(css), node => node.type === 'Atrule' && node.name === 'font-face')) {
     if (node.type !== 'Atrule' || node.name !== 'font-face') { continue }
 

diff --git a/src/providers/adobe.ts b/src/providers/adobe.ts
@@ -84,8 +84,7 @@ async function getFontDetails (family: string, variants: ResolveFontFacesOptions
   }
 
   if (styles.length === 0) return []
-  const fontFaceRegex = new RegExp(`@font-face\\s*{[^}]*font-family:\\s*["']${family.toLowerCase()}["'][^}]*}`, 'g');
-  const css = (await fontCSSAPI(`${fonts.kit.id}.css`)).match(fontFaceRegex).join('\n')
+  const css = await fontCSSAPI(`${fonts.kit.id}.css`)
 
-  return addLocalFallbacks(family, extractFontFaceData(css))
+  return addLocalFallbacks(family, extractFontFaceData(css, family))
 }