@unocss/preset-web-fonts 66.2.0 → 66.2.2

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.Du87QQvO.mjs';
-export { A as Axes, c as WebFontProcessor } from './shared/preset-web-fonts.Du87QQvO.mjs';
+import { W as WebFontMeta, a as WebFontsProviders, R as ResolvedWebFontMeta, P as Provider, b as WebFontsOptions } from './shared/preset-web-fonts.B42lyDww.mjs';
+export { A as Axes, c as WebFontProcessor } from './shared/preset-web-fonts.B42lyDww.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.Du87QQvO.js';
-export { A as Axes, c as WebFontProcessor } from './shared/preset-web-fonts.Du87QQvO.js';
+import { W as WebFontMeta, a as WebFontsProviders, R as ResolvedWebFontMeta, P as Provider, b as WebFontsOptions } from './shared/preset-web-fonts.B42lyDww.js';
+export { A as Axes, c as WebFontProcessor } from './shared/preset-web-fonts.B42lyDww.js';
 
 declare function normalizedFontMeta(meta: WebFontMeta | string, defaultProvider: WebFontsProviders): ResolvedWebFontMeta;
 

package/dist/index.mjs

@@ -82,8 +82,9 @@ function createFontSourceProvider(name, host) {
             throw new Error(`Failed to fetch font: ${font.name}`);
           }
         }
-        const { subsets, weights } = metadata;
-        if (metadata.variable) {
+        const { weights } = metadata;
+        const subsets = metadata.subsets.filter((subset) => font.subsets ? font.subsets.includes(subset) : true);
+        if (metadata.variable && !font.preferStatic) {
           let variableData = variablesMap.get(id);
           const url = `https://api.fontsource.org/v1/variable/${id}`;
           try {
@@ -244,10 +245,11 @@ function createWebFontPreset(fetcher) {
       provider: defaultProvider = "google",
       extendTheme = true,
       inlineImports = true,
-      themeKey = "fontFamily",
       customFetch = fetcher,
       timeouts = {}
     } = options;
+    const fontLayer = "fonts";
+    const layerName = inlineImports ? fontLayer : LAYER_IMPORTS;
     const processors = toArray(options.processors || []);
     const fontObject = Object.fromEntries(
       Object.entries(options.fonts || {}).map(([name, meta]) => [name, toArray(meta).map((m) => normalizedFontMeta(m, defaultProvider))])
@@ -330,12 +332,17 @@ function createWebFontPreset(fetcher) {
               css = await processor.transformCSS?.(css) || css;
             return css;
           },
-          layer: inlineImports ? void 0 : LAYER_IMPORTS
+          layer: layerName
         }
-      ]
+      ],
+      layers: {
+        [fontLayer]: -200
+      }
     };
     if (extendTheme) {
-      preset.extendTheme = (theme) => {
+      preset.extendTheme = (theme, config) => {
+        const hasWind4 = config.presets.some((p) => p.name === "@unocss/preset-wind4");
+        const themeKey = options.themeKey ?? (hasWind4 ? "font" : "fontFamily");
         if (!theme[themeKey])
           theme[themeKey] = {};
         const obj = Object.fromEntries(

package/dist/local.d.mts

@@ -1,4 +1,4 @@
-import { c as WebFontProcessor } from './shared/preset-web-fonts.Du87QQvO.mjs';
+import { c as WebFontProcessor } from './shared/preset-web-fonts.B42lyDww.mjs';
 import '@unocss/core';
 
 interface LocalFontProcessorOptions {

package/dist/local.d.ts

@@ -1,4 +1,4 @@
-import { c as WebFontProcessor } from './shared/preset-web-fonts.Du87QQvO.js';
+import { c as WebFontProcessor } from './shared/preset-web-fonts.B42lyDww.js';
 import '@unocss/core';
 
 interface LocalFontProcessorOptions {

package/dist/shared/{preset-web-fonts.Du87QQvO.d.mts → preset-web-fonts.B42lyDww.d.mts}

@@ -2,10 +2,40 @@ import { Awaitable, Arrayable } from '@unocss/core';
 
 type WebFontsProviders = 'google' | 'bunny' | 'fontshare' | 'fontsource' | 'coollabs' | 'none' | Provider;
 interface WebFontMeta {
+    /**
+     * The name of the font family
+     * @example 'Fira Code'
+     */
     name: string;
+    /**
+     * Font weight(s) to include, and respect the weight order
+     * @example [400, 700]
+     */
     weights?: (string | number)[];
+    /**
+     * Use italic style
+     */
     italic?: boolean;
+    /**
+     * Variable font settings
+     * @example
+     * ```ts
+     * variable: {
+     *   wght: { default: '400', min: '100', max: '900', step: '100' },
+     *   wdth: { default: '100', min: '50', max: '200', step: '10' },
+     *   slnt: { default: '0', min: '-20', max: '20', step: '1' },
+     * }
+     */
     variable?: Record<string, Partial<Axes>>;
+    /**
+     * The font subsets to include
+     * @example ['latin', 'cyrillic']
+     */
+    subsets?: string[];
+    /**
+     * Prefer static font files over variable
+     */
+    preferStatic?: boolean;
     /**
      * Override the provider
      * @default <matches root config>
@@ -37,7 +67,11 @@ interface WebFontsOptions {
     /**
      * Key for the theme object
      *
-     * @default 'fontFamily'
+     * Automatically detect the key based on the preset used
+     *
+     * @default
+     * `preset-wind3` -> 'fontFamily'
+     * `preset-wind4` -> 'font'
      */
     themeKey?: string;
     /**

package/dist/shared/{preset-web-fonts.Du87QQvO.d.ts → preset-web-fonts.B42lyDww.d.ts}

@@ -2,10 +2,40 @@ import { Awaitable, Arrayable } from '@unocss/core';
 
 type WebFontsProviders = 'google' | 'bunny' | 'fontshare' | 'fontsource' | 'coollabs' | 'none' | Provider;
 interface WebFontMeta {
+    /**
+     * The name of the font family
+     * @example 'Fira Code'
+     */
     name: string;
+    /**
+     * Font weight(s) to include, and respect the weight order
+     * @example [400, 700]
+     */
     weights?: (string | number)[];
+    /**
+     * Use italic style
+     */
     italic?: boolean;
+    /**
+     * Variable font settings
+     * @example
+     * ```ts
+     * variable: {
+     *   wght: { default: '400', min: '100', max: '900', step: '100' },
+     *   wdth: { default: '100', min: '50', max: '200', step: '10' },
+     *   slnt: { default: '0', min: '-20', max: '20', step: '1' },
+     * }
+     */
     variable?: Record<string, Partial<Axes>>;
+    /**
+     * The font subsets to include
+     * @example ['latin', 'cyrillic']
+     */
+    subsets?: string[];
+    /**
+     * Prefer static font files over variable
+     */
+    preferStatic?: boolean;
     /**
      * Override the provider
      * @default <matches root config>
@@ -37,7 +67,11 @@ interface WebFontsOptions {
     /**
      * Key for the theme object
      *
-     * @default 'fontFamily'
+     * Automatically detect the key based on the preset used
+     *
+     * @default
+     * `preset-wind3` -> 'fontFamily'
+     * `preset-wind4` -> 'font'
      */
     themeKey?: string;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/preset-web-fonts",
   "type": "module",
-  "version": "66.2.0",
+  "version": "66.2.2",
   "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.2.0"
+    "@unocss/core": "66.2.2"
   },
   "scripts": {
     "build": "unbuild",