chore: rename to customFetch

unocss · Dec 19, 2022 · 9bc5fa4 · 9bc5fa4
1 parent 4891d4c
commit 9bc5fa4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 31 deletions.
diff --git a/packages/preset-web-fonts/README.md b/packages/preset-web-fonts/README.md
@@ -73,9 +73,11 @@ Currently supported Providers:
 - `bunny` - [Privacy-Friendly Google Fonts](https://fonts.bunny.net/)
 - `fontshare` - [Quality Font Service by ITF](https://www.fontshare.com/)
 
-### Custom request function
+PR welcome to add more providers 🙌
+
+### Custom fetch function
 
-Use your own request to fetch font source
+Use your own function to fetch font source.
 
 ```ts
 import presetWebFonts from '@unocss/preset-web-fonts'
@@ -88,32 +90,17 @@ Unocss({
     presetUno(),
     presetWebFonts({
       // use axios with an https proxy
-      customRequest: (url: string) => axios.get(url, { httpsAgent: new ProxyAgent('https://localhost:7890') }),
+      customFetch: (url: string) => axios.get(url, { httpsAgent: new ProxyAgent('https://localhost:7890') }),
       provider: 'google',
       fonts: {
         sans: 'Roboto',
         mono: ['Fira Code', 'Fira Mono:400,700'],
-        // custom ones
-        lobster: 'Lobster',
-        lato: [
-          {
-            name: 'Lato',
-            weights: ['400', '700'],
-            italic: true,
-          },
-          {
-            name: 'sans-serif',
-            provider: 'none',
-          },
-        ],
       },
     }),
   ],
 })
 ```
 
-PR welcome to add more providers 🙌
-
 ## Configuration
 
 Refer to the [type definition](https://github.com/unocss/unocss/blob/main/packages/preset-web-fonts/src/types.ts#L4) for all configurations available.

diff --git a/packages/preset-web-fonts/src/index.ts b/packages/preset-web-fonts/src/index.ts
@@ -35,7 +35,7 @@ const preset = (options: WebFontsOptions = {}): Preset<any> => {
     extendTheme = true,
     inlineImports = true,
     themeKey = 'fontFamily',
-    customRequest,
+    customFetch,
   } = options
 
   const fontObject = Object.fromEntries(
@@ -49,16 +49,15 @@ const preset = (options: WebFontsOptions = {}): Preset<any> => {
   async function importUrl(url: string) {
     if (inlineImports) {
       if (!importCache[url]) {
-        const { $fetch } = await import('ohmyfetch')
-        importCache[url] = (customRequest
-          ? customRequest(url)
-          : $fetch(url, { headers: {}, retry: 3 }))
-          .catch((e) => {
-            console.error('Failed to fetch web fonts')
-            console.error(e)
-            if (typeof process !== 'undefined' && process.env.CI)
-              throw e
-          })
+        const promise = customFetch
+          ? customFetch(url)
+          : (await import('ohmyfetch')).$fetch(url, { headers: {}, retry: 3 })
+        importCache[url] = promise.catch((e) => {
+          console.error('Failed to fetch web fonts')
+          console.error(e)
+          if (typeof process !== 'undefined' && process.env.CI)
+            throw e
+        })
       }
       return await importCache[url]
     }

diff --git a/packages/preset-web-fonts/src/types.ts b/packages/preset-web-fonts/src/types.ts
@@ -44,11 +44,11 @@ export interface WebFontsOptions {
   inlineImports?: boolean
 
   /**
-   * Inline CSS @import()
+   * Custom fetch function
    *
    * @default undefined
    */
-  customRequest?: (url: string) => Promise<any>
+  customFetch?: (url: string) => Promise<any>
 }
 
 export interface Provider {