.

Author: mdroidian

apps/roam/package-lock.json

@@ -3,7 +3,7 @@
   "version": "0.14.3",
   "description": "Discourse Graph Plugin for roamresearch.com",
   "scripts": {
-    "postinstall": "patch-package",
+    "postinstall": "patch-package && cd ../../ && patch-package",
     "dev": "tsx scripts/dev.ts",
     "build": "tsx scripts/build.ts",
     "deploy": "tsx scripts/deploy.ts",
@@ -33,7 +33,7 @@
     "@repo/types": "*",
     "@supabase/auth-js": "^2.71.1",
     "@supabase/supabase-js": "^2.52.0",
-    "@tldraw/tldraw": "^2.0.0-alpha.12",
+    "@tldraw/tldraw": "2.0.0-canary.ffda4cfb",
     "@vercel/blob": "^0.27.0",
     "contrast-color": "^1.0.1",
     "cytoscape-navigator": "^2.0.1",
@@ -45,11 +45,5 @@
     "react-vertical-timeline-component": "^3.5.2",
     "roamjs-components": "^0.85.1",
     "signia-react": "^0.1.1"
-  },
-  "overrides": {
-    "@tldraw/tldraw": {
-      "react": "^17.0.2",
-      "react-dom": "^17.0.2"
-    }
   }
 }

apps/roam/package.json

@@ -1,7 +1,7 @@
-diff --git a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/cjs/index.d.ts b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/cjs/index.d.ts
+diff --git a/node_modules/@tldraw/editor/dist/cjs/index.d.ts b/node_modules/@tldraw/editor/dist/cjs/index.d.ts
 index f87764a..20716f0 100644
---- a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/cjs/index.d.ts
-+++ b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/cjs/index.d.ts
+--- a/node_modules/@tldraw/editor/dist/cjs/index.d.ts
++++ b/node_modules/@tldraw/editor/dist/cjs/index.d.ts
 @@ -2478,7 +2478,7 @@ declare class Dragging extends StateNode {
      private complete;
  }
@@ -104,10 +104,10 @@ index f87764a..20716f0 100644
      static id: string;
      info: TLBaseEventInfo & {
          type: "pointer";
-diff --git a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/app/App.mjs b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/app/App.mjs
+diff --git a/node_modules/@tldraw/editor/dist/esm/lib/app/App.mjs b/node_modules/@tldraw/editor/dist/esm/lib/app/App.mjs
 index 41f58f9..51a4f78 100644
---- a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/app/App.mjs
-+++ b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/app/App.mjs
+--- a/node_modules/@tldraw/editor/dist/esm/lib/app/App.mjs
++++ b/node_modules/@tldraw/editor/dist/esm/lib/app/App.mjs
 @@ -2827,7 +2827,28 @@ const _App = class extends EventEmitter {
          newShape.index = index;
          index = getIndexAbove(index);
@@ -138,10 +138,10 @@ index 41f58f9..51a4f78 100644
          if (newShape.props.start.type === "binding") {
            const mappedId = idMap.get(newShape.props.start.boundShapeId);
            newShape.props.start = mappedId ? { ...newShape.props.start, boundShapeId: mappedId } : (
-diff --git a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/app/statechart/TLSelectTool/TLSelectTool.mjs b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/app/statechart/TLSelectTool/TLSelectTool.mjs
+diff --git a/node_modules/@tldraw/editor/dist/esm/lib/app/statechart/TLSelectTool/TLSelectTool.mjs b/node_modules/@tldraw/editor/dist/esm/lib/app/statechart/TLSelectTool/TLSelectTool.mjs
 index 185d39d..f19078a 100644
---- a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/app/statechart/TLSelectTool/TLSelectTool.mjs
-+++ b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/app/statechart/TLSelectTool/TLSelectTool.mjs
+--- a/node_modules/@tldraw/editor/dist/esm/lib/app/statechart/TLSelectTool/TLSelectTool.mjs
++++ b/node_modules/@tldraw/editor/dist/esm/lib/app/statechart/TLSelectTool/TLSelectTool.mjs
 @@ -40,6 +40,7 @@ class TLSelectTool extends StateNode {
    };
  }
@@ -151,10 +151,10 @@ index 185d39d..f19078a 100644
 +  DraggingHandle,
  };
  //# sourceMappingURL=TLSelectTool.mjs.map
-diff --git a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/components/ErrorBoundary/ErrorFallback.mjs b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/components/ErrorBoundary/ErrorFallback.mjs
+diff --git a/node_modules/@tldraw/editor/dist/esm/lib/components/ErrorBoundary/ErrorFallback.mjs b/node_modules/@tldraw/editor/dist/esm/lib/components/ErrorBoundary/ErrorFallback.mjs
 index 3a679a0..60332e1 100644
---- a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/components/ErrorBoundary/ErrorFallback.mjs
-+++ b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/components/ErrorBoundary/ErrorFallback.mjs
+--- a/node_modules/@tldraw/editor/dist/esm/lib/components/ErrorBoundary/ErrorFallback.mjs
++++ b/node_modules/@tldraw/editor/dist/esm/lib/components/ErrorBoundary/ErrorFallback.mjs
 @@ -15,6 +15,20 @@ function ErrorFallback({ error, app }) {
    const [shouldShowResetConfirmation, setShouldShowResetConfirmation] = useState(false);
    const errorMessage = error instanceof Error ? error.message : String(error);
@@ -176,10 +176,10 @@ index 3a679a0..60332e1 100644
    const isDarkModeFromApp = useValue(
      "isDarkMode",
      () => {
-diff --git a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/hooks/useCanvasEvents.mjs b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/hooks/useCanvasEvents.mjs
+diff --git a/node_modules/@tldraw/editor/dist/esm/lib/hooks/useCanvasEvents.mjs b/node_modules/@tldraw/editor/dist/esm/lib/hooks/useCanvasEvents.mjs
 index 043e7c0..f480bc6 100644
---- a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/hooks/useCanvasEvents.mjs
-+++ b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/hooks/useCanvasEvents.mjs
+--- a/node_modules/@tldraw/editor/dist/esm/lib/hooks/useCanvasEvents.mjs
++++ b/node_modules/@tldraw/editor/dist/esm/lib/hooks/useCanvasEvents.mjs
 @@ -78,7 +78,7 @@ function useCanvasEvents() {
          ;
          e.isKilled = true;
@@ -189,10 +189,10 @@ index 043e7c0..f480bc6 100644
        }
        function onTouchEnd(e) {
          ;
-diff --git a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/index.mjs b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/index.mjs
+diff --git a/node_modules/@tldraw/editor/dist/esm/lib/index.mjs b/node_modules/@tldraw/editor/dist/esm/lib/index.mjs
 index 57cb723..4be6ebd 100644
---- a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/index.mjs
-+++ b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/index.mjs
+--- a/node_modules/@tldraw/editor/dist/esm/lib/index.mjs
++++ b/node_modules/@tldraw/editor/dist/esm/lib/index.mjs
 @@ -3,6 +3,8 @@ export * from "./app/App.mjs";
  export * from "./app/shapeutils/index.mjs";
  export * from "./app/statechart/StateNode.mjs";
@@ -202,10 +202,10 @@ index 57cb723..4be6ebd 100644
  export * from "./app/types/clipboard-types.mjs";
  export * from "./app/types/event-types.mjs";
  export * from "./app/types/history-types.mjs";
-diff --git a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/utils/assets.mjs b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/utils/assets.mjs
+diff --git a/node_modules/@tldraw/editor/dist/esm/lib/utils/assets.mjs b/node_modules/@tldraw/editor/dist/esm/lib/utils/assets.mjs
 index bc63c45..221a390 100644
---- a/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/utils/assets.mjs
-+++ b/node_modules/@tldraw/tldraw/node_modules/@tldraw/editor/dist/esm/lib/utils/assets.mjs
+--- a/node_modules/@tldraw/editor/dist/esm/lib/utils/assets.mjs
++++ b/node_modules/@tldraw/editor/dist/esm/lib/utils/assets.mjs
 @@ -54,41 +54,70 @@ async function getResizedImageDataUrl(dataURLForImage, width, height) {
      img.src = dataURLForImage;
    });

apps/roam/patches/@playwright+test+1.29.0.patch

@@ -1,7 +1,7 @@
-diff --git a/node_modules/@tldraw/tldraw/node_modules/@tldraw/ui/dist/cjs/index.d.ts b/node_modules/@tldraw/tldraw/node_modules/@tldraw/ui/dist/cjs/index.d.ts
+diff --git a/node_modules/@tldraw/ui/dist/cjs/index.d.ts b/node_modules/@tldraw/ui/dist/cjs/index.d.ts
 index 0f93cb5..0e42591 100644
---- a/node_modules/@tldraw/tldraw/node_modules/@tldraw/ui/dist/cjs/index.d.ts
-+++ b/node_modules/@tldraw/tldraw/node_modules/@tldraw/ui/dist/cjs/index.d.ts
+--- a/node_modules/@tldraw/ui/dist/cjs/index.d.ts
++++ b/node_modules/@tldraw/ui/dist/cjs/index.d.ts
 @@ -737,6 +737,7 @@ export declare interface ToolItem {
      meta?: {
          [key: string]: any;
@@ -10,10 +10,10 @@ index 0f93cb5..0e42591 100644
  }
 
  /** @public */
-diff --git a/node_modules/@tldraw/tldraw/node_modules/@tldraw/ui/dist/esm/lib/components/Toolbar/Toolbar.mjs b/node_modules/@tldraw/tldraw/node_modules/@tldraw/ui/dist/esm/lib/components/Toolbar/Toolbar.mjs
+diff --git a/node_modules/@tldraw/ui/dist/esm/lib/components/Toolbar/Toolbar.mjs b/node_modules/@tldraw/ui/dist/esm/lib/components/Toolbar/Toolbar.mjs
 index 8c9610d..03a9b7c 100644
---- a/node_modules/@tldraw/tldraw/node_modules/@tldraw/ui/dist/esm/lib/components/Toolbar/Toolbar.mjs
-+++ b/node_modules/@tldraw/tldraw/node_modules/@tldraw/ui/dist/esm/lib/components/Toolbar/Toolbar.mjs
+--- a/node_modules/@tldraw/ui/dist/esm/lib/components/Toolbar/Toolbar.mjs
++++ b/node_modules/@tldraw/ui/dist/esm/lib/components/Toolbar/Toolbar.mjs
 @@ -151,7 +151,7 @@ const OverflowToolsContent = track(function OverflowToolsContent2({
    toolbarItems
  }) {

apps/roam/patches/@tldraw+tldraw++@tldraw+editor+2.0.0-canary.ffda4cfb.patch renamed to apps/roam/patches/@tldraw+editor+2.0.0-canary.ffda4cfb.patch

@@ -10,7 +10,7 @@ const Page = async ({ params }: { params: Promise<{ slug: string }> }) => {
   const { slug } = await params;
   const directory = docMap[slug] ?? docMap.default;
 
-  return <DocsPage params={Promise.resolve({ slug })} directory={directory} />;
+  return await DocsPage({ params: Promise.resolve({ slug }), directory });
 };
 
 export default Page;

apps/roam/patches/@tldraw+tldraw++@tldraw+ui+2.0.0-canary.ffda4cfb.patch renamed to apps/roam/patches/@tldraw+ui+2.0.0-canary.ffda4cfb.patch

@@ -16,16 +16,18 @@ const Page = async ({ params }: Params) => {
   const { slug } = await params;
   const directory = docMap[slug] ?? docMap.default;
 
-  return <DocsPage params={Promise.resolve({ slug })} directory={directory} />;
+  return await DocsPage({ params: Promise.resolve({ slug }), directory });
 };
 
 export default Page;
 
 export const generateStaticParams = () =>
   generateDocsStaticParams(docMap.default);
 
-export async function generateMetadata({ params }: Params): Promise<Metadata> {
+export const generateMetadata = async ({
+  params,
+}: Params): Promise<Metadata> => {
   const { slug } = await params;
   const directory = docMap[slug] ?? docMap.default;
   return generateDocsMetadata({ params: Promise.resolve({ slug }), directory });
-}
+};

apps/website/app/(docs)/docs/obsidian/[slug]/page.tsx

@@ -1,10 +1,11 @@
 "use client";
 
+import dynamic from "next/dynamic";
 import { usePathname, useSearchParams } from "next/navigation";
-import { useEffect, Suspense } from "react";
+import { useEffect } from "react";
 import { usePostHog } from "posthog-js/react";
 
-function PostHogPageView() {
+const PostHogPageViewInner = () => {
   const pathname = usePathname();
   const searchParams = useSearchParams();
   const posthog = usePostHog();
@@ -22,12 +23,11 @@ function PostHogPageView() {
   }, [pathname, searchParams, posthog]);
 
   return null;
-}
+};
 
-export default function SuspendedPostHogPageView() {
-  return (
-    <Suspense fallback={null}>
-      <PostHogPageView />
-    </Suspense>
-  );
-}
+// Use dynamic import to ensure this only runs on the client
+const PostHogPageView = dynamic(() => Promise.resolve(PostHogPageViewInner), {
+  ssr: false,
+});
+
+export default PostHogPageView;

apps/website/app/(docs)/docs/roam/[slug]/page.tsx

@@ -18,10 +18,10 @@
     "@sindresorhus/slugify": "^2.2.1",
     "@supabase/ssr": "^0.6.1",
     "gray-matter": "^4.0.3",
-    "next": "^15.0.3",
+    "next": "^15",
     "openai": "^4.98.0",
-    "react": "19.0.0-rc-66855b96-20241106",
-    "react-dom": "19.0.0-rc-66855b96-20241106",
+    "react": "^19",
+    "react-dom": "^19",
     "rehype-parse": "^9.0.1",
     "rehype-stringify": "^10.0.1",
     "remark": "^15.0.1",
@@ -37,8 +37,8 @@
     "@repo/typescript-config": "*",
     "@tailwindcss/typography": "^0.5.15",
     "@types/node": "^20",
-    "@types/react": "^18",
-    "@types/react-dom": "^18",
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
     "autoprefixer": "^10.4.20",
     "postcss": "^8.4.49",
     "tailwindcss": "^3.4.16",

apps/website/app/PostHogPageView.tsx

@@ -0,0 +1,13 @@
+# Remove all node_modules folders recursively
+Get-ChildItem -Path . -Directory -Recurse -Force -Filter "node_modules" | ForEach-Object {
+    Remove-Item -Path $_.FullName -Recurse -Force -ErrorAction SilentlyContinue
+}
+Write-Host "Removed all node_modules folders recursively"
+
+# Remove the package-lock.json file in the root directory
+Remove-Item -Path .\package-lock.json -Force -ErrorAction SilentlyContinue
+Write-Host "Removed package-lock.json"
+
+# Run npm install
+npm install
+Write-Host "Installed dependencies"