@bbki.ng/site 5.5.18 → 5.5.19

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @bbki.ng/site
 
+## 5.5.19
+
+### Patch Changes
+
+- 3edea98: fix base url config
+- Updated dependencies [3edea98]
+  - @bbki.ng/ui@0.2.13
+
 ## 5.5.18
 
 ### Patch Changes

package/index.d.ts

@@ -1,12 +1,11 @@
-import React from 'react';
+/// <reference types="vite/client" />
 
-declare const GLOBAL_BBKING_VERSION: string;
-declare const GLOBAL_COMMIT_HASH: string;
-interface ImportMeta {
-  glob: (pattern: string) => Record<string, () => Promise<unknown>>;
-}
+import type React from 'react';
 
 declare global {
+  const GLOBAL_BBKING_VERSION: string;
+  const GLOBAL_COMMIT_HASH: string;
+
   namespace JSX {
     interface IntrinsicElements {
       'bb-img': React.DetailedHTMLProps<
@@ -16,3 +15,5 @@ declare global {
     }
   }
 }
+
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbki.ng/site",
-  "version": "5.5.18",
+  "version": "5.5.19",
   "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.12"
+    "@bbki.ng/ui": "0.2.13"
   },
   "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.8"
+    "@bbki.ng/config": "1.0.9"
   },
   "author": "bbbottle",
   "license": "MIT",

package/src/core/pluginManager.ts

@@ -1,10 +1,12 @@
 import React from 'react';
 
 import { IHostContext } from '#/types/hostApi';
-import { registry } from './registry';
-import type { SlotName, HookPoint } from '#/types/slots';
+import type { SlotName, HookPoint, IComPropsRegisteredToSlot } from '#/types/slots';
 import { IPlugin } from '#/types/plugin';
 import { getStableDeviceId } from '@/utils/fingerprints';
+
+import { registry } from './registry';
+
 const pluginModules = import.meta.glob('../plugins/*/index.ts');
 
 class PluginManager {
@@ -13,13 +15,18 @@ class PluginManager {
   private createHostContext(): IHostContext {
     return {
       api: {
-        registerMiddleware: (point: HookPoint, fn: Function, pluginId: string, weight = 0) => {
+        registerMiddleware: <T>(
+          point: HookPoint,
+          fn: (data: T) => Promise<T> | T,
+          pluginId: string,
+          weight = 0
+        ) => {
           registry.registerMiddleware(point, fn, pluginId, weight);
         },
         getDeviceId: getStableDeviceId,
         registerSlot: (
           slotName: SlotName,
-          component: React.ComponentType<any>,
+          component: React.ComponentType<IComPropsRegisteredToSlot>,
           pluginId: string,
           weight = 0
         ) => {
@@ -54,7 +61,9 @@ class PluginManager {
     }
 
     try {
-      const module = await moduleLoader();
+      const module = (await moduleLoader()) as {
+        default: IPlugin;
+      };
 
       const p: IPlugin = module.default;
 

package/src/core/registry.ts

@@ -1,15 +1,17 @@
-import type { SlotName, HookPoint } from 'src/types/slots';
+import React from 'react';
+
+import type { SlotName, HookPoint, IComPropsRegisteredToSlot } from '#/types/slots';
 
 export interface ISlotEntry {
   id: string;
-  component: React.ComponentType<any>;
+  component: React.ComponentType<IComPropsRegisteredToSlot>;
   pluginId: string;
   weight: number;
 }
 
-export interface IMiddlewareEntry {
+export interface IMiddlewareEntry<T> {
   id: string;
-  fn: Function;
+  fn: (data: T) => Promise<T> | T;
   pluginId: string;
   weight?: number;
 }
@@ -19,7 +21,7 @@ export class Registry {
 
   private listeners = new Set<() => void>();
 
-  private middlewares = new Map<HookPoint, IMiddlewareEntry[]>();
+  private middlewares = new Map<HookPoint, IMiddlewareEntry<unknown>[]>();
 
   private broadcastChange() {
     this.listeners.forEach(listener => listener());
@@ -30,7 +32,12 @@ export class Registry {
     return () => this.listeners.delete(listener);
   }
 
-  registerComponent(slot: SlotName, component: React.ComponentType, pluginId: string, weight = 0) {
+  registerComponent(
+    slot: SlotName,
+    component: React.ComponentType<IComPropsRegisteredToSlot>,
+    pluginId: string,
+    weight = 0
+  ) {
     const existing = this.slots.get(slot) || [];
 
     const newEntry: ISlotEntry = {
@@ -65,10 +72,15 @@ export class Registry {
     this.broadcastChange();
   }
 
-  registerMiddleware(hookPoint: HookPoint, fn: Function, pluginId: string, weight = 0) {
+  registerMiddleware<T>(
+    hookPoint: HookPoint,
+    fn: (data: T) => Promise<T> | T,
+    pluginId: string,
+    weight = 0
+  ) {
     const existing = this.middlewares.get(hookPoint) || [];
 
-    const newEntry: IMiddlewareEntry = {
+    const newEntry: IMiddlewareEntry<T> = {
       id: `${pluginId}-${fn.name || 'middleware'}`,
       pluginId,
       fn,
@@ -76,11 +88,13 @@ export class Registry {
     };
 
     // 插入并按权重排序（权重大的在前）
-    const newList = [...existing, newEntry].sort((a, b) => (b.weight || 0) - (a.weight || 0));
+    const newList = [...existing, newEntry as IMiddlewareEntry<unknown>].sort(
+      (a, b) => (b.weight || 0) - (a.weight || 0)
+    );
     this.middlewares.set(hookPoint, newList);
   }
 
-  getComponents(slotName: SlotName): React.ComponentType<any>[] {
+  getComponents(slotName: SlotName): React.ComponentType<IComPropsRegisteredToSlot>[] {
     return (this.slots.get(slotName) || []).map(entry => entry.component);
   }
 
@@ -88,7 +102,7 @@ export class Registry {
     const fns = (this.middlewares.get(point) || []).map(entry => entry.fn);
     let result = data;
     for (const fn of fns) {
-      result = await fn(result);
+      result = (await fn(result)) as T;
     }
     return result;
   }

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

@@ -1,23 +1,21 @@
-import { PathObj } from '@bbki.ng/ui';
 import React from 'react';
+import { PathObj } from '@bbki.ng/ui';
 
-import { StickerCtx } from '../context';
+import { IComPropsRegisteredToSlot } from '#/types/slots';
 
-export const StickerCom = ({ data }: { data: PathObj[] }) => {
-  const ctx = StickerCtx.useCtx();
+export const StickerCom = ({ data }: IComPropsRegisteredToSlot) => {
+  const paths = data as PathObj[];
 
-  if (data.length === 0) {
+  if (paths.length === 0) {
     return null;
   }
 
-  const lastPath = data[data.length - 1];
+  const lastPath = paths[paths.length - 1];
 
   if (lastPath.name !== '~') {
     return null;
   }
 
-  console.log(ctx.deviceId);
-
   return (
     <div className="fixed bottom-32 left-16">
       <div className="-rotate-17 inline-flex">

package/src/plugins/xwy/components/logo.tsx

@@ -1,6 +1,8 @@
-import React, { ReactNode } from 'react';
+import React from 'react';
 import { useLocation } from 'react-router-dom';
 
+import { IComPropsRegisteredToSlot } from '#/types/slots';
+
 export const Crows = () => {
   return (
     <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -13,9 +15,11 @@ export const Crows = () => {
   );
 };
 
-export const XwyLogo = ({ data: defaultLogo }: { data: ReactNode }) => {
+export const XwyLogo = ({ data }: IComPropsRegisteredToSlot) => {
   const location = useLocation();
 
+  const defaultLogo = data as React.ReactNode;
+
   if (decodeURIComponent(location.pathname).includes('小乌鸦')) {
     return <Crows />;
   }

package/src/types/hostApi.ts

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { type FingerprintData } from '@/utils/fingerprints';
 
-import { HookPoint, SlotName } from './slots';
+import { HookPoint, IComPropsRegisteredToSlot, SlotName } from './slots';
 
 export interface IHostApi {
   getDeviceId: () => Promise<{ id: string; fp: FingerprintData }>;
@@ -12,9 +12,9 @@ export interface IHostApi {
     pluginId: string,
     weight?: number
   ) => void;
-  registerSlot: <T>(
+  registerSlot: (
     slotName: SlotName,
-    component: React.ComponentType<T>,
+    component: React.ComponentType<IComPropsRegisteredToSlot>,
     pluginId: string,
     weight?: number
   ) => void;

package/src/types/slots.ts

@@ -1,2 +1,6 @@
 export type SlotName = 'leftCol' | 'rightCol' | 'articleActionRow' | 'logo';
 export type HookPoint = 'filterPosts' | 'transformPostContent' | 'transformTitleList';
+
+export interface IComPropsRegisteredToSlot {
+  data: unknown;
+}

package/tsconfig.json

@@ -5,11 +5,9 @@
     "jsx": "react",
     "noEmit": true,
     "moduleResolution": "bundler",
-    "ignoreDeprecations": "6.0",
-    "baseUrl": ".",
     "paths": {
-      "@/*": ["src/blog/*"],
-      "#/*": ["src/*"]
+      "@/*": ["./src/blog/*"],
+      "#/*": ["./src/*"]
     }
   },
   "include": ["./src", "vite.config.js", "index.d.ts"]