Merge pull request #1014 from Crossbell-Box/dev

Release bug fixes and enhancements.

dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 0
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 0

package.json

@@ -38,7 +38,7 @@
     "@codemirror/language-data": "6.3.1",
     "@codemirror/state": "6.2.1",
     "@codemirror/theme-one-dark": "6.1.2",
-    "@codemirror/view": "6.20.1",
+    "@codemirror/view": "6.20.2",
     "@crossbell/connect-kit": "1.5.14",
     "@crossbell/contract": "1.5.13",
     "@crossbell/indexer": "1.5.13",
@@ -55,8 +55,8 @@
     "@heroicons/react": "2.0.18",
     "@iconify-json/mingcute": "1.1.10",
     "@lezer/highlight": "1.1.6",
-    "@mantine/core": "7.0.0",
-    "@mantine/dates": "7.0.0",
+    "@mantine/core": "7.0.2",
+    "@mantine/dates": "7.0.2",
     "@monaco-editor/react": "4.5.2",
     "@popperjs/core": "2.11.8",
     "@prisma/client": "5.3.1",
@@ -79,7 +79,7 @@
     "fast-average-color": "9.4.0",
     "fast-deep-equal": "3.1.3",
     "hast-util-from-html": "2.0.1",
-    "hast-util-to-html": "8.0.4",
+    "hast-util-to-html": "9.0.0",
     "i18next": "23.5.1",
     "i18next-resources-to-backend": "1.1.4",
     "immer": "10.0.2",
@@ -89,14 +89,14 @@
     "jsdom": "22.1.0",
     "jsonfeed-to-rss": "3.0.7",
     "katex": "0.16.8",
-    "langchain": "0.0.153",
+    "langchain": "0.0.154",
     "lottie-react": "2.4.0",
-    "mdast-util-to-hast": "12.3.0",
+    "mdast-util-to-hast": "13.0.2",
     "mdast-util-toc": "7.0.0",
     "medium-zoom": "1.0.8",
     "mermaid": "10.4.0",
     "nanoid": "5.0.1",
-    "next": "13.5.2",
+    "next": "13.5.3",
     "next-themes": "0.2.1",
     "node-id3": "0.2.6",
     "open-graph-scraper": "^6.2.2",
@@ -113,7 +113,7 @@
     "react-hook-form": "7.46.2",
     "react-hot-toast": "2.4.1",
     "react-i18next": "13.2.2",
-    "react-parallax-tilt": "1.7.167",
+    "react-parallax-tilt": "1.7.168",
     "react-popper": "2.3.0",
     "react-sortablejs": "6.1.4",
     "react-string-replace": "1.1.1",
@@ -158,7 +158,7 @@
   },
   "devDependencies": {
     "@iconify/tailwind": "0.1.3",
-    "@next/bundle-analyzer": "13.5.2",
+    "@next/bundle-analyzer": "13.5.3",
     "@trivago/prettier-plugin-sort-imports": "4.2.0",
     "@types/async-lock": "1.4.0",
     "@types/canvas-confetti": "1.6.1",
@@ -169,15 +169,15 @@
     "@types/katex": "0.16.3",
     "@types/mdast": "4.0.0",
     "@types/mjml": "4.7.1",
-    "@types/node": "20.6.5",
+    "@types/node": "20.7.0",
     "@types/pangu": "4.0.0",
     "@types/prismjs": "1.26.1",
-    "@types/react": "18.2.22",
+    "@types/react": "18.2.23",
     "@types/react-dom": "18.2.7",
     "@types/react-infinite-scroller": "1.2.3",
     "@types/remove-markdown": "0.3.1",
     "@types/serialize-javascript": "5.0.2",
-    "@types/sortablejs": "1.15.2",
+    "@types/sortablejs": "1.15.3",
     "@types/ua-parser-js": "0.7.37",
     "@types/uuid": "9.0.4",
     "autoprefixer": "10.4.16",
@@ -186,7 +186,7 @@
     "esbuild": "0.19.3",
     "esbuild-register": "3.5.0",
     "eslint": "8.50.0",
-    "eslint-config-next": "13.5.2",
+    "eslint-config-next": "13.5.3",
     "eslint-plugin-import": "2.28.1",
     "eslint-plugin-react": "7.33.2",
     "eslint-plugin-unused-imports": "3.0.0",

src/app/(home)/support/page.tsx

@@ -0,0 +1,46 @@
+import { DISCORD_LINK } from "~/lib/env"
+
+export default function SupportPage() {
+  return (
+    <div className="min-h-screen w-full">
+      <div className="py-12">
+        <div className="max-w-full w-full mx-auto bg-white shadow-lg rounded-lg md:max-w-5xl">
+          <div className="md:flex">
+            <div className="w-full p-4 px-5 py-5">
+              <div className="md:grid md:grid-cols-3 gap-2">
+                <div className="col-span-2 p-5">
+                  <h1 className="text-3xl font-medium">Support</h1>
+                  <p className="mt-5">
+                    You can access our Discord server to get support.
+                  </p>
+                  <p className="mt-5">
+                    <a
+                      href={DISCORD_LINK}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="text-indigo-500 hover:text-indigo-700"
+                    >
+                      Join our Discord server
+                    </a>
+                  </p>
+                  <p className="mt-5">
+                    If you want to learn more about xLog, please visit the{" "}
+                    <a
+                      href={"https://xlog.xlog.app/"}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="text-indigo-500 hover:text-indigo-700"
+                    >
+                      home page
+                    </a>{" "}
+                    of xLog
+                  </p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}

src/components/common/PatronModal.tsx

@@ -249,7 +249,7 @@ const PatronModal = ({
                   tooltip: t("Coming soon") || "",
                 },
               ]}
-              className="justify-center"
+              className="justify-center overflow-visible"
             ></Tabs>
           </div>
           <div>

src/components/ui/DPlayer.tsx

@@ -2,7 +2,6 @@
 
 import dynamic from "next/dynamic"
 import { type DPlayerProps } from "rc-dplayer"
-import { ReactElement } from "rehype-react/lib"
 
 import { toGateway } from "~/lib/ipfs-parser"
 
@@ -14,12 +13,14 @@ const DPlayer = function DPlayer({
   ...props
 }: {
   src?: string
-  children?: ReactElement[]
+  children?: JSX.Element[] | JSX.Element
 } & DPlayerProps) {
-  const sources = children?.filter(
-    (child) =>
-      child && typeof child.type === "string" && child.type === "source",
-  )
+  const sources = Array.isArray(children)
+    ? children?.filter(
+        (child) =>
+          child && typeof child.type === "string" && child.type === "source",
+      )
+    : []
 
   if (!src) {
     src = (sources?.[0]?.props as DPlayerProps)?.src as string

src/markdown/rehype-audio.ts

@@ -1,4 +1,4 @@
-import { Root } from "rehype-raw"
+import type { Root } from "hast"
 import { Plugin } from "unified"
 import { visit } from "unist-util-visit"
 

src/markdown/rehype-embed.ts

@@ -1,5 +1,5 @@
+import type { Root } from "hast"
 import { fromHtml } from "hast-util-from-html"
-import { Root } from "rehype-raw"
 import { Plugin } from "unified"
 import { visit } from "unist-util-visit"
 

src/markdown/rehype-image.ts

@@ -1,4 +1,4 @@
-import { Root } from "rehype-raw"
+import type { Root } from "hast"
 import { Plugin } from "unified"
 import { visit } from "unist-util-visit"
 

src/markdown/rehype-table.ts

@@ -1,4 +1,4 @@
-import { Root } from "rehype-raw"
+import type { Root } from "hast"
 import { Plugin } from "unified"
 import { visit } from "unist-util-visit"
 

src/markdown/rehype-video.ts

@@ -1,4 +1,4 @@
-import { Root } from "rehype-raw"
+import type { Root } from "hast"
 import { Plugin } from "unified"
 import { visit } from "unist-util-visit"
 

src/markdown/rehype-wrap-code.ts

@@ -1,4 +1,4 @@
-import { Root } from "rehype-raw"
+import type { Root } from "hast"
 import { Plugin } from "unified"
 import { u } from "unist-builder"
 import { visit } from "unist-util-visit"

src/markdown/rehyper-external-link.ts

@@ -1,4 +1,4 @@
-import { Root } from "rehype-raw"
+import type { Root } from "hast"
 import { Plugin } from "unified"
 import { visit } from "unist-util-visit"
 

src/markdown/remark-callout.ts

@@ -1,10 +1,10 @@
-import { Root } from "remark-gfm"
-import { Plugin } from "unified"
+import type { Root } from "mdast"
+import type { Plugin } from "unified"
 import { visit } from "unist-util-visit"
 
 const CALLOUT_RE = /^(TIP|WARN|SUCCESS|DANGER):(\n|$)/
 
-export const remarkCallout: Plugin<Array<void>, Root> = () => (tree: Root) => {
+export const remarkCallout: Plugin<[], Root> = () => (tree: Root) => {
   visit(tree, { type: "blockquote" }, (node, index, parent) => {
     if (node.type !== "blockquote") return
 

src/markdown/remark-mermaid.ts

@@ -1,8 +1,8 @@
-import { Root } from "remark-gfm"
-import { Plugin } from "unified"
+import type { Root } from "mdast"
+import type { Plugin } from "unified"
 import { visit } from "unist-util-visit"
 
-export const remarkMermaid: Plugin<Array<void>, Root> = () => (tree: Root) => {
+export const remarkMermaid: Plugin<[], Root> = () => (tree: Root) => {
   visit(tree, (node) => {
     if (node.type === "code" && node.lang === "mermaid") {
       // @ts-ignore

src/markdown/remark-pangu.ts

@@ -1,5 +1,5 @@
+import type { Root } from "mdast"
 import pangu from "pangu"
-import type { Root } from "remark-gfm"
 import type { Plugin } from "unified"
 import { visit } from "unist-util-visit"
 
@@ -26,7 +26,7 @@ function format(value: string) {
   return pangu.spacing(value)
 }
 
-export const remarkPangu: Plugin<Array<Options>, Root> =
+export const remarkPangu: Plugin<[], Root> =
   (options = {}) =>
   (tree: Root) => {
     const settings = Object.assign({}, defaultOptions, options)

src/markdown/remark-youtube.ts

@@ -1,10 +1,10 @@
-import { Root } from "remark-gfm"
-import { Plugin } from "unified"
+import type { Root } from "mdast"
+import type { Plugin } from "unified"
 import { visit } from "unist-util-visit"
 
-export const remarkYoutube: Plugin<Array<void>, Root> =
+export const remarkYoutube: Plugin<[], Root> =
   () => (tree: Root, file: any) => {
-    visit(tree, (node) => {
+    visit(tree, (node: any) => {
       if (
         node.type === "textDirective" ||
         node.type === "leafDirective" ||