@unocss/preset-web-fonts 0.45.1 → 0.45.5

package/README.md

@@ -70,12 +70,13 @@ Currently supported Providers:
 
 - `none` - do nothing, treat the font as system font
 - `google` - [Google Fonts](https://fonts.google.com/)
+- `bunny` - [Privacy-Friendly Google Fonts](https://fonts.bunny.net/)
 
 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 avaliable.
+Refer to the [type definition](https://github.com/unocss/unocss/blob/main/packages/preset-web-fonts/src/types.ts#L4) for all configurations available.
 
 ## License
 

package/dist/index.cjs

@@ -4,22 +4,27 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const core = require('@unocss/core');
 
-const GoogleFontsProvider = {
-  name: "google",
-  getImportUrl(fonts) {
-    const strings = fonts.filter((i) => i.provider === "google").map((i) => {
-      let name = i.name.replace(/\s+/g, "+");
-      if (i.weights?.length) {
-        name += i.italic ? `:ital,wght@${i.weights.flatMap((i2) => [`0,${i2}`, `1,${i2}`]).sort().join(";")}` : `:wght@${i.weights.sort().join(";")}`;
-      }
-      return `family=${name}`;
-    }).join("&");
-    return `https://fonts.googleapis.com/css2?${strings}&display=swap`;
-  },
-  getFontName(font) {
-    return `"${font.name}"`;
-  }
-};
+const GoogleFontsProvider = createGoogleProvider("google", "https://fonts.googleapis.com");
+function createGoogleProvider(name, host) {
+  return {
+    name,
+    getImportUrl(fonts) {
+      const strings = fonts.filter((i) => i.provider === name).map((i) => {
+        let name2 = i.name.replace(/\s+/g, "+");
+        if (i.weights?.length) {
+          name2 += i.italic ? `:ital,wght@${i.weights.flatMap((i2) => [`0,${i2}`, `1,${i2}`]).sort().join(";")}` : `:wght@${i.weights.sort().join(";")}`;
+        }
+        return `family=${name2}`;
+      }).join("&");
+      return `${host}/css2?${strings}&display=swap`;
+    },
+    getFontName(font) {
+      return `"${font.name}"`;
+    }
+  };
+}
+
+const BunnyFontsProvider = createGoogleProvider("bunny", "https://fonts.bunny.net");
 
 const NoneProvider = {
   name: "none",
@@ -45,6 +50,7 @@ function normalizedFontMeta(meta, defaultProvider) {
 }
 const providers = {
   google: GoogleFontsProvider,
+  bunny: BunnyFontsProvider,
   none: NoneProvider
 };
 const preset = (options = {}) => {
@@ -62,17 +68,15 @@ const preset = (options = {}) => {
   async function importUrl(url) {
     if (inlineImports) {
       if (!importCache[url]) {
-        try {
-          const { $fetch } = await import('ohmyfetch');
-          importCache[url] = await $fetch(url, { headers: {} });
-        } catch (e) {
+        const { $fetch } = await import('ohmyfetch');
+        importCache[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;
-        }
+        });
       }
-      return importCache[url];
+      return await importCache[url];
     } else {
       return `@import url('${url}')`;
     }

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Preset } from '@unocss/core';
 
-declare type WebFontsProviders = 'google' | 'none';
+declare type WebFontsProviders = 'google' | 'bunny' | 'none';
 interface WebFontMeta {
     name: string;
     weights?: (string | number)[];

package/dist/index.mjs

@@ -1,21 +1,26 @@
 import { toArray } from '@unocss/core';
 
-const GoogleFontsProvider = {
-  name: "google",
-  getImportUrl(fonts) {
-    const strings = fonts.filter((i) => i.provider === "google").map((i) => {
-      let name = i.name.replace(/\s+/g, "+");
-      if (i.weights?.length) {
-        name += i.italic ? `:ital,wght@${i.weights.flatMap((i2) => [`0,${i2}`, `1,${i2}`]).sort().join(";")}` : `:wght@${i.weights.sort().join(";")}`;
-      }
-      return `family=${name}`;
-    }).join("&");
-    return `https://fonts.googleapis.com/css2?${strings}&display=swap`;
-  },
-  getFontName(font) {
-    return `"${font.name}"`;
-  }
-};
+const GoogleFontsProvider = createGoogleProvider("google", "https://fonts.googleapis.com");
+function createGoogleProvider(name, host) {
+  return {
+    name,
+    getImportUrl(fonts) {
+      const strings = fonts.filter((i) => i.provider === name).map((i) => {
+        let name2 = i.name.replace(/\s+/g, "+");
+        if (i.weights?.length) {
+          name2 += i.italic ? `:ital,wght@${i.weights.flatMap((i2) => [`0,${i2}`, `1,${i2}`]).sort().join(";")}` : `:wght@${i.weights.sort().join(";")}`;
+        }
+        return `family=${name2}`;
+      }).join("&");
+      return `${host}/css2?${strings}&display=swap`;
+    },
+    getFontName(font) {
+      return `"${font.name}"`;
+    }
+  };
+}
+
+const BunnyFontsProvider = createGoogleProvider("bunny", "https://fonts.bunny.net");
 
 const NoneProvider = {
   name: "none",
@@ -41,6 +46,7 @@ function normalizedFontMeta(meta, defaultProvider) {
 }
 const providers = {
   google: GoogleFontsProvider,
+  bunny: BunnyFontsProvider,
   none: NoneProvider
 };
 const preset = (options = {}) => {
@@ -58,17 +64,15 @@ const preset = (options = {}) => {
   async function importUrl(url) {
     if (inlineImports) {
       if (!importCache[url]) {
-        try {
-          const { $fetch } = await import('ohmyfetch');
-          importCache[url] = await $fetch(url, { headers: {} });
-        } catch (e) {
+        const { $fetch } = await import('ohmyfetch');
+        importCache[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;
-        }
+        });
       }
-      return importCache[url];
+      return await importCache[url];
     } else {
       return `@import url('${url}')`;
     }

package/package.json

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