@unocss/preset-icons 0.45.3 → 0.45.4

package/dist/browser.cjs

@@ -14,6 +14,7 @@ const presetIcons = core.createPresetIcons(async (options) => {
   return cdn.loadIcon;
 });
 
+exports.combineLoaders = core.combineLoaders;
 exports.createPresetIcons = core.createPresetIcons;
 exports["default"] = presetIcons;
 exports.presetIcons = presetIcons;

package/dist/browser.d.ts

@@ -1,6 +1,6 @@
 import * as _unocss_core from '@unocss/core';
 import { IconsOptions } from './core.js';
-export { IconsOptions, createPresetIcons } from './core.js';
+export { IconsOptions, combineLoaders, createPresetIcons } from './core.js';
 import '@iconify/utils/lib/loader/types';
 import '@iconify/types';
 

package/dist/browser.mjs

@@ -1,6 +1,6 @@
 import { c as createCDNLoader, l as loadIcon } from './chunks/cdn.mjs';
 import { createPresetIcons } from './core.mjs';
-export { createPresetIcons } from './core.mjs';
+export { combineLoaders, createPresetIcons } from './core.mjs';
 import 'ohmyfetch';
 import '@unocss/core';
 

package/dist/core.cjs

@@ -110,5 +110,15 @@ function createPresetIcons(lookupIconLoader) {
     };
   };
 }
+function combineLoaders(loaders) {
+  return (...args) => {
+    for (const loader of loaders) {
+      const result = loader(...args);
+      if (result)
+        return result;
+    }
+  };
+}
 
+exports.combineLoaders = combineLoaders;
 exports.createPresetIcons = createPresetIcons;

package/dist/core.d.ts

@@ -78,5 +78,6 @@ interface IconsOptions {
 }
 
 declare function createPresetIcons(lookupIconLoader: (options: IconsOptions) => Promise<UniversalIconLoader>): (options?: IconsOptions) => Preset;
+declare function combineLoaders(loaders: UniversalIconLoader[]): UniversalIconLoader;
 
-export { IconsOptions, createPresetIcons };
+export { IconsOptions, combineLoaders, createPresetIcons };

package/dist/core.mjs

@@ -106,5 +106,14 @@ function createPresetIcons(lookupIconLoader) {
     };
   };
 }
+function combineLoaders(loaders) {
+  return (...args) => {
+    for (const loader of loaders) {
+      const result = loader(...args);
+      if (result)
+        return result;
+    }
+  };
+}
 
-export { createPresetIcons };
+export { combineLoaders, createPresetIcons };

package/dist/index.cjs

@@ -10,25 +10,30 @@ require('@unocss/core');
 const isNode = typeof process < "u" && typeof process.stdout < "u" && !process.versions.deno;
 const isVSCode = isNode && !!process.env.VSCODE_CWD;
 
+async function createNodeLoader() {
+  try {
+    return await import('@iconify/utils/lib/loader/node-loader').then((i) => i?.loadNodeIcon);
+  } catch {
+  }
+  try {
+    return require("@iconify/utils/lib/loader/node-loader.cjs");
+  } catch {
+  }
+}
 const presetIcons = core.createPresetIcons(async (options) => {
   const {
     cdn: cdn$1
   } = options;
+  const loaders = [];
+  if (isNode && !isVSCode)
+    loaders.push(await createNodeLoader());
   if (cdn$1)
-    return cdn.createCDNLoader(cdn$1);
-  if (isNode && !isVSCode) {
-    try {
-      return await import('@iconify/utils/lib/loader/node-loader').then((i) => i?.loadNodeIcon);
-    } catch {
-    }
-    try {
-      return require("@iconify/utils/lib/loader/node-loader.cjs");
-    } catch {
-    }
-  }
-  return cdn.loadIcon;
+    loaders.push(cdn.createCDNLoader(cdn$1));
+  loaders.push(cdn.loadIcon);
+  return core.combineLoaders(loaders);
 });
 
+exports.combineLoaders = core.combineLoaders;
 exports.createPresetIcons = core.createPresetIcons;
 exports["default"] = presetIcons;
 exports.presetIcons = presetIcons;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as _unocss_core from '@unocss/core';
 import { IconsOptions } from './core.js';
-export { IconsOptions, createPresetIcons } from './core.js';
+export { IconsOptions, combineLoaders, createPresetIcons } from './core.js';
 import '@iconify/utils/lib/loader/types';
 import '@iconify/types';
 

package/dist/index.mjs

@@ -1,29 +1,33 @@
 import { c as createCDNLoader, l as loadIcon } from './chunks/cdn.mjs';
-import { createPresetIcons } from './core.mjs';
-export { createPresetIcons } from './core.mjs';
+import { createPresetIcons, combineLoaders } from './core.mjs';
+export { combineLoaders, createPresetIcons } from './core.mjs';
 import 'ohmyfetch';
 import '@unocss/core';
 
 const isNode = typeof process < "u" && typeof process.stdout < "u" && !process.versions.deno;
 const isVSCode = isNode && !!process.env.VSCODE_CWD;
 
+async function createNodeLoader() {
+  try {
+    return await import('@iconify/utils/lib/loader/node-loader').then((i) => i?.loadNodeIcon);
+  } catch {
+  }
+  try {
+    return require("@iconify/utils/lib/loader/node-loader.cjs");
+  } catch {
+  }
+}
 const presetIcons = createPresetIcons(async (options) => {
   const {
     cdn
   } = options;
+  const loaders = [];
+  if (isNode && !isVSCode)
+    loaders.push(await createNodeLoader());
   if (cdn)
-    return createCDNLoader(cdn);
-  if (isNode && !isVSCode) {
-    try {
-      return await import('@iconify/utils/lib/loader/node-loader').then((i) => i?.loadNodeIcon);
-    } catch {
-    }
-    try {
-      return require("@iconify/utils/lib/loader/node-loader.cjs");
-    } catch {
-    }
-  }
-  return loadIcon;
+    loaders.push(createCDNLoader(cdn));
+  loaders.push(loadIcon);
+  return combineLoaders(loaders);
 });
 
 export { presetIcons as default, presetIcons };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-icons",
-  "version": "0.45.3",
+  "version": "0.45.4",
   "description": "Pure CSS Icons for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -48,7 +48,7 @@
   ],
   "dependencies": {
     "@iconify/utils": "^1.0.33",
-    "@unocss/core": "0.45.3",
+    "@unocss/core": "0.45.4",
     "ohmyfetch": "^0.4.18"
   },
   "devDependencies": {