@unocss/preset-web-fonts 66.4.2 → 66.5.1

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import * as _unocss_core from '@unocss/core';
-import { W as WebFontMeta, a as WebFontsProviders, R as ResolvedWebFontMeta, P as Provider, b as WebFontsOptions } from './shared/preset-web-fonts.CZc_IGwW.mjs';
-export { A as Axes, c as WebFontProcessor } from './shared/preset-web-fonts.CZc_IGwW.mjs';
+import { W as WebFontMeta, a as WebFontsProviders, R as ResolvedWebFontMeta, P as Provider, b as WebFontsOptions } from './shared/preset-web-fonts.COdQKJpo.mjs';
+export { A as Axes, c as WebFontProcessor } from './shared/preset-web-fonts.COdQKJpo.mjs';
 
 declare function normalizedFontMeta(meta: WebFontMeta | string, defaultProvider: WebFontsProviders): ResolvedWebFontMeta;
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as _unocss_core from '@unocss/core';
-import { W as WebFontMeta, a as WebFontsProviders, R as ResolvedWebFontMeta, P as Provider, b as WebFontsOptions } from './shared/preset-web-fonts.CZc_IGwW.js';
-export { A as Axes, c as WebFontProcessor } from './shared/preset-web-fonts.CZc_IGwW.js';
+import { W as WebFontMeta, a as WebFontsProviders, R as ResolvedWebFontMeta, P as Provider, b as WebFontsOptions } from './shared/preset-web-fonts.COdQKJpo.js';
+export { A as Axes, c as WebFontProcessor } from './shared/preset-web-fonts.COdQKJpo.js';
 
 declare function normalizedFontMeta(meta: WebFontMeta | string, defaultProvider: WebFontsProviders): ResolvedWebFontMeta;
 

package/dist/index.mjs

@@ -24,19 +24,39 @@ const BunnyFontsProvider = createBunnyFontsProvider(
   "https://fonts.bunny.net"
 );
 
-function createCoolLabsCompatibleProvider(name, host) {
+function generateFontAxes(axes) {
+  if (!axes || axes.length === 0)
+    return "";
+  let combinations = [[]];
+  for (const { values } of axes) {
+    const newCombinations = [];
+    for (const combo of combinations) {
+      for (const value of values) {
+        newCombinations.push([...combo, value]);
+      }
+    }
+    combinations = newCombinations;
+  }
+  return combinations.map((arr) => arr.join(",")).join(";");
+}
+function createGoogleCompatibleProvider(name, host) {
   return {
     name,
     getImportUrl(fonts) {
-      const sort = (weights) => {
-        const firstW = weights.map((w) => w[0]);
-        const lastW = weights.map((w) => w[1]);
-        return `${firstW.join(";")};${lastW.join(";")}`;
-      };
       const strings = fonts.map((i) => {
         let name2 = i.name.replace(/\s+/g, "+");
-        if (i.weights?.length) {
-          name2 += i.italic ? `:ital,wght@${sort(i.weights.map((w) => [`0,${w}`, `1,${w}`]))}` : `:wght@${i.weights.join(";")}`;
+        const axisValues = [];
+        if (i.italic)
+          axisValues.push({ axis: "ital", values: ["0", "1"] });
+        if (i.widths?.length)
+          axisValues.push({ axis: "wdth", values: i.widths.map((w) => w.toString()) });
+        if (i.weights?.length)
+          axisValues.push({ axis: "wght", values: i.weights.map((w) => w.toString()) });
+        if (axisValues.length) {
+          name2 += ":";
+          name2 += axisValues.map((a) => a.axis).join(",");
+          name2 += "@";
+          name2 += generateFontAxes(axisValues);
         }
         return `family=${name2}`;
       }).join("&");
@@ -44,7 +64,9 @@ function createCoolLabsCompatibleProvider(name, host) {
     }
   };
 }
-const CoolLabsFontsProvider = createCoolLabsCompatibleProvider("coollabs", "https://api.fonts.coollabs.io");
+const GoogleFontsProvider = createGoogleCompatibleProvider("google", "https://fonts.googleapis.com");
+
+const CoolLabsFontsProvider = createGoogleCompatibleProvider("coollabs", "https://api.fonts.coollabs.io");
 
 const FontshareProvider = createFontshareProvider("fontshare", "https://api.fontshare.com");
 function createFontshareProvider(name, host) {
@@ -205,28 +227,6 @@ function getVariableWght(axes) {
   return `${axes.min} ${axes.max}`;
 }
 
-function createGoogleCompatibleProvider(name, host) {
-  return {
-    name,
-    getImportUrl(fonts) {
-      const sort = (weights) => {
-        const firstW = weights.map((w) => w[0]);
-        const lastW = weights.map((w) => w[1]);
-        return `${firstW.join(";")};${lastW.join(";")}`;
-      };
-      const strings = fonts.map((i) => {
-        let name2 = i.name.replace(/\s+/g, "+");
-        if (i.weights?.length) {
-          name2 += i.italic ? `:ital,wght@${sort(i.weights.map((w) => [`0,${w}`, `1,${w}`]))}` : `:wght@${i.weights.join(";")}`;
-        }
-        return `family=${name2}`;
-      }).join("&");
-      return `${host}/css2?${strings}&display=swap`;
-    }
-  };
-}
-const GoogleFontsProvider = createGoogleCompatibleProvider("google", "https://fonts.googleapis.com");
-
 const NoneProvider = {
   name: "none",
   getPreflight() {
@@ -255,6 +255,8 @@ function normalizedFontMeta(meta, defaultProvider) {
     meta.provider = resolveProvider(meta.provider || defaultProvider);
     if (meta.weights)
       meta.weights = [...new Set(meta.weights.sort((a, b) => a.toString().localeCompare(b.toString(), "en", { numeric: true })))];
+    if (meta.widths)
+      meta.widths = [...new Set(meta.widths.sort((a, b) => a.toString().localeCompare(b.toString(), "en", { numeric: true })))];
     return meta;
   }
   const [name, weights = ""] = meta.split(":");
@@ -329,7 +331,11 @@ function createWebFontPreset(fetcher) {
           if (url)
             preflights.push(await importUrl(url));
         }
-        preflights.push(await provider.getPreflight?.(fontsForProvider, fetchWithTimeout));
+        try {
+          preflights.push(await provider.getPreflight?.(fontsForProvider, fetchWithTimeout));
+        } catch (e) {
+          console.warn(`[unocss] Web fonts preflight fetch failed.`, e);
+        }
       }
       const css = preflights.filter(Boolean).join("\n");
       return css;

package/dist/local.d.mts

@@ -1,4 +1,5 @@
-import { c as WebFontProcessor } from './shared/preset-web-fonts.CZc_IGwW.mjs';
+import { c as WebFontProcessor } from './shared/preset-web-fonts.COdQKJpo.mjs';
+import { fetch } from 'ofetch';
 import '@unocss/core';
 
 interface LocalFontProcessorOptions {
@@ -26,6 +27,10 @@ interface LocalFontProcessorOptions {
      * @default '/assets/fonts'
      */
     fontServeBaseUrl?: string;
+    /**
+     * Custom fetch function to provide the font data.
+     */
+    fetch?: typeof fetch;
 }
 declare function createLocalFontProcessor(options?: LocalFontProcessorOptions): WebFontProcessor;
 

package/dist/local.d.ts

@@ -1,4 +1,5 @@
-import { c as WebFontProcessor } from './shared/preset-web-fonts.CZc_IGwW.js';
+import { c as WebFontProcessor } from './shared/preset-web-fonts.COdQKJpo.js';
+import { fetch } from 'ofetch';
 import '@unocss/core';
 
 interface LocalFontProcessorOptions {
@@ -26,6 +27,10 @@ interface LocalFontProcessorOptions {
      * @default '/assets/fonts'
      */
     fontServeBaseUrl?: string;
+    /**
+     * Custom fetch function to provide the font data.
+     */
+    fetch?: typeof fetch;
 }
 declare function createLocalFontProcessor(options?: LocalFontProcessorOptions): WebFontProcessor;
 

package/dist/local.mjs

@@ -38,7 +38,8 @@ function createLocalFontProcessor(options) {
   const fontAssetsDir = resolve(cwd, options?.fontAssetsDir || "public/assets/fonts");
   const fontServeBaseUrl = options?.fontServeBaseUrl || "/assets/fonts";
   async function _downloadFont(url, assetPath) {
-    const response = await fetch(url).then((r) => r.arrayBuffer());
+    const fetcher = options?.fetch ?? fetch;
+    const response = await fetcher(url).then((r) => r.arrayBuffer());
     await fsp.mkdir(fontAssetsDir, { recursive: true });
     await fsp.writeFile(assetPath, Buffer.from(response));
   }

package/dist/shared/{preset-web-fonts.CZc_IGwW.d.mts → preset-web-fonts.COdQKJpo.d.mts}

@@ -16,6 +16,11 @@ interface WebFontMeta {
      * Use italic style
      */
     italic?: boolean;
+    /**
+     * Font width(s) to include, and respect the width order
+     * @example [62.5, 125]
+     */
+    widths?: (string | number)[];
     /**
      * Variable font settings
      * @example

package/dist/shared/{preset-web-fonts.CZc_IGwW.d.ts → preset-web-fonts.COdQKJpo.d.ts}

@@ -16,6 +16,11 @@ interface WebFontMeta {
      * Use italic style
      */
     italic?: boolean;
+    /**
+     * Font width(s) to include, and respect the width order
+     * @example [62.5, 125]
+     */
+    widths?: (string | number)[];
     /**
      * Variable font settings
      * @example

package/package.json

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