Merge branch 'main' into feat-endpoint-style-structure

client/src/components/Conversations/Conversation.jsx

@@ -16,11 +16,12 @@ export default function Conversation({ conversation, retainView }) {
   const { switchToConversation } = store.useConversation();
 
   const [renaming, setRenaming] = useState(false);
-  const [titleInput, setTitleInput] = useState(title);
   const inputRef = useRef(null);
 
   const { conversationId, title } = conversation;
 
+  const [titleInput, setTitleInput] = useState(title);
+
   const rename = manualSWR(`/api/convos/update`, 'post');
 
   const clickHandler = async () => {

client/src/components/MessageHandler/index.jsx

@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import { useRecoilValue, useResetRecoilState, useSetRecoilState } from 'recoil';
-import { SSE } from '~/utils/sse';
+import { SSE } from '~/utils/sse.mjs';
 import createPayload from '~/utils/createPayload';
 
 import store from '~/store';

client/src/components/Messages/Content/Content.jsx

@@ -6,7 +6,7 @@ import remarkMath from 'remark-math';
 import remarkGfm from 'remark-gfm';
 import rehypeRaw from 'rehype-raw'
 import CodeBlock from './CodeBlock';
-import { langSubset } from '~/utils/languages';
+import { langSubset } from '~/utils/languages.mjs';
 
 const Content = React.memo(({ content }) => {
   let rehypePlugins = [

client/src/hooks/ThemeContext.jsx

@@ -42,5 +42,5 @@ export const ThemeProvider = ({ initialTheme, children }) => {
     rawSetTheme(theme);
   }, [theme]);
 
-  return <ThemeContext.Provider value={{ theme, setTheme }}>{children}</ThemeContext.Provider>;
+  return <ThemeContext.Provider value={{ theme, setTheme }}>{children}</ThemeContext.Provider>
 };

client/src/main.jsx

@@ -0,0 +1,21 @@
+import React from 'react';
+import { createRoot } from 'react-dom/client';
+// import { Provider } from 'react-redux';
+// import { store } from './src/store';
+import { RecoilRoot } from 'recoil';
+
+import { ThemeProvider } from './hooks/ThemeContext';
+import App from './App';
+import './style.css';
+import './mobile.css';
+
+const container = document.getElementById('root');
+const root = createRoot(container);
+
+root.render(
+  <RecoilRoot>
+    <ThemeProvider>
+      <App />
+    </ThemeProvider>
+  </RecoilRoot>
+);

client/src/utils/languages.mjs

@@ -353,4 +353,4 @@ const langSubset = [
   'yaml',
 ];
 
-module.exports = { languages, langSubset };
+export { languages, langSubset };

client/src/utils/sse.mjs

@@ -211,8 +211,9 @@ var SSE = function (url, options) {
   };
 };
 
+export { SSE };
 // Export our SSE module for npm.js
-if (typeof exports !== 'undefined') {
-  // exports.SSE = SSE;
-  module.exports = { SSE };
-}
+// if (typeof exports !== 'undefined') {
+//   // exports.SSE = SSE;
+//   module.exports = { SSE };
+// }