From 36f3a1f40388738d32af01f4ce5a0d5dc765a2a3 Mon Sep 17 00:00:00 2001 From: Simon Farshid Date: Thu, 20 Jun 2024 15:29:28 -0700 Subject: [PATCH] refactor: switch from biome to prettier + eslint (#266) * refactor: switch from biome back to prettier + eslint * run prettier * fix build ,add changesets --- .changeset/lovely-trains-relax.md | 5 + .changeset/ninety-llamas-notice.md | 5 + .changeset/polite-jars-move.md | 8 + .github/workflows/changeset.yaml | 2 +- README.md | 4 +- apps/www/.eslintrc.json | 3 + apps/www/components.json | 2 +- apps/www/components/Home.tsx | 4 +- apps/www/components/Onboarding.tsx | 4 +- apps/www/components/chatgpt/ChatGPT.tsx | 18 +- apps/www/components/claude/Claude.tsx | 14 +- apps/www/components/docs/ParametersTable.tsx | 14 +- apps/www/components/shadcn/Shadcn.tsx | 43 +- apps/www/components/ui/avatar.tsx | 28 +- apps/www/components/ui/card.tsx | 2 +- apps/www/components/ui/dropdown-menu.tsx | 16 +- apps/www/components/ui/input.tsx | 2 +- apps/www/components/ui/popover.tsx | 2 +- apps/www/components/ui/select.tsx | 12 +- apps/www/components/ui/sheet.tsx | 6 +- apps/www/components/ui/tooltip.tsx | 2 +- apps/www/package.json | 31 +- apps/www/pages/_meta.tsx | 4 +- apps/www/pages/docs/_meta.tsx | 4 +- apps/www/pages/docs/advanced/Branching.mdx | 6 +- apps/www/pages/docs/advanced/Editing.mdx | 3 +- .../www/pages/docs/advanced/ToolRenderers.mdx | 21 +- apps/www/pages/docs/advanced/_meta.tsx | 4 +- apps/www/pages/docs/getting-started.mdx | 10 +- apps/www/pages/docs/index.mdx | 2 +- apps/www/pages/docs/migrations/v0.1.md | 3 +- apps/www/pages/docs/runtimes/_meta.tsx | 6 +- apps/www/pages/docs/runtimes/custom-rest.mdx | 181 +- apps/www/pages/docs/runtimes/langserve.mdx | 146 +- .../pages/docs/runtimes/pick-a-runtime.mdx | 2 +- .../docs/runtimes/vercel-ai-sdk/_meta.tsx | 6 +- .../pages/docs/runtimes/vercel-ai-sdk/rsc.mdx | 332 +- .../runtimes/vercel-ai-sdk/use-assistant.mdx | 290 +- .../docs/runtimes/vercel-ai-sdk/use-chat.mdx | 178 +- apps/www/pages/docs/ui/AssistantModal.mdx | 8 +- apps/www/pages/docs/ui/AssistantSidebar.mdx | 12 +- apps/www/pages/docs/ui/Thread.mdx | 20 +- apps/www/pages/docs/ui/_meta.tsx | 4 +- apps/www/pages/examples.mdx | 2 +- apps/www/pages/index.mdx | 4 +- apps/www/pages/reference/_meta.tsx | 4 +- .../pages/reference/integrations/_meta.tsx | 4 +- .../integrations/react-hook-form.mdx | 13 +- .../pages/reference/primitives/ActionBar.mdx | 75 +- .../reference/primitives/BranchPicker.mdx | 49 +- .../pages/reference/primitives/Composer.mdx | 87 +- .../reference/primitives/ContentPart.mdx | 10 +- .../pages/reference/primitives/Message.mdx | 101 +- .../www/pages/reference/primitives/Thread.mdx | 81 +- apps/www/pages/reference/primitives/_meta.tsx | 4 +- .../reference/primitives/composition.mdx | 4 +- apps/www/pages/reference/runtime.mdx | 26 +- apps/www/pages/styles.css | 7 +- apps/www/theme.config.tsx | 6 +- apps/www/tsconfig.json | 8 +- biome.json | 29 - .../search-agent-for-e-commerce/README.md | 13 +- .../components.json | 2 +- .../search-agent-for-e-commerce/package.json | 33 +- .../public/dummy-ecommerce-website.html | 60 +- .../src/app/api/chat/actions.tsx | 97 +- .../src/app/api/chat/route.ts | 8 +- .../src/app/globals.css | 108 +- .../src/app/layout.tsx | 5 +- .../src/app/page.tsx | 40 +- .../ui/assistant-ui/assistant-modal.tsx | 137 +- .../src/components/ui/assistant-ui/thread.tsx | 68 +- .../src/components/ui/avatar.tsx | 28 +- .../src/components/ui/button.tsx | 26 +- .../src/components/ui/card.tsx | 45 +- .../src/components/ui/carousel.tsx | 162 +- .../src/components/ui/popover.tsx | 22 +- .../src/components/ui/productcarousel.tsx | 122 +- .../src/components/ui/tooltip.tsx | 24 +- .../src/lib/utils.ts | 6 +- .../tailwind.config.ts | 16 +- .../search-agent-for-e-commerce/vercel.json | 2 +- examples/with-react-hook-form/.eslintrc.json | 3 + examples/with-react-hook-form/app/globals.css | 108 +- examples/with-react-hook-form/app/page.tsx | 11 +- examples/with-react-hook-form/components.json | 2 +- .../ui/assistant-ui/assistant-sidebar.tsx | 2 +- .../components/ui/assistant-ui/thread.tsx | 20 +- .../components/ui/avatar.tsx | 28 +- .../components/ui/button.tsx | 26 +- .../components/ui/form.tsx | 4 +- .../components/ui/input.tsx | 18 +- .../components/ui/label.tsx | 20 +- .../components/ui/resizable.tsx | 4 +- .../components/ui/tabs.tsx | 6 +- .../components/ui/tooltip.tsx | 24 +- examples/with-react-hook-form/lib/utils.ts | 6 +- examples/with-react-hook-form/package.json | 18 +- .../with-react-hook-form/tailwind.config.ts | 2 +- examples/with-vercel-ai-rsc/app/globals.css | 2 +- examples/with-vercel-ai-rsc/components.json | 2 +- .../components/ui/assistant-ui/thread.tsx | 10 +- .../components/ui/avatar.tsx | 28 +- .../components/ui/button.tsx | 26 +- .../components/ui/tooltip.tsx | 2 +- examples/with-vercel-ai-rsc/lib/utils.ts | 6 +- examples/with-vercel-ai-rsc/package.json | 12 +- package.json | 11 +- packages/cli/.eslintrc.json | 3 + packages/cli/README.md | 2 +- packages/cli/package.json | 7 +- packages/react-ai-sdk/.eslintrc.json | 3 + packages/react-ai-sdk/README.md | 2 +- packages/react-ai-sdk/package.json | 2 +- packages/react-hook-form/.eslintrc.json | 3 + packages/react-hook-form/README.md | 2 +- packages/react-hook-form/package.json | 2 +- packages/react-markdown/.eslintrc.json | 3 + packages/react-markdown/package.json | 2 +- packages/react-markdown/src/codeblock.tsx | 148 +- packages/react/.eslintrc.json | 3 + packages/react/package.json | 14 +- packages/react/src/context/ThreadContext.ts | 4 +- .../primitives/actionBar/ActionBarRoot.tsx | 9 +- .../branchPicker/BranchPickerRoot.tsx | 9 +- .../primitives/composer/ComposerCancel.tsx | 9 +- .../src/primitives/composer/ComposerInput.tsx | 2 + .../src/primitives/composer/ComposerRoot.tsx | 13 +- .../src/primitives/composer/ComposerSend.tsx | 9 +- .../contentPart/ContentPartImage.tsx | 9 +- .../contentPart/ContentPartText.tsx | 9 +- .../src/primitives/message/MessageContent.tsx | 1 + .../primitives/message/MessageInProgress.tsx | 12 +- .../src/primitives/message/MessageRoot.tsx | 9 +- .../src/primitives/thread/ThreadRoot.tsx | 9 +- .../thread/ThreadScrollToBottom.tsx | 9 +- .../primitives/thread/ThreadSuggestion.tsx | 9 +- .../src/primitives/thread/ThreadViewport.tsx | 12 +- packages/react/src/runtime/local/index.ts | 5 +- .../src/utils/combined/createCombinedStore.ts | 6 +- .../src/utils/combined/useCombinedStore.ts | 2 +- .../react/src/utils/createActionButton.tsx | 40 +- .../src/utils/hooks/useOnResizeContent.tsx | 5 +- packages/shadcn-registry/.eslintrc.json | 3 + packages/shadcn-registry/components.json | 2 +- .../shadcn-registry/components/ui/avatar.tsx | 28 +- .../shadcn-registry/components/ui/popover.tsx | 2 +- .../components/ui/resizable.tsx | 26 +- .../shadcn-registry/components/ui/tooltip.tsx | 2 +- packages/shadcn-registry/package.json | 13 +- .../registry/assistant-ui/assistant-modal.tsx | 17 +- .../experimental/markdown-text.tsx | 2 +- .../assistant-ui/experimental/thread.tsx | 20 +- .../registry/assistant-ui/full/thread.tsx | 26 +- .../registry/assistant-ui/thread.tsx | 16 +- packages/tsconfig/base.json | 12 +- pnpm-lock.yaml | 4235 ++++------------- pnpm-workspace.yaml | 6 +- 158 files changed, 3048 insertions(+), 5158 deletions(-) create mode 100644 .changeset/lovely-trains-relax.md create mode 100644 .changeset/ninety-llamas-notice.md create mode 100644 .changeset/polite-jars-move.md create mode 100644 apps/www/.eslintrc.json delete mode 100644 biome.json create mode 100644 examples/with-react-hook-form/.eslintrc.json create mode 100644 packages/cli/.eslintrc.json create mode 100644 packages/react-ai-sdk/.eslintrc.json create mode 100644 packages/react-hook-form/.eslintrc.json create mode 100644 packages/react-markdown/.eslintrc.json create mode 100644 packages/react/.eslintrc.json create mode 100644 packages/shadcn-registry/.eslintrc.json diff --git a/.changeset/lovely-trains-relax.md b/.changeset/lovely-trains-relax.md new file mode 100644 index 0000000000..9356fb29e4 --- /dev/null +++ b/.changeset/lovely-trains-relax.md @@ -0,0 +1,5 @@ +--- +"@assistant-ui/react": patch +--- + +fix: add DisplayName to primitive components for better error logs diff --git a/.changeset/ninety-llamas-notice.md b/.changeset/ninety-llamas-notice.md new file mode 100644 index 0000000000..0d042bba82 --- /dev/null +++ b/.changeset/ninety-llamas-notice.md @@ -0,0 +1,5 @@ +--- +"@assistant-ui/react": patch +--- + +chore: upgrade to radix-ui 1.1 diff --git a/.changeset/polite-jars-move.md b/.changeset/polite-jars-move.md new file mode 100644 index 0000000000..eeec72038f --- /dev/null +++ b/.changeset/polite-jars-move.md @@ -0,0 +1,8 @@ +--- +"@assistant-ui/react-hook-form": patch +"@assistant-ui/react-ai-sdk": patch +"@assistant-ui/react": patch +"assistant-ui": patch +--- + +chore: update dependencies diff --git a/.github/workflows/changeset.yaml b/.github/workflows/changeset.yaml index a4a933bd20..a2202e3172 100644 --- a/.github/workflows/changeset.yaml +++ b/.github/workflows/changeset.yaml @@ -41,4 +41,4 @@ jobs: publish: pnpm ci:publish env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/README.md b/README.md index 5df6737111..3e5ed3a8d3 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ import { useVercelUseChatRuntime } from "@assistant-ui/react-ai-sdk"; import { AssistantModal } from "@/components/ui/assistant-ui/assistant-modal"; export default const MyApp = () => { - const chat = useChat({ + const chat = useChat({ api: "/api/chat" // your backend route }); const runtime = useVercelUseChatRuntime(chat); @@ -36,4 +36,4 @@ export default const MyApp = () => { ); } -``` \ No newline at end of file +``` diff --git a/apps/www/.eslintrc.json b/apps/www/.eslintrc.json new file mode 100644 index 0000000000..bffb357a71 --- /dev/null +++ b/apps/www/.eslintrc.json @@ -0,0 +1,3 @@ +{ + "extends": "next/core-web-vitals" +} diff --git a/apps/www/components.json b/apps/www/components.json index 58b812d037..0b78c3bf55 100644 --- a/apps/www/components.json +++ b/apps/www/components.json @@ -14,4 +14,4 @@ "components": "@/components", "utils": "@/lib/utils" } -} \ No newline at end of file +} diff --git a/apps/www/components/Home.tsx b/apps/www/components/Home.tsx index 4b6c1e38f7..7da73185c9 100644 --- a/apps/www/components/Home.tsx +++ b/apps/www/components/Home.tsx @@ -43,10 +43,10 @@ export default function Home() { return (
-

+

React Components for AI Chat

-

+

Add an AI chatbot to your app in minutes.

diff --git a/apps/www/components/Onboarding.tsx b/apps/www/components/Onboarding.tsx index 5728889364..057262049f 100644 --- a/apps/www/components/Onboarding.tsx +++ b/apps/www/components/Onboarding.tsx @@ -15,13 +15,13 @@ export default function Onboarding() { }, []); return (
-

Get Onboarded By a Founder

+

Get Onboarded By a Founder

-

Self-Guided Onboarding

+

Self-Guided Onboarding

If you prefer to explore on your own, you can visit the{" "} diff --git a/apps/www/components/chatgpt/ChatGPT.tsx b/apps/www/components/chatgpt/ChatGPT.tsx index b64986e60e..dbbfc4f36a 100644 --- a/apps/www/components/chatgpt/ChatGPT.tsx +++ b/apps/www/components/chatgpt/ChatGPT.tsx @@ -24,14 +24,14 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip"; export const ChatGPT: FC = () => { return ( - +

C -

How can I help you today?

+

How can I help you today?

@@ -51,7 +51,7 @@ export const ChatGPT: FC = () => { /> - + @@ -60,7 +60,7 @@ export const ChatGPT: FC = () => { -

+

ChatGPT can make mistakes. Check important info.

@@ -89,7 +89,7 @@ const UserMessage: FC = () => {

- + ); }; @@ -100,10 +100,10 @@ const EditComposer: FC = () => {
- + Cancel - + Send
@@ -115,7 +115,7 @@ const AssistantMessage: FC = () => { return ( - + C @@ -161,7 +161,7 @@ const BranchPicker: FC<{ className?: string }> = ({ className }) => { diff --git a/apps/www/components/claude/Claude.tsx b/apps/www/components/claude/Claude.tsx index 8b64166215..762a7138d1 100644 --- a/apps/www/components/claude/Claude.tsx +++ b/apps/www/components/claude/Claude.tsx @@ -18,7 +18,7 @@ export const Claude: FC = () => { -

+

Claude can make mistakes. Please double-check responses.

@@ -32,12 +32,12 @@ export const Claude: FC = () => { /> @@ -57,7 +57,7 @@ const ChatMessage: FC = () => {
{ - + Retry - + Copy diff --git a/apps/www/components/docs/ParametersTable.tsx b/apps/www/components/docs/ParametersTable.tsx index 14365ad74f..cbbe745190 100644 --- a/apps/www/components/docs/ParametersTable.tsx +++ b/apps/www/components/docs/ParametersTable.tsx @@ -16,17 +16,17 @@ type ParameterProps = { const Parameter: FC = ({ parameter, isLast }) => { return (
-

+

{parameter.name} {!parameter.required && "?"}:

-
+
{parameter.type}
-
+

{parameter.description}

@@ -40,7 +40,9 @@ const Parameter: FC = ({ parameter, isLast }) => { const ParametersList = ({ parameters, -}: { parameters: Array }) => { +}: { + parameters: Array; +}) => { return parameters.map((parameter, idx) => ( = ({ type, parameters }) => { return (
{!!type && ( -

+

{type}

)} diff --git a/apps/www/components/shadcn/Shadcn.tsx b/apps/www/components/shadcn/Shadcn.tsx index 75abfff374..2c7e191e38 100644 --- a/apps/www/components/shadcn/Shadcn.tsx +++ b/apps/www/components/shadcn/Shadcn.tsx @@ -6,7 +6,7 @@ import { cn } from "@/lib/utils"; import icon from "@/public/favicon/favicon.svg"; import type { TooltipContentProps } from "@radix-ui/react-tooltip"; import Image from "next/image"; -import { type FC, forwardRef } from "react"; +import { type FC } from "react"; import { Thread } from "@/components/ui/assistant-ui/thread"; import { Sheet, SheetContent, SheetTrigger } from "../ui/sheet"; import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip"; @@ -17,21 +17,24 @@ type ButtonWithTooltipProps = ButtonProps & { side?: TooltipContentProps["side"]; }; -const ButtonWithTooltip = forwardRef( - ({ children, tooltip, side = "top", ...rest }, ref) => { - return ( - - - - - {tooltip} - - ); - }, -); +const ButtonWithTooltip: FC = ({ + children, + tooltip, + side = "top", + ...rest +}) => { + return ( + + + + + {tooltip} + + ); +}; const TopLeft: FC = () => { return ( @@ -41,7 +44,7 @@ const TopLeft: FC = () => { tooltip="New Chat" side="right" > -
+
logo assistant-ui
@@ -53,15 +56,15 @@ const TopLeft: FC = () => { const MainLeft: FC = () => { return ( -