@bbki.ng/site 1.0.16 → 1.1.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @bbki.ng/site
 
+## 1.1.1
+
+## 1.1.0
+
 ## 1.0.16
 
 ## 1.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbki.ng/site",
-  "version": "1.0.16",
+  "version": "1.1.1",
   "description": "code behind bbki.ng",
   "main": "index.js",
   "scripts": {
@@ -24,12 +24,14 @@
     "react-dom": "^18.0.0",
     "react-hotkeys-hook": "^3.4.3",
     "react-router-dom": "6",
+    "sonner": "1.4.0",
     "swr": "^1.2.1"
   },
   "devDependencies": {
     "@bbki.ng/stylebase": "workspace:0.0.19",
     "@mdx-js/mdx": "2.0.0-next.9",
     "@mdx-js/react": "^1.6.22",
+    "@mdx-js/rollup": "3.0.0",
     "@tailwindcss/typography": "^0.5.0",
     "@types/jest": "^27.0.3",
     "@types/node": "^16.11.1",
@@ -46,7 +48,7 @@
     "rehype-autolink-headings": "^6.1.1",
     "rehype-highlight": "^5.0.0",
     "rehype-slug": "^5.0.1",
-    "remark-frontmatter": "^4.0.1",
+    "remark-frontmatter": "5.0.0",
     "remark-gfm": "^3.0.0",
     "remark-mdx-frontmatter": "^1.0.1",
     "remark-parse": "^10.0.0",
@@ -55,7 +57,7 @@
     "tailwindcss": "^3.0.7",
     "ts-jest": "^27.1.1",
     "typescript": "^4.5.4",
-    "vite": "3.0.0",
+    "vite": "5.0.0",
     "vite-plugin-mdx": "^3.5.8",
     "vite-plugin-pwa": "^0.11.3",
     "workbox-window": "^6.3.0"

package/src/components/reload_prompt/index.tsx

@@ -1,8 +1,8 @@
-import React from "react";
+import React, { useEffect } from "react";
+import { toast } from "sonner";
 
 // @ts-ignore
 import { useRegisterSW } from "virtual:pwa-register/react";
-import { CornerPromptBox } from "@/components";
 
 export const ReloadPrompt = () => {
   const {
@@ -21,16 +21,31 @@ export const ReloadPrompt = () => {
 
   // @ts-ignore
   const appVer = GLOBAL_BBKING_VERSION;
-  console.log("appVer: ", appVer);
 
-  return (
-    <CornerPromptBox
-      className="z-[1010]"
-      content={`🚀 发现新版本（当前 v${appVer}）。获取更新？`}
-      showBox={needRefresh}
-      onCancel={close}
-      cancelLabel="关闭"
-      onOk={needRefresh ? () => updateServiceWorker(true) : close}
-    />
-  );
+  useEffect(() => {
+    if (!needRefresh) {
+      return;
+    }
+
+    toast("", {
+      description: "检测到更新，当前 v" + appVer + "。是否更新？",
+      position: "bottom-center",
+      actionButtonStyle: {
+        backgroundColor: "#fff",
+        color: "rgb(37,99,235)",
+      },
+      action: {
+        label: "是",
+        onClick: () => {
+          if (!needRefresh) {
+            setNeedRefresh(false);
+            return;
+          }
+          updateServiceWorker(true);
+        },
+      },
+    });
+  }, []);
+
+  return null;
 };

package/src/main.tsx

@@ -1,5 +1,6 @@
 import React from "react";
 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";
@@ -14,6 +15,7 @@ root.render(
     <Router>
       <ReloadPrompt />
       <App />
+      <Toaster />
     </Router>
   </React.StrictMode>
 );

package/tsconfig.json

@@ -20,5 +20,5 @@
       "@/*": ["src/*"]
     }
   },
-  "include": ["./src", "vite.config.ts"]
+  "include": ["./src", "vite.config.js"]
 }

package/{vite.config.ts → vite.config.js}

@@ -1,11 +1,11 @@
 import path from "path";
 import { defineConfig } from "vite";
 import { VitePWA } from "vite-plugin-pwa";
-import mdx from "vite-plugin-mdx";
+import mdx from "@mdx-js/rollup";
 import remarkGfm from "remark-gfm";
 import remarkParse from "remark-parse";
 import remarkToc from "remark-toc";
-import remarkFrontmatter from "remark-frontmatter";
+import remarkFrontMatter from "remark-frontmatter";
 import { remarkMdxFrontmatter } from "remark-mdx-frontmatter";
 import rehypeSlug from "rehype-slug";
 import rehypeHighlight from "rehype-highlight";
@@ -13,11 +13,10 @@ import rehypeAutolinkHeadings from "rehype-autolink-headings";
 import react from "@vitejs/plugin-react";
 
 const options = {
-  // See https://mdxjs.com/advanced/plugins
   remarkPlugins: [
     remarkParse,
     [remarkToc, { maxDepth: 3, heading: "目录", tight: true }],
-    [remarkFrontmatter, { type: "yaml", marker: "-" }],
+    [remarkFrontMatter, { type: "yaml", marker: "-" }],
     [remarkMdxFrontmatter, { name: "meta" }],
     remarkGfm,
   ],
@@ -47,11 +46,11 @@ export default defineConfig({
     GLOBAL_BBKING_VERSION: JSON.stringify(process.env.npm_package_version),
   },
   esbuild: {
-    logOverride: { 'this-is-undefined-in-esm': 'silent' }
+    logOverride: { "this-is-undefined-in-esm": "silent" },
   },
   plugins: [
     react(),
-    (mdx as any).default(options),
+    mdx(options),
     VitePWA({
       includeAssets: [
         "favicon.svg",
@@ -80,9 +79,9 @@ export default defineConfig({
         ],
       },
       manifest: {
-        name: "BBKi.ng",
-        short_name: "BBKi.ng",
-        description: "A Personal Site.",
+        name: "bbki.ng",
+        short_name: "bbki.ng",
+        description: "words, pictures",
         theme_color: "#ffffff",
         icons: [
           {