@marimo-team/frontend 0.22.1-dev21 → 0.22.1-dev25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/frontend",
-  "version": "0.22.1-dev21",
+  "version": "0.22.1-dev25",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -66,30 +66,7 @@
     "@open-rpc/client-js": "^1.8.1",
     "@paralleldrive/cuid2": "^2.3.1",
     "@radix-ui/colors": "^3.0.0",
-    "@radix-ui/primitive": "~1.1.3",
-    "@radix-ui/react-accordion": "~1.2.12",
-    "@radix-ui/react-alert-dialog": "~1.1.15",
-    "@radix-ui/react-checkbox": "~1.3.3",
-    "@radix-ui/react-compose-refs": "~1.1.2",
-    "@radix-ui/react-context-menu": "~2.2.16",
-    "@radix-ui/react-dialog": "~1.1.15",
-    "@radix-ui/react-dropdown-menu": "~2.1.16",
     "@radix-ui/react-icons": "~1.3.2",
-    "@radix-ui/react-label": "~2.1.8",
-    "@radix-ui/react-navigation-menu": "~1.2.14",
-    "@radix-ui/react-popover": "~1.1.15",
-    "@radix-ui/react-progress": "~1.1.8",
-    "@radix-ui/react-radio-group": "~1.3.8",
-    "@radix-ui/react-scroll-area": "^1.2.10",
-    "@radix-ui/react-select": "~2.2.6",
-    "@radix-ui/react-slider": "~1.3.6",
-    "@radix-ui/react-slot": "~1.2.4",
-    "@radix-ui/react-switch": "~1.2.6",
-    "@radix-ui/react-tabs": "~1.1.13",
-    "@radix-ui/react-toast": "~1.2.15",
-    "@radix-ui/react-toggle": "~1.1.10",
-    "@radix-ui/react-tooltip": "~1.2.8",
-    "@radix-ui/react-use-callback-ref": "~1.1.1",
     "@radix-ui/react-use-controllable-state": "~1.2.2",
     "@replit/codemirror-vim": "^6.3.0",
     "@streamdown/math": "^1.0.1",
@@ -126,7 +103,6 @@
     "dequal": "^2.0.3",
     "dnd-core": "^16.0.1",
     "dompurify": "^3.3.1",
-    "eslint-plugin-header": "^3.1.1",
     "htm": "^3.1.1",
     "html-react-parser": "^5.2.14",
     "html-to-image": "1.11.13",
@@ -183,7 +159,8 @@
     "vscode-jsonrpc": "^8.2.1",
     "vscode-languageserver-protocol": "^3.17.5",
     "web-vitals": "^4.2.4",
-    "zod": "^4.3.6"
+    "zod": "^4.3.6",
+    "radix-ui": "1.4.3"
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -194,9 +171,10 @@
     "build": "cross-env vite build",
     "test": "vitest",
     "typecheck": "tsgo",
-    "lint": "run-s lint:biome lint:eslint lint:stylelint",
-    "lint:biome": "biome lint --diagnostic-level=warn --write .",
-    "lint:eslint": "cross-env TIMING=1 eslint src e2e-tests --fix",
+    "format": "oxfmt --config ../.oxfmtrc.json src",
+    "format:check": "oxfmt --config ../.oxfmtrc.json --check src",
+    "lint": "run-s lint:oxlint lint:stylelint",
+    "lint:oxlint": "oxlint --fix src",
     "lint:stylelint": "stylelint src/**/*.css --fix",
     "preview": "vite preview",
     "dev:quarto": "VITE_MARIMO_ISLANDS=true vite",
@@ -213,7 +191,6 @@
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "^7.28.6",
     "@babel/preset-typescript": "^7.25.9",
-    "@biomejs/biome": "2.3.13",
     "@codecov/vite-plugin": "^1.9.1",
     "@csstools/postcss-light-dark-function": "^2.0.11",
     "@playwright/test": "^1.58.2",
@@ -231,24 +208,15 @@
     "@types/react": "^19.2.10",
     "@types/react-dom": "^19.2.3",
     "@types/timestring": "^6.0.5",
-    "@typescript-eslint/eslint-plugin": "^7.15.0",
-    "@typescript-eslint/parser": "^7.15.0",
     "@vitejs/plugin-react": "^5.1.4",
     "babel-plugin-react-compiler": "19.1.0-rc.3",
     "blob-polyfill": "^7.0.20220408",
     "cross-env": "^7.0.3",
-    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-react": "^7.34.3",
-    "eslint-plugin-react-hooks": "^6.0.0-rc.1",
-    "eslint-plugin-react-you-might-not-need-an-effect": "^0.5.1",
-    "eslint-plugin-ssr-friendly": "^1.3.0",
-    "eslint-plugin-storybook": "^9.0.14",
-    "eslint-plugin-unicorn": "^54.0.0",
-    "eslint-plugin-vitest": "^0.4.1",
     "jsdom": "^24.1.3",
     "msw": "^2.12.7",
     "npm-run-all2": "^6.2.6",
+    "oxfmt": "^0.42.0",
+    "oxlint": "^1.57.0",
     "postcss": "^8.5.6",
     "postcss-plugin-namespace": "^0.0.3",
     "react": "^19.2.4",

package/src/components/data-table/charts/components/chart-items.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as SelectPrimitive from "@radix-ui/react-select";
 import { ChevronDown } from "lucide-react";
+import { Select as SelectPrimitive } from "radix-ui";
 import React from "react";
 import { useFormContext, useWatch } from "react-hook-form";
 import type { z } from "zod";

package/src/components/data-table/columns.tsx

@@ -1,7 +1,10 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 "use no memo";
 
-import { PopoverClose } from "@radix-ui/react-popover";
+import { Popover as PopoverPrimitive } from "radix-ui";
+
+const PopoverClose = PopoverPrimitive.Close;
+
 import type { Column, ColumnDef } from "@tanstack/react-table";
 import { formatDate, isValid } from "date-fns";
 import { useLocale, useNumberFormatter } from "react-aria";

package/src/components/editor/chrome/components/contribute-snippet-button.tsx

@@ -1,6 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { Slot } from "@radix-ui/react-slot";
+import { Slot as SlotPrimitive } from "radix-ui";
+
+const Slot = SlotPrimitive.Slot;
+
 import React, { type PropsWithChildren } from "react";
 import { useImperativeModal } from "@/components/modal/ImperativeModal";
 import { Button } from "@/components/ui/button";

package/src/components/editor/chrome/components/feedback-button.tsx

@@ -1,6 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { Slot } from "@radix-ui/react-slot";
+import { Slot as SlotPrimitive } from "radix-ui";
+
+const Slot = SlotPrimitive.Slot;
+
 import React, { type PropsWithChildren } from "react";
 import { useImperativeModal } from "@/components/modal/ImperativeModal";
 import {

package/src/components/editor/chrome/wrapper/app-chrome.tsx

@@ -14,7 +14,10 @@ import {
 import { Footer } from "./footer";
 import { Sidebar } from "./sidebar";
 import "./app-chrome.css";
-import { TooltipProvider } from "@radix-ui/react-tooltip";
+import { Tooltip } from "radix-ui";
+
+const TooltipProvider = Tooltip.Provider;
+
 import { useAtom, useAtomValue } from "jotai";
 import { XIcon } from "lucide-react";
 import useEvent from "react-use-event-hook";

package/src/components/editor/header/filename-input.tsx

@@ -1,6 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { PopoverAnchor } from "@radix-ui/react-popover";
+import { Popover as PopoverPrimitive } from "radix-ui";
+
+const PopoverAnchor = PopoverPrimitive.Anchor;
+
 import { FilePenIcon } from "lucide-react";
 import { type JSX, useEffect, useRef, useState } from "react";
 import {

package/src/components/ui/accordion.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as AccordionPrimitive from "@radix-ui/react-accordion";
 import { ChevronDown } from "lucide-react";
+import { Accordion as AccordionPrimitive } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/alert-dialog.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog";
+import { AlertDialog as AlertDialogPrimitive } from "radix-ui";
 import * as React from "react";
 import { buttonVariants } from "@/components/ui/button";
 import { StyleNamespace } from "@/theme/namespace";

package/src/components/ui/button.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { Slot } from "@radix-ui/react-slot";
 import { cva, type VariantProps } from "class-variance-authority";
+import { Slot as SlotPrimitive } from "radix-ui";
 import * as React from "react";
 import { parseShortcut } from "@/core/hotkeys/shortcuts";
 import { useEventListener } from "@/hooks/useEventListener";
@@ -135,7 +135,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
 
     useEventListener(document, "keydown", handleKeyPress);
 
-    const Comp = asChild ? Slot : "button";
+    const Comp = asChild ? SlotPrimitive.Slot : "button";
     return (
       <Comp
         className={cn(

package/src/components/ui/checkbox.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as CheckboxPrimitive from "@radix-ui/react-checkbox";
 import { Check } from "lucide-react";
+import { Checkbox as CheckboxPrimitive } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/command.tsx

@@ -1,6 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type { DialogProps } from "@radix-ui/react-dialog";
+import type { Dialog as DialogPrimitive } from "radix-ui";
+
+type DialogProps = DialogPrimitive.DialogProps;
+
 import type { VariantProps } from "class-variance-authority";
 import { Command as CommandPrimitive } from "cmdk";
 import { Search } from "lucide-react";

package/src/components/ui/context-menu.tsx

@@ -1,12 +1,12 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as ContextMenuPrimitive from "@radix-ui/react-context-menu";
 import {
   CheckIcon,
   ChevronRightIcon,
   DotFilledIcon,
 } from "@radix-ui/react-icons";
 import type { VariantProps } from "class-variance-authority";
+import { ContextMenu as ContextMenuPrimitive } from "radix-ui";
 import * as React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/components/ui/dialog.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as DialogPrimitive from "@radix-ui/react-dialog";
 import { X } from "lucide-react";
+import { Dialog as DialogPrimitive } from "radix-ui";
 import * as React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/components/ui/draggable-popover.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type * as PopoverPrimitive from "@radix-ui/react-popover";
 import { GripHorizontalIcon } from "lucide-react";
+import type { Popover as PopoverPrimitive } from "radix-ui";
 import { useRef, useState } from "react";
 import { Popover, PopoverContent, PopoverTrigger } from "./popover";
 

package/src/components/ui/dropdown-menu.tsx

@@ -1,7 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
-import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+
 import type { VariantProps } from "class-variance-authority";
 import { Check, ChevronRight, Circle } from "lucide-react";
+import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
 import React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/components/ui/form.tsx

@@ -1,8 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type * as LabelPrimitive from "@radix-ui/react-label";
-import { Slot } from "@radix-ui/react-slot";
 import { AlertCircleIcon } from "lucide-react";
+import { type Label as LabelPrimitive, Slot as SlotPrimitive } from "radix-ui";
 import * as React from "react";
 import {
   Controller,
@@ -130,14 +129,14 @@ const FormLabel = React.forwardRef<
 FormLabel.displayName = "FormLabel";
 
 const FormControl = React.forwardRef<
-  React.ElementRef<typeof Slot>,
-  React.ComponentPropsWithoutRef<typeof Slot>
+  React.ElementRef<typeof SlotPrimitive.Slot>,
+  React.ComponentPropsWithoutRef<typeof SlotPrimitive.Slot>
 >(({ ...props }, ref) => {
   const { error, formItemId, formDescriptionId, formMessageId } =
     useFormField();
 
   return (
-    <Slot
+    <SlotPrimitive.Slot
       ref={ref}
       id={formItemId}
       aria-describedby={

package/src/components/ui/fullscreen.tsx

@@ -1,6 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type { PopoverContentProps } from "@radix-ui/react-popover";
+import type { Popover } from "radix-ui";
+
+type PopoverContentProps = Popover.PopoverContentProps;
+
 import React, { useState } from "react";
 import { isInVscodeExtension } from "@/core/vscode/is-in-vscode";
 import { useEventListener } from "@/hooks/useEventListener";

package/src/components/ui/label.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as LabelPrimitive from "@radix-ui/react-label";
 import { cva, type VariantProps } from "class-variance-authority";
+import { Label as LabelPrimitive } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/navigation.tsx

@@ -1,8 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { ChevronDownIcon } from "@radix-ui/react-icons";
-import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu";
 import { cva, type VariantProps } from "class-variance-authority";
+import { NavigationMenu as NavigationMenuPrimitive } from "radix-ui";
 import * as React from "react";
 import { cn } from "@/utils/cn";
 

package/src/components/ui/popover.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as PopoverPrimitive from "@radix-ui/react-popover";
+import { Popover as PopoverPrimitive } from "radix-ui";
 import * as React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/components/ui/progress.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as ProgressPrimitive from "@radix-ui/react-progress";
+import { Progress as ProgressPrimitive } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/radio-group.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as RadioGroupPrimitive from "@radix-ui/react-radio-group";
 import { Circle } from "lucide-react";
+import { RadioGroup as RadioGroupPrimitive } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/range-slider.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as SliderPrimitive from "@radix-ui/react-slider";
+import { Slider as SliderPrimitive } from "radix-ui";
 import * as React from "react";
 import { useLocale } from "react-aria";
 import { cn } from "@/utils/cn";

package/src/components/ui/scroll-area.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area";
+import { ScrollArea as ScrollAreaPrimitive } from "radix-ui";
 import * as React from "react";
 import { cn } from "@/utils/cn";
 

package/src/components/ui/select.tsx

@@ -1,6 +1,5 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as SelectPrimitive from "@radix-ui/react-select";
 import type { VariantProps } from "class-variance-authority";
 import {
   CheckIcon,
@@ -9,6 +8,7 @@ import {
   ChevronUpIcon,
   XIcon,
 } from "lucide-react";
+import { Select as SelectPrimitive } from "radix-ui";
 import * as React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/components/ui/sheet.tsx

@@ -1,8 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as SheetPrimitive from "@radix-ui/react-dialog";
 import { Cross2Icon } from "@radix-ui/react-icons";
 import { cva, type VariantProps } from "class-variance-authority";
+import { Dialog as SheetPrimitive } from "radix-ui";
 import React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/components/ui/slider.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as SliderPrimitive from "@radix-ui/react-slider";
+import { Slider as SliderPrimitive } from "radix-ui";
 import * as React from "react";
 import { useLocale } from "react-aria";
 import { cn } from "@/utils/cn";

package/src/components/ui/switch.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as SwitchPrimitives from "@radix-ui/react-switch";
 import { cva, type VariantProps } from "class-variance-authority";
+import { Switch as SwitchPrimitives } from "radix-ui";
 import * as React from "react";
 import { cn } from "@/utils/cn";
 

package/src/components/ui/tabs.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as TabsPrimitive from "@radix-ui/react-tabs";
+import { Tabs as TabsPrimitive } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/toast.tsx

@@ -1,8 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as ToastPrimitives from "@radix-ui/react-toast";
 import { cva, type VariantProps } from "class-variance-authority";
 import { X } from "lucide-react";
+import { Toast as ToastPrimitives } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/toggle.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as TogglePrimitive from "@radix-ui/react-toggle";
 import { cva, type VariantProps } from "class-variance-authority";
+import { Toggle as TogglePrimitive } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/tooltip.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as TooltipPrimitive from "@radix-ui/react-tooltip";
+import { Tooltip as TooltipPrimitive } from "radix-ui";
 import * as React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/core/cells/logs.ts

@@ -98,7 +98,7 @@ const CellLogLogger = {
           ? "red"
           : "orange";
     const status = payload.level.toUpperCase();
-    /** biome-ignore lint/suspicious/noConsole: for debugging */
+    // oxlint-disable-next-line no-console -- intentional debug logging
     console.log(
       `%c[${status}]`,
       `color:${color}; padding:2px 0; border-radius:2px; font-weight:bold`,

package/src/core/codemirror/copilot/transport.ts

@@ -169,8 +169,7 @@ export class LazyWebsocketTransport extends Transport {
           // Show error toast on final retry
           this.options.showError(
             "GitHub Copilot Connection Error",
-            "Failed to connect to GitHub Copilot. Please check your settings and try again.\n\n" +
-              prettyError(error),
+            `Failed to connect to GitHub Copilot. Please check your settings and try again.\n\n${prettyError(error)}`,
           );
           throw error;
         }

package/src/core/codemirror/language/languages/python.ts

@@ -45,6 +45,7 @@ import type { LanguageAdapter } from "../types";
 
 const pylspClient = once((lspConfig: LSPConfig) => {
   // Create a mutable reference for the resync callback
+  // oxlint-disable-next-line prefer-const -- reassigned after closure capture
   let resyncCallback: (() => Promise<void>) | undefined;
 
   const transport = createTransport("pylsp", async () => {
@@ -151,6 +152,7 @@ const pylspClient = once((lspConfig: LSPConfig) => {
 });
 
 const tyLspClient = once((_: LSPConfig) => {
+  // oxlint-disable-next-line prefer-const -- reassigned after closure capture
   let resyncCallback: (() => Promise<void>) | undefined;
 
   const transport = createTransport("ty", async () => {
@@ -181,7 +183,8 @@ const tyLspClient = once((_: LSPConfig) => {
 
 const pyreflyClient = once(
   (lspConfig: LSPConfig & { diagnostics: DiagnosticsConfig }) => {
-    let resyncCallback: (() => Promise<void>) | undefined;
+    // oxlint-disable-next-line prefer-const -- reassigned after closure capture
+  let resyncCallback: (() => Promise<void>) | undefined;
 
     const transport = createTransport("pyrefly", async () => {
       await resyncCallback?.();
@@ -218,6 +221,7 @@ const pyreflyClient = once(
 );
 
 const pyrightClient = once((_: LSPConfig) => {
+  // oxlint-disable-next-line prefer-const -- reassigned after closure capture
   let resyncCallback: (() => Promise<void>) | undefined;
 
   const transport = createTransport("basedpyright", async () => {

package/src/core/codemirror/language/panel/sql.tsx

@@ -1,6 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type { SelectTriggerProps } from "@radix-ui/react-select";
+import type { Select as SelectPrimitive } from "radix-ui";
+
+type SelectTriggerProps = SelectPrimitive.SelectTriggerProps;
+
 import { useAtomValue } from "jotai";
 import {
   AlertCircle,

package/src/core/edit-app.tsx

@@ -1,7 +1,10 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { usePrevious } from "@dnd-kit/utilities";
-import { TooltipProvider } from "@radix-ui/react-tooltip";
+import { Tooltip } from "radix-ui";
+
+const TooltipProvider = Tooltip.Provider;
+
 import { useAtomValue, useSetAtom } from "jotai";
 import { useEffect } from "react";
 import { NotStartedConnectionAlert } from "@/components/editor/alerts/connecting-alert";

package/src/plugins/core/BadPlugin.tsx

@@ -1,11 +1,12 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
-} from "@radix-ui/react-accordion";
+import { Accordion as AccordionPrimitive } from "radix-ui";
+
+const Accordion = AccordionPrimitive.Root;
+const AccordionContent = AccordionPrimitive.Content;
+const AccordionItem = AccordionPrimitive.Item;
+const AccordionTrigger = AccordionPrimitive.Trigger;
+
 import type { JSX } from "react";
 import { ZodError } from "zod";
 import { EmotionCacheProvider } from "@/components/editor/output/EmotionCacheProvider";

package/src/plugins/impl/CheckboxPlugin.tsx

@@ -1,6 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type { CheckedState } from "@radix-ui/react-checkbox";
+import type { Checkbox as CheckboxPrimitive } from "radix-ui";
+
+type CheckedState = CheckboxPrimitive.CheckedState;
+
 import { type JSX, useId } from "react";
 import { z } from "zod";
 import { Checkbox } from "../../components/ui/checkbox";

package/src/plugins/impl/DataEditorPlugin.tsx

@@ -1,7 +1,10 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import glideCss from "@glideapps/glide-data-grid/dist/index.css?inline";
-import { TooltipProvider } from "@radix-ui/react-tooltip";
+import { Tooltip } from "radix-ui";
+
+const TooltipProvider = Tooltip.Provider;
+
 import React, { useState } from "react";
 import { z } from "zod";
 import { inferFieldTypes } from "@/components/data-table/columns";

package/src/plugins/impl/DataTablePlugin.tsx

@@ -1,7 +1,10 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { Provider as SlotzProvider } from "@marimo-team/react-slotz";
-import { TooltipProvider } from "@radix-ui/react-tooltip";
+import { Tooltip } from "radix-ui";
+
+const TooltipProvider = Tooltip.Provider;
+
 import type {
   ColumnFiltersState,
   OnChangeFn,

package/src/plugins/impl/__tests__/DataTablePlugin.test.tsx

@@ -1,6 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { TooltipProvider } from "@radix-ui/react-tooltip";
+import { Tooltip } from "radix-ui";
+
+const TooltipProvider = Tooltip.Provider;
+
 import { act, render, screen, waitFor } from "@testing-library/react";
 import { Provider } from "jotai";
 import { beforeAll, describe, expect, it, vi } from "vitest";