@bbki.ng/site 5.5.17 → 5.5.18

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @bbki.ng/site
 
+## 5.5.18
+
+### Patch Changes
+
+- 43fb1e3: add xwy plugin
+- Updated dependencies [43fb1e3]
+  - @bbki.ng/ui@0.2.12
+
 ## 5.5.17
 
 ### Patch Changes

package/index.d.ts

@@ -1,5 +1,18 @@
+import React from 'react';
+
 declare const GLOBAL_BBKING_VERSION: string;
 declare const GLOBAL_COMMIT_HASH: string;
 interface ImportMeta {
-  glob: (pattern: string) => Record<string, () => Promise<any>>;
+  glob: (pattern: string) => Record<string, () => Promise<unknown>>;
+}
+
+declare global {
+  namespace JSX {
+    interface IntrinsicElements {
+      'bb-img': React.DetailedHTMLProps<
+        React.ImgHTMLAttributes<HTMLImageElement>,
+        HTMLImageElement
+      >;
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbki.ng/site",
-  "version": "5.5.17",
+  "version": "5.5.18",
   "description": "code behind bbki.ng",
   "main": "index.js",
   "type": "module",
@@ -14,7 +14,7 @@
     "react-dom": "^18.0.0",
     "react-router-dom": "6",
     "swr": "^2.2.5",
-    "@bbki.ng/ui": "0.2.11"
+    "@bbki.ng/ui": "0.2.12"
   },
   "devDependencies": {
     "@eslint/compat": "^1.0.0",
@@ -57,7 +57,7 @@
     "vite-plugin-mdx": "^3.5.8",
     "vite-plugin-pwa": "0.19",
     "workbox-window": "^6.3.0",
-    "@bbki.ng/config": "1.0.7"
+    "@bbki.ng/config": "1.0.8"
   },
   "author": "bbbottle",
   "license": "MIT",

package/src/blog/app.tsx

@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
-import { Outlet, Route, Routes } from 'react-router-dom';
-import { Nav, NotFound, Page, Grid, ErrorBoundary, Container } from '@bbki.ng/ui';
+import { Outlet, Route, Routes, useNavigate } from 'react-router-dom';
+import { Logo, Nav, NotFound, Page, Grid, ErrorBoundary, Container } from '@bbki.ng/ui';
 
 import { usePaths } from '@/hooks';
 import ArticlePage from '@/pages/extensions/txt/article';
@@ -13,12 +13,16 @@ import { usePlugins } from '#/core/hooks/use_plugins';
 import { SWR } from '@/swr';
 
 import { Cover, Streaming } from './pages';
-import { useDynamicLogo } from './hooks/use_dynamic_logo';
 
 const Layout = () => {
   const paths = usePaths();
   const { isLoading } = useContext(GlobalLoadingContext);
-  const logo = useDynamicLogo();
+
+  const nav = useNavigate();
+
+  const defaultLogo = (
+    <Logo className="mr-2 cursor-pointer hover:opacity-80" onClick={() => nav('/')} />
+  );
 
   return (
     <Page
@@ -27,7 +31,7 @@ const Layout = () => {
           paths={paths}
           className="gradient-blur-cover select-none"
           loading={isLoading}
-          customLogo={logo}
+          customLogo={<Slot name="logo" data={defaultLogo} placeholder={defaultLogo} />}
           style={{
             paddingTop: 'var(--safe-top)',
             transition: 'all .2s ease-in-out',
@@ -59,7 +63,7 @@ const Layout = () => {
 };
 
 export const App = () => {
-  usePlugins(['sticker', 'fontstyler', 'extra-cd']);
+  usePlugins(['sticker', 'xwy', 'extra-cd']);
 
   return (
     <SWR>

package/src/core/components/SlotComp.tsx

@@ -1,15 +1,23 @@
 import React from 'react';
-import { SlotName } from 'src/types/slots';
+
+import { SlotName } from '#/types/slots';
+
 import { useSlotComp } from '../hooks/useSlotComp';
 
 export interface ISlotProps {
   name: SlotName;
   data?: unknown;
+
+  placeholder?: React.ReactNode;
 }
 
-export const Slot: React.FC<ISlotProps> = ({ name, data }) => {
+export const Slot: React.FC<ISlotProps> = ({ name, data, placeholder }) => {
   const components = useSlotComp(name);
 
+  if (components.length === 0) {
+    return <>{placeholder}</>;
+  }
+
   return (
     <>
       {components.map((Component, index) => (

package/src/plugins/manifest.ts

@@ -1,10 +1,4 @@
 export const PLUGIN_MANIFEST = [
-  {
-    name: 'test',
-    id: 'test',
-    version: '0.1.0',
-    description: 'A test plugin',
-  },
   {
     name: 'sticker',
     id: 'sticker',
@@ -19,9 +13,9 @@ export const PLUGIN_MANIFEST = [
       'Provides additional change directory functionalities for enhanced user experience.',
   },
   {
-    name: 'fontstyler',
-    id: 'fontstyler',
+    name: 'xwy',
+    id: 'xwy',
     version: '0.1.0',
-    description: 'Apply custom fonts to specific post',
+    description: 'customize for xwy',
   },
 ];

package/src/plugins/sticker/components/StickerCom.tsx

@@ -3,17 +3,6 @@ import React from 'react';
 
 import { StickerCtx } from '../context';
 
-declare global {
-  namespace JSX {
-    interface IntrinsicElements {
-      'bb-img': React.DetailedHTMLProps<
-        React.ImgHTMLAttributes<HTMLImageElement>,
-        HTMLImageElement
-      >;
-    }
-  }
-}
-
 export const StickerCom = ({ data }: { data: PathObj[] }) => {
   const ctx = StickerCtx.useCtx();
 

package/src/plugins/sticker/index.ts

@@ -1,5 +1,6 @@
 import { IHostContext } from '#/types/hostApi';
 import { IPlugin } from '#/types/plugin';
+
 import { StickerCom } from './components/StickerCom';
 import { IStickerCtx, StickerCtx } from './context';
 

package/src/{blog/components/Pochacco/xwy.tsx → plugins/xwy/components/logo.tsx}

@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
+import { useLocation } from 'react-router-dom';
 
 export const Crows = () => {
   return (
@@ -11,3 +12,13 @@ export const Crows = () => {
     </svg>
   );
 };
+
+export const XwyLogo = ({ data: defaultLogo }: { data: ReactNode }) => {
+  const location = useLocation();
+
+  if (decodeURIComponent(location.pathname).includes('小乌鸦')) {
+    return <Crows />;
+  }
+
+  return <>{defaultLogo}</>;
+};

package/src/plugins/xwy/const/index.ts

@@ -0,0 +1,15 @@
+import { FontRule } from '../types';
+
+export const FontRules: Array<FontRule> = [
+  {
+    match: '小乌鸦合集',
+    fontFamily: 'xwy',
+    fontConfig: {
+      name: 'xwy',
+      src: '/fonts/xwy.woff2',
+      format: 'woff2',
+    },
+    extraCls: 'text-2xl',
+    variant: 'special',
+  },
+];

package/src/plugins/xwy/index.ts

@@ -0,0 +1,73 @@
+import { IHostContext } from '#/types/hostApi';
+import { IPlugin } from '#/types/plugin';
+import { TitleListItem } from '#/types/posts';
+
+import { XwyLogo } from './components/logo';
+import { FontRules } from './const';
+import { loadFont } from './utils';
+
+class XwyPlugin implements IPlugin {
+  id = 'fontstyler';
+  name = 'Font Styler';
+  description = 'Apply custom fonts to specific post titles';
+  version = '1.0.0';
+  author = 'bbki.ng';
+
+  private loadedFonts = new Set<string>();
+
+  onInstall = (ctx: IHostContext) => {
+    // 加载所有需要的字体文件
+    FontRules.forEach(rule => {
+      if (rule.fontConfig && !this.loadedFonts.has(rule.fontConfig.name)) {
+        loadFont(rule.fontConfig);
+        this.loadedFonts.add(rule.fontConfig.name);
+      }
+    });
+
+    // 注册中间件，修改标题列表
+    ctx.api.registerMiddleware(
+      'transformTitleList',
+      this.transformTitleList,
+      this.id,
+      10 // weight
+    );
+
+    // 注册logo插槽组件
+    ctx.api.registerSlot('logo', XwyLogo, this.id);
+  };
+
+  /**
+   * 转换标题列表，为匹配的标题添加字体类名
+   */
+  private transformTitleList = (titleList: TitleListItem[]): TitleListItem[] => {
+    return titleList.map(item => {
+      for (const rule of FontRules) {
+        const match =
+          typeof rule.match === 'string' ? item.name === rule.match : rule.match.test(item.name);
+
+        if (match) {
+          return {
+            ...item,
+            variant: rule.variant || 'default',
+            className: `font-${rule.fontFamily} ${rule.extraCls || ''}`.trim(),
+          };
+        }
+      }
+      return item;
+    });
+  };
+
+  onDisable = async () => {
+    this.loadedFonts.forEach(fontName => {
+      const styleEl = document.getElementById(`font-${fontName}`);
+      if (styleEl) {
+        styleEl.remove();
+      }
+    });
+    this.loadedFonts.clear();
+  };
+
+  onDestroy = () => {};
+}
+
+export default new XwyPlugin();

package/src/plugins/xwy/types/index.ts

@@ -0,0 +1,15 @@
+export interface FontConfig {
+  name: string;
+  src: string;
+  format: 'woff2' | 'woff' | 'ttf' | 'otf';
+  fontWeight?: string;
+  fontStyle?: string;
+}
+
+export interface FontRule {
+  match: string | RegExp;
+  fontFamily: string;
+  fontConfig?: FontConfig;
+  extraCls?: string;
+  variant?: 'default' | 'special';
+}

package/src/plugins/xwy/utils/index.ts

@@ -0,0 +1,22 @@
+import { type FontConfig } from '../types';
+
+export const loadFont = (config: FontConfig) => {
+  const styleId = `font-${config.name}`;
+  if (document.getElementById(styleId)) return;
+
+  const style = document.createElement('style');
+  style.id = styleId;
+  style.textContent = `
+      @font-face {
+        font-family: '${config.name}';
+        src: url('${config.src}') format('${config.format}');
+        font-weight: ${config.fontWeight || 'normal'};
+        font-style: ${config.fontStyle || 'normal'};
+        font-display: swap;
+      }
+      .font-${config.name} {
+        font-family: '${config.name}', monospace;
+      }
+    `;
+  document.head.appendChild(style);
+};

package/src/types/plugin.ts

@@ -12,4 +12,4 @@ export interface IPlugin {
   onDestroy?: () => void;
 }
 
-export type PluginID = 'sticker' | 'fontstyler' | 'extra-cd';
+export type PluginID = 'sticker' | 'xwy' | 'extra-cd';

package/src/types/posts.ts

@@ -3,4 +3,5 @@ export interface TitleListItem {
   to: string;
   children: string;
   className?: string;
+  variant?: 'default' | 'special';
 }

package/src/types/slots.ts

@@ -1,2 +1,2 @@
-export type SlotName = 'leftCol' | 'rightCol' | 'articleActionRow';
+export type SlotName = 'leftCol' | 'rightCol' | 'articleActionRow' | 'logo';
 export type HookPoint = 'filterPosts' | 'transformPostContent' | 'transformTitleList';

package/src/blog/hooks/use_dynamic_logo.tsx

@@ -1,15 +0,0 @@
-import React from 'react';
-import { Role, useRole } from './use_role';
-import { useLocation } from 'react-router-dom';
-import { Crows } from '@/components/Pochacco/xwy';
-
-export const useDynamicLogo = () => {
-  const role = useRole();
-  const location = useLocation();
-
-  if (decodeURIComponent(location.pathname).includes('小乌鸦')) {
-    return <Crows />;
-  }
-
-  return null;
-};

package/src/plugins/fontstyler/index.ts

@@ -1,132 +0,0 @@
-import { IHostContext } from '#/types/hostApi';
-import { IPlugin } from '#/types/plugin';
-
-export interface TitleListItem {
-  name: string;
-  to: string;
-  children: string;
-  className?: string;
-}
-
-export interface FontConfig {
-  name: string;
-  src: string;
-  format: 'woff2' | 'woff' | 'ttf' | 'otf';
-  fontWeight?: string;
-  fontStyle?: string;
-}
-
-export interface FontRule {
-  match: string | RegExp;
-  fontFamily: string;
-  fontConfig?: FontConfig;
-  extraCls?: string;
-}
-
-class FontStylerPlugin implements IPlugin {
-  id = 'fontstyler';
-  name = 'Font Styler';
-  description = 'Apply custom fonts to specific post titles';
-  version = '1.0.0';
-  author = 'bbki.ng';
-
-  /**
-   * 配置：标题匹配规则 → 字体配置
-   * 支持精确字符串匹配或正则表达式匹配
-   *
-   * 示例：
-   * - 精确匹配: { match: '某篇文章标题', fontFamily: 'CustomFont1', fontConfig: {...} }
-   * - 正则匹配: { match: /^示例/, fontFamily: 'CustomFont2', fontConfig: {...} }
-   */
-  private fontRules: FontRule[] = [
-    {
-      match: '小乌鸦合集',
-      fontFamily: 'xwy',
-      fontConfig: {
-        name: 'xwy',
-        src: '/fonts/xwy.woff2',
-        format: 'woff2',
-      },
-      extraCls: 'text-2xl',
-    },
-  ];
-
-  private loadedFonts = new Set<string>();
-
-  onInstall = (ctx: IHostContext) => {
-    // 加载所有需要的字体文件
-    this.fontRules.forEach(rule => {
-      if (rule.fontConfig && !this.loadedFonts.has(rule.fontConfig.name)) {
-        this.loadFont(rule.fontConfig);
-        this.loadedFonts.add(rule.fontConfig.name);
-      }
-    });
-
-    ctx.api.registerMiddleware(
-      'transformTitleList',
-      this.transformTitleList,
-      this.id,
-      10 // weight
-    );
-  };
-
-  /**
-   * 动态加载字体文件
-   * 通过创建 style 标签添加 @font-face 规则
-   */
-  private loadFont = (config: FontConfig) => {
-    const styleId = `font-${config.name}`;
-    if (document.getElementById(styleId)) return;
-
-    const style = document.createElement('style');
-    style.id = styleId;
-    style.textContent = `
-      @font-face {
-        font-family: '${config.name}';
-        src: url('${config.src}') format('${config.format}');
-        font-weight: ${config.fontWeight || 'normal'};
-        font-style: ${config.fontStyle || 'normal'};
-        font-display: swap;
-      }
-      .font-${config.name} {
-        font-family: '${config.name}', monospace;
-      }
-    `;
-    document.head.appendChild(style);
-  };
-
-  /**
-   * 转换标题列表，为匹配的标题添加字体类名
-   */
-  private transformTitleList = (titleList: TitleListItem[]): TitleListItem[] => {
-    return titleList.map(item => {
-      for (const rule of this.fontRules) {
-        const match =
-          typeof rule.match === 'string' ? item.name === rule.match : rule.match.test(item.name);
-
-        if (match) {
-          return {
-            ...item,
-            className: `font-${rule.fontFamily} ${rule.extraCls || ''}`.trim(),
-          };
-        }
-      }
-      return item;
-    });
-  };
-
-  onDisable = async () => {
-    // 清理加载的字体样式
-    this.loadedFonts.forEach(fontName => {
-      const styleEl = document.getElementById(`font-${fontName}`);
-      if (styleEl) {
-        styleEl.remove();
-      }
-    });
-    this.loadedFonts.clear();
-  };
-
-  onDestroy = () => {};
-}
-
-export default new FontStylerPlugin();

package/src/plugins/test/components/emoji.tsx

@@ -1,8 +0,0 @@
-import { type PathObj } from '@bbki.ng/ui';
-import React from 'react';
-
-export const Emoji = ({ data }: { data: any }) => {
-  const path = data as PathObj[];
-  console.log(path);
-  return <span>😊</span>;
-};

package/src/plugins/test/index.ts

@@ -1,23 +0,0 @@
-import { IHostContext } from '#/types/hostApi';
-import { IPlugin } from '#/types/plugin';
-
-import { Emoji } from './components/emoji';
-
-class TestPlugin implements IPlugin {
-  id: string = 'test';
-  name: string = 'Test Plugin';
-  description?: string | undefined;
-  version: string = '0.1.0';
-  author?: string | undefined;
-
-  onInstall?: ((ctx: IHostContext) => void) | undefined = (ctx: IHostContext) => {
-    ctx.api.registerSlot('leftCol', Emoji, this.id);
-  };
-
-  onDisable?: (() => Promise<void> | void) | undefined;
-  onDestroy?: (() => void) | undefined;
-}
-
-const testPlugin = new TestPlugin();
-
-export default testPlugin;