@lobehub/ui 1.140.2 → 1.140.3

package/es/ConfigProvider/index.d.ts

@@ -1,11 +1,12 @@
 import { ElementType, ReactNode } from 'react';
-import { CDN, CdnApi } from "../utils/genCdnUrl";
-type CdnFn = ({ pkg, version, path }: CdnApi) => string;
+import { CDN, CdnApi, JsdelivrApi, JsdelivrCDN } from "../utils/genCdnUrl";
 export interface Config {
     aAs?: ElementType;
     customCdnFn?: CdnFn;
+    customJsdelivrFn?: JsdelivrFn;
     imgAs?: ElementType;
     imgUnoptimized?: boolean;
+    jsdelivrProxy?: JsdelivrCDN | 'custom';
     proxy?: CDN | 'custom';
 }
 export declare const ConfigContext: import("react").Context<Config | null>;
@@ -13,5 +14,8 @@ declare const ConfigProvider: import("react").NamedExoticComponent<{
     children: ReactNode;
     config: Config;
 }>;
+export type CdnFn = ({ pkg, version, path }: CdnApi) => string;
 export declare const useCdnFn: () => CdnFn;
+export type JsdelivrFn = ({ repo, path }: JsdelivrApi) => string;
+export declare const useJsdelivrFn: () => JsdelivrFn;
 export default ConfigProvider;

package/es/ConfigProvider/index.js

@@ -1,5 +1,5 @@
 import { createContext, memo, useContext } from 'react';
-import { genCdnUrl } from "../utils/genCdnUrl";
+import { genCdnUrl, genJsdelivrUrl } from "../utils/genCdnUrl";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var ConfigContext = /*#__PURE__*/createContext(null);
 var ConfigProvider = /*#__PURE__*/memo(function (_ref) {
@@ -10,7 +10,10 @@ var ConfigProvider = /*#__PURE__*/memo(function (_ref) {
     children: children
   });
 });
-var fallback = function fallback(_ref2) {
+
+// useCdnFn
+
+var cdnFallback = function cdnFallback(_ref2) {
   var pkg = _ref2.pkg,
     version = _ref2.version,
     path = _ref2.path;
@@ -23,7 +26,7 @@ var fallback = function fallback(_ref2) {
 };
 export var useCdnFn = function useCdnFn() {
   var config = useContext(ConfigContext);
-  if (!config) return fallback;
+  if (!config) return cdnFallback;
   if ((config === null || config === void 0 ? void 0 : config.proxy) !== 'custom') return function (_ref3) {
     var pkg = _ref3.pkg,
       version = _ref3.version,
@@ -35,6 +38,32 @@ export var useCdnFn = function useCdnFn() {
       version: version
     });
   };
-  return (config === null || config === void 0 ? void 0 : config.customCdnFn) || fallback;
+  return (config === null || config === void 0 ? void 0 : config.customCdnFn) || cdnFallback;
+};
+
+// useJsdelivrFn
+
+var JsdelivrFallback = function JsdelivrFallback(_ref4) {
+  var repo = _ref4.repo,
+    path = _ref4.path;
+  return genJsdelivrUrl({
+    path: path,
+    proxy: 'lobehub',
+    repo: repo
+  });
+};
+export var useJsdelivrFn = function useJsdelivrFn() {
+  var config = useContext(ConfigContext);
+  if (!config) return JsdelivrFallback;
+  if ((config === null || config === void 0 ? void 0 : config.proxy) !== 'custom') return function (_ref5) {
+    var repo = _ref5.repo,
+      path = _ref5.path;
+    return genJsdelivrUrl({
+      path: path,
+      proxy: config.proxy,
+      repo: repo
+    });
+  };
+  return (config === null || config === void 0 ? void 0 : config.customJsdelivrFn) || JsdelivrFallback;
 };
 export default ConfigProvider;

package/es/FluentEmoji/index.js

@@ -4,6 +4,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { memo, useMemo, useState } from 'react';
 import { Center } from 'react-layout-kit';
+import { useCdnFn, useJsdelivrFn } from "../ConfigProvider";
 import Img from "../Img";
 import { useStyles } from "./style";
 import { genEmojiUrl } from "./utils";
@@ -21,12 +22,18 @@ var FluentEmoji = /*#__PURE__*/memo(function (_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loadingFail = _useState2[0],
     setLoadingFail = _useState2[1];
+  var genJsdelivrUrl = useJsdelivrFn();
+  var genCdnUrl = useCdnFn();
   var _useStyles = useStyles(),
     cx = _useStyles.cx,
     styles = _useStyles.styles;
   var emojiUrl = useMemo(function () {
-    return genEmojiUrl(emoji, type);
-  }, [type, emoji]);
+    return genEmojiUrl(emoji, type, {
+      genCdnUrl: genCdnUrl,
+      genJsdelivrUrl: genJsdelivrUrl
+    });
+  }, [type, emoji, genJsdelivrUrl, genCdnUrl]);
+  console.log(emojiUrl);
   if (type === 'pure' || !emojiUrl || loadingFail) return /*#__PURE__*/_jsx(Center, {
     className: cx(styles.container, className),
     flex: 'none',

package/es/FluentEmoji/utils.d.ts

@@ -1,2 +1,8 @@
+import { CdnFn, JsdelivrFn } from "../ConfigProvider";
 export type EmojiType = 'anim' | 'flat' | 'modern' | 'mono' | 'pure' | '3d';
-export declare const genEmojiUrl: (emoji: string, type: EmojiType) => string | null;
+export declare function isFlagEmoji(emoji: string): boolean;
+export declare function emojiToUnicode(emoji: string): string;
+export declare const genEmojiUrl: (emoji: string, type: EmojiType, { genCdnUrl, genJsdelivrUrl }: {
+    genCdnUrl: CdnFn;
+    genJsdelivrUrl: JsdelivrFn;
+}) => string | null;

package/es/FluentEmoji/utils.js

@@ -1,17 +1,61 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-function isFlagEmoji(emoji) {
+export function isFlagEmoji(emoji) {
   var flagRegex = /(?:\uD83C[\uDDE6-\uDDFF]){2}/;
   return flagRegex.test(emoji);
 }
-function emojiToUnicode(emoji) {
+export function emojiToUnicode(emoji) {
   return _toConsumableArray(emoji).map(function (char) {
     var _char$codePointAt;
     return char === null || char === void 0 || (_char$codePointAt = char.codePointAt(0)) === null || _char$codePointAt === void 0 ? void 0 : _char$codePointAt.toString(16);
   }).join('-');
 }
-export var genEmojiUrl = function genEmojiUrl(emoji, type) {
-  if (isFlagEmoji(emoji)) return "https://jsdelivr.lobehub-inc.cn/gh/RealityRipple/emoji/noto/".concat(emojiToUnicode(emoji), ".png");
-  if (type === 'pure') return null;
+export var genEmojiUrl = function genEmojiUrl(emoji, type, _ref) {
+  var genCdnUrl = _ref.genCdnUrl,
+    genJsdelivrUrl = _ref.genJsdelivrUrl;
   var ext = ['anim', '3d'].includes(type) ? 'webp' : 'svg';
-  return "https://jsdelivr.lobehub-inc.cn/gh/lobehub/fluent-emoji/packages/".concat(type, "/assets/").concat(emojiToUnicode(emoji), ".").concat(ext);
+  switch (type) {
+    case 'pure':
+      {
+        return null;
+      }
+    case 'anim':
+      {
+        return genJsdelivrUrl({
+          path: "packages/".concat(type, "/assets/").concat(emojiToUnicode(emoji), ".").concat(ext),
+          repo: 'lobehub/fluent-emoji'
+        });
+      }
+    case '3d':
+      {
+        return genCdnUrl({
+          path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
+          pkg: '@lobehub/fluent-emoji-3d',
+          version: '1.1.0'
+        });
+      }
+    case 'flat':
+      {
+        return genCdnUrl({
+          path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
+          pkg: '@lobehub/fluent-emoji-flat',
+          version: '1.1.0'
+        });
+      }
+    case 'modern':
+      {
+        return genCdnUrl({
+          path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
+          pkg: '@lobehub/fluent-emoji-modern',
+          version: '1.0.0'
+        });
+      }
+    case 'mono':
+      {
+        return genCdnUrl({
+          path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
+          pkg: '@lobehub/fluent-emoji-mono',
+          version: '1.1.0'
+        });
+      }
+  }
 };

package/es/utils/genCdnUrl.d.ts

@@ -6,3 +6,10 @@ export interface CdnApi {
     version?: string;
 }
 export declare const genCdnUrl: ({ pkg, version, path, proxy }: CdnApi) => string;
+export type JsdelivrCDN = 'jsdelivr' | 'lobehub';
+export interface JsdelivrApi {
+    path: string;
+    proxy?: JsdelivrCDN;
+    repo: string;
+}
+export declare const genJsdelivrUrl: ({ path, proxy, repo }: JsdelivrApi) => string;

package/es/utils/genCdnUrl.js

@@ -17,4 +17,21 @@ export var genCdnUrl = function genCdnUrl(_ref) {
         return urlJoin(ALIYUN_API, pkg, version, 'files', path);
       }
   }
+};
+var JSDELIVR_API = 'https://fastly.jsdelivr.net';
+var LOBEHUB_API = 'https://jsdelivr.lobeobjects.space';
+export var genJsdelivrUrl = function genJsdelivrUrl(_ref2) {
+  var path = _ref2.path,
+    proxy = _ref2.proxy,
+    repo = _ref2.repo;
+  switch (proxy) {
+    case 'jsdelivr':
+      {
+        return urlJoin(JSDELIVR_API, 'gh', repo, path);
+      }
+    default:
+      {
+        return urlJoin(LOBEHUB_API, 'gh', repo, path);
+      }
+  }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/ui",
-  "version": "1.140.2",
+  "version": "1.140.3",
   "description": "Lobe UI is an open-source UI component library for building AIGC web apps",
   "keywords": [
     "lobehub",