@unocss/preset-web-fonts 66.6.6-beta.1 → 66.6.7

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { a as WebFontProcessor, i as WebFontMeta, n as Provider, o as WebFontsOptions, r as ResolvedWebFontMeta, s as WebFontsProviders, t as Axes } from "./types-CAg9LcCB.mjs";
+import { a as WebFontProcessor, i as WebFontMeta, n as Provider, o as WebFontsOptions, r as ResolvedWebFontMeta, s as WebFontsProviders, t as Axes } from "./types-o6CvBLpT.mjs";
 import * as _unocss_core0 from "@unocss/core";
 
 //#region src/preset.d.ts

package/dist/index.mjs

@@ -1,13 +1,12 @@
 import { LAYER_IMPORTS, definePreset, mergeDeep, toArray } from "@unocss/core";
-
 //#region src/providers/bunny.ts
 function createBunnyFontsProvider(name, host) {
 	return {
 		name,
 		getImportUrl(fonts) {
 			return `${host}/css?family=${fonts.map((font) => {
-				const { name: name$1, weights, italic } = font;
-				const formattedName = name$1.toLowerCase().replace(/\s/g, "-");
+				const { name, weights, italic } = font;
+				const formattedName = name.toLowerCase().replace(/\s/g, "-");
 				if (!weights?.length) return `${formattedName}${italic ? ":i" : ""}`;
 				let weightsAsString = weights.map((weight) => weight.toString());
 				if (!weightsAsString.some((weight) => weight.endsWith("i")) && italic) weightsAsString = weightsAsString.map((weight) => weight += "i");
@@ -17,7 +16,6 @@ function createBunnyFontsProvider(name, host) {
 	};
 }
 const BunnyFontsProvider = createBunnyFontsProvider("bunny", "https://fonts.bunny.net");
-
 //#endregion
 //#region src/providers/google.ts
 function generateFontAxes(axes) {
@@ -35,7 +33,7 @@ function createGoogleCompatibleProvider(name, host) {
 		name,
 		getImportUrl(fonts) {
 			return `${host}/css2?${fonts.map((i) => {
-				let name$1 = i.name.replace(/\s+/g, "+");
+				let name = i.name.replace(/\s+/g, "+");
 				/**
 				* When using the Google Fonts API, be sure to list them alphabetically.
 				* @see https://fonts.google.com/knowledge/using_type/styling_type_on_the_web_with_variable_fonts
@@ -55,22 +53,20 @@ function createGoogleCompatibleProvider(name, host) {
 					values: i.weights.map((w) => w.toString())
 				});
 				if (axisValues.length) {
-					name$1 += ":";
-					name$1 += axisValues.map((a) => a.axis).join(",");
-					name$1 += "@";
-					name$1 += generateFontAxes(axisValues);
+					name += ":";
+					name += axisValues.map((a) => a.axis).join(",");
+					name += "@";
+					name += generateFontAxes(axisValues);
 				}
-				return `family=${name$1}`;
+				return `family=${name}`;
 			}).join("&")}&display=swap`;
 		}
 	};
 }
 const GoogleFontsProvider = createGoogleCompatibleProvider("google", "https://fonts.googleapis.com");
-
 //#endregion
 //#region src/providers/coollabs.ts
 const CoolLabsFontsProvider = createGoogleCompatibleProvider("coollabs", "https://api.fonts.coollabs.io");
-
 //#endregion
 //#region src/providers/fontshare.ts
 const FontshareProvider = createFontshareProvider("fontshare", "https://api.fontshare.com");
@@ -79,15 +75,14 @@ function createFontshareProvider(name, host) {
 		name,
 		getImportUrl(fonts) {
 			return `${host}/v2/css?${fonts.map((f) => {
-				let name$1 = f.name.replace(/\s+/g, "-").toLocaleLowerCase();
-				if (f.weights?.length) name$1 += `@${f.weights.flatMap((w) => f.italic ? Number(w) + 1 : w).sort().join()}`;
-				else name$1 += `@${f.italic ? 2 : 1}`;
-				return `f[]=${name$1}`;
+				let name = f.name.replace(/\s+/g, "-").toLocaleLowerCase();
+				if (f.weights?.length) name += `@${f.weights.flatMap((w) => f.italic ? Number(w) + 1 : w).sort().join()}`;
+				else name += `@${f.italic ? 2 : 1}`;
+				return `f[]=${name}`;
 			}).join("&")}&display=swap`;
 		}
 	};
 }
-
 //#endregion
 //#region src/providers/fontsource/index.ts
 function createFontSourceProvider(name, host) {
@@ -205,19 +200,6 @@ function getVariableWght(axes) {
 	if (axes.min === axes.max) return `${axes.min}`;
 	return `${axes.min} ${axes.max}`;
 }
-
-//#endregion
-//#region src/providers/none.ts
-const NoneProvider = {
-	name: "none",
-	getPreflight() {
-		return "";
-	},
-	getFontName(font) {
-		return font.name;
-	}
-};
-
 //#endregion
 //#region src/preset.ts
 const builtinProviders = {
@@ -226,7 +208,15 @@ const builtinProviders = {
 	fontshare: FontshareProvider,
 	fontsource: FontSourceProvider,
 	coollabs: CoolLabsFontsProvider,
-	none: NoneProvider
+	none: {
+		name: "none",
+		getPreflight() {
+			return "";
+		},
+		getFontName(font) {
+			return font.name;
+		}
+	}
 };
 function resolveProvider(provider) {
 	if (typeof provider === "string") return builtinProviders[provider];
@@ -281,10 +271,10 @@ function createWebFontPreset(fetcher) {
 			} else return `@import url('${url}');`;
 		}
 		const enabledProviders = Array.from(new Set(fonts.map((i) => i.provider)));
-		async function getCSSDefault(fonts$1, providers) {
+		async function getCSSDefault(fonts, providers) {
 			const preflights = [];
 			for (const provider of providers) {
-				const fontsForProvider = fonts$1.filter((i) => i.provider.name === provider.name);
+				const fontsForProvider = fonts.filter((i) => i.provider.name === provider.name);
 				if (provider.getImportUrl) {
 					const url = provider.getImportUrl(fontsForProvider);
 					if (url) preflights.push(await importUrl(url));
@@ -321,14 +311,13 @@ function createWebFontPreset(fetcher) {
 			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(Object.entries(fontObject).map(([name, fonts$1]) => [name, fonts$1.map((f) => f.provider.getFontName?.(f) ?? `"${f.name}"`)]));
+			const obj = Object.fromEntries(Object.entries(fontObject).map(([name, fonts]) => [name, fonts.map((f) => f.provider.getFontName?.(f) ?? `"${f.name}"`)]));
 			for (const key of Object.keys(obj)) if (typeof theme[themeKey][key] === "string") theme[themeKey][key] = obj[key].map((i) => `${i},`).join("") + theme[themeKey][key];
 			else theme[themeKey][key] = obj[key].join(",");
 		};
 		return preset;
 	};
 }
-
 //#endregion
 //#region src/index.ts
 const userAgentWoff2 = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36";
@@ -342,7 +331,5 @@ const defaultFetch = async (url) => (await import("ofetch")).$fetch(url, {
 * @see https://unocss.dev/presets/web-fonts
 */
 const presetWebFonts = definePreset(createWebFontPreset(defaultFetch));
-var src_default = presetWebFonts;
-
 //#endregion
-export { createGoogleCompatibleProvider as createGoogleProvider, src_default as default, normalizedFontMeta, presetWebFonts };
+export { createGoogleCompatibleProvider as createGoogleProvider, presetWebFonts as default, presetWebFonts, normalizedFontMeta };

package/dist/local.d.mts

@@ -1,4 +1,4 @@
-import { a as WebFontProcessor } from "./types-CAg9LcCB.mjs";
+import { a as WebFontProcessor } from "./types-o6CvBLpT.mjs";
 import { fetch } from "ofetch";
 
 //#region src/local.d.ts

package/dist/local.mjs

@@ -6,7 +6,6 @@ import fsp from "node:fs/promises";
 import { join, resolve } from "node:path";
 import process from "node:process";
 import { fetch } from "ofetch";
-
 //#region ../../virtual-shared/integration/src/utils.ts
 function replaceAsync(string, searchValue, replacer) {
 	try {
@@ -26,7 +25,6 @@ function replaceAsync(string, searchValue, replacer) {
 		return Promise.reject(error);
 	}
 }
-
 //#endregion
 //#region src/local.ts
 const fontUrlRegex = /[-\w@:%+.~#?&/=]+\.(?:woff2?|eot|ttf|otf|svg)/gi;
@@ -81,6 +79,5 @@ function withProtocol(input, protocol = "https://") {
 	if (!match) return protocol + input;
 	return protocol + input.slice(match[0].length);
 }
-
 //#endregion
-export { createLocalFontProcessor };
+export { createLocalFontProcessor };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/preset-web-fonts",
   "type": "module",
-  "version": "66.6.6-beta.1",
+  "version": "66.6.7",
   "description": "Web Fonts support for Uno CSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -42,7 +42,7 @@
   ],
   "dependencies": {
     "ofetch": "^1.5.1",
-    "@unocss/core": "66.6.6-beta.1"
+    "@unocss/core": "66.6.7"
   },
   "scripts": {
     "build": "tsdown --config-loader unrun",