Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Move dashboard components to `@spree/dashboard-ui` package (#14104)

Damian Legawiec3accddfd169d
diff --git a/packages/dashboard-ui/package.json b/packages/dashboard-ui/package.json
index f79f9ec217..efb75dd75c 100644
--- a/packages/dashboard-ui/package.json
+++ b/packages/dashboard-ui/package.json
@@ -3,14 +3,18 @@
"private": true,
"license": "MIT",
"version": "0.0.0",
- "description": "Spree Dashboard design system — shadcn primitives, composed components, and design tokens. Source-only package; consumers compile via their own Vite/Tailwind setup.",
+ "description": "Spree Dashboard design system — shadcn primitives, headless composed components, and design tokens. Source-only package; consumers compile via their own Vite/Tailwind setup.",
"type": "module",
"main": "./src/index.ts",
"module": "./src/index.ts",
"types": "./src/index.ts",
"exports": {
".": "./src/index.ts",
- "./styles.css": "./src/styles.css"
+ "./styles.css": "./src/styles.css",
+ "./ui/*": "./src/ui/*.tsx",
+ "./spree/*": "./src/spree/*.tsx",
+ "./lib/*": "./src/lib/*.ts",
+ "./hooks/*": "./src/hooks/*.ts"
},
"files": [
"src",
@@ -23,8 +27,39 @@
"typecheck": "tsc --noEmit"
},
"peerDependencies": {
+ "@tanstack/react-hotkeys": "^0.10.0",
+ "@tanstack/react-router": "^1.169.2",
+ "i18next": "^26.2.0",
"react": "^19.2.6",
- "react-dom": "^19.2.6"
+ "react-dom": "^19.2.6",
+ "react-hook-form": "^7.75.0",
+ "react-i18next": "^17.0.8"
+ },
+ "dependencies": {
+ "@base-ui/react": "^1.4.1",
+ "@dnd-kit/core": "^6.3.1",
+ "@dnd-kit/sortable": "^10.0.0",
+ "@dnd-kit/utilities": "^3.2.2",
+ "@fontsource-variable/geist": "^5.2.8",
+ "@fontsource-variable/geist-mono": "^5.2.7",
+ "@tanstack/react-table": "^8.21.3",
+ "@tiptap/extension-link": "^3.22.5",
+ "@tiptap/extension-placeholder": "^3.22.5",
+ "@tiptap/react": "^3.22.5",
+ "@tiptap/starter-kit": "^3.22.5",
+ "class-variance-authority": "^0.7.1",
+ "clsx": "^2.1.1",
+ "cmdk": "^1.1.1",
+ "date-fns": "^4.1.0",
+ "date-fns-tz": "^3.2.0",
+ "flag-icons": "^7.5.0",
+ "lucide-react": "^1.14.0",
+ "react-colorful": "^5.7.0",
+ "react-day-picker": "^9.14.0",
+ "recharts": "^3.8.1",
+ "shadcn": "^4.7.0",
+ "tailwind-merge": "^3.5.0",
+ "tw-animate-css": "^1.4.0"
},
"devDependencies": {
"@types/react": "^19.2.14",
diff --git a/packages/dashboard/src/hooks/use-mobile.ts b/packages/dashboard-ui/src/hooks/use-mobile.ts
similarity index 100%
rename from packages/dashboard/src/hooks/use-mobile.ts
rename to packages/dashboard-ui/src/hooks/use-mobile.ts
diff --git a/packages/dashboard-ui/src/index.ts b/packages/dashboard-ui/src/index.ts
index 829c782345..f70ed4b877 100644
--- a/packages/dashboard-ui/src/index.ts
+++ b/packages/dashboard-ui/src/index.ts
@@ -1,5 +1,79 @@
// @spree/dashboard-ui — Spree Dashboard design system.
//
-// Phase 0 placeholder. The actual primitives + headless composed components
-// land in Phase 1 (see docs/plans/6.0-admin-spa.md "Package Split").
-export {}
+// Shadcn primitives + headless composed components + design tokens.
+// Consumers import flat from this barrel:
+//
+// import { Button, Card, PageHeader } from '@spree/dashboard-ui'
+//
+// Or import a specific file (for forking, lazy-loading, or to skip the barrel):
+//
+// import { Button } from '@spree/dashboard-ui/ui/button'
+//
+// CSS lives at `@spree/dashboard-ui/styles.css` — import once from your Vite app.
+
+export { useIsMobile } from './hooks/use-mobile'
+// ---------------------------------------------------------------------------
+// Helpers + hooks
+// ---------------------------------------------------------------------------
+export { cn } from './lib/utils'
+export { requiredMessage } from './lib/validation-messages'
+// ---------------------------------------------------------------------------
+// Spree composed components — headless, accept data via props
+// ---------------------------------------------------------------------------
+export * from './spree/address-block'
+export * from './spree/back-button'
+export * from './spree/bulk-dialog'
+export * from './spree/calculator-summary'
+export * from './spree/color-picker'
+export * from './spree/confirm-dialog'
+export * from './spree/country-flag'
+export * from './spree/data-grid'
+export * from './spree/drag-handle'
+export * from './spree/form-actions'
+export * from './spree/metadata/metadata-card'
+export * from './spree/relative-time'
+export * from './spree/resource-layout'
+export * from './spree/resource-name-cell'
+export * from './spree/route-error-boundary'
+export * from './spree/row-actions'
+export * from './spree/row-click-bridge'
+export * from './spree/secret-input'
+export * from './spree/storefront-visible-switch'
+export * from './spree/tag-list'
+// ---------------------------------------------------------------------------
+// UI primitives (shadcn) — see ./ui/*
+// ---------------------------------------------------------------------------
+export * from './ui/avatar'
+export * from './ui/badge'
+export * from './ui/breadcrumb'
+export * from './ui/button'
+export * from './ui/calendar'
+export * from './ui/card'
+export * from './ui/chart'
+export * from './ui/checkbox'
+export * from './ui/collapsible'
+export * from './ui/combobox'
+export * from './ui/command'
+export * from './ui/data-table'
+export * from './ui/date-picker'
+export * from './ui/date-range-picker'
+export * from './ui/dialog'
+export * from './ui/dropdown-menu'
+export * from './ui/empty'
+export * from './ui/field'
+export * from './ui/input'
+export * from './ui/input-group'
+export * from './ui/label'
+export * from './ui/pagination'
+export * from './ui/popover'
+export * from './ui/radio-group'
+export * from './ui/rich-text-editor'
+export * from './ui/select'
+export * from './ui/separator'
+export * from './ui/sheet'
+export * from './ui/sidebar'
+export * from './ui/skeleton'
+export * from './ui/slot'
+export * from './ui/switch'
+export * from './ui/textarea'
+export * from './ui/tooltip'
diff --git a/packages/dashboard/src/lib/utils.ts b/packages/dashboard-ui/src/lib/utils.ts
similarity index 100%
rename from packages/dashboard/src/lib/utils.ts
rename to packages/dashboard-ui/src/lib/utils.ts
diff --git a/packages/dashboard/src/lib/validation-messages.ts b/packages/dashboard-ui/src/lib/validation-messages.ts
similarity index 95%
rename from packages/dashboard/src/lib/validation-messages.ts
rename to packages/dashboard-ui/src/lib/validation-messages.ts
index b03b5bd044..20fa4babe0 100644
--- a/packages/dashboard/src/lib/validation-messages.ts
+++ b/packages/dashboard-ui/src/lib/validation-messages.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@/lib/i18n'
+import i18n from 'i18next'
/**
* Lazy "<Field> is required" message for Zod v4 schemas. Wrap in `{ error: ... }`
diff --git a/packages/dashboard/src/components/spree/address-block.tsx b/packages/dashboard-ui/src/spree/address-block.tsx
similarity index 60%
rename from packages/dashboard/src/components/spree/address-block.tsx
rename to packages/dashboard-ui/src/spree/address-block.tsx
index 5a2b3cbb3f..c7aab23ea4 100644
--- a/packages/dashboard/src/components/spree/address-block.tsx
+++ b/packages/dashboard-ui/src/spree/address-block.tsx
@@ -1,11 +1,26 @@
-import type { Address } from '@spree/admin-sdk'
+/**
+ * Structural shape of the fields `<AddressBlock>` renders. Lets the design
+ * system stay decoupled from `@spree/admin-sdk`'s `Address` type — any
+ * object carrying these fields renders fine.
+ */
+export interface AddressBlockValue {
+ full_name?: string | null
+ company?: string | null
+ address1?: string | null
+ address2?: string | null
+ city?: string | null
+ state_text?: string | null
+ postal_code?: string | null
+ country_name?: string | null
+ phone?: string | null
+}
export function AddressBlock({
title,
address,
}: {
title: string
- address: Address | null | undefined
+ address: AddressBlockValue | null | undefined
}) {
return (
<div>
diff --git a/packages/dashboard/src/components/spree/back-button.tsx b/packages/dashboard-ui/src/spree/back-button.tsx
similarity index 100%
rename from packages/dashboard/src/components/spree/back-button.tsx
rename to packages/dashboard-ui/src/spree/back-button.tsx
diff --git a/packages/dashboard/src/components/spree/bulk-dialog.tsx b/packages/dashboard-ui/src/spree/bulk-dialog.tsx
similarity index 93%
rename from packages/dashboard/src/components/spree/bulk-dialog.tsx
rename to packages/dashboard-ui/src/spree/bulk-dialog.tsx
index 52fb49f6af..84f941c009 100644
--- a/packages/dashboard/src/components/spree/bulk-dialog.tsx
+++ b/packages/dashboard-ui/src/spree/bulk-dialog.tsx
@@ -1,6 +1,6 @@
import type { ReactNode } from 'react'
import { useTranslation } from 'react-i18next'
-import { Button } from '@/components/ui/button'
+import { Button } from '../ui/button'
import {
Dialog,
DialogBody,
@@ -9,8 +9,8 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog'
-import { FieldGroup } from '@/components/ui/field'
+} from '../ui/dialog'
+import { FieldGroup } from '../ui/field'
interface BulkDialogProps {
title: string
diff --git a/packages/dashboard/src/components/spree/calculator-summary.tsx b/packages/dashboard-ui/src/spree/calculator-summary.tsx
similarity index 100%
rename from packages/dashboard/src/components/spree/calculator-summary.tsx
rename to packages/dashboard-ui/src/spree/calculator-summary.tsx
diff --git a/packages/dashboard/src/components/spree/color-picker.tsx b/packages/dashboard-ui/src/spree/color-picker.tsx
similarity index 98%
rename from packages/dashboard/src/components/spree/color-picker.tsx
rename to packages/dashboard-ui/src/spree/color-picker.tsx
index c61571693d..e9b0e5023f 100644
--- a/packages/dashboard/src/components/spree/color-picker.tsx
+++ b/packages/dashboard-ui/src/spree/color-picker.tsx
@@ -1,8 +1,8 @@
import { useEffect, useRef, useState } from 'react'
import { HexColorPicker } from 'react-colorful'
import { useTranslation } from 'react-i18next'
-import { Input } from '@/components/ui/input'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Input } from '../ui/input'
/** Matches the server-side validation in `Spree::OptionValue#color_code`. */
const HEX_RE = /^#?[0-9A-Fa-f]{6}([0-9A-Fa-f]{2})?$/
diff --git a/packages/dashboard/src/components/spree/confirm-dialog.tsx b/packages/dashboard-ui/src/spree/confirm-dialog.tsx
similarity index 94%
rename from packages/dashboard/src/components/spree/confirm-dialog.tsx
rename to packages/dashboard-ui/src/spree/confirm-dialog.tsx
index 0480d2beb3..f403783e6f 100644
--- a/packages/dashboard/src/components/spree/confirm-dialog.tsx
+++ b/packages/dashboard-ui/src/spree/confirm-dialog.tsx
@@ -1,5 +1,6 @@
import { createContext, type ReactNode, useCallback, useContext, useRef, useState } from 'react'
-import { Button } from '@/components/ui/button'
+import { useTranslation } from 'react-i18next'
+import { Button } from '../ui/button'
import {
Dialog,
DialogContent,
@@ -7,8 +8,7 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog'
-import { useTranslation } from '@/lib/i18n'
+} from '../ui/dialog'
interface ConfirmOptions {
title?: string
diff --git a/packages/dashboard/src/components/spree/country-flag.tsx b/packages/dashboard-ui/src/spree/country-flag.tsx
similarity index 96%
rename from packages/dashboard/src/components/spree/country-flag.tsx
rename to packages/dashboard-ui/src/spree/country-flag.tsx
index 476abe42c8..ef6fa8bf6a 100644
--- a/packages/dashboard/src/components/spree/country-flag.tsx
+++ b/packages/dashboard-ui/src/spree/country-flag.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
interface CountryFlagProps {
/** ISO 3166-1 alpha-2 country code (case-insensitive). */
diff --git a/packages/dashboard/src/components/spree/data-grid/cells.tsx b/packages/dashboard-ui/src/spree/data-grid/cells.tsx
similarity index 98%
rename from packages/dashboard/src/components/spree/data-grid/cells.tsx
rename to packages/dashboard-ui/src/spree/data-grid/cells.tsx
index 448573111b..d8f146379e 100644
--- a/packages/dashboard/src/components/spree/data-grid/cells.tsx
+++ b/packages/dashboard-ui/src/spree/data-grid/cells.tsx
@@ -1,13 +1,7 @@
import { type KeyboardEvent, type ReactNode, useEffect, useId, useRef, useState } from 'react'
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from '@/components/ui/select'
-import { Switch } from '@/components/ui/switch'
-import { cn } from '@/lib/utils'
+import { cn } from '../../lib/utils'
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../../ui/select'
+import { Switch } from '../../ui/switch'
import { modeFor, useDataGridContext } from './context'
import type { CellCoords } from './types'
import { useStableCellRegistration } from './use-stable-cell-registration'
diff --git a/packages/dashboard/src/components/spree/data-grid/context.ts b/packages/dashboard-ui/src/spree/data-grid/context.ts
similarity index 100%
rename from packages/dashboard/src/components/spree/data-grid/context.ts
rename to packages/dashboard-ui/src/spree/data-grid/context.ts
diff --git a/packages/dashboard/src/components/spree/data-grid/data-grid.tsx b/packages/dashboard-ui/src/spree/data-grid/data-grid.tsx
similarity index 99%
rename from packages/dashboard/src/components/spree/data-grid/data-grid.tsx
rename to packages/dashboard-ui/src/spree/data-grid/data-grid.tsx
index c39a3d1df6..c3d8715580 100644
--- a/packages/dashboard/src/components/spree/data-grid/data-grid.tsx
+++ b/packages/dashboard-ui/src/spree/data-grid/data-grid.tsx
@@ -7,7 +7,7 @@ import {
useReactTable,
} from '@tanstack/react-table'
import { useCallback, useMemo, useRef, useState } from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../../lib/utils'
import { coordsInRect, DataGridContext, type DataGridContextValue } from './context'
import { FillHandle } from './fill-handle'
import type { CellCoords, CellKey, CellRegistration, RenderSectionHeader } from './types'
diff --git a/packages/dashboard/src/components/spree/data-grid/fill-handle.tsx b/packages/dashboard-ui/src/spree/data-grid/fill-handle.tsx
similarity index 100%
rename from packages/dashboard/src/components/spree/data-grid/fill-handle.tsx
rename to packages/dashboard-ui/src/spree/data-grid/fill-handle.tsx
diff --git a/packages/dashboard/src/components/spree/data-grid/helpers.ts b/packages/dashboard-ui/src/spree/data-grid/helpers.ts
similarity index 100%
rename from packages/dashboard/src/components/spree/data-grid/helpers.ts
rename to packages/dashboard-ui/src/spree/data-grid/helpers.ts
diff --git a/packages/dashboard/src/components/spree/data-grid/index.ts b/packages/dashboard-ui/src/spree/data-grid/index.ts
similarity index 100%
rename from packages/dashboard/src/components/spree/data-grid/index.ts
rename to packages/dashboard-ui/src/spree/data-grid/index.ts
diff --git a/packages/dashboard/src/components/spree/data-grid/types.ts b/packages/dashboard-ui/src/spree/data-grid/types.ts
similarity index 100%
rename from packages/dashboard/src/components/spree/data-grid/types.ts
rename to packages/dashboard-ui/src/spree/data-grid/types.ts
diff --git a/packages/dashboard/src/components/spree/data-grid/use-data-grid-keyboard.ts b/packages/dashboard-ui/src/spree/data-grid/use-data-grid-keyboard.ts
similarity index 100%
rename from packages/dashboard/src/components/spree/data-grid/use-data-grid-keyboard.ts
rename to packages/dashboard-ui/src/spree/data-grid/use-data-grid-keyboard.ts
diff --git a/packages/dashboard/src/components/spree/data-grid/use-stable-cell-registration.ts b/packages/dashboard-ui/src/spree/data-grid/use-stable-cell-registration.ts
similarity index 100%
rename from packages/dashboard/src/components/spree/data-grid/use-stable-cell-registration.ts
rename to packages/dashboard-ui/src/spree/data-grid/use-stable-cell-registration.ts
diff --git a/packages/dashboard/src/components/spree/drag-handle.tsx b/packages/dashboard-ui/src/spree/drag-handle.tsx
similarity index 98%
rename from packages/dashboard/src/components/spree/drag-handle.tsx
rename to packages/dashboard-ui/src/spree/drag-handle.tsx
index 1ce000a667..3d2a78f0d2 100644
--- a/packages/dashboard/src/components/spree/drag-handle.tsx
+++ b/packages/dashboard-ui/src/spree/drag-handle.tsx
@@ -2,7 +2,7 @@ import type { DraggableAttributes, DraggableSyntheticListeners } from '@dnd-kit/
import { GripVerticalIcon } from 'lucide-react'
import type { ComponentProps } from 'react'
import { useTranslation } from 'react-i18next'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
interface DragHandleProps extends Omit<ComponentProps<'button'>, 'type'> {
/** `attributes` from `useSortable` / `useDraggable`. */
diff --git a/packages/dashboard/src/components/spree/form-actions.tsx b/packages/dashboard-ui/src/spree/form-actions.tsx
similarity index 98%
rename from packages/dashboard/src/components/spree/form-actions.tsx
rename to packages/dashboard-ui/src/spree/form-actions.tsx
index 31b5042dd8..54d6b776e4 100644
--- a/packages/dashboard/src/components/spree/form-actions.tsx
+++ b/packages/dashboard-ui/src/spree/form-actions.tsx
@@ -2,7 +2,7 @@ import { useHotkey } from '@tanstack/react-hotkeys'
import { Loader2Icon } from 'lucide-react'
import { useEffect } from 'react'
import { type FieldValues, type UseFormReturn, useFormState } from 'react-hook-form'
-import { Button } from '@/components/ui/button'
+import { Button } from '../ui/button'
/**
* Submit button wired to a `react-hook-form` instance. Always rendered,
diff --git a/packages/dashboard/src/components/spree/metadata/metadata-card.tsx b/packages/dashboard-ui/src/spree/metadata/metadata-card.tsx
similarity index 94%
rename from packages/dashboard/src/components/spree/metadata/metadata-card.tsx
rename to packages/dashboard-ui/src/spree/metadata/metadata-card.tsx
index 53fbabe37a..e156e93607 100644
--- a/packages/dashboard/src/components/spree/metadata/metadata-card.tsx
+++ b/packages/dashboard-ui/src/spree/metadata/metadata-card.tsx
@@ -1,7 +1,7 @@
import { BracesIcon } from 'lucide-react'
import { Fragment } from 'react'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from '@/components/ui/empty'
+import { Card, CardContent, CardHeader, CardTitle } from '../../ui/card'
+import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from '../../ui/empty'
interface MetadataCardProps {
/**
diff --git a/packages/dashboard/src/components/spree/relative-time.tsx b/packages/dashboard-ui/src/spree/relative-time.tsx
similarity index 90%
rename from packages/dashboard/src/components/spree/relative-time.tsx
rename to packages/dashboard-ui/src/spree/relative-time.tsx
index 2cdc8c7492..d71189d64f 100644
--- a/packages/dashboard/src/components/spree/relative-time.tsx
+++ b/packages/dashboard-ui/src/spree/relative-time.tsx
@@ -1,8 +1,7 @@
import { format, formatDistanceToNow } from 'date-fns'
import type { ComponentProps, ReactNode } from 'react'
-
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip'
type TooltipContentProps = ComponentProps<typeof TooltipContent>
diff --git a/packages/dashboard/src/components/spree/resource-layout.tsx b/packages/dashboard-ui/src/spree/resource-layout.tsx
similarity index 100%
rename from packages/dashboard/src/components/spree/resource-layout.tsx
rename to packages/dashboard-ui/src/spree/resource-layout.tsx
diff --git a/packages/dashboard/src/components/spree/resource-name-cell.tsx b/packages/dashboard-ui/src/spree/resource-name-cell.tsx
similarity index 97%
rename from packages/dashboard/src/components/spree/resource-name-cell.tsx
rename to packages/dashboard-ui/src/spree/resource-name-cell.tsx
index df64ef93f4..1bc1eef751 100644
--- a/packages/dashboard/src/components/spree/resource-name-cell.tsx
+++ b/packages/dashboard-ui/src/spree/resource-name-cell.tsx
@@ -1,5 +1,5 @@
import type { ReactNode } from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
interface ResourceNameCellProps {
/** Resource identifier, mirrored into the bridge data attribute. */
diff --git a/packages/dashboard/src/components/spree/route-error-boundary.tsx b/packages/dashboard-ui/src/spree/route-error-boundary.tsx
similarity index 97%
rename from packages/dashboard/src/components/spree/route-error-boundary.tsx
rename to packages/dashboard-ui/src/spree/route-error-boundary.tsx
index 40a1fadb57..eea5bd9500 100644
--- a/packages/dashboard/src/components/spree/route-error-boundary.tsx
+++ b/packages/dashboard-ui/src/spree/route-error-boundary.tsx
@@ -1,6 +1,6 @@
import { AlertTriangleIcon, RotateCcwIcon } from 'lucide-react'
import { Component, type ReactNode } from 'react'
-import { Button } from '@/components/ui/button'
+import { Button } from '../ui/button'
import {
Empty,
EmptyContent,
@@ -8,7 +8,7 @@ import {
EmptyHeader,
EmptyMedia,
EmptyTitle,
-} from '@/components/ui/empty'
+} from '../ui/empty'
interface ErrorStateProps {
/** Headline. Defaults to "Something went wrong". */
diff --git a/packages/dashboard/src/components/spree/row-actions.tsx b/packages/dashboard-ui/src/spree/row-actions.tsx
similarity index 97%
rename from packages/dashboard/src/components/spree/row-actions.tsx
rename to packages/dashboard-ui/src/spree/row-actions.tsx
index 0bdf8c6e06..09d97a6d75 100644
--- a/packages/dashboard/src/components/spree/row-actions.tsx
+++ b/packages/dashboard-ui/src/spree/row-actions.tsx
@@ -1,13 +1,13 @@
import { CopyIcon, EllipsisVerticalIcon, PencilIcon, Trash2Icon } from 'lucide-react'
import type { ReactNode } from 'react'
import { useTranslation } from 'react-i18next'
-import { Button } from '@/components/ui/button'
+import { Button } from '../ui/button'
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
+} from '../ui/dropdown-menu'
export interface RowAction {
/** Stable key for React reconciliation. Doubles as the i18n action slug
diff --git a/packages/dashboard/src/components/spree/row-click-bridge.tsx b/packages/dashboard-ui/src/spree/row-click-bridge.tsx
similarity index 100%
rename from packages/dashboard/src/components/spree/row-click-bridge.tsx
rename to packages/dashboard-ui/src/spree/row-click-bridge.tsx
diff --git a/packages/dashboard/src/components/spree/secret-input.tsx b/packages/dashboard-ui/src/spree/secret-input.tsx
similarity index 87%
rename from packages/dashboard/src/components/spree/secret-input.tsx
rename to packages/dashboard-ui/src/spree/secret-input.tsx
index 1e9b5944d3..851a7016e8 100644
--- a/packages/dashboard/src/components/spree/secret-input.tsx
+++ b/packages/dashboard-ui/src/spree/secret-input.tsx
@@ -1,10 +1,18 @@
-import { isMaskedSecret } from '@spree/admin-sdk'
import { EyeIcon, EyeOffIcon } from 'lucide-react'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
-import { Button } from '@/components/ui/button'
-import { Field, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
+import { Button } from '../ui/button'
+import { Field, FieldLabel } from '../ui/field'
+import { Input } from '../ui/input'
+
+// Server masks stored secrets as `••••…` on read so admins can see "yes,
+// something is stored" without exposing the actual value. Detecting that
+// prefix tells us whether the field is round-tripping the existing secret
+// (the backend has a guard that ignores writes still carrying the mask).
+const PREFERENCE_MASK_TOKEN = '••••'
+function isMaskedSecret(value: unknown): value is string {
+ return typeof value === 'string' && value.startsWith(PREFERENCE_MASK_TOKEN)
+}
interface SecretInputProps {
id: string
diff --git a/packages/dashboard/src/components/spree/storefront-visible-switch.tsx b/packages/dashboard-ui/src/spree/storefront-visible-switch.tsx
similarity index 94%
rename from packages/dashboard/src/components/spree/storefront-visible-switch.tsx
rename to packages/dashboard-ui/src/spree/storefront-visible-switch.tsx
index bf24a8f914..fa025aa164 100644
--- a/packages/dashboard/src/components/spree/storefront-visible-switch.tsx
+++ b/packages/dashboard-ui/src/spree/storefront-visible-switch.tsx
@@ -1,6 +1,6 @@
import { type Control, Controller, type FieldPath, type FieldValues } from 'react-hook-form'
-import { Field, FieldLabel } from '@/components/ui/field'
-import { Switch } from '@/components/ui/switch'
+import { Field, FieldLabel } from '../ui/field'
+import { Switch } from '../ui/switch'
interface StorefrontVisibleSwitchProps<TFieldValues extends FieldValues> {
control: Control<TFieldValues>
diff --git a/packages/dashboard/src/components/spree/tag-list.tsx b/packages/dashboard-ui/src/spree/tag-list.tsx
similarity index 94%
rename from packages/dashboard/src/components/spree/tag-list.tsx
rename to packages/dashboard-ui/src/spree/tag-list.tsx
index e32870b746..1e0dbc8555 100644
--- a/packages/dashboard/src/components/spree/tag-list.tsx
+++ b/packages/dashboard-ui/src/spree/tag-list.tsx
@@ -1,4 +1,4 @@
-import { Badge } from '@/components/ui/badge'
+import { Badge } from '../ui/badge'
interface TagListProps {
tags: string[] | null | undefined
diff --git a/packages/dashboard/src/index.css b/packages/dashboard-ui/src/styles.css
similarity index 93%
rename from packages/dashboard/src/index.css
rename to packages/dashboard-ui/src/styles.css
index 860386a25f..35bbbb50f6 100644
--- a/packages/dashboard/src/index.css
+++ b/packages/dashboard-ui/src/styles.css
@@ -3,6 +3,20 @@
@import "shadcn/tailwind.css";
@import "@fontsource-variable/geist";
@import "@fontsource-variable/geist-mono";
+
+/* Tailwind v4 only scans the consuming project's own source by default.
+ * `@source` lets us point it at additional roots — the consumer's own
+ * sources are auto-detected; this directive teaches Tailwind to also scan
+ * the dashboard-ui source files that live alongside this CSS.
+ *
+ * Path is relative to this CSS file (`packages/dashboard-ui/src/styles.css`)
+ * so it resolves correctly whether dashboard-ui is consumed via the workspace
+ * symlink (`node_modules/@spree/dashboard-ui` → `packages/dashboard-ui`) or
+ * eventually from a published npm package (where the same relative layout
+ * holds inside the tarball).
+ */
+@source "./ui/**/*.{ts,tsx}";
+@source "./spree/**/*.{ts,tsx}";
/* Country flag icons — `<CountryFlag iso="US" />` resolves to `.fi.fi-us`,
which lazy-loads `flags/4x3/us.svg` via background-image. Only flags
actually rendered hit the network. */
diff --git a/packages/dashboard/src/components/ui/avatar.tsx b/packages/dashboard-ui/src/ui/avatar.tsx
similarity index 98%
rename from packages/dashboard/src/components/ui/avatar.tsx
rename to packages/dashboard-ui/src/ui/avatar.tsx
index 0829431334..fe14a4a788 100644
--- a/packages/dashboard/src/components/ui/avatar.tsx
+++ b/packages/dashboard-ui/src/ui/avatar.tsx
@@ -1,7 +1,7 @@
import { Avatar as AvatarPrimitive } from '@base-ui/react/avatar'
import type * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Avatar({
className,
diff --git a/packages/dashboard/src/components/ui/badge.tsx b/packages/dashboard-ui/src/ui/badge.tsx
similarity index 98%
rename from packages/dashboard/src/components/ui/badge.tsx
rename to packages/dashboard-ui/src/ui/badge.tsx
index a161e017ca..fca812ab0e 100644
--- a/packages/dashboard/src/components/ui/badge.tsx
+++ b/packages/dashboard-ui/src/ui/badge.tsx
@@ -1,8 +1,8 @@
import { cva, type VariantProps } from 'class-variance-authority'
import { CheckIcon } from 'lucide-react'
import * as React from 'react'
-import { Slot } from '@/components/ui/slot'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Slot } from './slot'
const badgeVariants = cva(
'group/badge inline-flex h-5 w-fit shrink-0 items-center justify-center gap-1 overflow-hidden rounded-4xl border border-transparent px-2 py-0.5 text-xs font-medium whitespace-nowrap transition-all focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&>svg]:pointer-events-none [&>svg]:size-3!',
diff --git a/packages/dashboard/src/components/ui/breadcrumb.tsx b/packages/dashboard-ui/src/ui/breadcrumb.tsx
similarity index 95%
rename from packages/dashboard/src/components/ui/breadcrumb.tsx
rename to packages/dashboard-ui/src/ui/breadcrumb.tsx
index 2b2e06fcdb..f9f9f19e1e 100644
--- a/packages/dashboard/src/components/ui/breadcrumb.tsx
+++ b/packages/dashboard-ui/src/ui/breadcrumb.tsx
@@ -1,8 +1,8 @@
+import i18n from 'i18next'
import { ChevronRightIcon, MoreHorizontalIcon } from 'lucide-react'
import type * as React from 'react'
-import { Slot } from '@/components/ui/slot'
-import { i18n } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Slot } from './slot'
function Breadcrumb({ className, ...props }: React.ComponentProps<'nav'>) {
return (
diff --git a/packages/dashboard/src/components/ui/button.tsx b/packages/dashboard-ui/src/ui/button.tsx
similarity index 96%
rename from packages/dashboard/src/components/ui/button.tsx
rename to packages/dashboard-ui/src/ui/button.tsx
index ac40192b33..c79a384787 100644
--- a/packages/dashboard/src/components/ui/button.tsx
+++ b/packages/dashboard-ui/src/ui/button.tsx
@@ -1,8 +1,7 @@
import { cva, type VariantProps } from 'class-variance-authority'
import type * as React from 'react'
-import { Slot } from '@/components/ui/slot'
-
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Slot } from './slot'
const buttonVariants = cva(
"group/button inline-flex shrink-0 items-center justify-center gap-2 rounded-xl border border-transparent text-sm font-medium whitespace-nowrap cursor-pointer select-none no-underline transition-colors duration-100 ease-linear outline-none focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-500 disabled:pointer-events-none disabled:opacity-70 disabled:cursor-not-allowed aria-invalid:border-destructive [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
diff --git a/packages/dashboard/src/components/ui/calendar.tsx b/packages/dashboard-ui/src/ui/calendar.tsx
similarity index 98%
rename from packages/dashboard/src/components/ui/calendar.tsx
rename to packages/dashboard-ui/src/ui/calendar.tsx
index 3b6e842a3c..99ba1ede13 100644
--- a/packages/dashboard/src/components/ui/calendar.tsx
+++ b/packages/dashboard-ui/src/ui/calendar.tsx
@@ -1,7 +1,7 @@
import { ChevronLeftIcon, ChevronRightIcon } from 'lucide-react'
import type * as React from 'react'
import { DayPicker } from 'react-day-picker'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Calendar({
className,
diff --git a/packages/dashboard/src/components/ui/card.tsx b/packages/dashboard-ui/src/ui/card.tsx
similarity index 98%
rename from packages/dashboard/src/components/ui/card.tsx
rename to packages/dashboard-ui/src/ui/card.tsx
index b9772de163..ef99df9eed 100644
--- a/packages/dashboard/src/components/ui/card.tsx
+++ b/packages/dashboard-ui/src/ui/card.tsx
@@ -1,6 +1,6 @@
import type * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Card({ className, ...props }: React.ComponentProps<'div'>) {
return (
diff --git a/packages/dashboard/src/components/ui/chart.tsx b/packages/dashboard-ui/src/ui/chart.tsx
similarity index 98%
rename from packages/dashboard/src/components/ui/chart.tsx
rename to packages/dashboard-ui/src/ui/chart.tsx
index 7251168d4a..23b2534716 100644
--- a/packages/dashboard/src/components/ui/chart.tsx
+++ b/packages/dashboard-ui/src/ui/chart.tsx
@@ -1,6 +1,6 @@
import * as React from 'react'
import { ResponsiveContainer, Tooltip } from 'recharts'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
export type ChartConfig = Record<string, { label: string; color?: string }>
diff --git a/packages/dashboard/src/components/ui/checkbox.tsx b/packages/dashboard-ui/src/ui/checkbox.tsx
similarity index 98%
rename from packages/dashboard/src/components/ui/checkbox.tsx
rename to packages/dashboard-ui/src/ui/checkbox.tsx
index b8c4adc42c..c832d42841 100644
--- a/packages/dashboard/src/components/ui/checkbox.tsx
+++ b/packages/dashboard-ui/src/ui/checkbox.tsx
@@ -1,7 +1,7 @@
import { Checkbox as CheckboxPrimitive } from '@base-ui/react/checkbox'
import { CheckIcon, MinusIcon } from 'lucide-react'
import type * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Checkbox({
className,
diff --git a/packages/dashboard/src/components/ui/collapsible.tsx b/packages/dashboard-ui/src/ui/collapsible.tsx
similarity index 100%
rename from packages/dashboard/src/components/ui/collapsible.tsx
rename to packages/dashboard-ui/src/ui/collapsible.tsx
diff --git a/packages/dashboard/src/components/ui/combobox.tsx b/packages/dashboard-ui/src/ui/combobox.tsx
similarity index 97%
rename from packages/dashboard/src/components/ui/combobox.tsx
rename to packages/dashboard-ui/src/ui/combobox.tsx
index 8ee5c43d08..683b10f97e 100644
--- a/packages/dashboard/src/components/ui/combobox.tsx
+++ b/packages/dashboard-ui/src/ui/combobox.tsx
@@ -3,14 +3,9 @@
import { Combobox as ComboboxPrimitive } from '@base-ui/react'
import { CheckIcon, ChevronDownIcon, XIcon } from 'lucide-react'
import * as React from 'react'
-import { Button } from '@/components/ui/button'
-import {
- InputGroup,
- InputGroupAddon,
- InputGroupButton,
- InputGroupInput,
-} from '@/components/ui/input-group'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Button } from './button'
+import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from './input-group'
const Combobox = ComboboxPrimitive.Root
diff --git a/packages/dashboard/src/components/ui/command.tsx b/packages/dashboard-ui/src/ui/command.tsx
similarity index 95%
rename from packages/dashboard/src/components/ui/command.tsx
rename to packages/dashboard-ui/src/ui/command.tsx
index f4d4b3e23b..e05271116a 100644
--- a/packages/dashboard/src/components/ui/command.tsx
+++ b/packages/dashboard-ui/src/ui/command.tsx
@@ -1,15 +1,9 @@
import { Command as CommandPrimitive } from 'cmdk'
import { CheckIcon, SearchIcon } from 'lucide-react'
import * as React from 'react'
-import {
- Dialog,
- DialogContent,
- DialogDescription,
- DialogHeader,
- DialogTitle,
-} from '@/components/ui/dialog'
-import { InputGroup, InputGroupAddon } from '@/components/ui/input-group'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from './dialog'
+import { InputGroup, InputGroupAddon } from './input-group'
function Command({ className, ...props }: React.ComponentProps<typeof CommandPrimitive>) {
return (
diff --git a/packages/dashboard/src/components/ui/data-table.tsx b/packages/dashboard-ui/src/ui/data-table.tsx
similarity index 98%
rename from packages/dashboard/src/components/ui/data-table.tsx
rename to packages/dashboard-ui/src/ui/data-table.tsx
index 244f59bc60..b1d2488113 100644
--- a/packages/dashboard/src/components/ui/data-table.tsx
+++ b/packages/dashboard-ui/src/ui/data-table.tsx
@@ -1,5 +1,5 @@
import type { ReactNode } from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Table({ className, ...props }: React.ComponentProps<'table'>) {
return (
diff --git a/packages/dashboard/src/components/ui/date-picker.tsx b/packages/dashboard-ui/src/ui/date-picker.tsx
similarity index 96%
rename from packages/dashboard/src/components/ui/date-picker.tsx
rename to packages/dashboard-ui/src/ui/date-picker.tsx
index d8812ee1b0..e82d3a5955 100644
--- a/packages/dashboard/src/components/ui/date-picker.tsx
+++ b/packages/dashboard-ui/src/ui/date-picker.tsx
@@ -1,13 +1,13 @@
import { format, parse, parseISO } from 'date-fns'
import { formatInTimeZone, fromZonedTime, toZonedTime } from 'date-fns-tz'
+import i18n from 'i18next'
import { CalendarIcon, XIcon } from 'lucide-react'
import { useEffect, useMemo, useRef, useState } from 'react'
-import { Button } from '@/components/ui/button'
-import { Calendar } from '@/components/ui/calendar'
-import { Input } from '@/components/ui/input'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { i18n } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Button } from './button'
+import { Calendar } from './calendar'
+import { Input } from './input'
+import { Popover, PopoverContent, PopoverTrigger } from './popover'
interface DatePickerProps {
value?: string | null
diff --git a/packages/dashboard/src/components/ui/date-range-picker.tsx b/packages/dashboard-ui/src/ui/date-range-picker.tsx
similarity index 95%
rename from packages/dashboard/src/components/ui/date-range-picker.tsx
rename to packages/dashboard-ui/src/ui/date-range-picker.tsx
index 98b4ae661c..25f1c4985c 100644
--- a/packages/dashboard/src/components/ui/date-range-picker.tsx
+++ b/packages/dashboard-ui/src/ui/date-range-picker.tsx
@@ -2,10 +2,10 @@ import { format, startOfMonth, startOfYear, subDays } from 'date-fns'
import { CalendarIcon, ChevronDownIcon } from 'lucide-react'
import { useState } from 'react'
import type { DateRange as DayPickerDateRange } from 'react-day-picker'
-import { Button } from '@/components/ui/button'
-import { Calendar } from '@/components/ui/calendar'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Button } from './button'
+import { Calendar } from './calendar'
+import { Popover, PopoverContent, PopoverTrigger } from './popover'
export interface DateRange {
from: Date
diff --git a/packages/dashboard/src/components/ui/dialog.tsx b/packages/dashboard-ui/src/ui/dialog.tsx
similarity index 98%
rename from packages/dashboard/src/components/ui/dialog.tsx
rename to packages/dashboard-ui/src/ui/dialog.tsx
index 1abfe91e19..8c90fc8823 100644
--- a/packages/dashboard/src/components/ui/dialog.tsx
+++ b/packages/dashboard-ui/src/ui/dialog.tsx
@@ -1,8 +1,8 @@
import { Dialog as DialogPrimitive } from '@base-ui/react/dialog'
import { XIcon } from 'lucide-react'
import * as React from 'react'
-import { Button } from '@/components/ui/button'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Button } from './button'
function Dialog({
children,
diff --git a/packages/dashboard/src/components/ui/dropdown-menu.tsx b/packages/dashboard-ui/src/ui/dropdown-menu.tsx
similarity index 99%
rename from packages/dashboard/src/components/ui/dropdown-menu.tsx
rename to packages/dashboard-ui/src/ui/dropdown-menu.tsx
index 9b196ddb68..9710e66a74 100644
--- a/packages/dashboard/src/components/ui/dropdown-menu.tsx
+++ b/packages/dashboard-ui/src/ui/dropdown-menu.tsx
@@ -3,7 +3,7 @@
import { Menu as MenuPrimitive } from '@base-ui/react/menu'
import { CheckIcon, ChevronRightIcon } from 'lucide-react'
import * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function DropdownMenu({
children,
diff --git a/packages/dashboard/src/components/ui/empty.tsx b/packages/dashboard-ui/src/ui/empty.tsx
similarity index 98%
rename from packages/dashboard/src/components/ui/empty.tsx
rename to packages/dashboard-ui/src/ui/empty.tsx
index 84dce41ef6..bdb21a8ec4 100644
--- a/packages/dashboard/src/components/ui/empty.tsx
+++ b/packages/dashboard-ui/src/ui/empty.tsx
@@ -1,6 +1,6 @@
import { cva, type VariantProps } from 'class-variance-authority'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Empty({ className, ...props }: React.ComponentProps<'div'>) {
return (
diff --git a/packages/dashboard/src/components/ui/field.tsx b/packages/dashboard-ui/src/ui/field.tsx
similarity index 97%
rename from packages/dashboard/src/components/ui/field.tsx
rename to packages/dashboard-ui/src/ui/field.tsx
index e565f12488..dd495bc426 100644
--- a/packages/dashboard/src/components/ui/field.tsx
+++ b/packages/dashboard-ui/src/ui/field.tsx
@@ -1,8 +1,8 @@
import { cva, type VariantProps } from 'class-variance-authority'
import { useMemo } from 'react'
-import { Label } from '@/components/ui/label'
-import { Separator } from '@/components/ui/separator'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Label } from './label'
+import { Separator } from './separator'
function FieldSet({ className, ...props }: React.ComponentProps<'fieldset'>) {
return (
diff --git a/packages/dashboard/src/components/ui/input-group.tsx b/packages/dashboard-ui/src/ui/input-group.tsx
similarity index 96%
rename from packages/dashboard/src/components/ui/input-group.tsx
rename to packages/dashboard-ui/src/ui/input-group.tsx
index 87aabf8e69..0260f37aee 100644
--- a/packages/dashboard/src/components/ui/input-group.tsx
+++ b/packages/dashboard-ui/src/ui/input-group.tsx
@@ -1,9 +1,9 @@
import { cva, type VariantProps } from 'class-variance-authority'
import * as React from 'react'
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import { Textarea } from '@/components/ui/textarea'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Button } from './button'
+import { Input } from './input'
+import { Textarea } from './textarea'
function InputGroup({ className, ...props }: React.ComponentProps<'div'>) {
return (
diff --git a/packages/dashboard/src/components/ui/input.tsx b/packages/dashboard-ui/src/ui/input.tsx
similarity index 96%
rename from packages/dashboard/src/components/ui/input.tsx
rename to packages/dashboard-ui/src/ui/input.tsx
index 79245ca682..a49c8fbb3b 100644
--- a/packages/dashboard/src/components/ui/input.tsx
+++ b/packages/dashboard-ui/src/ui/input.tsx
@@ -1,6 +1,6 @@
import type * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
return (
diff --git a/packages/dashboard/src/components/ui/label.tsx b/packages/dashboard-ui/src/ui/label.tsx
similarity index 96%
rename from packages/dashboard/src/components/ui/label.tsx
rename to packages/dashboard-ui/src/ui/label.tsx
index b2d3773284..c7255317c4 100644
--- a/packages/dashboard/src/components/ui/label.tsx
+++ b/packages/dashboard-ui/src/ui/label.tsx
@@ -1,7 +1,7 @@
import { Field } from '@base-ui/react/field'
import * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
/**
* Label component backed by Base UI's Field.Label.
diff --git a/packages/dashboard/src/components/ui/pagination.tsx b/packages/dashboard-ui/src/ui/pagination.tsx
similarity index 95%
rename from packages/dashboard/src/components/ui/pagination.tsx
rename to packages/dashboard-ui/src/ui/pagination.tsx
index dc1705c631..a7c178ecbe 100644
--- a/packages/dashboard/src/components/ui/pagination.tsx
+++ b/packages/dashboard-ui/src/ui/pagination.tsx
@@ -4,14 +4,8 @@ import {
ChevronsLeftIcon,
ChevronsRightIcon,
} from 'lucide-react'
-import { Button } from '@/components/ui/button'
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from '@/components/ui/select'
+import { Button } from './button'
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './select'
interface PaginationMeta {
page: number
diff --git a/packages/dashboard/src/components/ui/popover.tsx b/packages/dashboard-ui/src/ui/popover.tsx
similarity index 98%
rename from packages/dashboard/src/components/ui/popover.tsx
rename to packages/dashboard-ui/src/ui/popover.tsx
index 48256928fe..3a7aa227e2 100644
--- a/packages/dashboard/src/components/ui/popover.tsx
+++ b/packages/dashboard-ui/src/ui/popover.tsx
@@ -1,6 +1,6 @@
import { Popover as PopoverPrimitive } from '@base-ui/react/popover'
import * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Popover({
children,
diff --git a/packages/dashboard/src/components/ui/radio-group.tsx b/packages/dashboard-ui/src/ui/radio-group.tsx
similarity index 97%
rename from packages/dashboard/src/components/ui/radio-group.tsx
rename to packages/dashboard-ui/src/ui/radio-group.tsx
index 3be66d4035..5804cf57e4 100644
--- a/packages/dashboard/src/components/ui/radio-group.tsx
+++ b/packages/dashboard-ui/src/ui/radio-group.tsx
@@ -1,7 +1,7 @@
import { Radio as RadioPrimitive } from '@base-ui/react/radio'
import { RadioGroup as RadioGroupPrimitive } from '@base-ui/react/radio-group'
import type * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function RadioGroup({ className, ...props }: React.ComponentProps<typeof RadioGroupPrimitive>) {
return (
diff --git a/packages/dashboard/src/components/ui/rich-text-editor.tsx b/packages/dashboard-ui/src/ui/rich-text-editor.tsx
similarity index 99%
rename from packages/dashboard/src/components/ui/rich-text-editor.tsx
rename to packages/dashboard-ui/src/ui/rich-text-editor.tsx
index c892300e15..5b763870e2 100644
--- a/packages/dashboard/src/components/ui/rich-text-editor.tsx
+++ b/packages/dashboard-ui/src/ui/rich-text-editor.tsx
@@ -14,7 +14,7 @@ import {
UndoIcon,
} from 'lucide-react'
import { useCallback, useEffect } from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
interface RichTextEditorProps {
value?: string
diff --git a/packages/dashboard/src/components/ui/select.tsx b/packages/dashboard-ui/src/ui/select.tsx
similarity index 99%
rename from packages/dashboard/src/components/ui/select.tsx
rename to packages/dashboard-ui/src/ui/select.tsx
index 0f7d34cc53..4cd5726202 100644
--- a/packages/dashboard/src/components/ui/select.tsx
+++ b/packages/dashboard-ui/src/ui/select.tsx
@@ -1,7 +1,7 @@
import { Select as SelectPrimitive } from '@base-ui/react/select'
import { CheckIcon, ChevronDownIcon } from 'lucide-react'
import type * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Select({
children,
diff --git a/packages/dashboard/src/components/ui/separator.tsx b/packages/dashboard-ui/src/ui/separator.tsx
similarity index 95%
rename from packages/dashboard/src/components/ui/separator.tsx
rename to packages/dashboard-ui/src/ui/separator.tsx
index 04f84b0144..b03d3213e9 100644
--- a/packages/dashboard/src/components/ui/separator.tsx
+++ b/packages/dashboard-ui/src/ui/separator.tsx
@@ -3,7 +3,7 @@
import { Separator as SeparatorPrimitive } from '@base-ui/react/separator'
import * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Separator({
className,
diff --git a/packages/dashboard/src/components/ui/sheet.tsx b/packages/dashboard-ui/src/ui/sheet.tsx
similarity index 98%
rename from packages/dashboard/src/components/ui/sheet.tsx
rename to packages/dashboard-ui/src/ui/sheet.tsx
index 8a5fdffe72..55667621b8 100644
--- a/packages/dashboard/src/components/ui/sheet.tsx
+++ b/packages/dashboard-ui/src/ui/sheet.tsx
@@ -3,8 +3,8 @@
import { Dialog as SheetPrimitive } from '@base-ui/react/dialog'
import { XIcon } from 'lucide-react'
import * as React from 'react'
-import { Button } from '@/components/ui/button'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
+import { Button } from './button'
function Sheet({
children,
diff --git a/packages/dashboard/src/components/ui/sidebar.tsx b/packages/dashboard-ui/src/ui/sidebar.tsx
similarity index 97%
rename from packages/dashboard/src/components/ui/sidebar.tsx
rename to packages/dashboard-ui/src/ui/sidebar.tsx
index d9c9dbd154..24ee7f7627 100644
--- a/packages/dashboard/src/components/ui/sidebar.tsx
+++ b/packages/dashboard-ui/src/ui/sidebar.tsx
@@ -1,22 +1,16 @@
import { cva, type VariantProps } from 'class-variance-authority'
+import i18n from 'i18next'
import { PanelLeftIcon } from 'lucide-react'
import * as React from 'react'
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import { Separator } from '@/components/ui/separator'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
-import { Skeleton } from '@/components/ui/skeleton'
-import { Slot } from '@/components/ui/slot'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { useIsMobile } from '@/hooks/use-mobile'
-import { i18n } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
+import { useIsMobile } from '../hooks/use-mobile'
+import { cn } from '../lib/utils'
+import { Button } from './button'
+import { Input } from './input'
+import { Separator } from './separator'
+import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle } from './sheet'
+import { Skeleton } from './skeleton'
+import { Slot } from './slot'
+import { Tooltip, TooltipContent, TooltipTrigger } from './tooltip'
const SIDEBAR_COOKIE_NAME = 'sidebar_state'
const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7
diff --git a/packages/dashboard/src/components/ui/skeleton.tsx b/packages/dashboard-ui/src/ui/skeleton.tsx
similarity index 87%
rename from packages/dashboard/src/components/ui/skeleton.tsx
rename to packages/dashboard-ui/src/ui/skeleton.tsx
index 1fef545792..03435e853a 100644
--- a/packages/dashboard/src/components/ui/skeleton.tsx
+++ b/packages/dashboard-ui/src/ui/skeleton.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Skeleton({ className, ...props }: React.ComponentProps<'div'>) {
return (
diff --git a/packages/dashboard/src/components/ui/slot.tsx b/packages/dashboard-ui/src/ui/slot.tsx
similarity index 96%
rename from packages/dashboard/src/components/ui/slot.tsx
rename to packages/dashboard-ui/src/ui/slot.tsx
index 4b6ffb601e..407242df9f 100644
--- a/packages/dashboard/src/components/ui/slot.tsx
+++ b/packages/dashboard-ui/src/ui/slot.tsx
@@ -1,5 +1,5 @@
import * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
/**
* A simple Slot component that merges props onto its single child element.
diff --git a/packages/dashboard/src/components/ui/switch.tsx b/packages/dashboard-ui/src/ui/switch.tsx
similarity index 97%
rename from packages/dashboard/src/components/ui/switch.tsx
rename to packages/dashboard-ui/src/ui/switch.tsx
index 65d74f42f8..57cbbecdc1 100644
--- a/packages/dashboard/src/components/ui/switch.tsx
+++ b/packages/dashboard-ui/src/ui/switch.tsx
@@ -1,6 +1,6 @@
import { Switch as SwitchPrimitive } from '@base-ui/react/switch'
import type * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Switch({
className,
diff --git a/packages/dashboard/src/components/ui/textarea.tsx b/packages/dashboard-ui/src/ui/textarea.tsx
similarity index 95%
rename from packages/dashboard/src/components/ui/textarea.tsx
rename to packages/dashboard-ui/src/ui/textarea.tsx
index 03427b01f0..73d55f96a7 100644
--- a/packages/dashboard/src/components/ui/textarea.tsx
+++ b/packages/dashboard-ui/src/ui/textarea.tsx
@@ -1,6 +1,6 @@
import * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function Textarea({ className, ...props }: React.ComponentProps<'textarea'>) {
return (
diff --git a/packages/dashboard/src/components/ui/tooltip.tsx b/packages/dashboard-ui/src/ui/tooltip.tsx
similarity index 98%
rename from packages/dashboard/src/components/ui/tooltip.tsx
rename to packages/dashboard-ui/src/ui/tooltip.tsx
index 5a0a6dd163..e423cbbe64 100644
--- a/packages/dashboard/src/components/ui/tooltip.tsx
+++ b/packages/dashboard-ui/src/ui/tooltip.tsx
@@ -3,7 +3,7 @@
import { Tooltip as TooltipPrimitive } from '@base-ui/react/tooltip'
import * as React from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '../lib/utils'
function TooltipProvider({
delayDuration = 0,
diff --git a/packages/dashboard-ui/tsconfig.json b/packages/dashboard-ui/tsconfig.json
index 84dfa24a44..3501ca104c 100644
--- a/packages/dashboard-ui/tsconfig.json
+++ b/packages/dashboard-ui/tsconfig.json
@@ -17,10 +17,7 @@
"noUnusedParameters": true,
"erasableSyntaxOnly": true,
"noFallthroughCasesInSwitch": true,
- "noUncheckedSideEffectImports": true,
- "paths": {
- "@/*": ["./src/*"]
- }
+ "noUncheckedSideEffectImports": true
},
"include": ["src"]
}
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index 7c206c83a1..8b72632e6b 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -24,6 +24,7 @@
"@fontsource-variable/geist-mono": "^5.2.7",
"@hookform/resolvers": "^5.2.2",
"@spree/admin-sdk": "workspace:^",
+ "@spree/dashboard-ui": "workspace:^",
"@tanstack/react-hotkeys": "^0.10.0",
"@tanstack/react-query": "^5.100.9",
"@tanstack/react-router": "^1.169.2",
diff --git a/packages/dashboard/src/components/spree/address-form-dialog.tsx b/packages/dashboard/src/components/spree/address-form-dialog.tsx
index 75fb175416..636859cbd8 100644
--- a/packages/dashboard/src/components/spree/address-form-dialog.tsx
+++ b/packages/dashboard/src/components/spree/address-form-dialog.tsx
@@ -1,25 +1,28 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { Address } from '@spree/admin-sdk'
-import { useEffect, useRef } from 'react'
-import { Controller, useForm } from 'react-hook-form'
-import { useTranslation } from 'react-i18next'
-import { z } from 'zod/v4'
-import { CountryCombobox } from '@/components/spree/country-combobox'
-import { StateCombobox, useCountryStates } from '@/components/spree/country-state-fields'
-import { Button } from '@/components/ui/button'
-import { Checkbox } from '@/components/ui/checkbox'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
import {
+ Button,
+ Checkbox,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ requiredMessage,
Sheet,
SheetContent,
SheetDescription,
SheetFooter,
SheetHeader,
SheetTitle,
-} from '@/components/ui/sheet'
+} from '@spree/dashboard-ui'
+import { useEffect, useRef } from 'react'
+import { Controller, useForm } from 'react-hook-form'
+import { useTranslation } from 'react-i18next'
+import { z } from 'zod/v4'
+import { CountryCombobox } from '@/components/spree/country-combobox'
+import { StateCombobox, useCountryStates } from '@/components/spree/country-state-fields'
import { mapSpreeErrorsToForm } from '@/lib/form-errors'
-import { requiredMessage } from '@/lib/validation-messages'
export interface AddressParams {
first_name: string
diff --git a/packages/dashboard/src/components/spree/app-sidebar.tsx b/packages/dashboard/src/components/spree/app-sidebar.tsx
index d01acc1a0e..501a9fa928 100644
--- a/packages/dashboard/src/components/spree/app-sidebar.tsx
+++ b/packages/dashboard/src/components/spree/app-sidebar.tsx
@@ -1,9 +1,9 @@
+import { Sidebar, SidebarContent, SidebarHeader } from '@spree/dashboard-ui'
import { useParams } from '@tanstack/react-router'
import { PackageIcon } from 'lucide-react'
import type { ComponentProps } from 'react'
import { type NavItem, NavMain } from '@/components/spree/nav-main'
import { StoreSwitcher } from '@/components/spree/store-switcher'
-import { Sidebar, SidebarContent, SidebarHeader } from '@/components/ui/sidebar'
import { type NavEntry, useNavEntries } from '@/lib/nav-registry'
import { type Permissions, usePermissions } from '@/providers/permission-provider'
diff --git a/packages/dashboard/src/components/spree/bulk-action-bar.tsx b/packages/dashboard/src/components/spree/bulk-action-bar.tsx
index afdac6850f..f791f9f44e 100644
--- a/packages/dashboard/src/components/spree/bulk-action-bar.tsx
+++ b/packages/dashboard/src/components/spree/bulk-action-bar.tsx
@@ -1,11 +1,10 @@
+import { Button, useConfirm } from '@spree/dashboard-ui'
import type { QueryKey } from '@tanstack/react-query'
import { useQueryClient } from '@tanstack/react-query'
import type { ReactNode } from 'react'
import { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { toast } from 'sonner'
-import { useConfirm } from '@/components/spree/confirm-dialog'
-import { Button } from '@/components/ui/button'
import { usePermissions } from '@/providers/permission-provider'
/**
diff --git a/packages/dashboard/src/components/spree/bulk-price-editor/bulk-price-editor-dialog.tsx b/packages/dashboard/src/components/spree/bulk-price-editor/bulk-price-editor-dialog.tsx
index 9b57106688..b2f90986c5 100644
--- a/packages/dashboard/src/components/spree/bulk-price-editor/bulk-price-editor-dialog.tsx
+++ b/packages/dashboard/src/components/spree/bulk-price-editor/bulk-price-editor-dialog.tsx
@@ -1,27 +1,25 @@
import type { PriceList, Product } from '@spree/admin-sdk'
-import { XIcon } from 'lucide-react'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import {
- BulkPriceEditor,
- type BulkPriceEditorState,
-} from '@/components/spree/bulk-price-editor/bulk-price-editor'
-import { useConfirm } from '@/components/spree/confirm-dialog'
-import { Button } from '@/components/ui/button'
import {
+ Button,
Dialog,
DialogBody,
DialogContent,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog'
-import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@/components/ui/select'
+ useConfirm,
+} from '@spree/dashboard-ui'
+import { XIcon } from 'lucide-react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+ BulkPriceEditor,
+ type BulkPriceEditorState,
+} from '@/components/spree/bulk-price-editor/bulk-price-editor'
import { useStore } from '@/providers/store-provider'
/**
diff --git a/packages/dashboard/src/components/spree/bulk-price-editor/bulk-price-editor.tsx b/packages/dashboard/src/components/spree/bulk-price-editor/bulk-price-editor.tsx
index 0cbbaef50f..c485cc8001 100644
--- a/packages/dashboard/src/components/spree/bulk-price-editor/bulk-price-editor.tsx
+++ b/packages/dashboard/src/components/spree/bulk-price-editor/bulk-price-editor.tsx
@@ -1,13 +1,18 @@
import type { PriceBulkUpsertRow } from '@spree/admin-sdk'
+import {
+ Button,
+ DataGrid,
+ editableRowIndex,
+ Input,
+ MoneyCell,
+ ReadOnlyCell,
+} from '@spree/dashboard-ui'
import { useQuery } from '@tanstack/react-query'
import type { ColumnDef } from '@tanstack/react-table'
import { useCallback, useDeferredValue, useEffect, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { toast } from 'sonner'
import { adminClient } from '@/client'
-import { DataGrid, editableRowIndex, MoneyCell, ReadOnlyCell } from '@/components/spree/data-grid'
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
import { useBulkUpsertPrices } from '@/hooks/use-prices'
const PAGE_SIZE = 50
diff --git a/packages/dashboard/src/components/spree/command-palette/command-palette.tsx b/packages/dashboard/src/components/spree/command-palette/command-palette.tsx
index acd11688ca..c428e45038 100644
--- a/packages/dashboard/src/components/spree/command-palette/command-palette.tsx
+++ b/packages/dashboard/src/components/spree/command-palette/command-palette.tsx
@@ -1,15 +1,3 @@
-import { useNavigate, useParams } from '@tanstack/react-router'
-import {
- HomeIcon,
- Loader2Icon,
- LogOutIcon,
- PackageIcon,
- ShoppingCartIcon,
- TagIcon,
- UsersIcon,
-} from 'lucide-react'
-import { type ReactNode, useState } from 'react'
-import { StatusBadge } from '@/components/ui/badge'
import {
Command,
CommandEmpty,
@@ -18,14 +6,24 @@ import {
CommandItem,
CommandList,
CommandSeparator,
-} from '@/components/ui/command'
-import {
Dialog,
DialogContent,
DialogDescription,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog'
+ StatusBadge,
+} from '@spree/dashboard-ui'
+import { useNavigate, useParams } from '@tanstack/react-router'
+import {
+ HomeIcon,
+ Loader2Icon,
+ LogOutIcon,
+ PackageIcon,
+ ShoppingCartIcon,
+ TagIcon,
+ UsersIcon,
+} from 'lucide-react'
+import { type ReactNode, useState } from 'react'
import { useAuth } from '@/hooks/use-auth'
import { useCommandPalette } from '@/hooks/use-command-palette'
import { useGlobalSearch } from '@/hooks/use-global-search'
diff --git a/packages/dashboard/src/components/spree/country-combobox.tsx b/packages/dashboard/src/components/spree/country-combobox.tsx
index 5d9ea1798e..3ae187434c 100644
--- a/packages/dashboard/src/components/spree/country-combobox.tsx
+++ b/packages/dashboard/src/components/spree/country-combobox.tsx
@@ -1,5 +1,3 @@
-import { useMemo, useState } from 'react'
-import { CountryFlag } from '@/components/spree/country-flag'
import {
Combobox,
ComboboxChip,
@@ -11,9 +9,11 @@ import {
ComboboxItem,
ComboboxList,
ComboboxValue,
+ CountryFlag,
+ InputGroupAddon,
useComboboxAnchor,
-} from '@/components/ui/combobox'
-import { InputGroupAddon } from '@/components/ui/input-group'
+} from '@spree/dashboard-ui'
+import { useMemo, useState } from 'react'
import { useCountries } from '@/hooks/use-countries'
import { useTranslation } from '@/lib/i18n'
diff --git a/packages/dashboard/src/components/spree/country-state-fields.tsx b/packages/dashboard/src/components/spree/country-state-fields.tsx
index f190483049..8a805766d5 100644
--- a/packages/dashboard/src/components/spree/country-state-fields.tsx
+++ b/packages/dashboard/src/components/spree/country-state-fields.tsx
@@ -1,6 +1,4 @@
import type { State } from '@spree/admin-sdk'
-import { useMemo } from 'react'
-import { useTranslation } from 'react-i18next'
import {
Combobox,
ComboboxContent,
@@ -8,7 +6,9 @@ import {
ComboboxInput,
ComboboxItem,
ComboboxList,
-} from '@/components/ui/combobox'
+} from '@spree/dashboard-ui'
+import { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
import { useCountries } from '@/hooks/use-countries'
type StateOption = { abbr: string; name: string }
diff --git a/packages/dashboard/src/components/spree/currency-select.tsx b/packages/dashboard/src/components/spree/currency-select.tsx
index 7d8981f6bd..07b43ca72c 100644
--- a/packages/dashboard/src/components/spree/currency-select.tsx
+++ b/packages/dashboard/src/components/spree/currency-select.tsx
@@ -1,11 +1,5 @@
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@spree/dashboard-ui'
import { useMemo, useState } from 'react'
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from '@/components/ui/select'
import { useTranslation } from '@/lib/i18n'
import { useStore } from '@/providers/store-provider'
diff --git a/packages/dashboard/src/components/spree/custom-fields/custom-fields-card.tsx b/packages/dashboard/src/components/spree/custom-fields/custom-fields-card.tsx
index f4b2236875..b63cbdb451 100644
--- a/packages/dashboard/src/components/spree/custom-fields/custom-fields-card.tsx
+++ b/packages/dashboard/src/components/spree/custom-fields/custom-fields-card.tsx
@@ -1,10 +1,19 @@
import type { CustomFieldOwnerType } from '@spree/admin-sdk'
+import {
+ Button,
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ Empty,
+ EmptyDescription,
+ EmptyHeader,
+ EmptyMedia,
+ EmptyTitle,
+ Skeleton,
+} from '@spree/dashboard-ui'
import { PencilIcon, TagIcon } from 'lucide-react'
import { Fragment, useState } from 'react'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from '@/components/ui/empty'
-import { Skeleton } from '@/components/ui/skeleton'
import { useCustomFieldDefinitions, useCustomFields } from '@/hooks/use-custom-fields'
import { CustomFieldsDrawer } from './custom-fields-drawer'
diff --git a/packages/dashboard/src/components/spree/custom-fields/custom-fields-drawer.tsx b/packages/dashboard/src/components/spree/custom-fields/custom-fields-drawer.tsx
index 958182d3e0..6620df61b7 100644
--- a/packages/dashboard/src/components/spree/custom-fields/custom-fields-drawer.tsx
+++ b/packages/dashboard/src/components/spree/custom-fields/custom-fields-drawer.tsx
@@ -1,20 +1,25 @@
import type { CustomFieldOwnerType } from '@spree/admin-sdk'
-import { ArrowLeftIcon, CheckCircle2Icon, Loader2Icon, PlusIcon } from 'lucide-react'
-import { type ReactNode, useEffect, useMemo, useState } from 'react'
-import { useForm } from 'react-hook-form'
-import { useTranslation } from 'react-i18next'
-import { toast } from 'sonner'
-import { Button } from '@/components/ui/button'
import {
+ Button,
Empty,
EmptyContent,
EmptyDescription,
EmptyHeader,
EmptyTitle,
-} from '@/components/ui/empty'
-import { Field, FieldLabel } from '@/components/ui/field'
-import { Sheet, SheetContent, SheetFooter, SheetHeader, SheetTitle } from '@/components/ui/sheet'
-import { Skeleton } from '@/components/ui/skeleton'
+ Field,
+ FieldLabel,
+ Sheet,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ Skeleton,
+} from '@spree/dashboard-ui'
+import { ArrowLeftIcon, CheckCircle2Icon, Loader2Icon, PlusIcon } from 'lucide-react'
+import { type ReactNode, useEffect, useMemo, useState } from 'react'
+import { useForm } from 'react-hook-form'
+import { useTranslation } from 'react-i18next'
+import { toast } from 'sonner'
import {
useCreateCustomField,
useCustomFieldDefinitions,
diff --git a/packages/dashboard/src/components/spree/custom-fields/definition-form.tsx b/packages/dashboard/src/components/spree/custom-fields/definition-form.tsx
index 88b24e0b6f..3f1d2b14c1 100644
--- a/packages/dashboard/src/components/spree/custom-fields/definition-form.tsx
+++ b/packages/dashboard/src/components/spree/custom-fields/definition-form.tsx
@@ -1,19 +1,21 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { Loader2Icon } from 'lucide-react'
-import type { ReactNode } from 'react'
-import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
-import { useTranslation } from 'react-i18next'
-import { Button } from '@/components/ui/button'
-import { Field, FieldError, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
import {
+ Button,
+ Field,
+ FieldError,
+ FieldLabel,
+ Input,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@/components/ui/select'
-import { Switch } from '@/components/ui/switch'
+ Switch,
+} from '@spree/dashboard-ui'
+import { Loader2Icon } from 'lucide-react'
+import type { ReactNode } from 'react'
+import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
+import { useTranslation } from 'react-i18next'
import { useCreateCustomFieldDefinition } from '@/hooks/use-custom-fields'
import { mapSpreeErrorsToForm } from '@/lib/form-errors'
import {
diff --git a/packages/dashboard/src/components/spree/custom-fields/value-input.tsx b/packages/dashboard/src/components/spree/custom-fields/value-input.tsx
index 32d0933aab..135adac00f 100644
--- a/packages/dashboard/src/components/spree/custom-fields/value-input.tsx
+++ b/packages/dashboard/src/components/spree/custom-fields/value-input.tsx
@@ -1,8 +1,5 @@
+import { Input, RichTextEditor, Switch, Textarea } from '@spree/dashboard-ui'
import { type Control, Controller } from 'react-hook-form'
-import { Input } from '@/components/ui/input'
-import { RichTextEditor } from '@/components/ui/rich-text-editor'
-import { Switch } from '@/components/ui/switch'
-import { Textarea } from '@/components/ui/textarea'
import { useTranslation } from '@/lib/i18n'
type FieldType = 'short_text' | 'long_text' | 'rich_text' | 'number' | 'boolean' | 'json'
diff --git a/packages/dashboard/src/components/spree/export-button.tsx b/packages/dashboard/src/components/spree/export-button.tsx
index a1e0c9c7b3..e8ddd35fbb 100644
--- a/packages/dashboard/src/components/spree/export-button.tsx
+++ b/packages/dashboard/src/components/spree/export-button.tsx
@@ -1,9 +1,6 @@
import type { ExportType } from '@spree/admin-sdk'
-import { DownloadIcon, FilterIcon, GlobeIcon } from 'lucide-react'
-import { useState } from 'react'
-import type { ResourceActionsContext } from '@/components/spree/resource-table'
-import { Button } from '@/components/ui/button'
import {
+ Button,
Dialog,
DialogBody,
DialogContent,
@@ -11,15 +8,17 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog'
-import {
Field,
FieldContent,
FieldDescription,
FieldLabel,
FieldTitle,
-} from '@/components/ui/field'
-import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
+ RadioGroup,
+ RadioGroupItem,
+} from '@spree/dashboard-ui'
+import { DownloadIcon, FilterIcon, GlobeIcon } from 'lucide-react'
+import { useState } from 'react'
+import type { ResourceActionsContext } from '@/components/spree/resource-table'
import { useExport } from '@/hooks/use-export'
import { filtersToRansack } from '@/lib/filters-to-ransack'
diff --git a/packages/dashboard/src/components/spree/json-preview-drawer.tsx b/packages/dashboard/src/components/spree/json-preview-drawer.tsx
index 6138d2a90c..8daf04b89b 100644
--- a/packages/dashboard/src/components/spree/json-preview-drawer.tsx
+++ b/packages/dashboard/src/components/spree/json-preview-drawer.tsx
@@ -1,3 +1,12 @@
+import {
+ Button,
+ cn,
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetHeader,
+ SheetTitle,
+} from '@spree/dashboard-ui'
import { useQuery } from '@tanstack/react-query'
import { Link } from '@tanstack/react-router'
import JsonView from '@uiw/react-json-view'
@@ -15,16 +24,7 @@ import {
import type { ComponentProps } from 'react'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
-import { Button } from '@/components/ui/button'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
import { useCopyToClipboard } from '@/hooks/use-copy-to-clipboard'
-import { cn } from '@/lib/utils'
const PREFIX_DESTINATIONS: Record<string, { route: string; param: string }> = {
or: { route: '/$storeId/orders/$orderId', param: 'orderId' },
diff --git a/packages/dashboard/src/components/spree/locale-select.tsx b/packages/dashboard/src/components/spree/locale-select.tsx
index 01a9343d8a..13baccb0bb 100644
--- a/packages/dashboard/src/components/spree/locale-select.tsx
+++ b/packages/dashboard/src/components/spree/locale-select.tsx
@@ -1,4 +1,3 @@
-import { useMemo, useState } from 'react'
import {
Combobox,
ComboboxChip,
@@ -9,15 +8,14 @@ import {
ComboboxItem,
ComboboxList,
ComboboxValue,
- useComboboxAnchor,
-} from '@/components/ui/combobox'
-import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@/components/ui/select'
+ useComboboxAnchor,
+} from '@spree/dashboard-ui'
+import { useMemo, useState } from 'react'
import { useTranslation } from '@/lib/i18n'
import { useStore } from '@/providers/store-provider'
diff --git a/packages/dashboard/src/components/spree/nav-main.tsx b/packages/dashboard/src/components/spree/nav-main.tsx
index 516ad2d9f8..da88a20210 100644
--- a/packages/dashboard/src/components/spree/nav-main.tsx
+++ b/packages/dashboard/src/components/spree/nav-main.tsx
@@ -1,13 +1,8 @@
-import { Link, useRouterState } from '@tanstack/react-router'
-import type { LucideIcon } from 'lucide-react'
-import { useState } from 'react'
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
-import {
SidebarGroup,
SidebarMenu,
SidebarMenuButton,
@@ -16,7 +11,10 @@ import {
SidebarMenuSubButton,
SidebarMenuSubItem,
useSidebar,
-} from '@/components/ui/sidebar'
+} from '@spree/dashboard-ui'
+import { Link, useRouterState } from '@tanstack/react-router'
+import type { LucideIcon } from 'lucide-react'
+import { useState } from 'react'
import type { SubjectName } from '@/lib/permissions'
export type NavItem = {
diff --git a/packages/dashboard/src/components/spree/page-header.tsx b/packages/dashboard/src/components/spree/page-header.tsx
index af3d27f130..9db7a8dae0 100644
--- a/packages/dashboard/src/components/spree/page-header.tsx
+++ b/packages/dashboard/src/components/spree/page-header.tsx
@@ -1,22 +1,22 @@
-import { useParams } from '@tanstack/react-router'
-import { BracesIcon, CheckIcon, CopyIcon, EllipsisVerticalIcon, TrashIcon } from 'lucide-react'
-import { lazy, type ReactNode, Suspense, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { BackButton } from '@/components/spree/back-button'
-import { useConfirm } from '@/components/spree/confirm-dialog'
-import type { JsonPreviewDrawerProps } from '@/components/spree/json-preview-drawer'
-import { Slot } from '@/components/spree/slot'
-import { Button } from '@/components/ui/button'
import {
+ BackButton,
+ Button,
+ cn,
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
+ useConfirm,
+} from '@spree/dashboard-ui'
+import { useParams } from '@tanstack/react-router'
+import { BracesIcon, CheckIcon, CopyIcon, EllipsisVerticalIcon, TrashIcon } from 'lucide-react'
+import { lazy, type ReactNode, Suspense, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import type { JsonPreviewDrawerProps } from '@/components/spree/json-preview-drawer'
+import { Slot } from '@/components/spree/slot'
import { useCopyToClipboard } from '@/hooks/use-copy-to-clipboard'
import { useScrolled } from '@/hooks/use-scrolled'
-import { cn } from '@/lib/utils'
// JSON drawer is a developer-only feature; pulling its tree (which includes
// @uiw/react-json-view at ~30KB gzip) into the route bundle is wasteful.
diff --git a/packages/dashboard/src/components/spree/page-tabs.tsx b/packages/dashboard/src/components/spree/page-tabs.tsx
index f28f658cfb..b196cd5b12 100644
--- a/packages/dashboard/src/components/spree/page-tabs.tsx
+++ b/packages/dashboard/src/components/spree/page-tabs.tsx
@@ -1,7 +1,7 @@
+import { cn } from '@spree/dashboard-ui'
import { Link, type LinkProps, useLocation, useRouter } from '@tanstack/react-router'
import type { ReactNode } from 'react'
import { Slot } from '@/components/spree/slot'
-import { cn } from '@/lib/utils'
export interface PageTab {
/** Stable key used for React lists. */
diff --git a/packages/dashboard/src/components/spree/payment-method-editors/payment-method-form.tsx b/packages/dashboard/src/components/spree/payment-method-editors/payment-method-form.tsx
index 713d491445..3e322c32a1 100644
--- a/packages/dashboard/src/components/spree/payment-method-editors/payment-method-form.tsx
+++ b/packages/dashboard/src/components/spree/payment-method-editors/payment-method-form.tsx
@@ -1,20 +1,23 @@
import type { PaymentMethod, PreferenceField } from '@spree/admin-sdk'
-import { Controller, type UseFormReturn } from 'react-hook-form'
-import { useTranslation } from 'react-i18next'
-import { PreferencesForm } from '@/components/spree/preferences-form'
-import { Slot } from '@/components/spree/slot'
-import { StorefrontVisibleSwitch } from '@/components/spree/storefront-visible-switch'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
import {
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@/components/ui/select'
-import { Switch } from '@/components/ui/switch'
-import { Textarea } from '@/components/ui/textarea'
+ StorefrontVisibleSwitch,
+ Switch,
+ Textarea,
+} from '@spree/dashboard-ui'
+import { Controller, type UseFormReturn } from 'react-hook-form'
+import { useTranslation } from 'react-i18next'
+import { PreferencesForm } from '@/components/spree/preferences-form'
+import { Slot } from '@/components/spree/slot'
import { useSlotEntries } from '@/lib/slot-registry'
import {
type PaymentMethodEditorContext,
diff --git a/packages/dashboard/src/components/spree/preferences-form.tsx b/packages/dashboard/src/components/spree/preferences-form.tsx
index dede26a453..4c76ec13c0 100644
--- a/packages/dashboard/src/components/spree/preferences-form.tsx
+++ b/packages/dashboard/src/components/spree/preferences-form.tsx
@@ -1,13 +1,17 @@
import type { PreferenceField as PreferenceFieldDef } from '@spree/admin-sdk'
+import {
+ Button,
+ Field,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ SecretInput,
+ Switch,
+ Textarea,
+} from '@spree/dashboard-ui'
import { PlusIcon, TrashIcon } from 'lucide-react'
import { useId, useMemo, useState } from 'react'
import { CurrencySelect } from '@/components/spree/currency-select'
-import { SecretInput } from '@/components/spree/secret-input'
-import { Button } from '@/components/ui/button'
-import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import { Switch } from '@/components/ui/switch'
-import { Textarea } from '@/components/ui/textarea'
import { useTranslation } from '@/lib/i18n'
/**
diff --git a/packages/dashboard/src/components/spree/price-list-editors/price-list-form.tsx b/packages/dashboard/src/components/spree/price-list-editors/price-list-form.tsx
index 90d46b36fd..3f75460276 100644
--- a/packages/dashboard/src/components/spree/price-list-editors/price-list-form.tsx
+++ b/packages/dashboard/src/components/spree/price-list-editors/price-list-form.tsx
@@ -1,5 +1,6 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { PriceList, PriceRule, ResourceTypeDefinition } from '@spree/admin-sdk'
+import { useConfirm } from '@spree/dashboard-ui'
import { parseISO } from 'date-fns'
import { formatInTimeZone } from 'date-fns-tz'
import {
@@ -17,7 +18,6 @@ import { useTranslation } from 'react-i18next'
import { adminClient } from '@/client'
import { BulkPriceEditorDialog } from '@/components/spree/bulk-price-editor/bulk-price-editor-dialog'
import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { PageHeader } from '@/components/spree/page-header'
import { PreferencesForm } from '@/components/spree/preferences-form'
import { PriceListStatusBadge } from '@/components/spree/price-list-editors/status-badge'
@@ -28,32 +28,36 @@ import { useStore } from '@/providers/store-provider'
// mounts.
import '@/components/spree/price-list-editors/register'
import {
- type PriceRuleEditorContext,
- ruleFormSlot,
-} from '@/components/spree/price-list-editors/types'
-import { EditorShell } from '@/components/spree/promotion-editors/editor-shell'
-import { ResourceLayout } from '@/components/spree/resource-layout'
-import { Slot } from '@/components/spree/slot'
-import { StoreDatePicker } from '@/components/spree/store-date-picker'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
+ Button,
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ ResourceLayout,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@/components/ui/select'
-import {
Sheet,
SheetContent,
SheetDescription,
SheetHeader,
SheetTitle,
-} from '@/components/ui/sheet'
-import { Textarea } from '@/components/ui/textarea'
+ Textarea,
+} from '@spree/dashboard-ui'
+import {
+ type PriceRuleEditorContext,
+ ruleFormSlot,
+} from '@/components/spree/price-list-editors/types'
+import { EditorShell } from '@/components/spree/promotion-editors/editor-shell'
+import { Slot } from '@/components/spree/slot'
+import { StoreDatePicker } from '@/components/spree/store-date-picker'
import {
useActivatePriceList,
useDeactivatePriceList,
diff --git a/packages/dashboard/src/components/spree/price-list-editors/rule-customer-group.tsx b/packages/dashboard/src/components/spree/price-list-editors/rule-customer-group.tsx
index 8588d7df6f..0e07ac04fb 100644
--- a/packages/dashboard/src/components/spree/price-list-editors/rule-customer-group.tsx
+++ b/packages/dashboard/src/components/spree/price-list-editors/rule-customer-group.tsx
@@ -1,9 +1,9 @@
import type { CustomerGroup } from '@spree/admin-sdk'
+import { Field, FieldGroup, FieldLabel } from '@spree/dashboard-ui'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { EditorShell } from '@/components/spree/promotion-editors/editor-shell'
import { ResourceMultiAutocomplete } from '@/components/spree/resource-multi-autocomplete'
-import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
import { customerGroupAutocompleteProps } from '@/hooks/use-customer-groups'
import type { PriceRuleEditorContext } from './types'
diff --git a/packages/dashboard/src/components/spree/price-list-editors/rule-customer.tsx b/packages/dashboard/src/components/spree/price-list-editors/rule-customer.tsx
index 0da531d809..1733a78973 100644
--- a/packages/dashboard/src/components/spree/price-list-editors/rule-customer.tsx
+++ b/packages/dashboard/src/components/spree/price-list-editors/rule-customer.tsx
@@ -1,9 +1,9 @@
import type { Customer } from '@spree/admin-sdk'
+import { Field, FieldGroup, FieldLabel } from '@spree/dashboard-ui'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { EditorShell } from '@/components/spree/promotion-editors/editor-shell'
import { ResourceMultiAutocomplete } from '@/components/spree/resource-multi-autocomplete'
-import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
import { customerAutocompleteProps } from '@/hooks/use-customers'
import type { PriceRuleEditorContext } from './types'
diff --git a/packages/dashboard/src/components/spree/price-list-editors/status-badge.tsx b/packages/dashboard/src/components/spree/price-list-editors/status-badge.tsx
index 908dc85529..96e847e07d 100644
--- a/packages/dashboard/src/components/spree/price-list-editors/status-badge.tsx
+++ b/packages/dashboard/src/components/spree/price-list-editors/status-badge.tsx
@@ -1,6 +1,6 @@
import type { PriceList } from '@spree/admin-sdk'
+import { Badge } from '@spree/dashboard-ui'
import { useTranslation } from 'react-i18next'
-import { Badge } from '@/components/ui/badge'
// `scheduled` collapses into the active treatment whenever the date
// range puts it live now — mirrors the legacy admin's
diff --git a/packages/dashboard/src/components/spree/products/inventory-section.tsx b/packages/dashboard/src/components/spree/products/inventory-section.tsx
index 5c763cf324..006c836300 100644
--- a/packages/dashboard/src/components/spree/products/inventory-section.tsx
+++ b/packages/dashboard/src/components/spree/products/inventory-section.tsx
@@ -1,16 +1,16 @@
-import { Link } from '@tanstack/react-router'
-import type { ColumnDef } from '@tanstack/react-table'
-import { ExternalLinkIcon } from 'lucide-react'
-import { useMemo } from 'react'
-import { Controller, type UseFormReturn, useWatch } from 'react-hook-form'
-import { useTranslation } from 'react-i18next'
import {
DataGrid,
editableRowIndex,
NumberCell,
ReadOnlyCell,
SwitchCell,
-} from '@/components/spree/data-grid'
+} from '@spree/dashboard-ui'
+import { Link } from '@tanstack/react-router'
+import type { ColumnDef } from '@tanstack/react-table'
+import { ExternalLinkIcon } from 'lucide-react'
+import { useMemo } from 'react'
+import { Controller, type UseFormReturn, useWatch } from 'react-hook-form'
+import { useTranslation } from 'react-i18next'
import type { ProductFormValues } from '@/schemas/product'
interface InventoryRow {
diff --git a/packages/dashboard/src/components/spree/products/media-edit-sheet.tsx b/packages/dashboard/src/components/spree/products/media-edit-sheet.tsx
index 8cbf8bacd7..1961c9219a 100644
--- a/packages/dashboard/src/components/spree/products/media-edit-sheet.tsx
+++ b/packages/dashboard/src/components/spree/products/media-edit-sheet.tsx
@@ -1,11 +1,18 @@
import type { Media, Variant } from '@spree/admin-sdk'
+import {
+ Button,
+ Field,
+ FieldLabel,
+ Sheet,
+ SheetContent,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ Textarea,
+} from '@spree/dashboard-ui'
import { CheckIcon, DownloadIcon, ExternalLinkIcon, ImagePlusIcon, Loader2Icon } from 'lucide-react'
import { useEffect, useState } from 'react'
import { toast } from 'sonner'
-import { Button } from '@/components/ui/button'
-import { Field, FieldLabel } from '@/components/ui/field'
-import { Sheet, SheetContent, SheetFooter, SheetHeader, SheetTitle } from '@/components/ui/sheet'
-import { Textarea } from '@/components/ui/textarea'
import { useUpdateProductMedia } from '@/hooks/use-product-media'
import { useTranslation } from '@/lib/i18n'
diff --git a/packages/dashboard/src/components/spree/products/variant-media-picker.tsx b/packages/dashboard/src/components/spree/products/variant-media-picker.tsx
index 606b025633..6a24684368 100644
--- a/packages/dashboard/src/components/spree/products/variant-media-picker.tsx
+++ b/packages/dashboard/src/components/spree/products/variant-media-picker.tsx
@@ -1,14 +1,14 @@
-import { CheckIcon, ImagePlusIcon, Loader2Icon } from 'lucide-react'
-import { useMemo, useState } from 'react'
-import { Button } from '@/components/ui/button'
import {
+ Button,
Dialog,
DialogBody,
DialogContent,
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog'
+} from '@spree/dashboard-ui'
+import { CheckIcon, ImagePlusIcon, Loader2Icon } from 'lucide-react'
+import { useMemo, useState } from 'react'
import { useProductMedia, useUpdateProductMedia } from '@/hooks/use-product-media'
import { useVariantMedia } from '@/hooks/use-variant-media'
diff --git a/packages/dashboard/src/components/spree/promotion-editors/action-adjustment.tsx b/packages/dashboard/src/components/spree/promotion-editors/action-adjustment.tsx
index 2b9bfdec46..a86deef5c3 100644
--- a/packages/dashboard/src/components/spree/promotion-editors/action-adjustment.tsx
+++ b/packages/dashboard/src/components/spree/promotion-editors/action-adjustment.tsx
@@ -1,16 +1,18 @@
import type { PromotionActionCalculator } from '@spree/admin-sdk'
-import { useQuery } from '@tanstack/react-query'
-import { useEffect, useMemo, useState } from 'react'
-import { adminClient } from '@/client'
-import { PreferencesForm } from '@/components/spree/preferences-form'
-import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
import {
+ Field,
+ FieldGroup,
+ FieldLabel,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@/components/ui/select'
+} from '@spree/dashboard-ui'
+import { useQuery } from '@tanstack/react-query'
+import { useEffect, useMemo, useState } from 'react'
+import { adminClient } from '@/client'
+import { PreferencesForm } from '@/components/spree/preferences-form'
import { EditorShell } from './editor-shell'
import type { PromotionActionEditorContext } from './types'
diff --git a/packages/dashboard/src/components/spree/promotion-editors/editor-shell.tsx b/packages/dashboard/src/components/spree/promotion-editors/editor-shell.tsx
index 05834b184b..2ba6fd4404 100644
--- a/packages/dashboard/src/components/spree/promotion-editors/editor-shell.tsx
+++ b/packages/dashboard/src/components/spree/promotion-editors/editor-shell.tsx
@@ -1,6 +1,5 @@
+import { Button, SheetFooter } from '@spree/dashboard-ui'
import type { ReactNode } from 'react'
-import { Button } from '@/components/ui/button'
-import { SheetFooter } from '@/components/ui/sheet'
/**
* Shared layout for promotion rule and action editors. Wraps the body
diff --git a/packages/dashboard/src/components/spree/promotion-editors/match-policy-picker.tsx b/packages/dashboard/src/components/spree/promotion-editors/match-policy-picker.tsx
index d2d6f71133..74df34d5b6 100644
--- a/packages/dashboard/src/components/spree/promotion-editors/match-policy-picker.tsx
+++ b/packages/dashboard/src/components/spree/promotion-editors/match-policy-picker.tsx
@@ -5,8 +5,9 @@ import {
FieldGroup,
FieldLabel,
FieldTitle,
-} from '@/components/ui/field'
-import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
+ RadioGroup,
+ RadioGroupItem,
+} from '@spree/dashboard-ui'
export interface MatchPolicyOption<TValue extends string> {
value: TValue
diff --git a/packages/dashboard/src/components/spree/promotion-editors/promotion-form.tsx b/packages/dashboard/src/components/spree/promotion-editors/promotion-form.tsx
index 5b6d7c9804..871a1834aa 100644
--- a/packages/dashboard/src/components/spree/promotion-editors/promotion-form.tsx
+++ b/packages/dashboard/src/components/spree/promotion-editors/promotion-form.tsx
@@ -8,18 +8,51 @@ import type {
PromotionRuleDraft,
ResourceTypeDefinition,
} from '@spree/admin-sdk'
+import { formatCalculatorSummary, useConfirm } from '@spree/dashboard-ui'
import { DownloadIcon, PlusIcon, SparklesIcon, TrashIcon } from 'lucide-react'
import { useEffect, useState } from 'react'
import { Controller, type UseFormReturn, useFieldArray, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
-import { formatCalculatorSummary } from '@/components/spree/calculator-summary'
import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { PageHeader } from '@/components/spree/page-header'
import { PreferencesForm } from '@/components/spree/preferences-form'
import { EditorShell } from '@/components/spree/promotion-editors/editor-shell'
import { StoreDatePicker } from '@/components/spree/store-date-picker'
import '@/components/spree/promotion-editors/register'
+import {
+ ActiveBadge,
+ Badge,
+ Button,
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ ResourceLayout,
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ Switch,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+ Textarea,
+} from '@spree/dashboard-ui'
import {
actionDraftFromAction,
actionDraftFromType,
@@ -34,38 +67,7 @@ import {
ruleDraftToPayload,
ruleFormSlot,
} from '@/components/spree/promotion-editors/types'
-import { ResourceLayout } from '@/components/spree/resource-layout'
import { Slot } from '@/components/spree/slot'
-import { ActiveBadge, Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import {
- Table,
- TableBody,
- TableCell,
- TableHead,
- TableHeader,
- TableRow,
-} from '@/components/ui/data-table'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from '@/components/ui/select'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetFooter,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
-import { Switch } from '@/components/ui/switch'
-import { Textarea } from '@/components/ui/textarea'
import { useExport } from '@/hooks/use-export'
import {
usePromotionActionTypes,
diff --git a/packages/dashboard/src/components/spree/promotion-editors/rule-category.tsx b/packages/dashboard/src/components/spree/promotion-editors/rule-category.tsx
index 8eaddd79fb..fcdc003621 100644
--- a/packages/dashboard/src/components/spree/promotion-editors/rule-category.tsx
+++ b/packages/dashboard/src/components/spree/promotion-editors/rule-category.tsx
@@ -1,8 +1,8 @@
import type { Category } from '@spree/admin-sdk'
+import { Field, FieldGroup, FieldLabel } from '@spree/dashboard-ui'
import { useMemo, useState } from 'react'
import { adminClient } from '@/client'
import { ResourceMultiAutocomplete } from '@/components/spree/resource-multi-autocomplete'
-import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
import { useTranslation } from '@/lib/i18n'
import { EditorShell } from './editor-shell'
import { MatchPolicyPicker } from './match-policy-picker'
diff --git a/packages/dashboard/src/components/spree/promotion-editors/rule-country.tsx b/packages/dashboard/src/components/spree/promotion-editors/rule-country.tsx
index 6975ce7b23..2338022bdc 100644
--- a/packages/dashboard/src/components/spree/promotion-editors/rule-country.tsx
+++ b/packages/dashboard/src/components/spree/promotion-editors/rule-country.tsx
@@ -1,7 +1,7 @@
import type { Country } from '@spree/admin-sdk'
+import { Field, FieldGroup, FieldLabel } from '@spree/dashboard-ui'
import { useMemo, useState } from 'react'
import { CountryMultiCombobox } from '@/components/spree/country-combobox'
-import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
import { useCountries } from '@/hooks/use-countries'
import { useTranslation } from '@/lib/i18n'
import { EditorShell } from './editor-shell'
diff --git a/packages/dashboard/src/components/spree/promotion-editors/rule-customer-group.tsx b/packages/dashboard/src/components/spree/promotion-editors/rule-customer-group.tsx
index 7df4011e9a..e0b9c67acf 100644
--- a/packages/dashboard/src/components/spree/promotion-editors/rule-customer-group.tsx
+++ b/packages/dashboard/src/components/spree/promotion-editors/rule-customer-group.tsx
@@ -1,7 +1,7 @@
import type { CustomerGroup } from '@spree/admin-sdk'
+import { Field, FieldGroup, FieldLabel } from '@spree/dashboard-ui'
import { useState } from 'react'
import { ResourceMultiAutocomplete } from '@/components/spree/resource-multi-autocomplete'
-import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
import { customerGroupAutocompleteProps } from '@/hooks/use-customer-groups'
import { useTranslation } from '@/lib/i18n'
import { EditorShell } from './editor-shell'
diff --git a/packages/dashboard/src/components/spree/promotion-editors/rule-product.tsx b/packages/dashboard/src/components/spree/promotion-editors/rule-product.tsx
index 46a1e60159..bc0662fbc7 100644
--- a/packages/dashboard/src/components/spree/promotion-editors/rule-product.tsx
+++ b/packages/dashboard/src/components/spree/promotion-editors/rule-product.tsx
@@ -1,8 +1,8 @@
import type { Product } from '@spree/admin-sdk'
+import { Field, FieldGroup, FieldLabel } from '@spree/dashboard-ui'
import { useMemo, useState } from 'react'
import { adminClient } from '@/client'
import { ResourceMultiAutocomplete } from '@/components/spree/resource-multi-autocomplete'
-import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
import { useTranslation } from '@/lib/i18n'
import { EditorShell } from './editor-shell'
import { MatchPolicyPicker } from './match-policy-picker'
diff --git a/packages/dashboard/src/components/spree/promotion-editors/rule-user.tsx b/packages/dashboard/src/components/spree/promotion-editors/rule-user.tsx
index 35870f018a..30a2120e0b 100644
--- a/packages/dashboard/src/components/spree/promotion-editors/rule-user.tsx
+++ b/packages/dashboard/src/components/spree/promotion-editors/rule-user.tsx
@@ -1,8 +1,8 @@
import type { Customer } from '@spree/admin-sdk'
+import { Field, FieldGroup, FieldLabel } from '@spree/dashboard-ui'
import { useState } from 'react'
import { adminClient } from '@/client'
import { ResourceMultiAutocomplete } from '@/components/spree/resource-multi-autocomplete'
-import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
import { useTranslation } from '@/lib/i18n'
import { EditorShell } from './editor-shell'
import type { PromotionRuleEditorContext } from './types'
diff --git a/packages/dashboard/src/components/spree/resource-combobox.tsx b/packages/dashboard/src/components/spree/resource-combobox.tsx
index 0c244bccfa..bba3eb8517 100644
--- a/packages/dashboard/src/components/spree/resource-combobox.tsx
+++ b/packages/dashboard/src/components/spree/resource-combobox.tsx
@@ -1,6 +1,3 @@
-import { useQuery } from '@tanstack/react-query'
-import { type ReactNode, useDeferredValue, useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
import {
Combobox,
ComboboxContent,
@@ -8,7 +5,10 @@ import {
ComboboxInput,
ComboboxItem,
ComboboxList,
-} from '@/components/ui/combobox'
+} from '@spree/dashboard-ui'
+import { useQuery } from '@tanstack/react-query'
+import { type ReactNode, useDeferredValue, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
/**
* Anything we can pick. Records must have a stable string `id` so they round-
diff --git a/packages/dashboard/src/components/spree/resource-multi-autocomplete.tsx b/packages/dashboard/src/components/spree/resource-multi-autocomplete.tsx
index 4c6ca06887..1e3a5e8ed1 100644
--- a/packages/dashboard/src/components/spree/resource-multi-autocomplete.tsx
+++ b/packages/dashboard/src/components/spree/resource-multi-autocomplete.tsx
@@ -1,5 +1,3 @@
-import { useQuery } from '@tanstack/react-query'
-import { useCallback, useEffect, useMemo, useState } from 'react'
import {
Combobox,
ComboboxChip,
@@ -11,7 +9,9 @@ import {
ComboboxList,
ComboboxValue,
useComboboxAnchor,
-} from '@/components/ui/combobox'
+} from '@spree/dashboard-ui'
+import { useQuery } from '@tanstack/react-query'
+import { useCallback, useEffect, useMemo, useState } from 'react'
/**
* Anything we can pick. Items must have a stable string `id`. The label
diff --git a/packages/dashboard/src/components/spree/resource-table.tsx b/packages/dashboard/src/components/spree/resource-table.tsx
index 175e05661c..04c0366a63 100644
--- a/packages/dashboard/src/components/spree/resource-table.tsx
+++ b/packages/dashboard/src/components/spree/resource-table.tsx
@@ -15,6 +15,27 @@ import {
verticalListSortingStrategy,
} from '@dnd-kit/sortable'
import { CSS } from '@dnd-kit/utilities'
+import {
+ Card,
+ CardContent,
+ Checkbox,
+ cn,
+ DragHandle,
+ Empty,
+ EmptyDescription,
+ EmptyHeader,
+ EmptyMedia,
+ EmptyTitle,
+ Pagination,
+ type PaginationMeta,
+ Table,
+ TableBody,
+ TableCell,
+ TableEmpty,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from '@spree/dashboard-ui'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { useNavigate } from '@tanstack/react-router'
import {
@@ -29,21 +50,7 @@ import {
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
import { type BulkAction, BulkActionBar } from '@/components/spree/bulk-action-bar'
-import { DragHandle } from '@/components/spree/drag-handle'
import { TableToolbar } from '@/components/spree/table-toolbar'
-import { Card, CardContent } from '@/components/ui/card'
-import { Checkbox } from '@/components/ui/checkbox'
-import {
- Table,
- TableBody,
- TableCell,
- TableEmpty,
- TableHead,
- TableHeader,
- TableRow,
-} from '@/components/ui/data-table'
-import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from '@/components/ui/empty'
-import { Pagination, type PaginationMeta } from '@/components/ui/pagination'
import { useAuth } from '@/hooks/use-auth'
import { filtersToRansack } from '@/lib/filters-to-ransack'
import {
@@ -54,7 +61,6 @@ import {
getTable,
type SortOption,
} from '@/lib/table-registry'
-import { cn } from '@/lib/utils'
// ============================================================================
// Search schema — shared by all resource table routes
diff --git a/packages/dashboard/src/components/spree/settings-sidebar.tsx b/packages/dashboard/src/components/spree/settings-sidebar.tsx
index 00d5323828..d637fab92e 100644
--- a/packages/dashboard/src/components/spree/settings-sidebar.tsx
+++ b/packages/dashboard/src/components/spree/settings-sidebar.tsx
@@ -1,21 +1,21 @@
-import { Link, useParams, useRouterState } from '@tanstack/react-router'
-import { PackageIcon } from 'lucide-react'
-import { useTranslation } from 'react-i18next'
-import { NavIcon } from '@/components/spree/nav-main'
-import { Badge } from '@/components/ui/badge'
import {
+ Badge,
+ cn,
SidebarGroup,
SidebarGroupLabel,
SidebarMenu,
SidebarMenuButton,
SidebarMenuItem,
-} from '@/components/ui/sidebar'
+} from '@spree/dashboard-ui'
+import { Link, useParams, useRouterState } from '@tanstack/react-router'
+import { PackageIcon } from 'lucide-react'
+import { useTranslation } from 'react-i18next'
+import { NavIcon } from '@/components/spree/nav-main'
import {
type SettingsNavEntry,
type SettingsNavSnapshot,
useSettingsNav,
} from '@/lib/settings-nav-registry'
-import { cn } from '@/lib/utils'
import { type Permissions, usePermissions } from '@/providers/permission-provider'
import '@/nav/settings'
diff --git a/packages/dashboard/src/components/spree/store-date-picker.tsx b/packages/dashboard/src/components/spree/store-date-picker.tsx
index 192b154fb6..2284d7018c 100644
--- a/packages/dashboard/src/components/spree/store-date-picker.tsx
+++ b/packages/dashboard/src/components/spree/store-date-picker.tsx
@@ -1,4 +1,4 @@
-import { DatePicker, type DatePickerProps } from '@/components/ui/date-picker'
+import { DatePicker, type DatePickerProps } from '@spree/dashboard-ui'
import { useStore } from '@/providers/store-provider'
/**
diff --git a/packages/dashboard/src/components/spree/store-switcher.tsx b/packages/dashboard/src/components/spree/store-switcher.tsx
index 1fd08e442c..73d15c30bd 100644
--- a/packages/dashboard/src/components/spree/store-switcher.tsx
+++ b/packages/dashboard/src/components/spree/store-switcher.tsx
@@ -1,13 +1,17 @@
-import { ChevronsUpDownIcon, ExternalLinkIcon } from 'lucide-react'
-import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
import {
+ Avatar,
+ AvatarFallback,
+ AvatarImage,
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
-import { SidebarMenu, SidebarMenuItem, useSidebar } from '@/components/ui/sidebar'
-import { Skeleton } from '@/components/ui/skeleton'
+ SidebarMenu,
+ SidebarMenuItem,
+ Skeleton,
+ useSidebar,
+} from '@spree/dashboard-ui'
+import { ChevronsUpDownIcon, ExternalLinkIcon } from 'lucide-react'
import { useStore } from '@/providers/store-provider'
export function StoreSwitcher() {
diff --git a/packages/dashboard/src/components/spree/table-toolbar.tsx b/packages/dashboard/src/components/spree/table-toolbar.tsx
index 5e20f6c88e..33570c3532 100644
--- a/packages/dashboard/src/components/spree/table-toolbar.tsx
+++ b/packages/dashboard/src/components/spree/table-toolbar.tsx
@@ -1,21 +1,7 @@
-import { useQuery } from '@tanstack/react-query'
-import {
- ArrowUpDownIcon,
- Columns3Icon,
- FilterIcon,
- PlusIcon,
- SearchIcon,
- Trash2Icon,
- XIcon,
-} from 'lucide-react'
-import { useCallback, useMemo, useRef, useState } from 'react'
-import { ResourceMultiAutocomplete } from '@/components/spree/resource-multi-autocomplete'
-import { StoreDatePicker } from '@/components/spree/store-date-picker'
-import { TagCombobox } from '@/components/spree/tag-combobox'
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { CardTitle } from '@/components/ui/card'
import {
+ Badge,
+ Button,
+ CardTitle,
DropdownMenu,
DropdownMenuCheckboxItem,
DropdownMenuContent,
@@ -24,17 +10,33 @@ import {
DropdownMenuRadioItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
-import { Input } from '@/components/ui/input'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import {
+ Input,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@/components/ui/select'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from '@spree/dashboard-ui'
+import { useQuery } from '@tanstack/react-query'
+import {
+ ArrowUpDownIcon,
+ Columns3Icon,
+ FilterIcon,
+ PlusIcon,
+ SearchIcon,
+ Trash2Icon,
+ XIcon,
+} from 'lucide-react'
+import { useCallback, useMemo, useRef, useState } from 'react'
+import { ResourceMultiAutocomplete } from '@/components/spree/resource-multi-autocomplete'
+import { StoreDatePicker } from '@/components/spree/store-date-picker'
+import { TagCombobox } from '@/components/spree/tag-combobox'
import { useTranslation } from '@/lib/i18n'
import {
type ColumnDef,
diff --git a/packages/dashboard/src/components/spree/tag-combobox.tsx b/packages/dashboard/src/components/spree/tag-combobox.tsx
index 76adb0ea7a..8fcc6927d8 100644
--- a/packages/dashboard/src/components/spree/tag-combobox.tsx
+++ b/packages/dashboard/src/components/spree/tag-combobox.tsx
@@ -1,6 +1,3 @@
-import { useQuery } from '@tanstack/react-query'
-import { useMemo, useState } from 'react'
-import { adminClient } from '@/client'
import {
Combobox,
ComboboxChip,
@@ -12,7 +9,10 @@ import {
ComboboxList,
ComboboxValue,
useComboboxAnchor,
-} from '@/components/ui/combobox'
+} from '@spree/dashboard-ui'
+import { useQuery } from '@tanstack/react-query'
+import { useMemo, useState } from 'react'
+import { adminClient } from '@/client'
import { useAuth } from '@/hooks/use-auth'
import type { TaggableType } from '@/lib/table-registry'
diff --git a/packages/dashboard/src/components/spree/theme-toggle.tsx b/packages/dashboard/src/components/spree/theme-toggle.tsx
index b1bfd96bd4..53b5bf5f79 100644
--- a/packages/dashboard/src/components/spree/theme-toggle.tsx
+++ b/packages/dashboard/src/components/spree/theme-toggle.tsx
@@ -1,9 +1,5 @@
+import { DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator } from '@spree/dashboard-ui'
import { CheckIcon, MonitorIcon, MoonIcon, SunIcon } from 'lucide-react'
-import {
- DropdownMenuItem,
- DropdownMenuLabel,
- DropdownMenuSeparator,
-} from '@/components/ui/dropdown-menu'
import { useTheme } from '@/providers/theme-provider'
/**
diff --git a/packages/dashboard/src/components/spree/top-bar.tsx b/packages/dashboard/src/components/spree/top-bar.tsx
index 92179fd0c9..72cd626c8d 100644
--- a/packages/dashboard/src/components/spree/top-bar.tsx
+++ b/packages/dashboard/src/components/spree/top-bar.tsx
@@ -1,3 +1,14 @@
+import {
+ Avatar,
+ AvatarFallback,
+ Button,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+ SidebarTrigger,
+} from '@spree/dashboard-ui'
import {
BookOpenIcon,
ExternalLinkIcon,
@@ -9,16 +20,6 @@ import {
} from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { ThemeMenuItems } from '@/components/spree/theme-toggle'
-import { Avatar, AvatarFallback } from '@/components/ui/avatar'
-import { Button } from '@/components/ui/button'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
-import { SidebarTrigger } from '@/components/ui/sidebar'
import { useAuth } from '@/hooks/use-auth'
import { useCommandPalette } from '@/hooks/use-command-palette'
import { getInitials } from '@/lib/formatters'
diff --git a/packages/dashboard/src/main.tsx b/packages/dashboard/src/main.tsx
index fc7e3cd8f7..086c9918f8 100644
--- a/packages/dashboard/src/main.tsx
+++ b/packages/dashboard/src/main.tsx
@@ -1,9 +1,8 @@
+import { ConfirmProvider, TooltipProvider } from '@spree/dashboard-ui'
import { QueryClientProvider } from '@tanstack/react-query'
import { RouterProvider } from '@tanstack/react-router'
import { StrictMode } from 'react'
import { createRoot } from 'react-dom/client'
-import { ConfirmProvider } from '@/components/spree/confirm-dialog'
-import { TooltipProvider } from '@/components/ui/tooltip'
// Side-effect import: registers i18next with react-i18next before any component
// calls useTranslation(). Must come before @/router.
import '@/lib/i18n'
@@ -12,7 +11,7 @@ import { AuthProvider } from '@/providers/auth-provider'
import { PermissionProvider } from '@/providers/permission-provider'
import { ThemeProvider } from '@/providers/theme-provider'
import { router } from '@/router'
-import './index.css'
+import '@spree/dashboard-ui/styles.css'
createRoot(document.getElementById('root')!).render(
<StrictMode>
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId.tsx
index 1faf6e5a97..06641dc7d8 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId.tsx
@@ -1,3 +1,4 @@
+import { SidebarInset, SidebarProvider } from '@spree/dashboard-ui'
import { createFileRoute, Outlet, useRouterState } from '@tanstack/react-router'
import { useEffect } from 'react'
import { adminClient } from '@/client'
@@ -5,7 +6,6 @@ import { AppSidebar } from '@/components/spree/app-sidebar'
import { CommandPalette } from '@/components/spree/command-palette/command-palette'
import { SettingsSidebar } from '@/components/spree/settings-sidebar'
import { TopBar } from '@/components/spree/top-bar'
-import { SidebarInset, SidebarProvider } from '@/components/ui/sidebar'
import { CommandPaletteProvider } from '@/hooks/use-command-palette'
import { StoreProvider } from '@/providers/store-provider'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/customers/$customerId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/customers/$customerId.tsx
index 44da8ad574..35a006ae64 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/customers/$customerId.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/customers/$customerId.tsx
@@ -1,33 +1,14 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { Address, Customer, Order, StoreCredit } from '@spree/admin-sdk'
-import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'
-import {
- EllipsisVerticalIcon,
- MailIcon,
- PencilIcon,
- PhoneIcon,
- PlusIcon,
- StarIcon,
- TrashIcon,
-} from 'lucide-react'
-import { type ReactNode, useEffect, useMemo, useState } from 'react'
-import { Controller, useForm } from 'react-hook-form'
-import { useTranslation } from 'react-i18next'
-import { AddressFormDialog, type AddressParams } from '@/components/spree/address-form-dialog'
-import { useConfirm } from '@/components/spree/confirm-dialog'
-import { CurrencySelect } from '@/components/spree/currency-select'
-import { CustomFieldsCard } from '@/components/spree/custom-fields/custom-fields-card'
-import { MetadataCard } from '@/components/spree/metadata/metadata-card'
-import { PageHeader } from '@/components/spree/page-header'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { ResourceLayout } from '@/components/spree/resource-layout'
-import { ErrorState } from '@/components/spree/route-error-boundary'
-import { TagCombobox } from '@/components/spree/tag-combobox'
-import { Badge, StatusBadge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Card, CardAction, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Checkbox } from '@/components/ui/checkbox'
import {
+ Badge,
+ Button,
+ Card,
+ CardAction,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ Checkbox,
Dialog,
DialogBody,
DialogContent,
@@ -35,31 +16,52 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog'
-import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
+ ErrorState,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ MetadataCard,
+ RelativeTime,
+ ResourceLayout,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@/components/ui/select'
-import {
Sheet,
SheetContent,
SheetDescription,
SheetFooter,
SheetHeader,
SheetTitle,
-} from '@/components/ui/sheet'
-import { Textarea } from '@/components/ui/textarea'
+ StatusBadge,
+ Textarea,
+ useConfirm,
+} from '@spree/dashboard-ui'
+import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'
+import {
+ EllipsisVerticalIcon,
+ MailIcon,
+ PencilIcon,
+ PhoneIcon,
+ PlusIcon,
+ StarIcon,
+ TrashIcon,
+} from 'lucide-react'
+import { type ReactNode, useEffect, useMemo, useState } from 'react'
+import { Controller, useForm } from 'react-hook-form'
+import { useTranslation } from 'react-i18next'
+import { AddressFormDialog, type AddressParams } from '@/components/spree/address-form-dialog'
+import { CurrencySelect } from '@/components/spree/currency-select'
+import { CustomFieldsCard } from '@/components/spree/custom-fields/custom-fields-card'
+import { PageHeader } from '@/components/spree/page-header'
+import { TagCombobox } from '@/components/spree/tag-combobox'
import { useCountries } from '@/hooks/use-countries'
import {
type StoreCreditUpdateParams,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/customers/groups.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/customers/groups.tsx
index 1d819efaa4..1a0d7eb491 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/customers/groups.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/customers/groups.tsx
@@ -1,5 +1,22 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { CustomerGroup, CustomerGroupCreateParams } from '@spree/admin-sdk'
+import {
+ Button,
+ Field,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ RowActions,
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ Textarea,
+ useConfirm,
+ useRowClickBridge,
+} from '@spree/dashboard-ui'
import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'
import { PlusIcon, UsersIcon } from 'lucide-react'
import { useEffect } from 'react'
@@ -8,22 +25,7 @@ import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
import { adminClient } from '@/client'
import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
-import { useRowClickBridge } from '@/components/spree/row-click-bridge'
-import { Button } from '@/components/ui/button'
-import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetFooter,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
-import { Textarea } from '@/components/ui/textarea'
import {
useCreateCustomerGroup,
useCustomerGroup,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/customers/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/customers/index.tsx
index 7a8da54356..e4a5169251 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/customers/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/customers/index.tsx
@@ -1,5 +1,24 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { Customer } from '@spree/admin-sdk'
+import {
+ BulkDialog,
+ Button,
+ Checkbox,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ RowActions,
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ Textarea,
+ useConfirm,
+} from '@spree/dashboard-ui'
import { useMutation } from '@tanstack/react-query'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { PlusIcon, TagsIcon, UserMinusIcon, UserPlusIcon } from 'lucide-react'
@@ -9,26 +28,10 @@ import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
import { adminClient } from '@/client'
import type { BulkAction, BulkActionFormProps } from '@/components/spree/bulk-action-bar'
-import { BulkDialog } from '@/components/spree/bulk-dialog'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { ExportButton } from '@/components/spree/export-button'
import { ResourceMultiAutocomplete } from '@/components/spree/resource-multi-autocomplete'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
import { TagCombobox } from '@/components/spree/tag-combobox'
-import { Button } from '@/components/ui/button'
-import { Checkbox } from '@/components/ui/checkbox'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetFooter,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
-import { Textarea } from '@/components/ui/textarea'
import { customerGroupAutocompleteProps } from '@/hooks/use-customer-groups'
import {
useBulkAddCustomersToGroups,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/index.tsx
index ad99c0d2a0..43380cefd6 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/index.tsx
@@ -1,4 +1,18 @@
import type { DashboardAnalytics } from '@spree/admin-sdk'
+import {
+ Card,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+ type ChartConfig,
+ ChartContainer,
+ ChartTooltip,
+ ChartTooltipContent,
+ type DateRange,
+ DateRangePicker,
+ Skeleton,
+} from '@spree/dashboard-ui'
import { useQuery } from '@tanstack/react-query'
import { createFileRoute, Link } from '@tanstack/react-router'
import { subDays } from 'date-fns'
@@ -7,15 +21,6 @@ import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { Bar, BarChart, CartesianGrid, XAxis } from 'recharts'
import { adminClient } from '@/client'
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
-import {
- type ChartConfig,
- ChartContainer,
- ChartTooltip,
- ChartTooltipContent,
-} from '@/components/ui/chart'
-import { type DateRange, DateRangePicker } from '@/components/ui/date-range-picker'
-import { Skeleton } from '@/components/ui/skeleton'
export const Route = createFileRoute('/_authenticated/$storeId/')({
component: DashboardPage,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/orders/$orderId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/orders/$orderId.tsx
index 7d0a9e941f..59a92cd406 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/orders/$orderId.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/orders/$orderId.tsx
@@ -1,4 +1,54 @@
import type { Order, Variant } from '@spree/admin-sdk'
+import {
+ AddressBlock,
+ Avatar,
+ AvatarFallback,
+ Badge,
+ Button,
+ Card,
+ CardAction,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ cn,
+ Dialog,
+ DialogBody,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+ ErrorState,
+ Field,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ MetadataCard,
+ RelativeTime,
+ ResourceLayout,
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+ Separator,
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ Skeleton,
+ StatusBadge,
+ Switch,
+ Textarea,
+ useConfirm,
+} from '@spree/dashboard-ui'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { createFileRoute } from '@tanstack/react-router'
import {
@@ -21,61 +71,13 @@ import {
import { type FormEvent, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { adminClient } from '@/client'
-import { AddressBlock } from '@/components/spree/address-block'
import { AddressFormDialog, type AddressParams } from '@/components/spree/address-form-dialog'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { CustomFieldsCard } from '@/components/spree/custom-fields/custom-fields-card'
-import { MetadataCard } from '@/components/spree/metadata/metadata-card'
import { PageHeader } from '@/components/spree/page-header'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { ResourceLayout } from '@/components/spree/resource-layout'
-import { ErrorState } from '@/components/spree/route-error-boundary'
import { TagCombobox } from '@/components/spree/tag-combobox'
-import { Avatar, AvatarFallback } from '@/components/ui/avatar'
-import { Badge, StatusBadge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Card, CardAction, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import {
- Dialog,
- DialogBody,
- DialogContent,
- DialogDescription,
- DialogFooter,
- DialogHeader,
- DialogTitle,
-} from '@/components/ui/dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
-import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from '@/components/ui/select'
-import { Separator } from '@/components/ui/separator'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetFooter,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
-import { Skeleton } from '@/components/ui/skeleton'
-import { Switch } from '@/components/ui/switch'
-import { Textarea } from '@/components/ui/textarea'
import { orderQueryKey, useOrder, useOrderMutation } from '@/hooks/use-order'
import { useResourceMutation } from '@/hooks/use-resource-mutation'
import { formatPrice, getInitials } from '@/lib/formatters'
-import { cn } from '@/lib/utils'
export const Route = createFileRoute('/_authenticated/$storeId/orders/$orderId')({
component: OrderDetailPage,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/orders/drafts.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/orders/drafts.tsx
index 752a3a429e..a411ff8443 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/orders/drafts.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/orders/drafts.tsx
@@ -1,9 +1,9 @@
+import { Button } from '@spree/dashboard-ui'
import { createFileRoute } from '@tanstack/react-router'
import { PlusIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { adminClient } from '@/client'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { Button } from '@/components/ui/button'
import '@/tables/orders'
export const Route = createFileRoute('/_authenticated/$storeId/orders/drafts')({
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/orders/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/orders/index.tsx
index 362b1f42dc..a95d2aac79 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/orders/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/orders/index.tsx
@@ -1,9 +1,9 @@
+import { Button } from '@spree/dashboard-ui'
import { createFileRoute, Link } from '@tanstack/react-router'
import { PlusIcon } from 'lucide-react'
import { adminClient } from '@/client'
import { ExportButton } from '@/components/spree/export-button'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { Button } from '@/components/ui/button'
import '@/tables/orders'
export const Route = createFileRoute('/_authenticated/$storeId/orders/')({
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/orders/new.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/orders/new.tsx
index ee67b11ba7..9265fc007b 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/orders/new.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/orders/new.tsx
@@ -1,5 +1,20 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { Customer, Variant } from '@spree/admin-sdk'
+import {
+ Button,
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ ResourceLayout,
+ Switch,
+ Textarea,
+} from '@spree/dashboard-ui'
import { useMutation, useQuery } from '@tanstack/react-query'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { TrashIcon } from 'lucide-react'
@@ -9,13 +24,6 @@ import { useTranslation } from 'react-i18next'
import { adminClient } from '@/client'
import { PageHeader } from '@/components/spree/page-header'
import { ResourceCombobox } from '@/components/spree/resource-combobox'
-import { ResourceLayout } from '@/components/spree/resource-layout'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import { Switch } from '@/components/ui/switch'
-import { Textarea } from '@/components/ui/textarea'
import { customerAutocompleteProps } from '@/hooks/use-customers'
import { mapSpreeErrorsToForm } from '@/lib/form-errors'
import { formatPrice } from '@/lib/formatters'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/$productId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/$productId.tsx
index 43186c7528..9678fa59ef 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/$productId.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/$productId.tsx
@@ -15,6 +15,32 @@ import {
import { CSS } from '@dnd-kit/utilities'
import { zodResolver } from '@hookform/resolvers/zod'
import { type Media, type Product, SpreeError, type Variant } from '@spree/admin-sdk'
+import {
+ Button,
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ ErrorState,
+ Field,
+ FieldError,
+ FieldLabel,
+ FormActions,
+ Input,
+ MetadataCard,
+ ResourceLayout,
+ RichTextEditor,
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+ Skeleton,
+ StatusBadge,
+ Textarea,
+ useConfirm,
+ useFormSubmitShortcut,
+} from '@spree/dashboard-ui'
import { createFileRoute, useRouter } from '@tanstack/react-router'
import { ImagePlusIcon, Loader2Icon, PencilIcon, TrashIcon } from 'lucide-react'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
@@ -23,33 +49,13 @@ import { useTranslation } from 'react-i18next'
import { toast } from 'sonner'
import { adminClient } from '@/client'
import { BulkPriceEditorDialog } from '@/components/spree/bulk-price-editor/bulk-price-editor-dialog'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { CustomFieldsCard } from '@/components/spree/custom-fields/custom-fields-card'
-import { FormActions, useFormSubmitShortcut } from '@/components/spree/form-actions'
-import { MetadataCard } from '@/components/spree/metadata/metadata-card'
import { PageHeader } from '@/components/spree/page-header'
import { InventorySection } from '@/components/spree/products/inventory-section'
import { MediaEditSheet } from '@/components/spree/products/media-edit-sheet'
-import { ResourceLayout } from '@/components/spree/resource-layout'
import { ResourceMultiAutocomplete } from '@/components/spree/resource-multi-autocomplete'
-import { ErrorState } from '@/components/spree/route-error-boundary'
import { StoreDatePicker } from '@/components/spree/store-date-picker'
import { TagCombobox } from '@/components/spree/tag-combobox'
-import { StatusBadge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Field, FieldError, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import { RichTextEditor } from '@/components/ui/rich-text-editor'
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from '@/components/ui/select'
-import { Skeleton } from '@/components/ui/skeleton'
-import { Textarea } from '@/components/ui/textarea'
import { categoryAutocompleteProps } from '@/hooks/use-categories'
import { useDirectUpload } from '@/hooks/use-direct-upload'
import { useDeleteProduct, useProduct, useUpdateProduct } from '@/hooks/use-product'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/index.tsx
index f5bddb8287..17c7179eb7 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/index.tsx
@@ -1,4 +1,17 @@
import type { Product } from '@spree/admin-sdk'
+import {
+ BulkDialog,
+ Button,
+ Field,
+ FieldLabel,
+ RowActions,
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+ useConfirm,
+} from '@spree/dashboard-ui'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import {
FolderMinusIcon,
@@ -13,22 +26,10 @@ import { useTranslation } from 'react-i18next'
import { toast } from 'sonner'
import { adminClient } from '@/client'
import type { BulkAction, BulkActionFormProps } from '@/components/spree/bulk-action-bar'
-import { BulkDialog } from '@/components/spree/bulk-dialog'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { ExportButton } from '@/components/spree/export-button'
import { ResourceMultiAutocomplete } from '@/components/spree/resource-multi-autocomplete'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
import { TagCombobox } from '@/components/spree/tag-combobox'
-import { Button } from '@/components/ui/button'
-import { Field, FieldLabel } from '@/components/ui/field'
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from '@/components/ui/select'
import { categoryAutocompleteProps } from '@/hooks/use-categories'
import { useDeleteProduct } from '@/hooks/use-product'
import {
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/options.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/options.tsx
index 9e3d84ec34..597ad91333 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/options.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/options.tsx
@@ -16,6 +16,43 @@ import {
import { CSS } from '@dnd-kit/utilities'
import { zodResolver } from '@hookform/resolvers/zod'
import type { OptionType, OptionTypeCreateParams } from '@spree/admin-sdk'
+import {
+ Button,
+ ColorPicker,
+ cn,
+ Dialog,
+ DialogContent,
+ DragHandle,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ RowActions,
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ Switch,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+ useConfirm,
+ useRowClickBridge,
+} from '@spree/dashboard-ui'
import { useQueryClient } from '@tanstack/react-query'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { ImageIcon, PlusIcon, Trash2Icon, UploadCloudIcon, XIcon } from 'lucide-react'
@@ -32,41 +69,7 @@ import { toast } from 'sonner'
import { z } from 'zod/v4'
import { adminClient } from '@/client'
import { Can } from '@/components/spree/can'
-import { ColorPicker } from '@/components/spree/color-picker'
-import { useConfirm } from '@/components/spree/confirm-dialog'
-import { DragHandle } from '@/components/spree/drag-handle'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
-import { useRowClickBridge } from '@/components/spree/row-click-bridge'
-import { Button } from '@/components/ui/button'
-import {
- Table,
- TableBody,
- TableCell,
- TableHead,
- TableHeader,
- TableRow,
-} from '@/components/ui/data-table'
-import { Dialog, DialogContent } from '@/components/ui/dialog'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from '@/components/ui/select'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetFooter,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
-import { Switch } from '@/components/ui/switch'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import { useDirectUpload } from '@/hooks/use-direct-upload'
import {
optionTypesQueryKey,
@@ -77,7 +80,6 @@ import {
} from '@/hooks/use-option-types'
import { mapSpreeErrorsToForm } from '@/lib/form-errors'
import { Subject } from '@/lib/permissions'
-import { cn } from '@/lib/utils'
import { usePermissions } from '@/providers/permission-provider'
import {
OPTION_TYPE_DEFAULTS,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/price-lists/$priceListId/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/price-lists/$priceListId/index.tsx
index 49c80af468..ec3a6a1bbc 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/price-lists/$priceListId/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/price-lists/$priceListId/index.tsx
@@ -1,7 +1,7 @@
+import { useConfirm } from '@spree/dashboard-ui'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { useTranslation } from 'react-i18next'
import { toast } from 'sonner'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { PriceListForm } from '@/components/spree/price-list-editors/price-list-form'
import { useDeletePriceList, usePriceList, useUpdatePriceList } from '@/hooks/use-price-lists'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/price-lists/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/price-lists/index.tsx
index c8573a8b6c..4fa4a9d454 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/price-lists/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/price-lists/index.tsx
@@ -1,15 +1,12 @@
import type { PriceList } from '@spree/admin-sdk'
+import { Button, RowActions, useConfirm, useRowClickBridge } from '@spree/dashboard-ui'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { PlusIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { toast } from 'sonner'
import { adminClient } from '@/client'
import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
-import { useRowClickBridge } from '@/components/spree/row-click-bridge'
-import { Button } from '@/components/ui/button'
import { useDeletePriceList } from '@/hooks/use-price-lists'
import { Subject } from '@/lib/permissions'
import { usePermissions } from '@/providers/permission-provider'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers.tsx
index 0462c99356..886c2cba48 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/products/transfers.tsx
@@ -1,37 +1,40 @@
import type { StockTransfer, Variant } from '@spree/admin-sdk'
-import { useQuery } from '@tanstack/react-query'
-import { createFileRoute, useNavigate } from '@tanstack/react-router'
-import { ArrowLeftRightIcon, EyeIcon, PlusIcon, TrashIcon } from 'lucide-react'
-import { useMemo, useState } from 'react'
-import { Trans, useTranslation } from 'react-i18next'
-import { z } from 'zod/v4'
-import { adminClient } from '@/client'
-import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
-import { useRowClickBridge } from '@/components/spree/row-click-bridge'
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Field, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
import {
+ Badge,
+ Button,
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ Field,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ RelativeTime,
+ RowActions,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@/components/ui/select'
-import {
Sheet,
SheetContent,
SheetDescription,
SheetFooter,
SheetHeader,
SheetTitle,
-} from '@/components/ui/sheet'
+ useConfirm,
+ useRowClickBridge,
+} from '@spree/dashboard-ui'
+import { useQuery } from '@tanstack/react-query'
+import { createFileRoute, useNavigate } from '@tanstack/react-router'
+import { ArrowLeftRightIcon, EyeIcon, PlusIcon, TrashIcon } from 'lucide-react'
+import { useMemo, useState } from 'react'
+import { Trans, useTranslation } from 'react-i18next'
+import { z } from 'zod/v4'
+import { adminClient } from '@/client'
+import { Can } from '@/components/spree/can'
+import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
import { useStockLocations } from '@/hooks/use-stock-locations'
import {
useCreateStockTransfer,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/promotions/$promotionId.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/promotions/$promotionId.tsx
index def9932044..0c38440b62 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/promotions/$promotionId.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/promotions/$promotionId.tsx
@@ -1,6 +1,6 @@
+import { useConfirm } from '@spree/dashboard-ui'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { useTranslation } from 'react-i18next'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { PromotionForm } from '@/components/spree/promotion-editors/promotion-form'
import {
useDeletePromotion,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/promotions/gift-cards.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/promotions/gift-cards.tsx
index 16b1170d26..0b93f1924e 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/promotions/gift-cards.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/promotions/gift-cards.tsx
@@ -1,5 +1,22 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { Customer, GiftCard } from '@spree/admin-sdk'
+import {
+ Button,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ RowActions,
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ useConfirm,
+ useRowClickBridge,
+} from '@spree/dashboard-ui'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { PlusIcon } from 'lucide-react'
import { useEffect, useRef } from 'react'
@@ -7,24 +24,10 @@ import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { CurrencySelect } from '@/components/spree/currency-select'
import { ResourceCombobox } from '@/components/spree/resource-combobox'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
-import { useRowClickBridge } from '@/components/spree/row-click-bridge'
import { StoreDatePicker } from '@/components/spree/store-date-picker'
-import { Button } from '@/components/ui/button'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetFooter,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
import { customerAutocompleteProps } from '@/hooks/use-customers'
import {
listGiftCards,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/promotions/index.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/promotions/index.tsx
index 0970e6a6ca..6d8b25a853 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/promotions/index.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/promotions/index.tsx
@@ -1,14 +1,11 @@
import type { Promotion } from '@spree/admin-sdk'
+import { Button, RowActions, useConfirm, useRowClickBridge } from '@spree/dashboard-ui'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { PlusIcon } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { adminClient } from '@/client'
import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
-import { useRowClickBridge } from '@/components/spree/row-click-bridge'
-import { Button } from '@/components/ui/button'
import { useDeletePromotion } from '@/hooks/use-promotions'
import { Subject } from '@/lib/permissions'
import { usePermissions } from '@/providers/permission-provider'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/allowed-origins.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/allowed-origins.tsx
index a390cbdead..9c2f6b4f1e 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/allowed-origins.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/allowed-origins.tsx
@@ -1,5 +1,23 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { AllowedOrigin, AllowedOriginCreateParams } from '@spree/admin-sdk'
+import {
+ Button,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ RowActions,
+ requiredMessage,
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ useConfirm,
+ useRowClickBridge,
+} from '@spree/dashboard-ui'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { PlusIcon } from 'lucide-react'
import { type UseFormReturn, useForm } from 'react-hook-form'
@@ -7,21 +25,7 @@ import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
import { adminClient } from '@/client'
import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
-import { useRowClickBridge } from '@/components/spree/row-click-bridge'
-import { Button } from '@/components/ui/button'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetFooter,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
import {
useAllowedOrigin,
useCreateAllowedOrigin,
@@ -31,7 +35,6 @@ import {
import { mapSpreeErrorsToForm } from '@/lib/form-errors'
import { i18n } from '@/lib/i18n'
import { Subject } from '@/lib/permissions'
-import { requiredMessage } from '@/lib/validation-messages'
import { usePermissions } from '@/providers/permission-provider'
import '@/tables/allowed-origins'
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/api-keys.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/api-keys.tsx
index b7e9ea4242..47327bfa51 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/api-keys.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/api-keys.tsx
@@ -1,36 +1,14 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { type ApiKey, type ApiKeyCreateParams, SpreeError } from '@spree/admin-sdk'
-import { createFileRoute } from '@tanstack/react-router'
-import {
- AlertTriangleIcon,
- BanIcon,
- CheckIcon,
- CopyIcon,
- KeyRoundIcon,
- PlusIcon,
-} from 'lucide-react'
-import { useState } from 'react'
-import { Controller, useForm } from 'react-hook-form'
-import { useTranslation } from 'react-i18next'
-import { toast } from 'sonner'
-import { z } from 'zod/v4'
-import { useConfirm } from '@/components/spree/confirm-dialog'
-import { PageHeader } from '@/components/spree/page-header'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { RowActions } from '@/components/spree/row-actions'
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Checkbox } from '@/components/ui/checkbox'
-import {
- Table,
- TableBody,
- TableCell,
- TableHead,
- TableHeader,
- TableRow,
-} from '@/components/ui/data-table'
import {
+ Badge,
+ Button,
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ Checkbox,
+ cn,
Dialog,
DialogBody,
DialogContent,
@@ -38,32 +16,58 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog'
-import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from '@/components/ui/empty'
-import {
+ Empty,
+ EmptyDescription,
+ EmptyHeader,
+ EmptyMedia,
+ EmptyTitle,
Field,
FieldContent,
FieldDescription,
FieldError,
FieldLabel,
FieldTitle,
-} from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
-import {
+ Input,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+ RadioGroup,
+ RadioGroupItem,
+ RelativeTime,
+ RowActions,
Sheet,
SheetContent,
SheetDescription,
SheetFooter,
SheetHeader,
SheetTitle,
-} from '@/components/ui/sheet'
-import { Skeleton } from '@/components/ui/skeleton'
+ Skeleton,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+ useConfirm,
+} from '@spree/dashboard-ui'
+import { createFileRoute } from '@tanstack/react-router'
+import {
+ AlertTriangleIcon,
+ BanIcon,
+ CheckIcon,
+ CopyIcon,
+ KeyRoundIcon,
+ PlusIcon,
+} from 'lucide-react'
+import { useState } from 'react'
+import { Controller, useForm } from 'react-hook-form'
+import { useTranslation } from 'react-i18next'
+import { toast } from 'sonner'
+import { z } from 'zod/v4'
+import { PageHeader } from '@/components/spree/page-header'
import { useApiKeys, useCreateApiKey, useDeleteApiKey, useRevokeApiKey } from '@/hooks/use-api-keys'
import { useCopyToClipboard } from '@/hooks/use-copy-to-clipboard'
import { mapSpreeErrorsToForm } from '@/lib/form-errors'
-import { cn } from '@/lib/utils'
export const Route = createFileRoute('/_authenticated/$storeId/settings/api-keys')({
component: ApiKeysSettingsPage,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/custom-field-definitions.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/custom-field-definitions.tsx
index 476c959b2b..dc2f914006 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/custom-field-definitions.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/custom-field-definitions.tsx
@@ -1,5 +1,17 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { CustomFieldDefinition } from '@spree/admin-sdk'
+import {
+ Button,
+ RowActions,
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ useConfirm,
+ useRowClickBridge,
+} from '@spree/dashboard-ui'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { PlusIcon } from 'lucide-react'
import { useEffect } from 'react'
@@ -8,20 +20,8 @@ import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
import { adminClient } from '@/client'
import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { DefinitionFormFields } from '@/components/spree/custom-fields/definition-form'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
-import { useRowClickBridge } from '@/components/spree/row-click-bridge'
-import { Button } from '@/components/ui/button'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetFooter,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
import {
useCreateCustomFieldDefinitionForSettings,
useCustomFieldDefinition,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/markets.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/markets.tsx
index ff5efd7f56..6a43e9643b 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/markets.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/markets.tsx
@@ -1,5 +1,23 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { Market } from '@spree/admin-sdk'
+import {
+ Button,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ RowActions,
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ Switch,
+ useConfirm,
+ useRowClickBridge,
+} from '@spree/dashboard-ui'
import { useQueryClient } from '@tanstack/react-query'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { PlusIcon } from 'lucide-react'
@@ -9,25 +27,10 @@ import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
import { adminClient } from '@/client'
import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { CountryMultiCombobox } from '@/components/spree/country-combobox'
import { CurrencySelect } from '@/components/spree/currency-select'
import { LocaleSelect } from '@/components/spree/locale-select'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
-import { useRowClickBridge } from '@/components/spree/row-click-bridge'
-import { Button } from '@/components/ui/button'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetFooter,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
-import { Switch } from '@/components/ui/switch'
import {
marketsQueryKey,
useCreateMarket,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/payment-methods.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/payment-methods.tsx
index 3386557d5a..b1bfee9157 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/payment-methods.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/payment-methods.tsx
@@ -1,5 +1,17 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { PaymentMethod, PreferenceField } from '@spree/admin-sdk'
+import {
+ Button,
+ RowActions,
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ useConfirm,
+ useRowClickBridge,
+} from '@spree/dashboard-ui'
import { useQueryClient } from '@tanstack/react-query'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { PlusIcon } from 'lucide-react'
@@ -9,22 +21,10 @@ import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
import { adminClient } from '@/client'
import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { PaymentMethodForm } from '@/components/spree/payment-method-editors/payment-method-form'
import type { PaymentMethodFormValues } from '@/components/spree/payment-method-editors/types'
import { defaultPreferences } from '@/components/spree/preferences-form'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
-import { useRowClickBridge } from '@/components/spree/row-click-bridge'
-import { Button } from '@/components/ui/button'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetFooter,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
import {
useCreatePaymentMethod,
useDeletePaymentMethod,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/staff.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/staff.tsx
index 2bfc5fb047..3dd39bd596 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/staff.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/staff.tsx
@@ -1,38 +1,15 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { type AdminUser, type Invitation, type Role, SpreeError } from '@spree/admin-sdk'
-import { createFileRoute } from '@tanstack/react-router'
-import {
- BanIcon,
- ClockIcon,
- LinkIcon,
- MailIcon,
- PlusIcon,
- UserMinusIcon,
- UsersRoundIcon,
-} from 'lucide-react'
-import { useState } from 'react'
-import { Controller, useForm } from 'react-hook-form'
-import { useTranslation } from 'react-i18next'
-import { toast } from 'sonner'
-import { z } from 'zod/v4'
-import { useConfirm } from '@/components/spree/confirm-dialog'
-import { PageHeader } from '@/components/spree/page-header'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { RowActions } from '@/components/spree/row-actions'
-import { Avatar, AvatarFallback } from '@/components/ui/avatar'
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Checkbox } from '@/components/ui/checkbox'
-import {
- Table,
- TableBody,
- TableCell,
- TableHead,
- TableHeader,
- TableRow,
-} from '@/components/ui/data-table'
import {
+ Avatar,
+ AvatarFallback,
+ Badge,
+ Button,
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ Checkbox,
Dialog,
DialogBody,
DialogContent,
@@ -40,26 +17,53 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog'
-import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from '@/components/ui/empty'
-import { Field, FieldError, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
+ Empty,
+ EmptyDescription,
+ EmptyHeader,
+ EmptyMedia,
+ EmptyTitle,
+ Field,
+ FieldError,
+ FieldLabel,
+ Input,
+ RelativeTime,
+ RowActions,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@/components/ui/select'
-import {
Sheet,
SheetContent,
SheetDescription,
SheetFooter,
SheetHeader,
SheetTitle,
-} from '@/components/ui/sheet'
-import { Skeleton } from '@/components/ui/skeleton'
+ Skeleton,
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+ useConfirm,
+} from '@spree/dashboard-ui'
+import { createFileRoute } from '@tanstack/react-router'
+import {
+ BanIcon,
+ ClockIcon,
+ LinkIcon,
+ MailIcon,
+ PlusIcon,
+ UserMinusIcon,
+ UsersRoundIcon,
+} from 'lucide-react'
+import { useState } from 'react'
+import { Controller, useForm } from 'react-hook-form'
+import { useTranslation } from 'react-i18next'
+import { toast } from 'sonner'
+import { z } from 'zod/v4'
+import { PageHeader } from '@/components/spree/page-header'
import { useCopyToClipboard } from '@/hooks/use-copy-to-clipboard'
import {
useCreateInvitation,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/stock-locations.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/stock-locations.tsx
index d9c15926fc..a62d0e163c 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/stock-locations.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/stock-locations.tsx
@@ -5,41 +5,44 @@ import type {
StockLocationCreateParams,
StockLocationUpdateParams,
} from '@spree/admin-sdk'
-import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'
-import { ChevronDownIcon, ChevronRightIcon, PlusIcon } from 'lucide-react'
-import { useEffect, useMemo, useState } from 'react'
-import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
-import { useTranslation } from 'react-i18next'
-import { z } from 'zod/v4'
-import { adminClient } from '@/client'
-import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
-import { CountryCombobox } from '@/components/spree/country-combobox'
-import { StateCombobox, useCountryStates } from '@/components/spree/country-state-fields'
-import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
-import { useRowClickBridge } from '@/components/spree/row-click-bridge'
-import { Button } from '@/components/ui/button'
-import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
import {
+ Button,
+ Collapsible,
+ CollapsibleContent,
+ CollapsibleTrigger,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ RowActions,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@/components/ui/select'
-import {
Sheet,
SheetContent,
SheetDescription,
SheetFooter,
SheetHeader,
SheetTitle,
-} from '@/components/ui/sheet'
-import { Switch } from '@/components/ui/switch'
-import { Textarea } from '@/components/ui/textarea'
+ Switch,
+ Textarea,
+ useConfirm,
+ useRowClickBridge,
+} from '@spree/dashboard-ui'
+import { createFileRoute, Link, useNavigate } from '@tanstack/react-router'
+import { ChevronDownIcon, ChevronRightIcon, PlusIcon } from 'lucide-react'
+import { useEffect, useMemo, useState } from 'react'
+import { Controller, type UseFormReturn, useForm } from 'react-hook-form'
+import { useTranslation } from 'react-i18next'
+import { z } from 'zod/v4'
+import { adminClient } from '@/client'
+import { Can } from '@/components/spree/can'
+import { CountryCombobox } from '@/components/spree/country-combobox'
+import { StateCombobox, useCountryStates } from '@/components/spree/country-state-fields'
+import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
import { useStockItems, useUpdateStockItem } from '@/hooks/use-stock-items'
import {
useCreateStockLocation,
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/store.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/store.tsx
index b86dc75312..a063eff356 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/store.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/store.tsx
@@ -1,5 +1,26 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { SpreeError, type Store } from '@spree/admin-sdk'
+import {
+ Card,
+ CardContent,
+ CardHeader,
+ CardTitle,
+ ErrorState,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ FormActions,
+ Input,
+ ResourceLayout,
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+ Skeleton,
+ useFormSubmitShortcut,
+} from '@spree/dashboard-ui'
import { createFileRoute } from '@tanstack/react-router'
import { useEffect, useMemo } from 'react'
import {
@@ -11,21 +32,7 @@ import {
} from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { toast } from 'sonner'
-import { FormActions, useFormSubmitShortcut } from '@/components/spree/form-actions'
import { PageHeader } from '@/components/spree/page-header'
-import { ResourceLayout } from '@/components/spree/resource-layout'
-import { ErrorState } from '@/components/spree/route-error-boundary'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from '@/components/ui/select'
-import { Skeleton } from '@/components/ui/skeleton'
import { useStoreSettings, useUpdateStoreSettings } from '@/hooks/use-store-settings'
import { mapSpreeErrorsToForm } from '@/lib/form-errors'
import {
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/tax-categories.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/tax-categories.tsx
index de9faa02da..a2b02ea3a9 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/tax-categories.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/tax-categories.tsx
@@ -1,5 +1,24 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { TaxCategory, TaxCategoryCreateParams } from '@spree/admin-sdk'
+import {
+ Button,
+ Field,
+ FieldError,
+ FieldGroup,
+ FieldLabel,
+ Input,
+ RowActions,
+ Sheet,
+ SheetContent,
+ SheetDescription,
+ SheetFooter,
+ SheetHeader,
+ SheetTitle,
+ Switch,
+ Textarea,
+ useConfirm,
+ useRowClickBridge,
+} from '@spree/dashboard-ui'
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { PlusIcon } from 'lucide-react'
import { useEffect } from 'react'
@@ -8,23 +27,7 @@ import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
import { adminClient } from '@/client'
import { Can } from '@/components/spree/can'
-import { useConfirm } from '@/components/spree/confirm-dialog'
import { ResourceTable, resourceSearchSchema } from '@/components/spree/resource-table'
-import { RowActions } from '@/components/spree/row-actions'
-import { useRowClickBridge } from '@/components/spree/row-click-bridge'
-import { Button } from '@/components/ui/button'
-import { Field, FieldError, FieldGroup, FieldLabel } from '@/components/ui/field'
-import { Input } from '@/components/ui/input'
-import {
- Sheet,
- SheetContent,
- SheetDescription,
- SheetFooter,
- SheetHeader,
- SheetTitle,
-} from '@/components/ui/sheet'
-import { Switch } from '@/components/ui/switch'
-import { Textarea } from '@/components/ui/textarea'
import {
useCreateTaxCategory,
useDeleteTaxCategory,
diff --git a/packages/dashboard/src/routes/accept-invitation.$invitationId.tsx b/packages/dashboard/src/routes/accept-invitation.$invitationId.tsx
index eff7627e84..52eace441b 100644
--- a/packages/dashboard/src/routes/accept-invitation.$invitationId.tsx
+++ b/packages/dashboard/src/routes/accept-invitation.$invitationId.tsx
@@ -1,15 +1,21 @@
import { zodResolver } from '@hookform/resolvers/zod'
import type { Invitation, SpreeError } from '@spree/admin-sdk'
+import {
+ Button,
+ Card,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+ Input,
+ Label,
+} from '@spree/dashboard-ui'
import { useQuery } from '@tanstack/react-query'
import { createFileRoute, Navigate, useNavigate } from '@tanstack/react-router'
import { useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
import { z } from 'zod/v4'
import { adminClient } from '@/client'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
import { useAuth } from '@/hooks/use-auth'
import { mapSpreeErrorsToForm } from '@/lib/form-errors'
import {
diff --git a/packages/dashboard/src/routes/login.tsx b/packages/dashboard/src/routes/login.tsx
index 6d35ea323a..79514be5a7 100644
--- a/packages/dashboard/src/routes/login.tsx
+++ b/packages/dashboard/src/routes/login.tsx
@@ -1,13 +1,19 @@
import { zodResolver } from '@hookform/resolvers/zod'
+import {
+ Button,
+ Card,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+ cn,
+ Input,
+ Label,
+} from '@spree/dashboard-ui'
import { createFileRoute, Navigate } from '@tanstack/react-router'
import { useForm } from 'react-hook-form'
import { useTranslation } from 'react-i18next'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
import { useAuth } from '@/hooks/use-auth'
-import { cn } from '@/lib/utils'
import { type LoginFormValues, loginFormSchema } from '@/schemas/auth'
export const Route = createFileRoute('/login')({
diff --git a/packages/dashboard/src/schemas/custom-field-definition.ts b/packages/dashboard/src/schemas/custom-field-definition.ts
index d6f968a5eb..16e2351ac6 100644
--- a/packages/dashboard/src/schemas/custom-field-definition.ts
+++ b/packages/dashboard/src/schemas/custom-field-definition.ts
@@ -2,9 +2,9 @@ import type {
CustomFieldDefinitionCreateParams,
CustomFieldDefinitionUpdateParams,
} from '@spree/admin-sdk'
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
import { i18n } from '@/lib/i18n'
-import { requiredMessage } from '@/lib/validation-messages'
// Mirrors `Spree::Metafield::FIELD_TYPE_TOKENS` on the backend. Keep in sync
// with the typelized `field_type` union on `CustomFieldDefinition`. Labels
diff --git a/packages/dashboard/src/schemas/customer-group.ts b/packages/dashboard/src/schemas/customer-group.ts
index d91a1bd3c7..92b3fbc73f 100644
--- a/packages/dashboard/src/schemas/customer-group.ts
+++ b/packages/dashboard/src/schemas/customer-group.ts
@@ -1,7 +1,7 @@
import type { CustomerGroupCreateParams, CustomerGroupUpdateParams } from '@spree/admin-sdk'
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
import { blankToNull } from '@/lib/form-mappers'
-import { requiredMessage } from '@/lib/validation-messages'
export const customerGroupFormSchema = z.object({
name: z
diff --git a/packages/dashboard/src/schemas/customer.ts b/packages/dashboard/src/schemas/customer.ts
index 934381fb16..b16f5c4626 100644
--- a/packages/dashboard/src/schemas/customer.ts
+++ b/packages/dashboard/src/schemas/customer.ts
@@ -1,6 +1,6 @@
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
import { i18n } from '@/lib/i18n'
-import { requiredMessage } from '@/lib/validation-messages'
const customerProfileBase = z.object({
// Server requires a valid email; check client-side so the user gets an
diff --git a/packages/dashboard/src/schemas/market.ts b/packages/dashboard/src/schemas/market.ts
index a76e08b7e0..629a5be1a0 100644
--- a/packages/dashboard/src/schemas/market.ts
+++ b/packages/dashboard/src/schemas/market.ts
@@ -1,6 +1,6 @@
import type { MarketCreateParams, MarketUpdateParams } from '@spree/admin-sdk'
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
-import { requiredMessage } from '@/lib/validation-messages'
export const marketFormSchema = z.object({
name: z.string().min(1, { error: requiredMessage('name') }),
diff --git a/packages/dashboard/src/schemas/option-type.ts b/packages/dashboard/src/schemas/option-type.ts
index d80f3d1125..ed0afda143 100644
--- a/packages/dashboard/src/schemas/option-type.ts
+++ b/packages/dashboard/src/schemas/option-type.ts
@@ -1,7 +1,7 @@
import type { OptionValue, OptionValueParams } from '@spree/admin-sdk'
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
import { i18n } from '@/lib/i18n'
-import { requiredMessage } from '@/lib/validation-messages'
// Labels live in `en.json` under `admin.products.options.kinds.*` — consumers
// translate at render time.
diff --git a/packages/dashboard/src/schemas/payment-method.ts b/packages/dashboard/src/schemas/payment-method.ts
index 6d34f02e5b..1b0c9d073e 100644
--- a/packages/dashboard/src/schemas/payment-method.ts
+++ b/packages/dashboard/src/schemas/payment-method.ts
@@ -1,6 +1,6 @@
import type { PaymentMethodCreateParams, PaymentMethodUpdateParams } from '@spree/admin-sdk'
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
-import { requiredMessage } from '@/lib/validation-messages'
export const paymentMethodBaseFormSchema = z.object({
name: z.string().min(1, { error: requiredMessage('name') }),
diff --git a/packages/dashboard/src/schemas/price-list.ts b/packages/dashboard/src/schemas/price-list.ts
index 6db384315e..d51eac51c2 100644
--- a/packages/dashboard/src/schemas/price-list.ts
+++ b/packages/dashboard/src/schemas/price-list.ts
@@ -6,10 +6,10 @@ import type {
PriceListUpdateParams,
PriceRule,
} from '@spree/admin-sdk'
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
import { defaultPreferences } from '@/components/spree/preferences-form'
import { blankToNull } from '@/lib/form-mappers'
-import { requiredMessage } from '@/lib/validation-messages'
export const MATCH_POLICIES = ['all', 'any'] as const
export type MatchPolicy = (typeof MATCH_POLICIES)[number]
diff --git a/packages/dashboard/src/schemas/product.ts b/packages/dashboard/src/schemas/product.ts
index 3f4751e1e1..2b566bdedf 100644
--- a/packages/dashboard/src/schemas/product.ts
+++ b/packages/dashboard/src/schemas/product.ts
@@ -1,5 +1,5 @@
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
-import { requiredMessage } from '@/lib/validation-messages'
export const stockItemFormSchema = z.object({
stock_location_id: z.string(),
diff --git a/packages/dashboard/src/schemas/promotion.ts b/packages/dashboard/src/schemas/promotion.ts
index be91720b72..243a790c8a 100644
--- a/packages/dashboard/src/schemas/promotion.ts
+++ b/packages/dashboard/src/schemas/promotion.ts
@@ -1,3 +1,4 @@
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
import type {
PromotionActionFormDraft,
@@ -5,7 +6,6 @@ import type {
} from '@/components/spree/promotion-editors/types'
import { emptyToUndefined } from '@/lib/form-mappers'
import { i18n } from '@/lib/i18n'
-import { requiredMessage } from '@/lib/validation-messages'
export type PromotionKind = 'coupon_code' | 'automatic'
export type MatchPolicy = 'all' | 'any'
diff --git a/packages/dashboard/src/schemas/stock-location.ts b/packages/dashboard/src/schemas/stock-location.ts
index 5ba826ca64..542ed37efc 100644
--- a/packages/dashboard/src/schemas/stock-location.ts
+++ b/packages/dashboard/src/schemas/stock-location.ts
@@ -3,9 +3,9 @@ import type {
StockLocationCreateParams,
StockLocationUpdateParams,
} from '@spree/admin-sdk'
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
import { blankToUndefined, emptyToUndefined } from '@/lib/form-mappers'
-import { requiredMessage } from '@/lib/validation-messages'
// Labels live in `en.json` under `admin.stock_locations.kinds.*` and
// `admin.stock_locations.pickup_stock_policies.*`. Consumers map these
diff --git a/packages/dashboard/src/schemas/store-credit.ts b/packages/dashboard/src/schemas/store-credit.ts
index 1206afde93..88e69fc995 100644
--- a/packages/dashboard/src/schemas/store-credit.ts
+++ b/packages/dashboard/src/schemas/store-credit.ts
@@ -1,6 +1,6 @@
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
import { i18n } from '@/lib/i18n'
-import { requiredMessage } from '@/lib/validation-messages'
const amountPositive = () =>
i18n.t('admin.validation.positive_number', {
diff --git a/packages/dashboard/src/schemas/store.ts b/packages/dashboard/src/schemas/store.ts
index d928487ba7..c7e11390b9 100644
--- a/packages/dashboard/src/schemas/store.ts
+++ b/packages/dashboard/src/schemas/store.ts
@@ -1,5 +1,5 @@
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
-import { requiredMessage } from '@/lib/validation-messages'
// Labels live in `en.json` under `admin.store.unit_systems.*` and
// `admin.store.weight_units.*`. Consumers translate at render time.
diff --git a/packages/dashboard/src/schemas/tax-category.ts b/packages/dashboard/src/schemas/tax-category.ts
index 145bb51ab5..e02dc2301b 100644
--- a/packages/dashboard/src/schemas/tax-category.ts
+++ b/packages/dashboard/src/schemas/tax-category.ts
@@ -1,7 +1,7 @@
import type { TaxCategoryCreateParams, TaxCategoryUpdateParams } from '@spree/admin-sdk'
+import { requiredMessage } from '@spree/dashboard-ui'
import { z } from 'zod/v4'
import { blankToNull } from '@/lib/form-mappers'
-import { requiredMessage } from '@/lib/validation-messages'
export const taxCategoryFormSchema = z.object({
name: z.string().min(1, { error: requiredMessage('name') }),
diff --git a/packages/dashboard/src/tables/allowed-origins.tsx b/packages/dashboard/src/tables/allowed-origins.tsx
index aedb293ccc..a6abfec85a 100644
--- a/packages/dashboard/src/tables/allowed-origins.tsx
+++ b/packages/dashboard/src/tables/allowed-origins.tsx
@@ -1,8 +1,7 @@
import type { AllowedOrigin } from '@spree/admin-sdk'
+import { RelativeTime, ResourceNameCell } from '@spree/dashboard-ui'
import i18n from 'i18next'
import { GlobeLockIcon } from 'lucide-react'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { ResourceNameCell } from '@/components/spree/resource-name-cell'
import { defineTable } from '@/lib/table-registry'
defineTable<AllowedOrigin>('allowed-origins', {
diff --git a/packages/dashboard/src/tables/custom-field-definitions.tsx b/packages/dashboard/src/tables/custom-field-definitions.tsx
index 0fa954e7c1..1904c02675 100644
--- a/packages/dashboard/src/tables/custom-field-definitions.tsx
+++ b/packages/dashboard/src/tables/custom-field-definitions.tsx
@@ -1,7 +1,6 @@
import type { CustomFieldDefinition } from '@spree/admin-sdk'
+import { ActiveBadge, Badge, ResourceNameCell } from '@spree/dashboard-ui'
import { TagIcon } from 'lucide-react'
-import { ResourceNameCell } from '@/components/spree/resource-name-cell'
-import { ActiveBadge, Badge } from '@/components/ui/badge'
import { i18n } from '@/lib/i18n'
import { defineTable } from '@/lib/table-registry'
import {
diff --git a/packages/dashboard/src/tables/customer-groups.tsx b/packages/dashboard/src/tables/customer-groups.tsx
index a3eb400d1c..0cf27c6cd0 100644
--- a/packages/dashboard/src/tables/customer-groups.tsx
+++ b/packages/dashboard/src/tables/customer-groups.tsx
@@ -1,6 +1,6 @@
import type { CustomerGroup } from '@spree/admin-sdk'
+import { ResourceNameCell } from '@spree/dashboard-ui'
import { UsersRoundIcon } from 'lucide-react'
-import { ResourceNameCell } from '@/components/spree/resource-name-cell'
import { defineTable } from '@/lib/table-registry'
defineTable<CustomerGroup>('customer-groups', {
diff --git a/packages/dashboard/src/tables/customers.tsx b/packages/dashboard/src/tables/customers.tsx
index e5e9fdf075..3efe9edf49 100644
--- a/packages/dashboard/src/tables/customers.tsx
+++ b/packages/dashboard/src/tables/customers.tsx
@@ -1,9 +1,7 @@
+import { ActiveBadge, Badge, RelativeTime, TagList } from '@spree/dashboard-ui'
import { Link } from '@tanstack/react-router'
import i18n from 'i18next'
import { UsersIcon } from 'lucide-react'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { TagList } from '@/components/spree/tag-list'
-import { ActiveBadge, Badge } from '@/components/ui/badge'
import { customerGroupAutocompleteProps } from '@/hooks/use-customer-groups'
import { Subject } from '@/lib/permissions'
import { defineTable } from '@/lib/table-registry'
diff --git a/packages/dashboard/src/tables/gift-cards.tsx b/packages/dashboard/src/tables/gift-cards.tsx
index 2ee3b49836..f00177902d 100644
--- a/packages/dashboard/src/tables/gift-cards.tsx
+++ b/packages/dashboard/src/tables/gift-cards.tsx
@@ -1,9 +1,7 @@
import type { GiftCard } from '@spree/admin-sdk'
+import { Badge, RelativeTime, ResourceNameCell } from '@spree/dashboard-ui'
import i18n from 'i18next'
import { GiftIcon } from 'lucide-react'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { ResourceNameCell } from '@/components/spree/resource-name-cell'
-import { Badge } from '@/components/ui/badge'
import { adminUserAutocompleteProps } from '@/hooks/use-admin-users'
import { customerAutocompleteProps } from '@/hooks/use-customers'
import { giftCardBatchAutocompleteProps } from '@/hooks/use-gift-cards'
diff --git a/packages/dashboard/src/tables/markets.tsx b/packages/dashboard/src/tables/markets.tsx
index 8e12c94425..cf30e0c9cf 100644
--- a/packages/dashboard/src/tables/markets.tsx
+++ b/packages/dashboard/src/tables/markets.tsx
@@ -1,8 +1,7 @@
import type { Market } from '@spree/admin-sdk'
+import { ActiveBadge, Badge, ResourceNameCell } from '@spree/dashboard-ui'
import { GlobeIcon } from 'lucide-react'
import { LocaleLabel } from '@/components/spree/locale-select'
-import { ResourceNameCell } from '@/components/spree/resource-name-cell'
-import { ActiveBadge, Badge } from '@/components/ui/badge'
import { defineTable } from '@/lib/table-registry'
defineTable<Market>('markets', {
diff --git a/packages/dashboard/src/tables/option-types.tsx b/packages/dashboard/src/tables/option-types.tsx
index cf05341441..c4c9746159 100644
--- a/packages/dashboard/src/tables/option-types.tsx
+++ b/packages/dashboard/src/tables/option-types.tsx
@@ -1,8 +1,6 @@
import type { OptionType } from '@spree/admin-sdk'
+import { ActiveBadge, Badge, RelativeTime, ResourceNameCell } from '@spree/dashboard-ui'
import { ListChecksIcon } from 'lucide-react'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { ResourceNameCell } from '@/components/spree/resource-name-cell'
-import { ActiveBadge, Badge } from '@/components/ui/badge'
import { defineTable } from '@/lib/table-registry'
const KIND_LABELS: Record<string, string> = {
diff --git a/packages/dashboard/src/tables/orders.tsx b/packages/dashboard/src/tables/orders.tsx
index ff618671d6..c2584a0428 100644
--- a/packages/dashboard/src/tables/orders.tsx
+++ b/packages/dashboard/src/tables/orders.tsx
@@ -1,9 +1,7 @@
+import { RelativeTime, StatusBadge, TagList } from '@spree/dashboard-ui'
import { Link } from '@tanstack/react-router'
import i18n from 'i18next'
import { ShoppingCartIcon } from 'lucide-react'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { TagList } from '@/components/spree/tag-list'
-import { StatusBadge } from '@/components/ui/badge'
import { Subject } from '@/lib/permissions'
import { defineTable } from '@/lib/table-registry'
diff --git a/packages/dashboard/src/tables/payment-methods.tsx b/packages/dashboard/src/tables/payment-methods.tsx
index c0f0fe0fbd..d9cab8b2a4 100644
--- a/packages/dashboard/src/tables/payment-methods.tsx
+++ b/packages/dashboard/src/tables/payment-methods.tsx
@@ -1,7 +1,6 @@
import type { PaymentMethod } from '@spree/admin-sdk'
+import { ActiveBadge, Badge, ResourceNameCell } from '@spree/dashboard-ui'
import { CreditCardIcon } from 'lucide-react'
-import { ResourceNameCell } from '@/components/spree/resource-name-cell'
-import { ActiveBadge, Badge } from '@/components/ui/badge'
import { defineTable } from '@/lib/table-registry'
defineTable<PaymentMethod>('payment-methods', {
diff --git a/packages/dashboard/src/tables/price-lists.tsx b/packages/dashboard/src/tables/price-lists.tsx
index 3d072db13a..77628e9b21 100644
--- a/packages/dashboard/src/tables/price-lists.tsx
+++ b/packages/dashboard/src/tables/price-lists.tsx
@@ -1,8 +1,8 @@
import type { PriceList } from '@spree/admin-sdk'
+import { ResourceNameCell } from '@spree/dashboard-ui'
import i18n from 'i18next'
import { TagsIcon } from 'lucide-react'
import { PriceListStatusBadge } from '@/components/spree/price-list-editors/status-badge'
-import { ResourceNameCell } from '@/components/spree/resource-name-cell'
import { defineTable } from '@/lib/table-registry'
defineTable<PriceList>('price-lists', {
diff --git a/packages/dashboard/src/tables/products.tsx b/packages/dashboard/src/tables/products.tsx
index 35cdf18fb7..53c9013daa 100644
--- a/packages/dashboard/src/tables/products.tsx
+++ b/packages/dashboard/src/tables/products.tsx
@@ -1,9 +1,7 @@
+import { RelativeTime, StatusBadge, TagList } from '@spree/dashboard-ui'
import { Link } from '@tanstack/react-router'
import i18n from 'i18next'
import { PackageIcon } from 'lucide-react'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { TagList } from '@/components/spree/tag-list'
-import { StatusBadge } from '@/components/ui/badge'
import { categoryAutocompleteProps } from '@/hooks/use-categories'
import { formatPrice } from '@/lib/formatters'
import { Subject } from '@/lib/permissions'
diff --git a/packages/dashboard/src/tables/promotions.tsx b/packages/dashboard/src/tables/promotions.tsx
index d9714d6748..673e796a75 100644
--- a/packages/dashboard/src/tables/promotions.tsx
+++ b/packages/dashboard/src/tables/promotions.tsx
@@ -1,8 +1,6 @@
import type { Promotion } from '@spree/admin-sdk'
+import { Badge, RelativeTime, ResourceNameCell } from '@spree/dashboard-ui'
import { TagIcon } from 'lucide-react'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { ResourceNameCell } from '@/components/spree/resource-name-cell'
-import { Badge } from '@/components/ui/badge'
import { defineTable } from '@/lib/table-registry'
defineTable<Promotion>('promotions', {
diff --git a/packages/dashboard/src/tables/stock-locations.tsx b/packages/dashboard/src/tables/stock-locations.tsx
index dfd0652b43..2356499e7b 100644
--- a/packages/dashboard/src/tables/stock-locations.tsx
+++ b/packages/dashboard/src/tables/stock-locations.tsx
@@ -1,7 +1,6 @@
import type { StockLocation } from '@spree/admin-sdk'
+import { ActiveBadge, ResourceNameCell } from '@spree/dashboard-ui'
import { WarehouseIcon } from 'lucide-react'
-import { ResourceNameCell } from '@/components/spree/resource-name-cell'
-import { ActiveBadge } from '@/components/ui/badge'
import { defineTable } from '@/lib/table-registry'
defineTable<StockLocation>('stock-locations', {
diff --git a/packages/dashboard/src/tables/stock-transfers.tsx b/packages/dashboard/src/tables/stock-transfers.tsx
index 250c2a92b6..c177131501 100644
--- a/packages/dashboard/src/tables/stock-transfers.tsx
+++ b/packages/dashboard/src/tables/stock-transfers.tsx
@@ -1,9 +1,7 @@
import type { StockTransfer } from '@spree/admin-sdk'
+import { Badge, RelativeTime, ResourceNameCell } from '@spree/dashboard-ui'
import i18n from 'i18next'
import { ArrowLeftRightIcon } from 'lucide-react'
-import { RelativeTime } from '@/components/spree/relative-time'
-import { ResourceNameCell } from '@/components/spree/resource-name-cell'
-import { Badge } from '@/components/ui/badge'
import { defineTable } from '@/lib/table-registry'
defineTable<StockTransfer>('stock-transfers', {
diff --git a/packages/dashboard/src/tables/tax-categories.tsx b/packages/dashboard/src/tables/tax-categories.tsx
index fdceb350a6..771a525ad4 100644
--- a/packages/dashboard/src/tables/tax-categories.tsx
+++ b/packages/dashboard/src/tables/tax-categories.tsx
@@ -1,7 +1,6 @@
import type { TaxCategory } from '@spree/admin-sdk'
+import { ActiveBadge, ResourceNameCell } from '@spree/dashboard-ui'
import { PercentIcon } from 'lucide-react'
-import { ResourceNameCell } from '@/components/spree/resource-name-cell'
-import { ActiveBadge } from '@/components/ui/badge'
import { defineTable } from '@/lib/table-registry'
defineTable<TaxCategory>('tax-categories', {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 436c399fb7..1c7ce3ae08 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -19,6 +19,116 @@ importers:
specifier: ^2.9.9
version: 2.9.9
+ packages/admin-sdk:
+ devDependencies:
+ '@changesets/changelog-github':
+ specifier: ^0.7.0
+ version: 0.7.0
+ '@changesets/cli':
+ specifier: ^2.31.0
+ version: 2.31.0(@types/[email protected])
+ '@spree/sdk-core':
+ specifier: workspace:*
+ version: link:../sdk-core
+ '@types/node':
+ specifier: ^25.6.0
+ version: 25.6.0
+ '@vitest/coverage-v8':
+ specifier: ^4.1.5
+ version: 4.1.5([email protected])
+ msw:
+ specifier: ^2.14.3
+ version: 2.14.3(@types/[email protected])([email protected])
+ tsup:
+ specifier: ^8.0.0
+ tsx:
+ specifier: ^4.0.0
+ version: 4.21.0
+ typescript:
+ specifier: ^6.0.3
+ version: 6.0.3
+ vitest:
+ specifier: ^4.1.5
+ yaml:
+ specifier: ^2.8.4
+ version: 2.8.4
+
+ packages/cli:
+ dependencies:
+ '@clack/prompts':
+ specifier: ^1.3.0
+ version: 1.3.0
+ commander:
+ specifier: ^14.0.3
+ version: 14.0.3
+ console-table-printer:
+ specifier: ^2.15.0
+ version: 2.15.0
+ execa:
+ specifier: ^9.6.1
+ version: 9.6.1
+ picocolors:
+ specifier: ^1.1.1
+ version: 1.1.1
+ devDependencies:
+ '@changesets/changelog-github':
+ specifier: ^0.7.0
+ version: 0.7.0
+ '@changesets/cli':
+ specifier: ^2.31.0
+ version: 2.31.0(@types/[email protected])
+ '@types/node':
+ specifier: ^25.6.0
+ version: 25.6.0
+ tsup:
+ specifier: ^8.5.1
+ typescript:
+ specifier: ^6.0.3
+ version: 6.0.3
+ vitest:
+ specifier: ^4.1.5
+
+ packages/create-spree-app:
+ dependencies:
+ '@clack/prompts':
+ specifier: ^1.3.0
+ version: 1.3.0
+ commander:
+ specifier: ^14.0.3
+ version: 14.0.3
+ execa:
+ specifier: ^9.6.1
+ version: 9.6.1
+ get-port:
+ specifier: ^7.2.0
+ version: 7.2.0
+ picocolors:
+ specifier: ^1.1.1
+ version: 1.1.1
+ devDependencies:
+ '@changesets/changelog-github':
+ specifier: ^0.7.0
+ version: 0.7.0
+ '@changesets/cli':
+ specifier: ^2.31.0
+ version: 2.31.0(@types/[email protected])
+ '@types/node':
+ specifier: ^25.6.0
+ version: 25.6.0
+ tsup:
+ specifier: ^8.5.1
+ typescript:
+ specifier: ^6.0.3
+ version: 6.0.3
+ vitest:
+ specifier: ^4.1.5
+
packages/dashboard:
dependencies:
'@base-ui/react':
@@ -45,6 +155,9 @@ importers:
'@spree/admin-sdk':
specifier: workspace:^
version: link:../admin-sdk
+ '@spree/dashboard-ui':
+ specifier: workspace:^
+ version: link:../dashboard-ui
'@tanstack/react-hotkeys':
specifier: ^0.10.0
@@ -173,116 +286,6 @@ importers:
specifier: ^8.0.11
- packages/admin-sdk:
- devDependencies:
- '@changesets/changelog-github':
- specifier: ^0.7.0
- version: 0.7.0
- '@changesets/cli':
- specifier: ^2.31.0
- version: 2.31.0(@types/[email protected])
- '@spree/sdk-core':
- specifier: workspace:*
- version: link:../sdk-core
- '@types/node':
- specifier: ^25.6.0
- version: 25.6.0
- '@vitest/coverage-v8':
- specifier: ^4.1.5
- version: 4.1.5([email protected])
- msw:
- specifier: ^2.14.3
- version: 2.14.3(@types/[email protected])([email protected])
- tsup:
- specifier: ^8.0.0
- tsx:
- specifier: ^4.0.0
- version: 4.21.0
- typescript:
- specifier: ^6.0.3
- version: 6.0.3
- vitest:
- specifier: ^4.1.5
- yaml:
- specifier: ^2.8.4
- version: 2.8.4
-
- packages/cli:
- dependencies:
- '@clack/prompts':
- specifier: ^1.3.0
- version: 1.3.0
- commander:
- specifier: ^14.0.3
- version: 14.0.3
- console-table-printer:
- specifier: ^2.15.0
- version: 2.15.0
- execa:
- specifier: ^9.6.1
- version: 9.6.1
- picocolors:
- specifier: ^1.1.1
- version: 1.1.1
- devDependencies:
- '@changesets/changelog-github':
- specifier: ^0.7.0
- version: 0.7.0
- '@changesets/cli':
- specifier: ^2.31.0
- version: 2.31.0(@types/[email protected])
- '@types/node':
- specifier: ^25.6.0
- version: 25.6.0
- tsup:
- specifier: ^8.5.1
- typescript:
- specifier: ^6.0.3
- version: 6.0.3
- vitest:
- specifier: ^4.1.5
-
- packages/create-spree-app:
- dependencies:
- '@clack/prompts':
- specifier: ^1.3.0
- version: 1.3.0
- commander:
- specifier: ^14.0.3
- version: 14.0.3
- execa:
- specifier: ^9.6.1
- version: 9.6.1
- get-port:
- specifier: ^7.2.0
- version: 7.2.0
- picocolors:
- specifier: ^1.1.1
- version: 1.1.1
- devDependencies:
- '@changesets/changelog-github':
- specifier: ^0.7.0
- version: 0.7.0
- '@changesets/cli':
- specifier: ^2.31.0
- version: 2.31.0(@types/[email protected])
- '@types/node':
- specifier: ^25.6.0
- version: 25.6.0
- tsup:
- specifier: ^8.5.1
- typescript:
- specifier: ^6.0.3
- version: 6.0.3
- vitest:
- specifier: ^4.1.5
-
packages/dashboard-core:
dependencies:
'@spree/dashboard-ui':
@@ -307,12 +310,99 @@ importers:
packages/dashboard-ui:
dependencies:
+ '@base-ui/react':
+ specifier: ^1.4.1
+ '@dnd-kit/core':
+ specifier: ^6.3.1
+ '@dnd-kit/sortable':
+ specifier: ^10.0.0
+ '@dnd-kit/utilities':
+ specifier: ^3.2.2
+ version: 3.2.2([email protected])
+ '@fontsource-variable/geist':
+ specifier: ^5.2.8
+ version: 5.2.8
+ '@fontsource-variable/geist-mono':
+ specifier: ^5.2.7
+ version: 5.2.7
+ '@tanstack/react-hotkeys':
+ specifier: ^0.10.0
+ '@tanstack/react-router':
+ specifier: ^1.169.2
+ '@tanstack/react-table':
+ specifier: ^8.21.3
+ '@tiptap/extension-link':
+ specifier: ^3.22.5
+ version: 3.22.5(@tiptap/[email protected](@tiptap/[email protected]))(@tiptap/[email protected])
+ '@tiptap/extension-placeholder':
+ specifier: ^3.22.5
+ version: 3.22.5(@tiptap/[email protected](@tiptap/[email protected](@tiptap/[email protected]))(@tiptap/[email protected]))
+ '@tiptap/react':
+ specifier: ^3.22.5
+ '@tiptap/starter-kit':
+ specifier: ^3.22.5
+ version: 3.22.5
+ class-variance-authority:
+ specifier: ^0.7.1
+ version: 0.7.1
+ clsx:
+ specifier: ^2.1.1
+ version: 2.1.1
+ cmdk:
+ specifier: ^1.1.1
+ date-fns:
+ specifier: ^4.1.0
+ version: 4.1.0
+ date-fns-tz:
+ specifier: ^3.2.0
+ version: 3.2.0([email protected])
+ flag-icons:
+ specifier: ^7.5.0
+ version: 7.5.0
+ i18next:
+ specifier: ^26.2.0
+ version: 26.2.0([email protected])
+ lucide-react:
+ specifier: ^1.14.0
+ version: 1.14.0([email protected])
react:
specifier: ^19.2.6
version: 19.2.6
+ react-colorful:
+ specifier: ^5.7.0
+ react-day-picker:
+ specifier: ^9.14.0
+ version: 9.14.0([email protected])
react-dom:
specifier: ^19.2.6
version: 19.2.6([email protected])
+ react-hook-form:
+ specifier: ^7.75.0
+ version: 7.75.0([email protected])
+ react-i18next:
+ specifier: ^17.0.8
+ recharts:
+ specifier: ^3.8.1
+ shadcn:
+ specifier: ^4.7.0
+ version: 4.7.0(@types/[email protected])([email protected])
+ tailwind-merge:
+ specifier: ^3.5.0
+ version: 3.5.0
+ tw-animate-css:
+ specifier: ^1.4.0
+ version: 1.4.0
devDependencies:
'@types/react':
specifier: ^19.2.14