Merge branch 'refs/heads/feature/ai-chat'

# Conflicts:
#	frontend/components/editor/index.tsx
This commit is contained in:
James Murdza
2024-10-20 17:22:16 -06:00
15 changed files with 2883 additions and 209 deletions

View File

@ -12,6 +12,7 @@
"@atlaskit/pragmatic-drag-and-drop": "^1.1.7",
"@clerk/nextjs": "^4.29.12",
"@clerk/themes": "^1.7.12",
"@codemirror/lang-javascript": "^6.2.2",
"@hookform/resolvers": "^3.3.4",
"@liveblocks/client": "^1.12.0",
"@liveblocks/node": "^1.12.0",
@ -30,6 +31,8 @@
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-switch": "^1.0.3",
"@react-three/fiber": "^8.16.6",
"@uiw/codemirror-theme-vscode": "^4.23.5",
"@uiw/react-codemirror": "^4.23.5",
"@vercel/analytics": "^1.2.2",
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
@ -48,7 +51,10 @@
"react": "^18.3.1",
"react-dom": "^18",
"react-hook-form": "^7.51.3",
"react-markdown": "^9.0.1",
"react-resizable-panels": "^2.0.16",
"react-syntax-highlighter": "^15.5.0",
"remark-gfm": "^4.0.0",
"socket.io-client": "^4.7.5",
"sonner": "^1.4.41",
"tailwind-merge": "^2.3.0",
@ -61,9 +67,11 @@
"zod": "^3.23.8"
},
"devDependencies": {
"@types/estree": "^1.0.6",
"@types/node": "^20",
"@types/react": "^18.3.3",
"@types/react-dom": "^18",
"@types/react-syntax-highlighter": "^15.5.13",
"@types/three": "^0.164.0",
"autoprefixer": "^10.0.1",
"postcss": "^8",