@unocss/preset-web-fonts 0.51.7 → 0.51.11

package/dist/index.cjs

@@ -4,12 +4,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const core = require('@unocss/core');
 
-const GoogleFontsProvider = createGoogleProvider("google", "https://fonts.googleapis.com");
-function createGoogleProvider(name, host) {
+function createGoogleCompatibleProvider(name, host) {
   return {
     name,
     getImportUrl(fonts) {
-      const strings = fonts.filter((i) => i.provider === name).map((i) => {
+      const strings = fonts.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(";")}`;
@@ -20,15 +19,16 @@ function createGoogleProvider(name, host) {
     }
   };
 }
+const GoogleFontsProvider = createGoogleCompatibleProvider("google", "https://fonts.googleapis.com");
 
-const BunnyFontsProvider = createGoogleProvider("bunny", "https://fonts.bunny.net");
+const BunnyFontsProvider = createGoogleCompatibleProvider("bunny", "https://fonts.bunny.net");
 
 const FontshareProvider = createFontshareProvider("fontshare", "https://api.fontshare.com");
 function createFontshareProvider(name, host) {
   return {
     name,
     getImportUrl(fonts) {
-      const strings = fonts.filter((f) => f.provider === name).map((f) => {
+      const strings = fonts.map((f) => {
         let name2 = f.name.replace(/\s+/g, "-").toLocaleLowerCase();
         if (f.weights?.length)
           name2 += `@${f.weights.flatMap((w) => f.italic ? Number(w) + 1 : w).sort().join()}`;
@@ -112,7 +112,7 @@ function preset(options = {}) {
         async getCSS() {
           const preflights = [];
           for (const provider of enabledProviders) {
-            const fontsForProvider = fonts.filter((i) => i.provider === provider);
+            const fontsForProvider = fonts.filter((i) => i.provider.name === provider.name);
             if (provider.getImportUrl) {
               const url = provider.getImportUrl(fontsForProvider);
               if (url)
@@ -143,5 +143,6 @@ function preset(options = {}) {
   return preset2;
 }
 
+exports.createGoogleProvider = createGoogleCompatibleProvider;
 exports["default"] = preset;
 exports.normalizedFontMeta = normalizedFontMeta;

package/dist/index.d.ts

@@ -55,7 +55,9 @@ interface Provider {
     getFontName?(font: WebFontMeta): string;
 }
 
+declare function createGoogleCompatibleProvider(name: WebFontsProviders, host: string): Provider;
+
 declare function normalizedFontMeta(meta: WebFontMeta | string, defaultProvider: WebFontsProviders): ResolvedWebFontMeta;
 declare function preset(options?: WebFontsOptions): Preset<any>;
 
-export { Provider, ResolvedWebFontMeta, WebFontMeta, WebFontsOptions, WebFontsProviders, preset as default, normalizedFontMeta };
+export { Provider, ResolvedWebFontMeta, WebFontMeta, WebFontsOptions, WebFontsProviders, createGoogleCompatibleProvider as createGoogleProvider, preset as default, normalizedFontMeta };

package/dist/index.mjs

@@ -1,11 +1,10 @@
 import { toArray } from '@unocss/core';
 
-const GoogleFontsProvider = createGoogleProvider("google", "https://fonts.googleapis.com");
-function createGoogleProvider(name, host) {
+function createGoogleCompatibleProvider(name, host) {
   return {
     name,
     getImportUrl(fonts) {
-      const strings = fonts.filter((i) => i.provider === name).map((i) => {
+      const strings = fonts.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(";")}`;
@@ -16,15 +15,16 @@ function createGoogleProvider(name, host) {
     }
   };
 }
+const GoogleFontsProvider = createGoogleCompatibleProvider("google", "https://fonts.googleapis.com");
 
-const BunnyFontsProvider = createGoogleProvider("bunny", "https://fonts.bunny.net");
+const BunnyFontsProvider = createGoogleCompatibleProvider("bunny", "https://fonts.bunny.net");
 
 const FontshareProvider = createFontshareProvider("fontshare", "https://api.fontshare.com");
 function createFontshareProvider(name, host) {
   return {
     name,
     getImportUrl(fonts) {
-      const strings = fonts.filter((f) => f.provider === name).map((f) => {
+      const strings = fonts.map((f) => {
         let name2 = f.name.replace(/\s+/g, "-").toLocaleLowerCase();
         if (f.weights?.length)
           name2 += `@${f.weights.flatMap((w) => f.italic ? Number(w) + 1 : w).sort().join()}`;
@@ -108,7 +108,7 @@ function preset(options = {}) {
         async getCSS() {
           const preflights = [];
           for (const provider of enabledProviders) {
-            const fontsForProvider = fonts.filter((i) => i.provider === provider);
+            const fontsForProvider = fonts.filter((i) => i.provider.name === provider.name);
             if (provider.getImportUrl) {
               const url = provider.getImportUrl(fontsForProvider);
               if (url)
@@ -139,4 +139,4 @@ function preset(options = {}) {
   return preset2;
 }
 
-export { preset as default, normalizedFontMeta };
+export { createGoogleCompatibleProvider as createGoogleProvider, preset as default, normalizedFontMeta };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-web-fonts",
-  "version": "0.51.7",
+  "version": "0.51.11",
   "description": "Web Fonts support for Uno CSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -8,7 +8,7 @@
   "homepage": "https://github.com/unocss/unocss/tree/main/packages/preset-web-fonts#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/unocss/unocss.git",
+    "url": "https://github.com/unocss/unocss",
     "directory": "packages/preset-web-fonts"
   },
   "bugs": {
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "ofetch": "^1.0.1",
-    "@unocss/core": "0.51.7"
+    "@unocss/core": "0.51.11"
   },
   "scripts": {
     "build": "unbuild",