Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

refactor(web): Enforce design-system structure via eslint (#17481)

Ben Bachem843a554f282d
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 84ad401073..f247d8d6db 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,5 +5,10 @@
/web/src/components/design-system/ @bezbac
/web/.storybook/ @bezbac
+# ESLint
+/packages/config-eslint/ @bezbac
+/packages/eslint-plugin/ @bezbac
+**/eslint.config.mjs @bezbac
+
# Skills for langfuse assistant
/packages/langfuse-skills/ @LysanderKie @bezbac
diff --git a/packages/eslint-plugin/src/index.ts b/packages/eslint-plugin/src/index.ts
index c963a08cf7..d8289e973c 100644
--- a/packages/eslint-plugin/src/index.ts
+++ b/packages/eslint-plugin/src/index.ts
@@ -1,4 +1,5 @@
import { default as noTailwindOverflowScroll } from "./rules/no-tailwind-overflow-scroll.js";
+import { default as filenameMatchesExport } from "./rules/filename-matches-export.js";
import { default as noArbitraryColors } from "./rules/no-arbitrary-colors.js";
import { default as noAbstractedOverlayTrigger } from "./rules/no-abstracted-overlay-trigger.js";
import { default as noInSourceVitest } from "./rules/no-in-source-vitest.js";
@@ -14,6 +15,7 @@ import { default as storybookPlayRequiresTestName } from "./rules/storybook-play
const plugin = {
rules: {
+ "filename-matches-export": filenameMatchesExport,
"no-abstracted-overlay-trigger": noAbstractedOverlayTrigger,
"no-arbitrary-colors": noArbitraryColors,
"no-in-source-vitest": noInSourceVitest,
diff --git a/packages/eslint-plugin/src/rules/filename-matches-export.test.ts b/packages/eslint-plugin/src/rules/filename-matches-export.test.ts
new file mode 100644
index 0000000000..4eab0f9d35
--- /dev/null
+++ b/packages/eslint-plugin/src/rules/filename-matches-export.test.ts
@@ -0,0 +1,112 @@
+import { RuleTester } from "@typescript-eslint/rule-tester";
+import * as typescriptEslintParser from "@typescript-eslint/parser";
+
+import rule from "./filename-matches-export.js";
+
+const ruleTester = new RuleTester({
+ languageOptions: {
+ parser: typescriptEslintParser,
+ parserOptions: {
+ ecmaVersion: 2022,
+ sourceType: "module",
+ ecmaFeatures: { jsx: true },
+ },
+ },
+});
+
+ruleTester.run("filename-matches-export", rule, {
+ valid: [
+ {
+ code: `export function Button() { return null; }`,
+ filename: "/repo/Button.tsx",
+ },
+ {
+ code: `const Button = () => null; export { Button };`,
+ filename: "/repo/Button.tsx",
+ },
+ {
+ code: `function Button() { return null; } export default Button;`,
+ filename: "/repo/Button.tsx",
+ },
+ {
+ code: `export default function Button() { return null; }`,
+ filename: "/repo/Button.tsx",
+ },
+ {
+ code: `const InternalButton = () => null; export { InternalButton as Button };`,
+ filename: "/repo/Button.tsx",
+ },
+ {
+ code: `const InternalButton = () => null; export { InternalButton as "Button" };`,
+ filename: "/repo/Button.tsx",
+ },
+ {
+ code: `export const Button = () => null; export const ButtonShell = () => null;`,
+ filename: "/repo/Button.tsx",
+ },
+ {
+ code: `export class Button {}`,
+ filename: "/repo/Button.tsx",
+ },
+ {
+ code: `export enum Button { Primary }`,
+ filename: "/repo/Button.tsx",
+ },
+ {
+ code: `export default class Button {}`,
+ filename: "/repo/Button.tsx",
+ },
+ ],
+ invalid: [
+ {
+ code: `export function Button() { return null; }`,
+ filename: "/repo/Link.tsx",
+ errors: [{ messageId: "missing" }],
+ },
+ {
+ code: `export type Button = { label: string };`,
+ filename: "/repo/Button.tsx",
+ errors: [{ messageId: "missing" }],
+ },
+ {
+ code: `export default function () { return null; }`,
+ filename: "/repo/Button.tsx",
+ errors: [{ messageId: "missing" }],
+ },
+ {
+ code: `const Button = () => null; export type { Button };`,
+ filename: "/repo/Button.tsx",
+ errors: [{ messageId: "missing" }],
+ },
+ {
+ code: `export interface Button { label: string }`,
+ filename: "/repo/Button.tsx",
+ errors: [{ messageId: "missing" }],
+ },
+ {
+ code: `export const { Button } = components;`,
+ filename: "/repo/Button.tsx",
+ errors: [{ messageId: "missing" }],
+ },
+ {
+ code: `export default createButton();`,
+ filename: "/repo/Button.tsx",
+ errors: [{ messageId: "missing" }],
+ },
+ {
+ code: `export declare function Button(): void;`,
+ filename: "/repo/Button.tsx",
+ errors: [{ messageId: "missing" }],
+ },
+ {
+ code: `export namespace Internal { export const value = 1; }`,
+ filename: "/repo/Button.tsx",
+ errors: [{ messageId: "missing" }],
+ },
+ {
+ code: `type Button = {}; const Link = () => null; export { type Button, Link };`,
+ filename: "/repo/Button.tsx",
+ errors: [{ messageId: "missing" }],
+ },
+ ],
+});
diff --git a/packages/eslint-plugin/src/rules/filename-matches-export.ts b/packages/eslint-plugin/src/rules/filename-matches-export.ts
new file mode 100644
index 0000000000..61212bd9dc
--- /dev/null
+++ b/packages/eslint-plugin/src/rules/filename-matches-export.ts
@@ -0,0 +1,99 @@
+import { basename, extname } from "node:path";
+import { AST_NODE_TYPES, type TSESTree } from "@typescript-eslint/utils";
+
+import { createRule } from "../util.js";
+
+function getDeclarationNames(
+ declaration: TSESTree.NamedExportDeclarations,
+): string[] {
+ if (declaration.type === AST_NODE_TYPES.VariableDeclaration) {
+ return declaration.declarations.flatMap(({ id }) =>
+ id.type === AST_NODE_TYPES.Identifier ? [id.name] : [],
+ );
+ }
+
+ if (
+ declaration.type === AST_NODE_TYPES.FunctionDeclaration ||
+ declaration.type === AST_NODE_TYPES.ClassDeclaration ||
+ declaration.type === AST_NODE_TYPES.TSEnumDeclaration
+ ) {
+ // Named export declarations cannot be anonymous.
+ return [declaration.id!.name];
+ }
+
+ return [];
+}
+
+function getDefaultExportName(
+ declaration: TSESTree.ExportDefaultDeclaration["declaration"],
+) {
+ if (declaration.type === AST_NODE_TYPES.Identifier) return declaration.name;
+
+ if (
+ declaration.type === AST_NODE_TYPES.FunctionDeclaration ||
+ declaration.type === AST_NODE_TYPES.ClassDeclaration
+ ) {
+ return declaration.id?.name;
+ }
+
+ return undefined;
+}
+
+const rule = createRule({
+ name: "filename-matches-export",
+ meta: {
+ type: "suggestion",
+ docs: {
+ description:
+ "Require a file to have a runtime export matching its filename.",
+ },
+ messages: {
+ missing:
+ 'File "{{ filename }}" must export a runtime value named "{{ expected }}".',
+ },
+ schema: [],
+ },
+ defaultOptions: [],
+ create(context) {
+ return {
+ Program(node) {
+ const filename = basename(context.filename);
+ const expected = basename(filename, extname(filename));
+ const exportedNames = node.body.flatMap((statement) => {
+ if (statement.type === AST_NODE_TYPES.ExportDefaultDeclaration) {
+ const name = getDefaultExportName(statement.declaration);
+ return name ? [name] : [];
+ }
+
+ if (
+ statement.type !== AST_NODE_TYPES.ExportNamedDeclaration ||
+ statement.exportKind === "type"
+ ) {
+ return [];
+ }
+
+ if (statement.declaration) {
+ return getDeclarationNames(statement.declaration);
+ }
+
+ return statement.specifiers.flatMap((specifier) => {
+ if (specifier.exportKind === "type") return [];
+ return specifier.exported.type === AST_NODE_TYPES.Identifier
+ ? [specifier.exported.name]
+ : [specifier.exported.value];
+ });
+ });
+
+ if (exportedNames.includes(expected)) return;
+
+ context.report({
+ node,
+ messageId: "missing",
+ data: { expected, filename },
+ });
+ },
+ };
+ },
+});
+
+export default rule;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 10725394c3..992936e6de 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -998,6 +998,9 @@ importers:
eslint-plugin-boundaries:
specifier: 7.2.0
+ eslint-plugin-check-file:
+ specifier: 3.3.2
eslint-plugin-react-you-might-not-need-an-effect:
specifier: ^1.0.1
@@ -8411,6 +8414,12 @@ packages:
peerDependencies:
eslint: '>=6.0.0'
+ resolution: {integrity: sha512-X0yVi4vbV7pSxu00oAJiE8wcwAvIoU2YQKrkvRRLq+88i/cZNooOgAgjk2gOS03lKMsFMVusJLlqHNuAwduX2g==}
+ engines: {node: '>=18'}
+ peerDependencies:
+ eslint: '>=9.0.0'
+
resolution: {integrity: sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==}
engines: {node: '>=4'}
@@ -20392,17 +20401,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- debug: 3.2.7([email protected])
- optionalDependencies:
- eslint-import-resolver-node: 0.3.10([email protected])
- transitivePeerDependencies:
- - supports-color
-
dependencies:
debug: 3.2.7([email protected])
@@ -20429,36 +20427,13 @@ snapshots:
- eslint-import-resolver-webpack
- supports-color
dependencies:
- '@rtsao/scc': 1.1.0
- array-includes: 3.1.9
- array.prototype.findlastindex: 1.2.6
- array.prototype.flat: 1.3.3
- array.prototype.flatmap: 1.3.3
- debug: 3.2.7([email protected])
- doctrine: 2.1.0
- eslint-import-resolver-node: 0.3.10([email protected])
- hasown: 2.0.4
- is-core-module: 2.16.2
is-glob: 4.0.3
- minimatch: 3.1.5
- object.fromentries: 2.0.8
- object.groupby: 1.0.3
- object.values: 1.2.1
- semver: 6.3.1
- string.prototype.trimend: 1.0.9
- tsconfig-paths: 3.15.0
- optionalDependencies:
- transitivePeerDependencies:
- - eslint-import-resolver-typescript
- - eslint-import-resolver-webpack
- - supports-color
+ micromatch: 4.0.8
dependencies:
'@rtsao/scc': 1.1.0
array-includes: 3.1.9
@@ -20469,7 +20444,7 @@ snapshots:
doctrine: 2.1.0
eslint-import-resolver-node: 0.3.10([email protected])
hasown: 2.0.4
is-core-module: 2.16.2
is-glob: 4.0.3
@@ -20481,7 +20456,7 @@ snapshots:
string.prototype.trimend: 1.0.9
tsconfig-paths: 3.15.0
optionalDependencies:
transitivePeerDependencies:
- eslint-import-resolver-typescript
- eslint-import-resolver-webpack
diff --git a/web/eslint.config.mjs b/web/eslint.config.mjs
index da8b4cb411..91c15cbf68 100644
--- a/web/eslint.config.mjs
+++ b/web/eslint.config.mjs
@@ -1,5 +1,6 @@
import { globalIgnores } from "eslint/config";
import boundaries from "eslint-plugin-boundaries";
+import checkFile from "eslint-plugin-check-file";
import reactYouMightNotNeedAnEffect from "eslint-plugin-react-you-might-not-need-an-effect";
import storybook from "eslint-plugin-storybook";
import eslintPluginTailwindcss from "eslint-plugin-tailwindcss";
@@ -203,6 +204,55 @@ export default [
},
},
+ // Root design-system components follow `Name/Name.tsx`, optionally alongside
+ // `Name/Name.stories.tsx`. Files must be directly inside a PascalCase folder,
+ // match that folder's name, and expose a matching named runtime export. The
+ // table subtree is a domain-specific exception with its own structure.
+ {
+ name: "langfuse/web/design-system-component-structure",
+ files: ["src/components/design-system/**/*.{ts,tsx}"],
+ ignores: ["src/components/design-system/table/**"],
+ plugins: {
+ "check-file": checkFile,
+ },
+ rules: {
+ "check-file/folder-match-with-fex": [
+ "error",
+ {
+ "*.{ts,tsx}": "src/components/design-system/*/",
+ },
+ ],
+ "check-file/folder-naming-convention": [
+ "error",
+ {
+ "src/components/design-system/*/": "PASCAL_CASE",
+ },
+ ],
+ "check-file/filename-naming-convention": [
+ "error",
+ {
+ "src/components/design-system/*/*.{ts,tsx}": "<0>",
+ },
+ {
+ ignoreMiddleExtensions: true,
+ },
+ ],
+ },
+ },
+
+ {
+ name: "langfuse/web/design-system-component-exports",
+ files: ["src/components/design-system/*/*.{ts,tsx}"],
+ ignores: [
+ "src/components/design-system/**/*.stories.{ts,tsx}",
+ "src/components/design-system/table/**",
+ ],
+ rules: {
+ "@repo/filename-matches-export": "error",
+ "import/no-default-export": "error",
+ },
+ },
+
{
...reactYouMightNotNeedAnEffect.configs.recommended,
name: "langfuse/web/design-system-rules",
diff --git a/web/package.json b/web/package.json
index 6d73366672..f5a81fd6e5 100644
--- a/web/package.json
+++ b/web/package.json
@@ -205,6 +205,7 @@
"dotenv-expand": "^10.0.0",
"eslint": "catalog:",
"eslint-plugin-boundaries": "7.2.0",
+ "eslint-plugin-check-file": "3.3.2",
"eslint-plugin-react-you-might-not-need-an-effect": "^1.0.1",
"eslint-plugin-storybook": "10.5.10",
"eslint-plugin-tailwindcss": "4.4.0",
diff --git a/web/src/components/BatchExportTableButton.tsx b/web/src/components/BatchExportTableButton.tsx
index 99a7d2fb92..6ee76ee822 100644
--- a/web/src/components/BatchExportTableButton.tsx
+++ b/web/src/components/BatchExportTableButton.tsx
@@ -9,7 +9,7 @@ import {
DropdownMenuLabel,
} from "@/src/components/ui/dropdown-menu";
import { Button } from "@/src/components/ui/button";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { Download, Info } from "lucide-react";
import {
type BatchExportTableName,
diff --git a/web/src/components/IconOnlyButton.tsx b/web/src/components/IconOnlyButton.tsx
index 7c9312ca0c..2f7d566055 100644
--- a/web/src/components/IconOnlyButton.tsx
+++ b/web/src/components/IconOnlyButton.tsx
@@ -1,7 +1,7 @@
/* eslint-disable @repo/no-style-props */
import * as React from "react";
import { Button, type ButtonProps } from "@/src/components/ui/button";
-import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip/Tooltip";
+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
import { cn } from "@/src/utils/tailwind";
export interface IconOnlyButtonProps extends Omit<
diff --git a/web/src/components/design-system/Codeblock/Codeblock.stories.tsx b/web/src/components/design-system/Codeblock/Codeblock.stories.tsx
index b0b2da6517..aad5e13c19 100644
--- a/web/src/components/design-system/Codeblock/Codeblock.stories.tsx
+++ b/web/src/components/design-system/Codeblock/Codeblock.stories.tsx
@@ -1,5 +1,5 @@
import preview from "../../../../.storybook/preview";
-import { CodeBlock } from "./Codeblock";
+import { Codeblock as CodeBlock } from "./Codeblock";
const meta = preview.meta({
component: CodeBlock,
diff --git a/web/src/components/design-system/Codeblock/Codeblock.tsx b/web/src/components/design-system/Codeblock/Codeblock.tsx
index 3fc91b6c20..d4771afe8a 100644
--- a/web/src/components/design-system/Codeblock/Codeblock.tsx
+++ b/web/src/components/design-system/Codeblock/Codeblock.tsx
@@ -113,4 +113,4 @@ const CodeBlock: FC<Props> = memo(
);
CodeBlock.displayName = "CodeBlock";
-export { CodeBlock };
+export { CodeBlock as Codeblock };
diff --git a/web/src/components/design-system/Tooltip/CustomTooltip/CustomTooltip.stories.tsx b/web/src/components/design-system/CustomTooltip/CustomTooltip.stories.tsx
similarity index 92%
rename from web/src/components/design-system/Tooltip/CustomTooltip/CustomTooltip.stories.tsx
rename to web/src/components/design-system/CustomTooltip/CustomTooltip.stories.tsx
index adf227d87e..e4a3d777cd 100644
--- a/web/src/components/design-system/Tooltip/CustomTooltip/CustomTooltip.stories.tsx
+++ b/web/src/components/design-system/CustomTooltip/CustomTooltip.stories.tsx
@@ -1,4 +1,4 @@
-import preview from "../../../../../.storybook/preview";
+import preview from "../../../../.storybook/preview";
import { CustomTooltip } from "./CustomTooltip";
const meta = preview.meta({
diff --git a/web/src/components/design-system/Tooltip/CustomTooltip/CustomTooltip.tsx b/web/src/components/design-system/CustomTooltip/CustomTooltip.tsx
similarity index 100%
rename from web/src/components/design-system/Tooltip/CustomTooltip/CustomTooltip.tsx
rename to web/src/components/design-system/CustomTooltip/CustomTooltip.tsx
diff --git a/web/src/components/design-system/Spinner/Spinner.stories.tsx b/web/src/components/design-system/Spinner/Spinner.stories.tsx
index f4e43059b9..13c43213ab 100644
--- a/web/src/components/design-system/Spinner/Spinner.stories.tsx
+++ b/web/src/components/design-system/Spinner/Spinner.stories.tsx
@@ -1,6 +1,6 @@
import React from "react";
import preview from "../../../../.storybook/preview";
-import Spinner from "./Spinner";
+import { Spinner } from "./Spinner";
type ComponentProps = React.ComponentProps<typeof Spinner>;
type Variant = NonNullable<ComponentProps["variant"]>;
diff --git a/web/src/components/design-system/Spinner/Spinner.tsx b/web/src/components/design-system/Spinner/Spinner.tsx
index 84c0e19407..257b841fe9 100644
--- a/web/src/components/design-system/Spinner/Spinner.tsx
+++ b/web/src/components/design-system/Spinner/Spinner.tsx
@@ -31,7 +31,7 @@ type Variant = NonNullable<ClassProps["variant"]>;
type Size = NonNullable<ClassProps["size"]>;
type Display = NonNullable<ClassProps["display"]>;
-export default function Spinner({
+export function Spinner({
variant,
size,
display,
diff --git a/web/src/components/design-system/Tooltip/Tooltip/Tooltip.stories.tsx b/web/src/components/design-system/Tooltip/Tooltip.stories.tsx
similarity index 96%
rename from web/src/components/design-system/Tooltip/Tooltip/Tooltip.stories.tsx
rename to web/src/components/design-system/Tooltip/Tooltip.stories.tsx
index 2a99d295b5..6a25299c5a 100644
--- a/web/src/components/design-system/Tooltip/Tooltip/Tooltip.stories.tsx
+++ b/web/src/components/design-system/Tooltip/Tooltip.stories.tsx
@@ -1,6 +1,6 @@
import { expect, userEvent, waitFor, within } from "storybook/test";
-import preview from "../../../../../.storybook/preview";
+import preview from "../../../../.storybook/preview";
import { Tooltip } from "./Tooltip";
const meta = preview.meta({
diff --git a/web/src/components/design-system/Tooltip/Tooltip/Tooltip.tsx b/web/src/components/design-system/Tooltip/Tooltip.tsx
similarity index 100%
rename from web/src/components/design-system/Tooltip/Tooltip/Tooltip.tsx
rename to web/src/components/design-system/Tooltip/Tooltip.tsx
diff --git a/web/src/components/layouts/app-layout/right-drawer/AppContentWithRightDrawer.tsx b/web/src/components/layouts/app-layout/right-drawer/AppContentWithRightDrawer.tsx
index 4d0f7dc574..fab4556315 100644
--- a/web/src/components/layouts/app-layout/right-drawer/AppContentWithRightDrawer.tsx
+++ b/web/src/components/layouts/app-layout/right-drawer/AppContentWithRightDrawer.tsx
@@ -3,7 +3,7 @@ import { useV4MigrationPanel } from "@/src/features/v4-migration/V4MigrationPane
import { type PropsWithChildren } from "react";
import { useMediaQuery } from "react-responsive";
import dynamic from "next/dynamic";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { ResizableSplitLayout } from "@/src/components/ui/resizable-split-layout";
const DynamicMobileRightDrawer = dynamic(
diff --git a/web/src/components/score-tag.tsx b/web/src/components/score-tag.tsx
index 7efd65abee..c75e256a83 100644
--- a/web/src/components/score-tag.tsx
+++ b/web/src/components/score-tag.tsx
@@ -1,6 +1,6 @@
import { cva } from "class-variance-authority";
-import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip/Tooltip";
+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
import { Badge } from "@/src/components/design-system/Badge/Badge";
import { cn } from "@/src/utils/tailwind";
diff --git a/web/src/components/table/data-table-pagination.tsx b/web/src/components/table/data-table-pagination.tsx
index 5e0819c91b..a5061d3c23 100644
--- a/web/src/components/table/data-table-pagination.tsx
+++ b/web/src/components/table/data-table-pagination.tsx
@@ -15,7 +15,7 @@ import {
SelectValue,
} from "@/src/components/ui/select";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { Input } from "@/src/components/ui/input";
import {
Tooltip,
diff --git a/web/src/components/ui/MarkdownViewer.tsx b/web/src/components/ui/MarkdownViewer.tsx
index 5873b2da60..f1feeeace7 100644
--- a/web/src/components/ui/MarkdownViewer.tsx
+++ b/web/src/components/ui/MarkdownViewer.tsx
@@ -15,7 +15,7 @@ import ReactMarkdown, {
type ExtraProps as ReactMarkdownExtraProps,
} from "react-markdown";
import remarkGfm from "remark-gfm";
-import { CodeBlock } from "@/src/components/design-system/Codeblock/Codeblock";
+import { Codeblock as CodeBlock } from "@/src/components/design-system/Codeblock/Codeblock";
import { useTheme } from "next-themes";
import { ImageOff, Info } from "lucide-react";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
diff --git a/web/src/components/ui/button.tsx b/web/src/components/ui/button.tsx
index 64bd2cfa8c..b4f1957d44 100644
--- a/web/src/components/ui/button.tsx
+++ b/web/src/components/ui/button.tsx
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from "class-variance-authority";
import { cn } from "@/src/utils/tailwind";
-import { default as SpinnerLib } from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner as SpinnerLib } from "@/src/components/design-system/Spinner/Spinner";
const buttonVariants = cva(
// No font-* here: buttons follow the text-sm token weight (one weight per
diff --git a/web/src/features/annotation-queues/components/AddTracesToAnnotationQueueSelectDialogContent.tsx b/web/src/features/annotation-queues/components/AddTracesToAnnotationQueueSelectDialogContent.tsx
index d8522d95f1..c3e19e75ef 100644
--- a/web/src/features/annotation-queues/components/AddTracesToAnnotationQueueSelectDialogContent.tsx
+++ b/web/src/features/annotation-queues/components/AddTracesToAnnotationQueueSelectDialogContent.tsx
@@ -1,5 +1,5 @@
import { ActionButton } from "@/src/components/ActionButton";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { SelectInput } from "@/src/components/design-system/SelectInput/SelectInput";
import { Button } from "@/src/components/ui/button";
import {
diff --git a/web/src/features/automations/components/AutomationButton.tsx b/web/src/features/automations/components/AutomationButton.tsx
index 9948392770..1490e748eb 100644
--- a/web/src/features/automations/components/AutomationButton.tsx
+++ b/web/src/features/automations/components/AutomationButton.tsx
@@ -2,7 +2,7 @@ import { ActionButton } from "@/src/components/ActionButton";
import { useHasProjectAccess } from "@/src/features/rbac";
import { Zap } from "lucide-react";
import { api } from "@/src/utils/api";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
type AutomationButtonProps = {
projectId: string;
diff --git a/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/StatusStep.tsx b/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/StatusStep.tsx
index 55420d6447..87c3c7f136 100644
--- a/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/StatusStep.tsx
+++ b/web/src/features/batch-actions/components/AddObservationsToDatasetDialog/StatusStep.tsx
@@ -12,7 +12,7 @@ import {
import Link from "next/link";
import { useRouter } from "next/router";
import { Check, AlertCircle } from "lucide-react";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
type StatusStepProps = {
projectId: string;
diff --git a/web/src/features/batch-actions/components/RunEvaluationDialog/EstimatedCostRow.tsx b/web/src/features/batch-actions/components/RunEvaluationDialog/EstimatedCostRow.tsx
index 107e6204a3..0d2ba11f55 100644
--- a/web/src/features/batch-actions/components/RunEvaluationDialog/EstimatedCostRow.tsx
+++ b/web/src/features/batch-actions/components/RunEvaluationDialog/EstimatedCostRow.tsx
@@ -2,7 +2,7 @@ import { InfoIcon } from "lucide-react";
import { api } from "@/src/utils/api";
import { usdFormatter } from "@/src/utils/numbers";
import { Skeleton } from "@/src/components/ui/skeleton";
-import { CustomTooltip } from "@/src/components/design-system/Tooltip/CustomTooltip/CustomTooltip";
+import { CustomTooltip } from "@/src/components/design-system/CustomTooltip/CustomTooltip";
type EstimatedCostRowProps = {
projectId: string;
diff --git a/web/src/features/batch-actions/components/RunEvaluationDialog/index.tsx b/web/src/features/batch-actions/components/RunEvaluationDialog/index.tsx
index 777c667b1f..95de25aee2 100644
--- a/web/src/features/batch-actions/components/RunEvaluationDialog/index.tsx
+++ b/web/src/features/batch-actions/components/RunEvaluationDialog/index.tsx
@@ -20,7 +20,7 @@ import {
} from "@/src/components/ui/dialog";
import { Button } from "@/src/components/ui/button";
import { Skeleton } from "@/src/components/ui/skeleton";
-import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip/Tooltip";
+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
import { showErrorToast, showSuccessToast } from "@/src/features/notifications";
import { ChevronLeft, ExternalLink, Plus } from "lucide-react";
import {
diff --git a/web/src/features/comments/CommentList.tsx b/web/src/features/comments/CommentList.tsx
index 9a0b0f692f..16348e07e7 100644
--- a/web/src/features/comments/CommentList.tsx
+++ b/web/src/features/comments/CommentList.tsx
@@ -28,7 +28,7 @@ import { getRelativeTimestampFromNow } from "@/src/utils/dates";
import { cn } from "@/src/utils/tailwind";
import { zodResolver } from "@hookform/resolvers/zod";
import { type CommentObjectType, CreateCommentData } from "@langfuse/shared";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { ArrowUpToLine, Search, Trash, X } from "lucide-react";
import { useSession } from "next-auth/react";
import React, {
diff --git a/web/src/features/comments/components/MentionAutocomplete.tsx b/web/src/features/comments/components/MentionAutocomplete.tsx
index 4359d12bdc..92dad7919e 100644
--- a/web/src/features/comments/components/MentionAutocomplete.tsx
+++ b/web/src/features/comments/components/MentionAutocomplete.tsx
@@ -1,5 +1,5 @@
import { useEffect, useRef } from "react";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { Avatar } from "@/src/components/design-system/Avatar/Avatar";
import {
Command,
diff --git a/web/src/features/dashboard/components/cards/DashboardCard.tsx b/web/src/features/dashboard/components/cards/DashboardCard.tsx
index f5587baab2..ef233d8e2b 100644
--- a/web/src/features/dashboard/components/cards/DashboardCard.tsx
+++ b/web/src/features/dashboard/components/cards/DashboardCard.tsx
@@ -1,5 +1,5 @@
/* eslint-disable @repo/no-style-props */
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import {
Card,
CardHeader,
diff --git a/web/src/features/developer-tools/components/DeveloperToolsSettings.tsx b/web/src/features/developer-tools/components/DeveloperToolsSettings.tsx
index 61d5ed30cb..3dfed84773 100644
--- a/web/src/features/developer-tools/components/DeveloperToolsSettings.tsx
+++ b/web/src/features/developer-tools/components/DeveloperToolsSettings.tsx
@@ -1,7 +1,7 @@
import Header from "@/src/components/layouts/header";
import { Button } from "@/src/components/ui/button";
import { Card } from "@/src/components/ui/card";
-import { CodeBlock } from "@/src/components/design-system/Codeblock/Codeblock";
+import { Codeblock as CodeBlock } from "@/src/components/design-system/Codeblock/Codeblock";
import Link from "next/link";
import { Bot, SquareTerminal, Sparkles } from "lucide-react";
diff --git a/web/src/features/evals/components/evaluator-table.tsx b/web/src/features/evals/components/evaluator-table.tsx
index d5bdfc9137..54db654632 100644
--- a/web/src/features/evals/components/evaluator-table.tsx
+++ b/web/src/features/evals/components/evaluator-table.tsx
@@ -59,7 +59,7 @@ import {
type EvaluatorDataRow,
useEvaluatorTableData,
} from "@/src/features/evals/hooks/useEvaluatorTableData";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useV4UpgradeUiEnabled } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";
import { V4MigrationBadgeContent } from "@/src/features/v4-migration/V4MigrationBadgeContent";
diff --git a/web/src/features/evals/components/maintainer-tooltip.tsx b/web/src/features/evals/components/maintainer-tooltip.tsx
index 20c5a42dbd..45fcbee307 100644
--- a/web/src/features/evals/components/maintainer-tooltip.tsx
+++ b/web/src/features/evals/components/maintainer-tooltip.tsx
@@ -1,5 +1,5 @@
import { LangfuseIcon } from "@/src/components/design-system/LangfuseIcon/LangfuseIcon";
-import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip/Tooltip";
+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
import { RagasLogoIcon } from "@/src/features/evals/components/ragas-logo";
import { UserCircle2Icon } from "lucide-react";
diff --git a/web/src/features/evals/v2/components/Evaluators/EvaluatorVersionHistorySheet/EvaluatorVersionHistorySheet.tsx b/web/src/features/evals/v2/components/Evaluators/EvaluatorVersionHistorySheet/EvaluatorVersionHistorySheet.tsx
index 4853d47a52..3bb6c5858f 100644
--- a/web/src/features/evals/v2/components/Evaluators/EvaluatorVersionHistorySheet/EvaluatorVersionHistorySheet.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/EvaluatorVersionHistorySheet/EvaluatorVersionHistorySheet.tsx
@@ -7,7 +7,7 @@ import {
SheetTitle,
} from "@/src/components/ui/sheet";
import type { JudgeModel } from "@/src/features/evals/v2/judgeModel";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { ConfirmDialog } from "@/src/components/ui/confirm-dialog";
import { EvaluatorVersionHistoryList } from "./components/EvaluatorVersionHistoryList/EvaluatorVersionHistoryList";
import type { EvaluatorVersion } from "./types";
diff --git a/web/src/features/evals/v2/components/Evaluators/EvaluatorVersionHistorySheet/components/EvaluatorDefinitionView/EvaluatorDefinitionView.tsx b/web/src/features/evals/v2/components/Evaluators/EvaluatorVersionHistorySheet/components/EvaluatorDefinitionView/EvaluatorDefinitionView.tsx
index 5f66a24162..cbc4a2f6bd 100644
--- a/web/src/features/evals/v2/components/Evaluators/EvaluatorVersionHistorySheet/components/EvaluatorDefinitionView/EvaluatorDefinitionView.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/EvaluatorVersionHistorySheet/components/EvaluatorDefinitionView/EvaluatorDefinitionView.tsx
@@ -7,7 +7,7 @@ import {
type EvaluatorPromptMessage,
} from "@langfuse/shared";
-import { CodeBlock } from "@/src/components/design-system/Codeblock/Codeblock";
+import { Codeblock as CodeBlock } from "@/src/components/design-system/Codeblock/Codeblock";
import { Badge } from "@/src/components/ui/badge";
import { Label } from "@/src/components/ui/label";
import { MediaReferenceTag } from "@/src/components/ui/media/MediaReferenceTag";
diff --git a/web/src/features/evals/v2/components/Evaluators/JudgeModelPicker/JudgeModelPicker.tsx b/web/src/features/evals/v2/components/Evaluators/JudgeModelPicker/JudgeModelPicker.tsx
index 04e4e138b9..ddb02703d2 100644
--- a/web/src/features/evals/v2/components/Evaluators/JudgeModelPicker/JudgeModelPicker.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/JudgeModelPicker/JudgeModelPicker.tsx
@@ -9,7 +9,7 @@ import {
} from "lucide-react";
import { forwardRef, type ReactNode } from "react";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { Badge } from "@/src/components/ui/badge";
import { Button, type ButtonProps } from "@/src/components/ui/button";
import {
diff --git a/web/src/features/evals/v2/components/Rules/EvaluatorExecutionHistory/EvaluatorExecutionHistory.tsx b/web/src/features/evals/v2/components/Rules/EvaluatorExecutionHistory/EvaluatorExecutionHistory.tsx
index d417e5ce9e..6e90aed688 100644
--- a/web/src/features/evals/v2/components/Rules/EvaluatorExecutionHistory/EvaluatorExecutionHistory.tsx
+++ b/web/src/features/evals/v2/components/Rules/EvaluatorExecutionHistory/EvaluatorExecutionHistory.tsx
@@ -1,4 +1,4 @@
-import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip/Tooltip";
+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
import { cn } from "@/src/utils/tailwind";
export function EvaluatorExecutionHistory({
diff --git a/web/src/features/evals/v2/components/Rules/RulesTable/components/RuleActiveSwitchCell/RuleActiveSwitchCell.tsx b/web/src/features/evals/v2/components/Rules/RulesTable/components/RuleActiveSwitchCell/RuleActiveSwitchCell.tsx
index 0553f0627f..387b4e6756 100644
--- a/web/src/features/evals/v2/components/Rules/RulesTable/components/RuleActiveSwitchCell/RuleActiveSwitchCell.tsx
+++ b/web/src/features/evals/v2/components/Rules/RulesTable/components/RuleActiveSwitchCell/RuleActiveSwitchCell.tsx
@@ -1,5 +1,5 @@
import { Switch } from "@/src/components/design-system/Switch/Switch";
-import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip/Tooltip";
+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { api, type RouterOutputs } from "@/src/utils/api";
import { trpcErrorToast } from "@/src/utils/trpcErrorToast";
diff --git a/web/src/features/experiments/components/RemoteExperimentDatasetStep.tsx b/web/src/features/experiments/components/RemoteExperimentDatasetStep.tsx
index 917d6f412d..85de045e74 100644
--- a/web/src/features/experiments/components/RemoteExperimentDatasetStep.tsx
+++ b/web/src/features/experiments/components/RemoteExperimentDatasetStep.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import { CheckIcon, ChevronDown } from "lucide-react";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { Button } from "@/src/components/ui/button";
import {
DialogBody,
diff --git a/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx b/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx
index a927c79c66..645c30c112 100644
--- a/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx
+++ b/web/src/features/experiments/components/RemoteExperimentTriggerModal.tsx
@@ -25,7 +25,7 @@ import { showSuccessToast } from "@/src/features/notifications/showSuccessToast"
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { getFormattedPayload } from "@/src/features/experiments/utils/format";
import { type Prisma } from "@langfuse/shared";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
const RemoteExperimentTriggerSchema = z.object({
payload: z.string(),
diff --git a/web/src/features/experiments/components/RemoteExperimentUpsertForm.tsx b/web/src/features/experiments/components/RemoteExperimentUpsertForm.tsx
index 3d2608cd65..45801e7f69 100644
--- a/web/src/features/experiments/components/RemoteExperimentUpsertForm.tsx
+++ b/web/src/features/experiments/components/RemoteExperimentUpsertForm.tsx
@@ -32,7 +32,7 @@ import { CodeView } from "@/src/components/ui/CodeJsonViewer";
import { type Prisma, WebhookProtectedHeaders } from "@langfuse/shared";
import { Skeleton } from "@/src/components/ui/skeleton";
import { getFormattedPayload } from "@/src/features/experiments/utils/format";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
const RemoteExperimentSetupSchema = z.object({
url: z.url(),
diff --git a/web/src/features/experiments/components/steps/ReviewStep.tsx b/web/src/features/experiments/components/steps/ReviewStep.tsx
index 7adb1c7b15..86b0ed2b3d 100644
--- a/web/src/features/experiments/components/steps/ReviewStep.tsx
+++ b/web/src/features/experiments/components/steps/ReviewStep.tsx
@@ -6,7 +6,7 @@ import {
CardTitle,
} from "@/src/components/ui/card";
import { Badge } from "@/src/components/ui/badge";
-import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip/Tooltip";
+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
import { InfoIcon } from "lucide-react";
import { type ReviewStepProps } from "@/src/features/experiments/types/stepProps";
import { StepHeader } from "@/src/features/experiments/components/shared/StepHeader";
diff --git a/web/src/features/experiments/components/table/NotRecordedMetric.tsx b/web/src/features/experiments/components/table/NotRecordedMetric.tsx
index 6a9ce86922..5188b321e8 100644
--- a/web/src/features/experiments/components/table/NotRecordedMetric.tsx
+++ b/web/src/features/experiments/components/table/NotRecordedMetric.tsx
@@ -1,4 +1,4 @@
-import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip/Tooltip";
+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";
const EXPLANATION: Record<NotRecordedMetricProps["metric"], string> = {
cost: "No cost was recorded for this run. Cost is derived from the token usage and model pricing its calls reported.",
diff --git a/web/src/features/in-app-agent/components/InAppAgentToolPayload.tsx b/web/src/features/in-app-agent/components/InAppAgentToolPayload.tsx
index 51fab54a1c..af3b899726 100644
--- a/web/src/features/in-app-agent/components/InAppAgentToolPayload.tsx
+++ b/web/src/features/in-app-agent/components/InAppAgentToolPayload.tsx
@@ -1,7 +1,7 @@
"use client";
import { useMemo, useState } from "react";
-import { CodeBlock } from "@/src/components/design-system/Codeblock/Codeblock";
+import { Codeblock as CodeBlock } from "@/src/components/design-system/Codeblock/Codeblock";
import { JSONView } from "@/src/components/ui/CodeJsonViewer";
import { cn } from "@/src/utils/tailwind";
import {
diff --git a/web/src/features/models/components/test-match/TestModelMatchDialog.tsx b/web/src/features/models/components/test-match/TestModelMatchDialog.tsx
index d496275be9..851d5ed201 100644
--- a/web/src/features/models/components/test-match/TestModelMatchDialog.tsx
+++ b/web/src/features/models/components/test-match/TestModelMatchDialog.tsx
@@ -17,7 +17,7 @@ import { MatchedModelCard } from "./MatchedModelCard";
import { MatchedTierCard } from "./MatchedTierCard";
import { NoMatchDisplay } from "./NoMatchDisplay";
import { CheckCircle, SquareArrowOutUpRight } from "lucide-react";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
type TestModelMatchDialogProps = {
projectId: string;
diff --git a/web/src/features/onboarding/components/OnboardingSurvey.tsx b/web/src/features/onboarding/components/OnboardingSurvey.tsx
index ba3aa4d910..9ea21df479 100644
--- a/web/src/features/onboarding/components/OnboardingSurvey.tsx
+++ b/web/src/features/onboarding/components/OnboardingSurvey.tsx
@@ -3,7 +3,7 @@ import { ExternalLink } from "lucide-react";
import { Button } from "@/src/components/ui/button";
import { Switch } from "@/src/components/design-system/Switch/Switch";
import { LangfuseIcon } from "@/src/components/design-system/LangfuseIcon/LangfuseIcon";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import {
Form,
FormControl,
diff --git a/web/src/features/playground/page/index.tsx b/web/src/features/playground/page/index.tsx
index 1f2f31fb3c..6b28778cf9 100644
--- a/web/src/features/playground/page/index.tsx
+++ b/web/src/features/playground/page/index.tsx
@@ -15,7 +15,7 @@ import {
MessageSearchToolbar,
} from "@/src/components/ChatMessages/MessageSearch";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
/**
* PlaygroundPage Component
diff --git a/web/src/features/prompts/components/delete-folder.tsx b/web/src/features/prompts/components/delete-folder.tsx
index 4cbd7e155b..9ea6b4a712 100644
--- a/web/src/features/prompts/components/delete-folder.tsx
+++ b/web/src/features/prompts/components/delete-folder.tsx
@@ -15,7 +15,7 @@ import {
import { Input } from "@/src/components/ui/input";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
import { Trash, Folder, FileText } from "lucide-react";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
export function DeleteFolder({ folderPath }: { folderPath: string }) {
const projectId = useProjectIdFromURL();
diff --git a/web/src/features/score-analytics/components/cards/DistributionBooleanCard.tsx b/web/src/features/score-analytics/components/cards/DistributionBooleanCard.tsx
index c09c3fa1d9..76ac8c5091 100644
--- a/web/src/features/score-analytics/components/cards/DistributionBooleanCard.tsx
+++ b/web/src/features/score-analytics/components/cards/DistributionBooleanCard.tsx
@@ -10,7 +10,7 @@ import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
import { useScoreAnalytics } from "../ScoreAnalyticsProvider";
import { ScoreDistributionBooleanChart } from "../charts/ScoreDistributionBooleanChart";
import { SamplingDetailsHoverCard } from "../SamplingDetailsHoverCard";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
type DistributionTab = "score1" | "score2" | "all" | "matched";
diff --git a/web/src/features/score-analytics/components/cards/DistributionCategoricalCard.tsx b/web/src/features/score-analytics/components/cards/DistributionCategoricalCard.tsx
index acf59d33e5..90c8a5a163 100644
--- a/web/src/features/score-analytics/components/cards/DistributionCategoricalCard.tsx
+++ b/web/src/features/score-analytics/components/cards/DistributionCategoricalCard.tsx
@@ -11,7 +11,7 @@ import { useScoreAnalytics } from "../ScoreAnalyticsProvider";
import { ScoreDistributionCategoricalChart } from "../charts/ScoreDistributionCategoricalChart";
import { getScoreCategoryColors } from "../../lib/color-scales";
import { SamplingDetailsHoverCard } from "../SamplingDetailsHoverCard";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
type DistributionTab = "score1" | "score2" | "all" | "matched";
diff --git a/web/src/features/score-analytics/components/cards/DistributionNumericCard.tsx b/web/src/features/score-analytics/components/cards/DistributionNumericCard.tsx
index 11a846b60b..23c92aee13 100644
--- a/web/src/features/score-analytics/components/cards/DistributionNumericCard.tsx
+++ b/web/src/features/score-analytics/components/cards/DistributionNumericCard.tsx
@@ -10,7 +10,7 @@ import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
import { useScoreAnalytics } from "../ScoreAnalyticsProvider";
import { ScoreDistributionNumericChart } from "../charts/ScoreDistributionNumericChart";
import { SamplingDetailsHoverCard } from "../SamplingDetailsHoverCard";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
type DistributionTab = "score1" | "score2" | "all" | "matched";
diff --git a/web/src/features/score-analytics/components/cards/HeatmapCard.tsx b/web/src/features/score-analytics/components/cards/HeatmapCard.tsx
index ccf2a6bfba..9d92d128ec 100644
--- a/web/src/features/score-analytics/components/cards/HeatmapCard.tsx
+++ b/web/src/features/score-analytics/components/cards/HeatmapCard.tsx
@@ -14,7 +14,7 @@ import { type HeatmapCell } from "@/src/features/score-analytics/lib/heatmap-uti
import { useCallback } from "react";
import { SamplingDetailsHoverCard } from "../SamplingDetailsHoverCard";
import { type ScoreDataTypeType } from "@langfuse/shared";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
interface HeatmapTooltipContentProps {
cell: HeatmapCell;
diff --git a/web/src/features/score-analytics/components/cards/StatisticsCard.tsx b/web/src/features/score-analytics/components/cards/StatisticsCard.tsx
index 74f8cb6876..a1dda3ff27 100644
--- a/web/src/features/score-analytics/components/cards/StatisticsCard.tsx
+++ b/web/src/features/score-analytics/components/cards/StatisticsCard.tsx
@@ -20,7 +20,7 @@ import {
interpretMAE,
interpretRMSE,
} from "@/src/features/score-analytics/lib/statistics-utils";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
/**
* StatisticsCard - Smart card component for displaying score statistics
diff --git a/web/src/features/score-analytics/components/cards/TimelineChartCard.tsx b/web/src/features/score-analytics/components/cards/TimelineChartCard.tsx
index 5bd21321f7..1e5ab2df51 100644
--- a/web/src/features/score-analytics/components/cards/TimelineChartCard.tsx
+++ b/web/src/features/score-analytics/components/cards/TimelineChartCard.tsx
@@ -14,7 +14,7 @@ import {
getScoreCategoryColors,
getScoreBooleanColors,
} from "@/src/features/score-analytics/lib/color-scales";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
type TimelineTab = "score1" | "score2" | "all" | "matched";
diff --git a/web/src/features/scores/components/AnnotationForm.tsx b/web/src/features/scores/components/AnnotationForm.tsx
index c8b85c9448..8848df3869 100644
--- a/web/src/features/scores/components/AnnotationForm.tsx
+++ b/web/src/features/scores/components/AnnotationForm.tsx
@@ -73,7 +73,7 @@ import {
} from "@/src/features/scores/lib/keyboardShortcuts";
import { useAnnotationScoreConfigs } from "@/src/features/scores/hooks/useScoreConfigs";
import { Skeleton } from "@/src/components/ui/skeleton";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
function CommentField({
savedComment,
diff --git a/web/src/features/slack/components/SlackDisconnectButton.tsx b/web/src/features/slack/components/SlackDisconnectButton.tsx
index 2f024c6d5a..908dd05067 100644
--- a/web/src/features/slack/components/SlackDisconnectButton.tsx
+++ b/web/src/features/slack/components/SlackDisconnectButton.tsx
@@ -13,7 +13,7 @@ import {
} from "@/src/components/ui/dialog";
import { showSuccessToast, showErrorToast } from "@/src/features/notifications";
import { api, reportTrpcErrorWithoutToast } from "@/src/utils/api";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
/**
* Props for the SlackDisconnectButton component
diff --git a/web/src/features/support-chat/SupportForm.tsx b/web/src/features/support-chat/SupportForm.tsx
index dcb1d7ac30..f423f1b706 100644
--- a/web/src/features/support-chat/SupportForm.tsx
+++ b/web/src/features/support-chat/SupportForm.tsx
@@ -45,7 +45,7 @@ import { useEffect, useState } from "react";
import { Dropzone } from "@/src/components/design-system/Dropzone/Dropzone";
import { Trash2 } from "lucide-react";
import { PYLON_MAX_FILE_SIZE_BYTES } from "./pylon/pylonConstants";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
/** Make RHF generics match the resolver (Zod defaults => input can be undefined) */
type SupportFormInput = z.input<typeof SupportFormSchema>;
diff --git a/web/src/features/table/components/TableActionDialog.tsx b/web/src/features/table/components/TableActionDialog.tsx
index 0cb997037f..0d259f489b 100644
--- a/web/src/features/table/components/TableActionDialog.tsx
+++ b/web/src/features/table/components/TableActionDialog.tsx
@@ -30,7 +30,7 @@ import { useOptionalEntitlement } from "@/src/features/entitlements";
import { type BatchExportTableName } from "@langfuse/shared";
import { api } from "@/src/utils/api";
import { targetOptionsQueryMap } from "@/src/features/table/components/targetOptionsQueryMap";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
type TableActionDialogProps = {
isOpen: boolean;
diff --git a/web/src/features/table/components/TableActionMenu.tsx b/web/src/features/table/components/TableActionMenu.tsx
index 01a9519105..e9535b429d 100644
--- a/web/src/features/table/components/TableActionMenu.tsx
+++ b/web/src/features/table/components/TableActionMenu.tsx
@@ -1,7 +1,7 @@
import { useEffect, useState } from "react";
import { Button } from "@/src/components/ui/button";
import { X, Trash, Plus } from "lucide-react";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import {
type TableAction,
type CustomDialogTableAction,
diff --git a/web/src/features/traces/components/AdvancedJsonViewer/lazy/react/LazyJsonViewer.tsx b/web/src/features/traces/components/AdvancedJsonViewer/lazy/react/LazyJsonViewer.tsx
index 783c7ab258..c14cce7755 100644
--- a/web/src/features/traces/components/AdvancedJsonViewer/lazy/react/LazyJsonViewer.tsx
+++ b/web/src/features/traces/components/AdvancedJsonViewer/lazy/react/LazyJsonViewer.tsx
@@ -17,7 +17,7 @@
import React, { useEffect, useState } from "react";
import { useStore } from "zustand";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { cn } from "@/src/utils/tailwind";
import { LazyJsonList } from "./LazyJsonList";
import { createRowModelStore, type LazyViewerMetric } from "./rowModelStore";
diff --git a/web/src/features/traces/components/IOPreview/components/CorrectedOutputField.tsx b/web/src/features/traces/components/IOPreview/components/CorrectedOutputField.tsx
index 7205f3339e..109efa7320 100644
--- a/web/src/features/traces/components/IOPreview/components/CorrectedOutputField.tsx
+++ b/web/src/features/traces/components/IOPreview/components/CorrectedOutputField.tsx
@@ -17,7 +17,7 @@ import {
HoverCardTrigger,
} from "@/src/components/ui/hover-card";
import Link from "next/link";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
interface CorrectedOutputFieldProps {
projectId: string;
diff --git a/web/src/features/traces/components/TraceLogView/LogViewExpandedContent.tsx b/web/src/features/traces/components/TraceLogView/LogViewExpandedContent.tsx
index d7d3ce7d18..21d84627bc 100644
--- a/web/src/features/traces/components/TraceLogView/LogViewExpandedContent.tsx
+++ b/web/src/features/traces/components/TraceLogView/LogViewExpandedContent.tsx
@@ -9,7 +9,7 @@ import { memo, useMemo } from "react";
import { PrettyJsonView } from "@/src/components/ui/PrettyJsonView";
import { type TreeNode } from "@/src/features/traces/types/treeNode";
import { useLogViewObservationIO } from "./useLogViewObservationIO";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
export interface LogViewExpandedContentProps {
node: TreeNode;
diff --git a/web/src/features/traces/components/TraceLogView/LogViewJsonMode.tsx b/web/src/features/traces/components/TraceLogView/LogViewJsonMode.tsx
index ac1aa40636..ce2a4e4be6 100644
--- a/web/src/features/traces/components/TraceLogView/LogViewJsonMode.tsx
+++ b/web/src/features/traces/components/TraceLogView/LogViewJsonMode.tsx
@@ -11,7 +11,7 @@ import { memo, useEffect } from "react";
import { JSONView } from "@/src/components/ui/CodeJsonViewer";
import { type FlatLogItem } from "./log-view-types";
import { useLogViewAllObservationsIO } from "./useLogViewAllObservationsIO";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
export interface LogViewJsonModeProps {
items: FlatLogItem[];
diff --git a/web/src/features/traces/components/TraceLogView/LogViewToolbar.tsx b/web/src/features/traces/components/TraceLogView/LogViewToolbar.tsx
index 474d3e3917..9010f94165 100644
--- a/web/src/features/traces/components/TraceLogView/LogViewToolbar.tsx
+++ b/web/src/features/traces/components/TraceLogView/LogViewToolbar.tsx
@@ -29,7 +29,7 @@ import {
HoverCardTrigger,
} from "@/src/components/ui/hover-card";
import { cn } from "@/src/utils/tailwind";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
export interface LogViewToolbarProps {
/** Current search query */
diff --git a/web/src/features/v4-migration/EvaluatorMigrationDialog.tsx b/web/src/features/v4-migration/EvaluatorMigrationDialog.tsx
index 4e040b0783..1f9813ecbf 100644
--- a/web/src/features/v4-migration/EvaluatorMigrationDialog.tsx
+++ b/web/src/features/v4-migration/EvaluatorMigrationDialog.tsx
@@ -9,7 +9,7 @@ import {
DialogTitle,
} from "@/src/components/ui/dialog";
import { Button } from "@/src/components/ui/button";
-import { CodeBlock } from "@/src/components/design-system/Codeblock/Codeblock";
+import { Codeblock as CodeBlock } from "@/src/components/design-system/Codeblock/Codeblock";
import {
useIsInAppAgentLauncherVisible,
useInAppAiAgent,
diff --git a/web/src/features/widgets/chart-library/ChartLoadingState.tsx b/web/src/features/widgets/chart-library/ChartLoadingState.tsx
index d7f4bfbf53..3b4f8e5eee 100644
--- a/web/src/features/widgets/chart-library/ChartLoadingState.tsx
+++ b/web/src/features/widgets/chart-library/ChartLoadingState.tsx
@@ -5,7 +5,7 @@ import { SLOW_QUERY_HINT_TEXT } from "@langfuse/shared";
import { type QueryProgress } from "@/src/hooks/useSSEDashboardQuery";
import { QueryProgressBar } from "@/src/features/widgets/chart-library/QueryProgressBar";
import { Button } from "@/src/components/ui/button";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
const DEFAULT_HINT_DELAY_MS = 2000;
const PROGRESS_REVEAL_DELAY_MS = 1000;
diff --git a/web/src/hooks/useReadyRouteParams.tsx b/web/src/hooks/useReadyRouteParams.tsx
index c0ca1788d1..cc8588161a 100644
--- a/web/src/hooks/useReadyRouteParams.tsx
+++ b/web/src/hooks/useReadyRouteParams.tsx
@@ -1,5 +1,5 @@
import { useRouter } from "next/router";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
/**
* Next.js pages-router dynamic segments are missing on the first render of a
diff --git a/web/src/pages/project/[projectId]/datasets/[datasetId]/compare/index.tsx b/web/src/pages/project/[projectId]/datasets/[datasetId]/compare/index.tsx
index e4a819bbcc..b8ad76bd07 100644
--- a/web/src/pages/project/[projectId]/datasets/[datasetId]/compare/index.tsx
+++ b/web/src/pages/project/[projectId]/datasets/[datasetId]/compare/index.tsx
@@ -26,7 +26,7 @@ import { SidePanel, SidePanelContent } from "@/src/components/ui/side-panel";
import { AnnotationPanel } from "@/src/features/datasets/components/AnnotationPanel";
import { useExperimentAccess } from "@/src/features/experiments/hooks/useExperimentAccess";
import { toExperimentsResultsUrl } from "@/src/features/experiments/utils/experimentUrlTranslation";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
function DatasetCompareLegacy() {
const router = useRouter();
diff --git a/web/src/pages/project/[projectId]/experiments/index.tsx b/web/src/pages/project/[projectId]/experiments/index.tsx
index f9ab7280c2..1ebea98507 100644
--- a/web/src/pages/project/[projectId]/experiments/index.tsx
+++ b/web/src/pages/project/[projectId]/experiments/index.tsx
@@ -15,7 +15,7 @@ import { api } from "@/src/utils/api";
import { FlaskConical } from "lucide-react";
import { useEffect, useState } from "react";
import { useRouter } from "next/router";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
export default function Experiments() {
const router = useRouter();
diff --git a/web/src/pages/project/[projectId]/experiments/results.tsx b/web/src/pages/project/[projectId]/experiments/results.tsx
index 964d9a6a56..56dd3f036e 100644
--- a/web/src/pages/project/[projectId]/experiments/results.tsx
+++ b/web/src/pages/project/[projectId]/experiments/results.tsx
@@ -12,7 +12,7 @@ import { useCallback, useEffect } from "react";
import { ExperimentDisplaySettings } from "@/src/features/experiments/components/ExperimentDisplaySettings";
import { ExperimentFormatSetting } from "@/src/features/experiments/components/ExperimentFormatSetting";
import { useExperimentAccess } from "@/src/features/experiments/hooks/useExperimentAccess";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
import { ExperimentSelectionControls } from "@/src/features/experiments/components/ExperimentSelectionControls";
import { useIoRenderModeLocalStorage } from "@/src/components/table/data-table-io-render-mode-switch";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
diff --git a/web/src/pages/project/[projectId]/scores/analytics.tsx b/web/src/pages/project/[projectId]/scores/analytics.tsx
index 60c0438668..c361eb7e39 100644
--- a/web/src/pages/project/[projectId]/scores/analytics.tsx
+++ b/web/src/pages/project/[projectId]/scores/analytics.tsx
@@ -20,7 +20,7 @@ import {
} from "@/src/features/score-analytics/components/ScoreAnalyticsProvider";
import { ScoreAnalyticsHeader } from "@/src/features/score-analytics/components/ScoreAnalyticsHeader";
import { ScoreAnalyticsDashboard } from "@/src/features/score-analytics/components/ScoreAnalyticsDashboard";
-import Spinner from "@/src/components/design-system/Spinner/Spinner";
+import { Spinner } from "@/src/components/design-system/Spinner/Spinner";
/**
* Score Analytics V2 - Refactored Architecture