Merge pull request #3418 from quantified-uncertainty/fumadocs

Nextra -> Fumadocs migration
quantified-uncertainty · Oct 26, 2024 · 2defc88 · 2defc88
2 parents 94b5ceb + 78a66ca
commit 2defc88
Show file tree

Hide file tree

Showing 105 changed files with 6,722 additions and 9,721 deletions.
diff --git a/package.json b/package.json
@@ -15,6 +15,11 @@
     "turbo": "^2.0.6",
     "turbo-ignore": "^2.0.6"
   },
+  "pnpm": {
+    "overrides": {
+      "@headlessui/react": "^2.2.0"
+    }
+  },
   "version": "0.0.1-0",
   "packageManager": "[email protected]+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4"
 }
diff --git a/packages/ai/src/generateSummary.ts b/packages/ai/src/generateSummary.ts
@@ -108,7 +108,7 @@ function generateDetailedStepLogs<Shape extends IOShape>(
     detailedLogs += "### Logs:\n";
     step.getLogs().forEach((log) => {
       detailedLogs += `#### **${getLogEntryFullName(log.entry)}:**\n`;
-      detailedLogs += getFullMessage(log);
+      detailedLogs += getFullMessage(log) + "\n";
     });
   });
   return detailedLogs;
@@ -124,38 +124,30 @@ function getFullMessage(log: TimestampedLogEntry): string {
       return log.entry.message;
     case "llmResponse": {
       const llmResponse = log.entry;
-      return `<details>
-  <summary>Content</summary>
+      return `##### Content
 
 \`\`\`\`
 ${llmResponse.content}
 \`\`\`\`
-</details>\n\n
 
-<details>
-  <summary>Prompt</summary>
+##### Prompt
 
 \`\`\`\`
 ${llmResponse.prompt}
 \`\`\`\`
-</details>\n\n
 
-
-<details>
-  <summary>Messages</summary>
+##### Messages
 
 \`\`\`\`json
 ${JSON.stringify(llmResponse.messages, null, 2)}
 \`\`\`\`
-</details>\n\n
 
-<details>
-  <summary>Full Response</summary>
+##### Full Response
 
 \`\`\`\`json
 ${JSON.stringify(llmResponse.response, null, 2)}
 \`\`\`\`
-</details>\n\n\n`;
+`;
     }
     default:
       return "❓ Unknown log type";
@@ -196,8 +188,7 @@ ${formatCode(artifact.value)}
 function formatCode(code: Code): string {
   switch (code.type) {
     case "formattingFailed":
-      return `<details>
-  <summary>🔴 Code Update: [Error] - Formatting failed</summary>
+      return `🔴 Code Update: [Error] - Formatting failed
 
 **Error:**
 \`\`\`
@@ -208,10 +199,10 @@ ${code.error}
 \`\`\`squiggleEditor
 ${code.source}
 \`\`\`
-</details>\n\n`;
+
+`;
     case "runFailed":
-      return `<details>
-  <summary>🔴 Code Update: [Error] - Run failed</summary>
+      return `🔴 Code Update: [Error] - Run failed
 
 **Error:**
 \`\`\`
@@ -222,15 +213,14 @@ ${code.error}
 \`\`\`squiggleEditor
 ${code.source}
 \`\`\`
-</details>\n\n`;
+`;
     case "success":
-      return `<details>
-  <summary>✅ Code Update: [Success] - Code executed successfully</summary>
+      return `✅ Code Update: [Success] - Code executed successfully
 
 \`\`\`squiggleEditor
 ${code.source}
 \`\`\`
-</details>\n\n`;
+`;
   }
 }
 

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -39,7 +39,6 @@
     "react-hook-form": "^7.50.0",
     "react-markdown": "^9.0.1",
     "reactflow": "^11.11.4",
-    "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.0",
     "shikiji": "^0.10.2",
     "unist-util-visit": "^5.0.0",

diff --git a/packages/components/src/components/ProjectStateViewer/index.tsx b/packages/components/src/components/ProjectStateViewer/index.tsx
@@ -1,3 +1,4 @@
+"use client";
 import Dagre from "@dagrejs/dagre";
 import { FC, useEffect, useMemo } from "react";
 import {

diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx
@@ -1,3 +1,4 @@
+"use client";
 import { FC, memo } from "react";
 
 import { SqValuePath } from "@quri/squiggle-lang";

diff --git a/packages/components/src/components/SquiggleEditor.tsx b/packages/components/src/components/SquiggleEditor.tsx
@@ -1,3 +1,4 @@
+"use client";
 import { FC, useRef } from "react";
 
 import { useUncontrolledCode } from "../lib/hooks/index.js";

diff --git a/packages/components/src/components/SquigglePlayground/index.tsx b/packages/components/src/components/SquigglePlayground/index.tsx
@@ -1,3 +1,4 @@
+"use client";
 import React, { CSSProperties, useCallback, useEffect, useRef } from "react";
 
 import { SqLinker, SqValuePath } from "@quri/squiggle-lang";

diff --git a/packages/components/src/components/SquiggleViewer/index.tsx b/packages/components/src/components/SquiggleViewer/index.tsx
@@ -1,3 +1,4 @@
+"use client";
 import { FC, forwardRef, memo } from "react";
 
 import { SqValue } from "@quri/squiggle-lang";

diff --git a/packages/components/src/components/ui/FnDocumentation.tsx b/packages/components/src/components/ui/FnDocumentation.tsx
@@ -186,6 +186,7 @@ export const FnDocumentation: FC<{
                 </div>
               ) : (
                 <MarkdownViewer
+                  backgroundColor="bg-slate-100"
                   className="max-width-[200px]"
                   key={i}
                   md={`\`\`\`squiggle\n${text}\n\`\`\``}

diff --git a/packages/components/src/components/ui/PanelWithToolbar/ToolbarItem.tsx b/packages/components/src/components/ui/PanelWithToolbar/ToolbarItem.tsx
@@ -1,3 +1,4 @@
+"use client";
 import { clsx } from "clsx";
 import { ComponentType, FC, ReactNode } from "react";
 

diff --git a/packages/components/src/components/ui/SquiggleErrorAlert.tsx b/packages/components/src/components/ui/SquiggleErrorAlert.tsx
@@ -1,3 +1,4 @@
+"use client";
 import { FC, PropsWithChildren } from "react";
 
 import {

diff --git a/packages/components/src/lib/CodeSyntaxHighlighter.tsx b/packages/components/src/lib/CodeSyntaxHighlighter.tsx
@@ -1,4 +1,5 @@
-import React, { FC, HTMLAttributes, useEffect, useState } from "react";
+"use client";
+import { FC, HTMLAttributes, useEffect, useState } from "react";
 import {
   type BundledLanguage,
   bundledLanguages,
@@ -58,7 +59,7 @@ export const CodeSyntaxHighlighter: FC<
     "children"
   >
 > = ({ children, language, theme, ...rest }) => {
-  const [html, setHtml] = useState(children);
+  const [html, setHtml] = useState<string | undefined>();
 
   // Syntax-highlighted blocks will start unstyled, that's fine.
   useEffect(() => {
@@ -69,11 +70,14 @@ export const CodeSyntaxHighlighter: FC<
     })();
   });
 
-  return (
-    <pre
+  return html ? (
+    // This must be a div, shiki creates its own `<pre>`, and we don't want nested `<pre>`s, to avoid styling issues.
+    <div
       className="*:!bg-inherit" // shiki themes add background color, so we have to override it
       dangerouslySetInnerHTML={{ __html: html }}
       {...rest}
     />
+  ) : (
+    <pre {...rest}>{children}</pre>
   );
 };