@bbki.ng/site 5.5.36 → 5.5.37

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @bbki.ng/site
 
+## 5.5.37
+
+### Patch Changes
+
+- 56a7bc7: fix 404 error page
+- Updated dependencies [56a7bc7]
+  - @bbki.ng/ui@0.2.18
+
 ## 5.5.36
 
 ### Patch Changes

package/eslint.config.js

@@ -9,6 +9,13 @@ const __dirname = path.dirname(__filename);
 export default [
   includeIgnoreFile(path.resolve(__dirname, '.gitignore')),
   ...webConfig,
+  {
+    languageOptions: {
+      globals: {
+        GLOBAL_COMMIT_HASH: 'readonly',
+      },
+    },
+  },
   {
     rules: {
       // Site specific overrides

package/index.d.ts

@@ -15,5 +15,3 @@ declare global {
     }
   }
 }
-
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbki.ng/site",
-  "version": "5.5.36",
+  "version": "5.5.37",
   "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.17"
+    "@bbki.ng/ui": "0.2.18"
   },
   "devDependencies": {
     "@eslint/compat": "^1.0.0",

package/src/blog/app.tsx

@@ -36,8 +36,8 @@ const AppRoutes = () => {
         {pluginEntries?.map(route => (
           <Route key={route.path} path={route.path} element={<Slot name="route" data={route} />} />
         ))}
+        <Route path="*" element={pluginEntries?.length ? <NotFound /> : null} />
       </Route>
-      <Route path="*" element={<NotFound />} />
     </Routes>
   );
 };

package/src/blog/hooks/use_posts.ts

@@ -10,6 +10,11 @@ import { useMiddlewareRunner } from '#/core/hooks/useMiddlewareTransData';
 const isProd = true;
 const POSTS_API = !isProd ? '/api/posts' : `${API_ENDPOINT}/posts`;
 
+interface PostsApiResponse {
+  data: IPost[];
+  // 可能还有其他字段如 status, message 等
+}
+
 export interface TitleListItem {
   name: string;
   to: string;
@@ -18,7 +23,7 @@ export interface TitleListItem {
 }
 
 export const usePosts = (name: string = '', suspense?: boolean) => {
-  const { data: response, error: swrError } = useSWR(POSTS_API, baseFetcher, {
+  const { data: response, error: swrError } = useSWR<PostsApiResponse>(POSTS_API, baseFetcher, {
     revalidateOnFocus: false,
     suspense,
   });

package/src/blog/pages/extensions/txt/article.tsx

@@ -6,6 +6,7 @@ import { usePosts } from '@/hooks/use_posts';
 import { ArticlePage } from '@/components/article';
 import { useBlogScrollReset } from '@/hooks/use_blog_scroll_pos_restoration';
 import { useMiddlewareTransformedData } from '#/core/hooks/useMiddlewareTransData';
+import { IPost } from '#/types/posts';
 
 function TxtArticle() {
   const { title } = useParams();
@@ -13,7 +14,9 @@ function TxtArticle() {
 
   useBlogScrollReset();
 
-  const transformedContent = useMiddlewareTransformedData('transformPostContent', posts?.content);
+  const p = posts as IPost;
+
+  const transformedContent = useMiddlewareTransformedData('transformPostContent', p?.content);
 
   if (!title) {
     return <NotFound />;
@@ -27,7 +30,7 @@ function TxtArticle() {
     return null;
   }
 
-  const date = posts.createdAt ? posts.createdAt.split('T')[0] : '';
+  const date = p.createdAt ? p.createdAt.split('T')[0] : '';
 
   return (
     <ArticlePage title={title} date={date}>

package/src/blog/utils/index.ts

@@ -2,33 +2,38 @@ import { API_ENDPOINT } from '@/constants/routes';
 
 import { getStableDeviceId } from './fingerprints';
 
-type Fetcher = (resource: string, init?: RequestInit) => Promise<unknown>;
+type RequestInit = globalThis.RequestInit;
+
+type Fetcher = <T>(resource: string, init?: RequestInit) => Promise<T>;
 
 export const floatNumberToPercentageString = (num: number): string => {
   return `${num * 100}%`;
 };
 
-export const baseFetcher = async (resource: string, init: RequestInit = {}) => {
+// 2. 显式声明为 Fetcher 类型，init 默认值改为 RequestInit
+export const baseFetcher: Fetcher = async (resource, init = {}) => {
   const headers = new Headers(init.headers || {});
   const fp = await getStableDeviceId();
   headers.set('X-Device-Fingerprint', fp.id);
-  return fetch(resource, {
+
+  const response = await fetch(resource, {
     ...init,
     headers,
     mode: 'cors',
-  }).then(res => {
-    if (!res.ok) {
-      throw new Error('An error occurred while fetching the data.');
-    }
-
-    return res.json();
   });
+
+  if (!response.ok) {
+    throw new Error('An error occurred while fetching the data.');
+  }
+
+  return response.json();
 };
 
+// 3. 简化 withBBApi 类型定义，确保参数类型一致
 export const withBBApi =
   (fetcher: Fetcher) =>
   (apiEndPoint: string): Fetcher =>
-  async (resource: string, init: RequestInit = {}) =>
+  async (resource, init = {}) =>
     fetcher(`${apiEndPoint}/${resource}`, { ...init, mode: 'cors' });
 
 export const cfApiFetcher = withBBApi(baseFetcher)(API_ENDPOINT);

package/src/plugins/now/components/streaming/index.tsx

@@ -9,6 +9,7 @@ import { useStreaming } from '../../hooks/use_streaming';
 import { useScrollBtnVisibility } from './useScrollBtnVisibility';
 
 declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace JSX {
     interface IntrinsicElements {
       'bb-msg-history': React.DetailedHTMLProps<
@@ -39,7 +40,7 @@ const Streaming = () => {
 
   useEffect(() => {
     const el = bbMsgHistoryRef.current;
-    let timer: NodeJS.Timeout;
+    let timer: ReturnType<typeof setTimeout>;
     if (!isLoading && el) {
       // 检查自定义元素是否已定义并升级
       if (el.scrollToBottom) {

package/src/plugins/xwy/index.ts

@@ -2,6 +2,7 @@ import { IHostContext } from '#/types/hostApi';
 import { IPlugin } from '#/types/plugin';
 import { HookPoint } from '#/types/slots';
 
+import { HookPointTypeMap, Transformer } from './types';
 import { SpecialTitle } from './components/article';
 import { XwyLogo } from './components/logo';
 import { FontRules, LOADING_CLASS } from './const';
@@ -43,7 +44,9 @@ class XwyPlugin implements IPlugin {
     ctx.api.registerSlot('articleTitle', SpecialTitle, this.id);
   };
 
-  private trasformerMap: Partial<Record<HookPoint, Array<(baseData: any) => any>>> = {
+  private trasformerMap: {
+    [K in Extract<HookPoint, keyof HookPointTypeMap>]?: Array<Transformer<K>>;
+  } = {
     transformTitleList: [pinTitle, transformTitleList],
     transformBreadcrumbPath: [transformBreadcrumbPaths],
     transformPostContent: [transformPostContent],

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

@@ -1,3 +1,7 @@
+import { PathObj } from '@bbki.ng/ui';
+
+import { TitleListItem } from '#/types/posts';
+
 export interface FontConfig {
   name: string;
   src: string;
@@ -15,3 +19,17 @@ export interface FontRule {
   extraCls?: string;
   variant?: 'default' | 'special';
 }
+
+// 1. 先定义每个 HookPoint 对应的类型映射
+export interface HookPointTypeMap {
+  transformTitleList: { input: TitleListItem[]; output: TitleListItem[] };
+  transformBreadcrumbPath: { input: PathObj[]; output: PathObj[] };
+  transformPostContent: { input: string; output: string };
+}
+
+type HookPoint = keyof HookPointTypeMap;
+
+// 2. 定义带类型的 Transformer
+export type Transformer<K extends HookPoint> = (
+  baseData: HookPointTypeMap[K]['input']
+) => HookPointTypeMap[K]['output'];

package/tsconfig.json

@@ -10,5 +10,5 @@
       "#/*": ["./src/*"]
     }
   },
-  "include": ["./src", "vite.config.js", "index.d.ts"]
+  "include": ["./src", "vite.config.js", "**/*.d.ts"]
 }