From 4527032359fb3f56d162f9c7a4ec7022d87cc4cf Mon Sep 17 00:00:00 2001 From: Fuma Nama Date: Sun, 17 Nov 2024 20:15:33 +0800 Subject: [PATCH 1/6] cli: fix `package-manager-detector` types --- packages/cli/src/utils/get-package-manager.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/utils/get-package-manager.ts b/packages/cli/src/utils/get-package-manager.ts index fe4101055..eab2f6bbc 100644 --- a/packages/cli/src/utils/get-package-manager.ts +++ b/packages/cli/src/utils/get-package-manager.ts @@ -1,6 +1,6 @@ -import { detect } from 'package-manager-detector'; +import { detect, type AgentName } from 'package-manager-detector'; -export type PackageManager = 'npm' | 'pnpm' | 'yarn' | 'bun'; +export type PackageManager = AgentName; export async function getPackageManager(): Promise { const result = await detect(); From 556d5dc68b06995c32abf19b203a9f0b03ec05fb Mon Sep 17 00:00:00 2001 From: Fuma Nama Date: Sun, 17 Nov 2024 23:04:09 +0800 Subject: [PATCH 2/6] AI: force it to add title and language --- apps/docs/app/docs/layout.tsx | 2 +- apps/docs/components/ai/engines/inkeep.ts | 3 +- apps/docs/components/ai/markdown-processor.ts | 11 ++++-- apps/docs/components/ai/search-ai.tsx | 36 ++++++++++--------- 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/apps/docs/app/docs/layout.tsx b/apps/docs/app/docs/layout.tsx index 815282fc1..5d0ef1359 100644 --- a/apps/docs/app/docs/layout.tsx +++ b/apps/docs/app/docs/layout.tsx @@ -140,7 +140,7 @@ export default function Layout({ children }: { children: ReactNode }) { buttonVariants({ variant: 'secondary', }), - 'fixed bottom-4 right-4 md:bottom-8 md:right-8 gap-2 rounded-xl text-fd-secondary-foreground/80 bg-secondary/50 shadow-lg backdrop-blur-lg', + 'fixed bottom-4 right-4 gap-2 rounded-xl bg-secondary/50 text-fd-secondary-foreground/80 shadow-lg backdrop-blur-lg md:bottom-8 md:right-8', )} > diff --git a/apps/docs/components/ai/engines/inkeep.ts b/apps/docs/components/ai/engines/inkeep.ts index 236c651b9..fad81d7b3 100644 --- a/apps/docs/components/ai/engines/inkeep.ts +++ b/apps/docs/components/ai/engines/inkeep.ts @@ -36,7 +36,8 @@ export async function createInkeepEngine(): Promise { integrationId: integrationId!, stream: true, chatSession: { - guidance: 'make sure to format code blocks', + guidance: + 'make sure to format code blocks, and add language/title to it', messages, }, }); diff --git a/apps/docs/components/ai/markdown-processor.ts b/apps/docs/components/ai/markdown-processor.ts index 312bd19c6..7e6bafc4d 100644 --- a/apps/docs/components/ai/markdown-processor.ts +++ b/apps/docs/components/ai/markdown-processor.ts @@ -9,7 +9,6 @@ import { type ReactNode } from 'react'; import { Fragment, jsx, jsxs } from 'react/jsx-runtime'; import { createHighlighter } from 'shiki/bundle/web'; import { createJavaScriptRegexEngine } from 'shiki/engine/javascript'; -import { createStyleTransformer } from 'fumadocs-core/server'; import type { Root } from 'hast'; interface MetaValue { @@ -75,13 +74,21 @@ export function createProcessor(): Processor { transformers: [ { name: 'pre-process', + line(hast) { + if (hast.children.length === 0) { + // Keep the empty lines when using grid layout + hast.children.push({ + type: 'text', + value: ' ', + }); + } + }, preprocess(_, { meta }) { if (meta) { meta.__raw = filterMetaString(meta.__raw ?? ''); } }, }, - createStyleTransformer(), ], }); }); diff --git a/apps/docs/components/ai/search-ai.tsx b/apps/docs/components/ai/search-ai.tsx index 78160556d..ef0b23629 100644 --- a/apps/docs/components/ai/search-ai.tsx +++ b/apps/docs/components/ai/search-ai.tsx @@ -140,7 +140,7 @@ function AIDialog({ type }: { type: EngineType }) { const messages = engine?.getHistory() ?? []; const activeBar = ( -
+
-

+

Answers from AI may be inaccurate, please verify the information.

From c66df64cd7ceb42aa2e6bca24fe0fba5dc063972 Mon Sep 17 00:00:00 2001 From: Filip Papiernik <45321473+LeCarteloo@users.noreply.github.com> Date: Sun, 17 Nov 2024 16:06:02 +0100 Subject: [PATCH 3/6] OpenAPI: Render Server Selector Only for Multiple Servers (#1065) * OpenAPI: Hide the server selector when there is only one server or none defined * OpenAPI: Improve APIInfo position on smaller screens * docs: Add changeset --- .changeset/red-owls-grab.md | 6 ++++++ packages/openapi/src/ui/client.tsx | 5 +++-- packages/openapi/src/ui/index.tsx | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 .changeset/red-owls-grab.md diff --git a/.changeset/red-owls-grab.md b/.changeset/red-owls-grab.md new file mode 100644 index 000000000..c20c29ab5 --- /dev/null +++ b/.changeset/red-owls-grab.md @@ -0,0 +1,6 @@ +--- +'fumadocs-openapi': minor +--- + +OpenAPI: Display the server selector only when more than one server is defined in the OpenAPI schema +OpenAPI: Improve APIInfo position for better visibility on smaller screens diff --git a/packages/openapi/src/ui/client.tsx b/packages/openapi/src/ui/client.tsx index a78e1e37e..f0998311d 100644 --- a/packages/openapi/src/ui/client.tsx +++ b/packages/openapi/src/ui/client.tsx @@ -76,10 +76,11 @@ export function CopyRouteButton({ export function BaseUrlSelect({ baseUrls }: { baseUrls: string[] }) { const { baseUrl, setBaseUrl } = useApiContext(); - if (baseUrls.length === 0) return null; + + if (baseUrls.length <= 1) return null; return ( -
+
Server diff --git a/packages/openapi/src/ui/index.tsx b/packages/openapi/src/ui/index.tsx index 3212d4c67..7a7d1f6e3 100644 --- a/packages/openapi/src/ui/index.tsx +++ b/packages/openapi/src/ui/index.tsx @@ -41,7 +41,7 @@ export function APIInfo({ return (
-
+
Date: Sun, 17 Nov 2024 23:22:22 +0800 Subject: [PATCH 4/6] Version Packages (#1066) --- .changeset/red-owls-grab.md | 6 ------ packages/openapi/CHANGELOG.md | 7 +++++++ packages/openapi/package.json | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 .changeset/red-owls-grab.md diff --git a/.changeset/red-owls-grab.md b/.changeset/red-owls-grab.md deleted file mode 100644 index c20c29ab5..000000000 --- a/.changeset/red-owls-grab.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'fumadocs-openapi': minor ---- - -OpenAPI: Display the server selector only when more than one server is defined in the OpenAPI schema -OpenAPI: Improve APIInfo position for better visibility on smaller screens diff --git a/packages/openapi/CHANGELOG.md b/packages/openapi/CHANGELOG.md index 432a21f45..ca592b3b5 100644 --- a/packages/openapi/CHANGELOG.md +++ b/packages/openapi/CHANGELOG.md @@ -1,5 +1,12 @@ # @fuma-docs/openapi +## 5.7.0 + +### Minor Changes + +- c66df64: OpenAPI: Display the server selector only when more than one server is defined in the OpenAPI schema + OpenAPI: Improve APIInfo position for better visibility on smaller screens + ## 5.6.2 ### Patch Changes diff --git a/packages/openapi/package.json b/packages/openapi/package.json index d788b1bdc..578ba61b4 100644 --- a/packages/openapi/package.json +++ b/packages/openapi/package.json @@ -1,6 +1,6 @@ { "name": "fumadocs-openapi", - "version": "5.6.2", + "version": "5.7.0", "description": "Generate MDX docs for your OpenAPI spec", "keywords": [ "NextJs", From 66c70ec3f0dbaaddaf80503787f73e09af0ca79d Mon Sep 17 00:00:00 2001 From: Fuma Nama Date: Tue, 19 Nov 2024 21:00:51 +0800 Subject: [PATCH 5/6] UI: Replace official Tailwind CSS typography plugin --- .changeset/lazy-beers-count.md | 7 + apps/docs/app/docs/layout.tsx | 2 +- apps/docs/components/ai/search-ai.tsx | 6 +- examples/next-mdx/content/docs/index.mdx | 7 + packages/ui/package.json | 7 +- packages/ui/postcss.config.js | 3 - packages/ui/src/tailwind-plugin.ts | 18 +- packages/ui/src/theme/typography.ts | 103 ----- packages/ui/src/theme/typography/LICENSE | 21 + packages/ui/src/theme/typography/index.ts | 188 +++++++++ packages/ui/src/theme/typography/styles.ts | 426 +++++++++++++++++++++ pnpm-lock.yaml | 65 ++-- 12 files changed, 701 insertions(+), 152 deletions(-) create mode 100644 .changeset/lazy-beers-count.md delete mode 100644 packages/ui/src/theme/typography.ts create mode 100644 packages/ui/src/theme/typography/LICENSE create mode 100644 packages/ui/src/theme/typography/index.ts create mode 100644 packages/ui/src/theme/typography/styles.ts diff --git a/.changeset/lazy-beers-count.md b/.changeset/lazy-beers-count.md new file mode 100644 index 000000000..06243b4cf --- /dev/null +++ b/.changeset/lazy-beers-count.md @@ -0,0 +1,7 @@ +--- +'fumadocs-ui': minor +--- + +**Replace official Tailwind CSS typography plugin** + +- Other variants like `prose-sm` and `prose-gray` are removed, as it's supposed to only provide support for Fumadocs UI typography styles. diff --git a/apps/docs/app/docs/layout.tsx b/apps/docs/app/docs/layout.tsx index 5d0ef1359..3a9e73fa6 100644 --- a/apps/docs/app/docs/layout.tsx +++ b/apps/docs/app/docs/layout.tsx @@ -140,7 +140,7 @@ export default function Layout({ children }: { children: ReactNode }) { buttonVariants({ variant: 'secondary', }), - 'fixed bottom-4 right-4 gap-2 rounded-xl bg-secondary/50 text-fd-secondary-foreground/80 shadow-lg backdrop-blur-lg md:bottom-8 md:right-8', + 'fixed bottom-4 right-4 z-10 gap-2 rounded-xl bg-secondary/50 text-fd-secondary-foreground/80 shadow-lg backdrop-blur-lg md:bottom-8 md:right-8', )} > diff --git a/apps/docs/components/ai/search-ai.tsx b/apps/docs/components/ai/search-ai.tsx index ef0b23629..11f1c9b39 100644 --- a/apps/docs/components/ai/search-ai.tsx +++ b/apps/docs/components/ai/search-ai.tsx @@ -449,13 +449,11 @@ export function Trigger(props: ButtonHTMLAttributes) { -
+