@unocss/preset-web-fonts 0.47.6 → 0.48.1

package/README.md

@@ -75,6 +75,32 @@ Currently supported Providers:
 
 PR welcome to add more providers 🙌
 
+### Custom fetch function
+
+Use your own function to fetch font source.
+
+```ts
+import presetWebFonts from '@unocss/preset-web-fonts'
+import presetUno from '@unocss/preset-uno'
+import axios from 'axios'
+import ProxyAgent from 'proxy-agent'
+
+Unocss({
+  presets: [
+    presetUno(),
+    presetWebFonts({
+      // use axios with an https proxy
+      customFetch: (url: string) => axios.get(url, { httpsAgent: new ProxyAgent('https://localhost:7890') }),
+      provider: 'google',
+      fonts: {
+        sans: 'Roboto',
+        mono: ['Fira Code', 'Fira Mono:400,700'],
+      },
+    }),
+  ],
+})
+```
+
 ## 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.

package/dist/index.cjs

@@ -80,7 +80,8 @@ const preset = (options = {}) => {
     provider: defaultProvider = "google",
     extendTheme = true,
     inlineImports = true,
-    themeKey = "fontFamily"
+    themeKey = "fontFamily",
+    customFetch
   } = options;
   const fontObject = Object.fromEntries(
     Object.entries(options.fonts || {}).map(([name, meta]) => [name, core.toArray(meta).map((m) => normalizedFontMeta(m, defaultProvider))])
@@ -90,8 +91,8 @@ const preset = (options = {}) => {
   async function importUrl(url) {
     if (inlineImports) {
       if (!importCache[url]) {
-        const { $fetch } = await import('ohmyfetch');
-        importCache[url] = $fetch(url, { headers: {}, retry: 3 }).catch((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)

package/dist/index.d.ts

@@ -38,6 +38,12 @@ interface WebFontsOptions {
      * @default true
      */
     inlineImports?: boolean;
+    /**
+     * Custom fetch function
+     *
+     * @default undefined
+     */
+    customFetch?: (url: string) => Promise<any>;
 }
 interface Provider {
     name: WebFontsProviders;

package/dist/index.mjs

@@ -76,7 +76,8 @@ const preset = (options = {}) => {
     provider: defaultProvider = "google",
     extendTheme = true,
     inlineImports = true,
-    themeKey = "fontFamily"
+    themeKey = "fontFamily",
+    customFetch
   } = options;
   const fontObject = Object.fromEntries(
     Object.entries(options.fonts || {}).map(([name, meta]) => [name, toArray(meta).map((m) => normalizedFontMeta(m, defaultProvider))])
@@ -86,8 +87,8 @@ const preset = (options = {}) => {
   async function importUrl(url) {
     if (inlineImports) {
       if (!importCache[url]) {
-        const { $fetch } = await import('ohmyfetch');
-        importCache[url] = $fetch(url, { headers: {}, retry: 3 }).catch((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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-web-fonts",
-  "version": "0.47.6",
+  "version": "0.48.1",
   "description": "Web Fonts support for Uno CSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@unocss/core": "0.47.6",
+    "@unocss/core": "0.48.1",
     "ohmyfetch": "^0.4.21"
   },
   "scripts": {