@unocss/preset-web-fonts 0.61.0 → 0.61.2

package/dist/index.d.mts

@@ -47,6 +47,23 @@ interface WebFontsOptions {
      * @default undefined
      */
     customFetch?: (url: string) => Promise<any>;
+    /**
+     * Timeouts for fetching web fonts
+     */
+    timeouts?: false | {
+        /**
+         * Timeout for printing warning message
+         *
+         * @default 500
+         */
+        warning?: number;
+        /**
+         * Timeout for failing the fetch
+         *
+         * @default 2000
+         */
+        failure?: number;
+    };
 }
 interface Provider {
     name: WebFontsProviders;

package/dist/index.d.ts

@@ -47,6 +47,23 @@ interface WebFontsOptions {
      * @default undefined
      */
     customFetch?: (url: string) => Promise<any>;
+    /**
+     * Timeouts for fetching web fonts
+     */
+    timeouts?: false | {
+        /**
+         * Timeout for printing warning message
+         *
+         * @default 500
+         */
+        warning?: number;
+        /**
+         * Timeout for failing the fetch
+         *
+         * @default 2000
+         */
+        failure?: number;
+    };
 }
 interface Provider {
     name: WebFontsProviders;

package/dist/index.mjs

@@ -108,18 +108,36 @@ function createWebFontPreset(fetcher) {
       extendTheme = true,
       inlineImports = true,
       themeKey = "fontFamily",
-      customFetch = fetcher
+      customFetch = fetcher,
+      timeouts = {}
     } = options;
     const fontObject = Object.fromEntries(
       Object.entries(options.fonts || {}).map(([name, meta]) => [name, toArray(meta).map((m) => normalizedFontMeta(m, defaultProvider))])
     );
     const fonts = Object.values(fontObject).flatMap((i) => i);
     const importCache = {};
+    async function fetchWithTimeout(url) {
+      if (timeouts === false)
+        return customFetch(url);
+      const {
+        warning = 500,
+        failure = 2e3
+      } = timeouts;
+      const timer = setTimeout(() => {
+        console.warn(`[unocss] Fetching web fonts: ${url}`);
+      }, warning);
+      return await Promise.race([
+        customFetch(url),
+        new Promise((_, reject) => {
+          setTimeout(() => reject(new Error(`[unocss] Fetch web fonts timeout.`)), failure);
+        })
+      ]).finally(() => clearTimeout(timer));
+    }
     async function importUrl(url) {
       if (inlineImports) {
         if (!importCache[url]) {
-          importCache[url] = customFetch(url).catch((e) => {
-            console.error("Failed to fetch web fonts");
+          importCache[url] = fetchWithTimeout(url).catch((e) => {
+            console.error(`[unocss] Failed to fetch web fonts: ${url}`);
             console.error(e);
             if (typeof process !== "undefined" && process.env.CI)
               throw e;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/preset-web-fonts",
   "type": "module",
-  "version": "0.61.0",
+  "version": "0.61.2",
   "description": "Web Fonts support for Uno CSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "ofetch": "^1.3.4",
-    "@unocss/core": "0.61.0"
+    "@unocss/core": "0.61.2"
   },
   "scripts": {
     "build": "unbuild",