npm - @bbki.ng/site - Versions diffs - 2.0.52 → 4.0.0 - Mend

@bbki.ng/site 2.0.52 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (42) hide show

package/CHANGELOG.md +4 -0
package/index.html +1 -1
package/package.json +19 -17
package/src/blog/app.tsx +0 -2
package/src/blog/articles/index.ts +2 -2
package/src/blog/articles/travel.mdx +1 -0
package/src/blog/components/Img_ctx_menu/index.tsx +1 -1
package/src/blog/components/app_ctx_menu/index.tsx +3 -15
package/src/blog/components/article/index.tsx +4 -4
package/src/blog/components/article_ctx_menu/index.tsx +1 -1
package/src/blog/components/effect-layer/EffectLayer.tsx +1 -1
package/src/blog/components/reaction/oh_reaction.tsx +1 -1
package/src/blog/global/mdx.d.ts +1 -0
package/src/blog/hooks/useTransitionCls.ts +1 -1
package/src/blog/index.tsx +1 -1
package/src/blog/main.css +40 -3
package/src/blog/pages/extensions/txt/article.tsx +5 -1
package/tailwind.config.cjs +1 -3
package/vite.config.js +19 -12
package/postcss.config.cjs +0 -6
package/src/blog/components/plugin/PluginContentPage.tsx +0 -52
package/src/blog/components/plugin/PluginDrawer.tsx +0 -39
package/src/blog/components/plugin/PluginInit.tsx +0 -59
package/src/blog/components/plugin/PluginInputForm.tsx +0 -117
package/src/blog/components/plugin/PluginMenuItem.tsx +0 -70
package/src/blog/components/plugin/PluginRoutes.tsx +0 -23
package/src/blog/components/plugin/PluginsMenuItem.tsx +0 -70
package/src/blog/components/plugin/hooks/useDependencies.ts +0 -80
package/src/blog/components/plugin/hooks/usePluginOutput.tsx +0 -17
package/src/blog/components/plugin/pluginUI/PluginUI.tsx +0 -34
package/src/blog/demo/DemoBox.tsx +0 -15
package/src/blog/demo/DemoMenu.tsx +0 -66
package/src/blog/demo/ImgDemo.tsx +0 -34
package/src/blog/demo/PluginDemo.ts +0 -24
package/src/blog/demo/SpinnerDemo.tsx +0 -13
package/src/blog/demo/Xwy.tsx +0 -13
package/src/blog/plugin/Dependencies.ts +0 -14
package/src/blog/plugin/HostFuncAdapter.ts +0 -28
package/src/blog/plugin/Plugin.ts +0 -125
package/src/blog/plugin/PluginEvent.ts +0 -50
package/src/blog/plugin/PluginManager.ts +0 -166
package/src/blog/plugin/PluginManagerPayload.ts +0 -3

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,9 @@
 # @bbki.ng/site
+## 4.0.0
+## 3.0.0
 ## 2.0.52
 ## 2.0.51

package/index.html CHANGED Viewed

@@ -49,7 +49,7 @@
   </head>
   <body class="h-full m-0 flex flex-col font-mono">
-    <div id="blog" class="flex-grow noto-serif no-scrollbar"></div>
+    <div id="blog" class="grow noto-serif no-scrollbar"></div>
     <script type="module" src="/src/index.tsx"></script>
     <script type="module">
       // Import the functions you need from the SDKs you need

package/package.json CHANGED Viewed

@@ -1,24 +1,16 @@
 {
   "name": "@bbki.ng/site",
-  "version": "2.0.52",
+  "version": "4.0.0",
   "description": "code behind bbki.ng",
   "main": "index.js",
-  "scripts": {
-    "test": "jest",
-    "test:cov": "jest --coverage",
-    "dev": "vite --host",
-    "build": "tsc && vite build",
-    "serve": "vite preview"
-  },
   "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/bbbottle/bbki.ng.git"
   },
   "dependencies": {
-    "@extism/extism": "2.0.0-rc11",
-    "@bbki.ng/components": "workspace:2.6.16",
     "@supabase/supabase-js": "^1.35.4",
+    "@tailwindcss/vite": "4.1.17",
     "classnames": "2.3.1",
     "react": "^18.0.0",
     "react-cusdis": "^2.1.3",
@@ -27,20 +19,21 @@
     "react-router-dom": "6",
     "sonner": "1.4.0",
     "swr": "^2.2.5",
-    "vaul": "1.1.2"
+    "vaul": "1.1.2",
+    "@bbki.ng/components": "4.0.0",
+    "@bbki.ng/stylebase": "2.0.0"
   },
   "devDependencies": {
-    "@bbki.ng/stylebase": "workspace:0.4.11",
     "@mdx-js/mdx": "2.0.0-next.9",
     "@mdx-js/react": "^1.6.22",
     "@mdx-js/rollup": "3.0.0",
+    "@tailwindcss/postcss": "4.1.17",
     "@tailwindcss/typography": "^0.5.0",
     "@types/jest": "^27.0.3",
     "@types/node": "^16.11.1",
     "@types/react": "^18.0.15",
     "@types/react-dom": "^18.0.6",
     "@vitejs/plugin-react": "^1.0.0",
-    "autoprefixer": "^10.3.7",
     "husky": "^7.0.0",
     "jest": "^27.4.5",
     "lint-staged": "^11.2.1",
@@ -55,8 +48,9 @@
     "remark-mdx-frontmatter": "^1.0.1",
     "remark-parse": "^10.0.0",
     "remark-toc": "^8.0.1",
+    "rollup-plugin-visualizer": "6.0.5",
     "sass": "^1.42.1",
-    "tailwindcss": "^3.0.7",
+    "tailwindcss": "^4.1.17",
     "ts-jest": "^27.1.1",
     "typescript": "^4.5.4",
     "vite": "5.0.0",
@@ -64,12 +58,20 @@
     "vite-plugin-glsl": "1.2.1",
     "vite-plugin-mdx": "^3.5.8",
     "vite-plugin-pwa": "0.19",
-    "workbox-window": "^6.3.0"
+    "workbox-window": "^6.3.0",
+    "@bbki.ng/stylebase": "2.0.0"
   },
   "author": "bbbottle",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/bbbottle/bbki.ng/issues"
   },
-  "homepage": "https://github.com/bbbottle/bbki.ng#readme"
-}
+  "homepage": "https://github.com/bbbottle/bbki.ng#readme",
+  "scripts": {
+    "test": "jest",
+    "test:cov": "jest --coverage",
+    "dev": "NODE_ENV=development && vite --host",
+    "build": "tsc && vite build",
+    "serve": "vite preview"
+  }
+}

package/src/blog/app.tsx CHANGED Viewed

@@ -22,8 +22,6 @@ import { Pochacco, PochaccoPose } from "@/components/Pochacco/Pochacco";
 import { Role, useRole } from "@/hooks/use_role";
 import { BotRedirect } from "@/pages/bot";
 import { BBContext } from "@/context/bbcontext";
-import { PluginContentPage } from "@/components/plugin/PluginContentPage";
-import { PluginRoutes } from "@/components/plugin/PluginRoutes";
 import { useClipboardToPost } from "@/hooks/use_clipboard_to_post";
 import { useSharedStringToPost } from "@/hooks/use_shared_string_to_post";
 import { ThreeColLayout, ErrorBoundary } from "@bbki.ng/components";

package/src/blog/articles/index.ts CHANGED Viewed

@@ -9,7 +9,7 @@ import * as 入夏 from "./web-burnning.mdx";
 import * as 六月 from "./black-river.mdx";
 import * as 立秋 from "./liqiu.mdx";
 import * as 照片 from "./photos.mdx";
-import * as 小乌鸦 from "./xwy.mdx";
+// import * as 小乌鸦 from "./xwy.mdx";
 import * as 我要看雪 from "./xwy-and-snowing.mdx";
 import * as 做饭 from "./cooking.mdx";
 import * as 堂兄 from "./cousin.mdx";
@@ -33,7 +33,7 @@ export const MdxArticleList = [
   六月,
   立秋,
   照片,
-  小乌鸦,
+  // 小乌鸦,
   做饭,
   堂兄,
   红色的枪,

package/src/blog/articles/travel.mdx CHANGED Viewed

@@ -1,5 +1,6 @@
 ---
 title: 离开
+created_at: 2023-05-11
 tags:
   - 随笔
 ---

package/src/blog/components/Img_ctx_menu/index.tsx CHANGED Viewed

@@ -38,7 +38,7 @@ export const ImgCtxMenu = (props: {
         {props.children}
       </ContextMenuTrigger>
       <Auth role={role}>
-        <ContextMenuContent className="w-256">
+        <ContextMenuContent className="w-5xl">
           <ContextMenuLabel>{props.name}</ContextMenuLabel>
           <ContextMenuItem disabled>
             {props.width} * {props.height}

package/src/blog/components/app_ctx_menu/index.tsx CHANGED Viewed

@@ -8,13 +8,9 @@ import {
   ContextMenuItem,
 } from "@bbki.ng/components";
 import { LoginMenuItem } from "@/components/app_ctx_menu/LoginMenuItem";
-import { VersionMenuItem } from "@/components/app_ctx_menu/VersionMenuItem";
 import { ViewSourceMenuItem } from "@/components/app_ctx_menu/ViewSourceMenuItem";
-import { PluginsMenuItem } from "@/components/plugin/PluginsMenuItem";
-import { PluginManager } from "@/plugin/PluginManager";
-import { PluginEvent } from "@/plugin/PluginEvent";
-import {PostMenuItem} from "@/components/app_ctx_menu/PostMenuItem";
-import {useAuthed} from "@/hooks/use_authed";
+import { PostMenuItem } from "@/components/app_ctx_menu/PostMenuItem";
+import { useAuthed } from "@/hooks/use_authed";
 export const AppCtxMenu = (props: { children: ReactElement }) => {
   const [showPluginEntry, setShowPluginEntry] = React.useState(false);
@@ -23,20 +19,12 @@ export const AppCtxMenu = (props: { children: ReactElement }) => {
     setShowPluginEntry(true);
   };
-  useEffect(() => {
-    PluginManager.addEventListener(PluginEvent.INIT, showEntry);
-    return () => {
-      PluginManager.removeEventListener(PluginEvent.INIT, showEntry);
-    };
-  }, []);
   const isKing = useAuthed();
   return (
     <ContextMenu>
       <ContextMenuTrigger>{props.children}</ContextMenuTrigger>
-      <ContextMenuContent className="w-256">
+      <ContextMenuContent className="w-5xl">
         <LoginMenuItem />
         <ViewSourceMenuItem />
         {isKing && <PostMenuItem />}

package/src/blog/components/article/index.tsx CHANGED Viewed

@@ -32,7 +32,7 @@ export const ArticlePage = (props: ArticlePageProps) => {
     return props.children;
   }
-  const articleCls = classNames("prose");
+  const articleCls = classNames("prose", "mb-32");
   return (
     <>
@@ -44,12 +44,12 @@ export const ArticlePage = (props: ArticlePageProps) => {
         loading={loading}
       >
         <article className={articleCls}>{props.children}</article>
-        <div className="mt-[1.25em] relative left-[-4px]">
-          {allTags.length ? <Tags tags={allTags} /> : null}
+        <div className="relative left-[-4px]">
+          {allTags.length ? <Tags tags={allTags} className="mb-32" /> : null}
           <Reaction title={title} />
         </div>
       </Article>
-      <div className="px-16">
+      <div className="">
         <Button
           className=""
           btnType="button"

package/src/blog/components/article_ctx_menu/index.tsx CHANGED Viewed

@@ -44,7 +44,7 @@ export const ArticleCtxMenu = (props: { children: ReactElement }) => {
   return (
     <ContextMenu>
       <ContextMenuTrigger>{props.children}</ContextMenuTrigger>
-      <ContextMenuContent className="w-128">
+      <ContextMenuContent className="w-lg">
         <ContextMenuItem
           onClick={() => {
             confirm("确认删除？", doDel);

package/src/blog/components/effect-layer/EffectLayer.tsx CHANGED Viewed

@@ -14,7 +14,7 @@ export const EffectLayer = () => {
     "h-full",
     "pointer-events-none",
     "w-full",
-    "z-[999]"
+    "z-999"
   );
   const { onRender } = useRender();

package/src/blog/components/reaction/oh_reaction.tsx CHANGED Viewed

@@ -88,7 +88,7 @@ export const OpenHeartReaction = (props: {
 export const Reaction = (props: { title: string }) => {
   return (
-    <div className="pt-32">
+    <div>
       <OpenHeartReaction title={props.title} emojiPair={hearts} />
       <OpenHeartReaction title={props.title} emojiPair={faces} />
       <OpenHeartReaction title={props.title} emojiPair={sadFaces} />

package/src/blog/global/mdx.d.ts CHANGED Viewed

@@ -4,5 +4,6 @@ declare module "*.mdx" {
   export const meta: {
     tags?: string[];
     title: string;
+    created_at?: string;
   };
 }

package/src/blog/hooks/useTransitionCls.ts CHANGED Viewed

@@ -20,7 +20,7 @@ export const useTransitionCls = (options: TransOption = defaultOpt) => {
   const { originCls, opacity, offset, blur } = options;
   const cls = classnames(originCls, "transition-all", "duration-500", {
-    "blur-sm": !visible && blur,
+    "blur-xs": !visible && blur,
     "blur-none": visible && blur,
     "translate-y-0": visible && offset,
     "translate-y-8": !visible && offset,

package/src/blog/index.tsx CHANGED Viewed

@@ -3,7 +3,7 @@ import { createRoot } from "react-dom/client";
 import { Toaster } from "sonner";
 import { BrowserRouter as Router } from "react-router-dom";
 import { ReloadPrompt } from "@/components";
-import "@bbki.ng/components/style";
+// import "@bbki.ng/components/style";
 import App from "./app";
 import "./main.css";
 import Logger from "@/components/Logger";

package/src/blog/main.css CHANGED Viewed

@@ -1,6 +1,43 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import "tailwindcss";
+@import "@bbki.ng/stylebase";
+@config '../../tailwind.config.cjs';
+/*
+  The default border color has changed to `currentcolor` in Tailwind CSS v4,
+  so we've added these compatibility styles to make sure everything still
+  looks the same as it did with Tailwind CSS v3.
+  If we ever want to remove these styles, we need to add an explicit border
+  color utility to any element that depends on these defaults.
+*/
+@layer base {
+  *,
+  ::after,
+  ::before,
+  ::backdrop,
+  ::file-selector-button {
+    border-color: var(--color-gray-200, currentcolor);
+  }
+}
+/*
+  The default border color has changed to `currentcolor` in Tailwind CSS v4,
+  so we've added these compatibility styles to make sure everything still
+  looks the same as it did with Tailwind CSS v3.
+  If we ever want to remove these styles, we need to add an explicit border
+  color utility to any element that depends on these defaults.
+*/
+@layer base {
+  *,
+  ::after,
+  ::before,
+  ::backdrop,
+  ::file-selector-button {
+    border-color: var(--color-gray-200, currentcolor);
+  }
+}
 * {
   -webkit-user-drag: none;

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

@@ -20,8 +20,12 @@ const ArticleMap: TArticleMap = {};
 MdxArticleList.forEach((article: unknown) => {
   const { meta, default: component } = article as MdxArticle;
+  console.log(meta);
+  const dateStr = meta.created_at
+    ? meta.created_at.toISOString().split("T")[0]
+    : "";
   const Article = withArticleWrapper(component);
-  ArticleMap[meta.title] = <Article {...meta} />;
+  ArticleMap[meta.title] = <Article {...meta} date={dateStr} />;
 });
 export default () => {

package/tailwind.config.cjs CHANGED Viewed

@@ -3,8 +3,6 @@ module.exports = {
   content: [
     "./index.html",
     "./src/**/*.{js,ts,jsx,tsx, mdx}",
-  ],
-  presets: [
-    require('@bbki.ng/stylebase')
+    "./node_modules/@bbki.ng/components/**/*.{js,ts,jsx,tsx, mdx}",
   ],
 };

package/vite.config.js CHANGED Viewed

@@ -6,6 +6,7 @@ import remarkGfm from "remark-gfm";
 import remarkParse from "remark-parse";
 import remarkToc from "remark-toc";
 import crossOriginIsolation from "vite-plugin-cross-origin-isolation";
+import tailwindcss from "@tailwindcss/vite";
 import remarkFrontMatter from "remark-frontmatter";
 import { remarkMdxFrontmatter } from "remark-mdx-frontmatter";
 import rehypeSlug from "rehype-slug";
@@ -13,6 +14,7 @@ import rehypeHighlight from "rehype-highlight";
 import rehypeAutolinkHeadings from "rehype-autolink-headings";
 import react from "@vitejs/plugin-react";
 import glsl from "vite-plugin-glsl";
+import { visualizer } from "rollup-plugin-visualizer";
 const options = {
   remarkPlugins: [
@@ -30,13 +32,17 @@ export default defineConfig({
   resolve: {
     alias: {
       "@": path.resolve(__dirname, "./src/blog"),
+      // "@bbki.ng/commponents": path.resolve(__dirname, "../components/lib"),
     },
+    // preserveSymlinks: true,
   },
   // build.rollupOptions.output.manualChunks
   build: {
+    sourcemap: true,
     rollupOptions: {
       output: {
-        manualChunks: (id) => {
+        manualChunks: (id, meta) => {
+          console.log(id);
           if (id.includes("node_modules")) {
             return "vendor";
           }
@@ -44,7 +50,6 @@ export default defineConfig({
       },
     },
   },
-  server: {},
   define: {
     GLOBAL_BBKING_VERSION: JSON.stringify(process.env.npm_package_version),
   },
@@ -55,6 +60,7 @@ export default defineConfig({
     react(),
     mdx(options),
     glsl(),
+    tailwindcss(),
     VitePWA({
       injectRegister: "auto",
       includeAssets: [
@@ -92,9 +98,9 @@ export default defineConfig({
               const sharedContent = url.searchParams.get("text");
               // post the shared content to the main thread
-                if (sharedContent) {
-                  window.postMessage(sharedContent, {})
-                }
+              if (sharedContent) {
+                window.postMessage(sharedContent, {});
+              }
             },
           },
           {
@@ -120,13 +126,13 @@ export default defineConfig({
         display: "fullscreen",
         start_url: "/",
         share_target: {
-          "action": "/new-content-handler/",
-          "method": "GET",
-          "params": {
-            "title": "title",
-            "text": "text",
-            "url": "url"
-          }
+          action: "/new-content-handler/",
+          method: "GET",
+          params: {
+            title: "title",
+            text: "text",
+            url: "url",
+          },
         },
         icons: [
           {
@@ -149,5 +155,6 @@ export default defineConfig({
       },
     }),
     crossOriginIsolation(),
+    visualizer({ open: true, gzipSize: true }),
   ],
 });

package/postcss.config.cjs DELETED Viewed

@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};

package/src/blog/components/plugin/PluginContentPage.tsx DELETED Viewed

@@ -1,52 +0,0 @@
-import { ArticlePage, ArticlePageProps } from "@/components/article";
-import React, { useCallback, useEffect } from "react";
-import { threeColWrapper } from "@/components/with_wrapper";
-import { useParams } from "react-router-dom";
-import { usePluginOutput } from "@/components/plugin/hooks/usePluginOutput";
-import { PluginManager } from "@/plugin/PluginManager";
-import { PluginConfig } from "@extism/extism";
-import { PluginEvent } from "@/plugin/PluginEvent";
-type PluginContentPageProps = Omit<ArticlePageProps, "children">;
-const ContentPage = (props: PluginContentPageProps) => {
-  const { pluginRoute } = useParams();
-  const [c, setC] = React.useState<string>("");
-  const onInstall = useCallback((plugin: PluginConfig) => {
-    if (plugin.route !== pluginRoute) {
-      return;
-    }
-    PluginManager.instance.run(plugin.id).then((result) => {
-      setC(result);
-    });
-  }, []);
-  useEffect(() => {
-    PluginManager.addEventListener<PluginConfig>(
-      PluginEvent.INSTALL,
-      onInstall
-    );
-    return () => {
-      PluginManager.removeEventListener<PluginConfig>(
-        PluginEvent.INSTALL,
-        onInstall
-      );
-    };
-  }, []);
-  const plugin = PluginManager.instance?.getPluginByRoute(pluginRoute || "");
-  const content = usePluginOutput(plugin?.config.id) || c;
-  return (
-    <ArticlePage {...props} title={plugin?.config.route || ""}>
-      <div dangerouslySetInnerHTML={{ __html: content }} />
-    </ArticlePage>
-  );
-};
-export const PluginContentPage = ContentPage;

package/src/blog/components/plugin/PluginDrawer.tsx DELETED Viewed

@@ -1,39 +0,0 @@
-import { DialogProps, Drawer } from "vaul";
-import React, { ReactNode } from "react";
-type PluginDrawerProps = {
-  children: ReactNode;
-  title?: string;
-  description?: string;
-} & Pick<DialogProps, "open"> &
-  Pick<DialogProps, "onOpenChange">;
-export const PluginDrawer = (props: PluginDrawerProps) => {
-  const { children, title, description, open, onOpenChange } = props;
-  return (
-    <Drawer.Root
-      direction="bottom"
-      open={open}
-      onOpenChange={onOpenChange}
-      modal={false}
-    >
-      <Drawer.Portal>
-        <Drawer.Content className="bg-gray-100 flex flex-col {/*rounded-t-[10px]*/} mt-24 h-fit fixed bottom-0 left-0 right-0 outline-none border-t border-gray-200">
-          <div className="p-4 bg-white {/*rounded-t-[10px]*/} flex-1">
-            <div className="mx-auto w-12 h-1.5 flex-shrink-0 rounded-full bg-gray-300 mb-8" />
-            <div className="max-w-md mx-auto my-32 p-16">
-              <Drawer.Title className="font-medium mb-2 text-zinc-900">
-                {title}
-              </Drawer.Title>
-              <Drawer.Description className="text-zinc-600 mb-2">
-                {description}
-              </Drawer.Description>
-              {children}
-            </div>
-          </div>
-        </Drawer.Content>
-      </Drawer.Portal>
-    </Drawer.Root>
-  );
-};

package/src/blog/components/plugin/PluginInit.tsx DELETED Viewed

@@ -1,59 +0,0 @@
-import React, { useCallback, useEffect } from "react";
-import { ReactNode } from "react";
-import { PluginInputForm } from "@/components/plugin/PluginInputForm";
-import { useDependencies } from "@/components/plugin/hooks/useDependencies";
-import { PluginManager } from "@/plugin/PluginManager";
-import PluginUI from "./pluginUI/PluginUI";
-export const PluginInit = (props: { children: ReactNode }) => {
-  const {
-    isPluginFormInputOpen,
-    setPluginFormInputOpen,
-    pluginInputFormConf,
-    formDataResolver,
-    pluginUIRef,
-    ...dep
-  } = useDependencies();
-  useEffect(() => {
-    PluginManager.init(dep)
-      .then()
-      .catch((e: any) => {
-        dep.toast("Failed to initialize plugin manager: " + e?.message);
-        dep.loading(false);
-      });
-  }, []);
-  const onSubmit = useCallback(
-    (formData: string) => {
-      formDataResolver(formData);
-      setPluginFormInputOpen(false);
-    },
-    [formDataResolver]
-  );
-  const onOpenChange = useCallback(
-    (o: boolean) => {
-      setPluginFormInputOpen(o);
-      if (!o) {
-        formDataResolver("");
-      }
-    },
-    [formDataResolver]
-  );
-  return (
-    <>
-      {props.children}
-      <PluginInputForm
-        open={isPluginFormInputOpen}
-        onOpenChange={onOpenChange}
-        input={pluginInputFormConf}
-        onSubmit={onSubmit}
-      />
-      <PluginUI ref={pluginUIRef} />
-    </>
-  );
-};