feat(web-fonts): expose createGoogleCompatibleProvider util

unocss · Apr 23, 2023 · ad1202b · ad1202b
1 parent 89ff6e1
commit ad1202b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/packages/preset-web-fonts/src/index.ts b/packages/preset-web-fonts/src/index.ts
@@ -21,6 +21,8 @@ function resolveProvider(provider: WebFontsProviders): Provider {
   return provider
 }
 
+export { createGoogleCompatibleProvider as createGoogleProvider } from './providers/google'
+
 export function normalizedFontMeta(meta: WebFontMeta | string, defaultProvider: WebFontsProviders): ResolvedWebFontMeta {
   if (typeof meta !== 'string') {
     meta.provider = resolveProvider(meta.provider || defaultProvider)
@@ -84,7 +86,7 @@ function preset(options: WebFontsOptions = {}): Preset<any> {
           const preflights: (string | undefined)[] = []
 
           for (const provider of enabledProviders) {
-            const fontsForProvider = fonts.filter(i => i.provider === provider)
+            const fontsForProvider = fonts.filter(i => i.provider.name === provider.name)
 
             if (provider.getImportUrl) {
               const url = provider.getImportUrl(fontsForProvider)

diff --git a/packages/preset-web-fonts/src/providers/bunny.ts b/packages/preset-web-fonts/src/providers/bunny.ts
@@ -1,3 +1,3 @@
-import { createGoogleProvider } from './google'
+import { createGoogleCompatibleProvider } from './google'
 
-export const BunnyFontsProvider = createGoogleProvider('bunny', 'https://fonts.bunny.net')
+export const BunnyFontsProvider = createGoogleCompatibleProvider('bunny', 'https://fonts.bunny.net')
diff --git a/packages/preset-web-fonts/src/providers/fontshare.ts b/packages/preset-web-fonts/src/providers/fontshare.ts
@@ -6,7 +6,7 @@ export function createFontshareProvider(name: WebFontsProviders, host: string):
   return {
     name,
     getImportUrl(fonts) {
-      const strings = fonts.filter(f => f.provider === name).map((f) => {
+      const strings = fonts.map((f) => {
         let name = f.name.replace(/\s+/g, '-').toLocaleLowerCase()
         if (f.weights?.length)
           name += `@${f.weights.flatMap(w => f.italic ? Number(w) + 1 : w).sort().join()}`

diff --git a/packages/preset-web-fonts/src/providers/google.ts b/packages/preset-web-fonts/src/providers/google.ts
@@ -1,13 +1,10 @@
 import type { Provider, WebFontsProviders } from '../types'
 
-export const GoogleFontsProvider: Provider = createGoogleProvider('google', 'https://fonts.googleapis.com')
-
-export function createGoogleProvider(name: WebFontsProviders, host: string): Provider {
+export function createGoogleCompatibleProvider(name: WebFontsProviders, host: string): Provider {
   return {
     name,
     getImportUrl(fonts) {
       const strings = fonts
-        .filter(i => i.provider === name)
         .map((i) => {
           let name = i.name.replace(/\s+/g, '+')
           if (i.weights?.length) {
@@ -21,3 +18,5 @@ export function createGoogleProvider(name: WebFontsProviders, host: string): Pro
     },
   }
 }
+
+export const GoogleFontsProvider: Provider = createGoogleCompatibleProvider('google', 'https://fonts.googleapis.com')