Merge pull request #317 from oasisprotocol/mz/bumpUIL

Sync with the latest UI Library version

Author: buberdds

.changelog/317.trivial.md

@@ -0,0 +1 @@
+Sync with the latest UI Library version

discover/package.json

@@ -10,7 +10,7 @@
     "dev": "vite",
     "build": "tsc && vite build",
     "preview": "vite preview",
-    "test": "vitest"
+    "test": "vitest --passWithNoTests"
   },
   "engines": {
     "node": ">=20",

home/package.json

@@ -10,6 +10,7 @@
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",
+    "checkTs": "tsc --noEmit",
     "dev": "vite",
     "build": "tsc && vite build",
     "preview": "vite preview"

move/package.json

@@ -6,6 +6,7 @@
   "type": "module",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
+    "checkTs": "tsc --noEmit",
     "dev": "vite",
     "build": "tsc && vite build",
     "generate:oasisscanv2": "swagger-typescript-api -p https://api.oasisscan.com/v2/swagger/api.json -o ./src/generated -n OasisScanV2Api.ts",

package.json

@@ -15,7 +15,7 @@
     "prettier": "prettier --write . --ignore-path .eslintignore",
     "build": "pnpm --filter @oasisprotocol/rose-app-home build",
     "dev": "pnpm --filter @oasisprotocol/rose-app-home dev",
-    "test": "pnpm --filter=!@oasisprotocol/rose-app-e2e --parallel -r exec vitest run --passWithNoTests",
+    "test": "pnpm --filter=!@oasisprotocol/rose-app-e2e --parallel -r run test",
     "test-e2e": "pnpm --filter @oasisprotocol/rose-app-e2e test"
   },
   "license": "Apache-2.0",

pnpm-lock.yaml

@@ -1,4 +1,4 @@
-import { Layout } from '@oasisprotocol/ui-library/src/components/ui/layout'
+import { Layout } from '@oasisprotocol/ui-library/src/components/layout'
 import { NavLink, Outlet, useLocation, useNavigate } from 'react-router-dom'
 import { Disc, Layers, Menu, Repeat, Sparkles } from 'lucide-react'
 import { useState } from 'react'
@@ -9,11 +9,11 @@ import {
   SheetHeader,
   SheetTitle,
   SheetTrigger,
-} from '@oasisprotocol/ui-library/src/components/ui/sheet'
+} from '@oasisprotocol/ui-library/src/components/sheet'
 import { useIsMobile } from '@oasisprotocol/ui-library/src/hooks/use-mobile'
-import { Button } from '@oasisprotocol/ui-library/src/components/ui/button'
+import { Button } from '@oasisprotocol/ui-library/src/components/button'
 import { cn } from '@oasisprotocol/ui-library/src/lib/utils'
-import { Separator } from '@oasisprotocol/ui-library/src/components/ui/separator'
+import { Separator } from '@oasisprotocol/ui-library/src/components/separator'
 
 import classes from './index.module.css'
 import {
@@ -22,7 +22,7 @@ import {
   BreadcrumbLink,
   BreadcrumbList,
   BreadcrumbSeparator,
-} from '@oasisprotocol/ui-library/src/components/ui/breadcrumb'
+} from '@oasisprotocol/ui-library/src/components/breadcrumb'
 import { NavbarLink } from '../NavbarLink'
 import {
   Sidebar,
@@ -31,7 +31,7 @@ import {
   SidebarMenu,
   SidebarMenuButton,
   SidebarMenuItem,
-} from '@oasisprotocol/ui-library/src/components/ui/sidebar'
+} from '@oasisprotocol/ui-library/src/components/sidebar'
 import { AppLogo } from '../icons'
 
 const locationListMap: Record<string, string[]> = {

ui-library

@@ -1,4 +1,4 @@
-import { Button } from '@oasisprotocol/ui-library/src/components/ui/button'
+import { Button } from '@oasisprotocol/ui-library/src/components/button'
 import { FC, PropsWithChildren } from 'react'
 import { NavLink } from 'react-router-dom'
 

ui/src/core/components/AppLayout/index.tsx

@@ -1,14 +1,15 @@
 import { FC } from 'react'
 import { ConnectButton } from '@rainbow-me/rainbowkit'
 import { ChevronDown, Wallet } from 'lucide-react'
-import { cn, Button } from '@oasisprotocol/ui-library/src'
+import { cn } from '@oasisprotocol/ui-library/src/lib/utils'
+import { Button } from '@oasisprotocol/ui-library/src/components/button'
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
-} from '@oasisprotocol/ui-library/src/components/ui/dropdown-menu'
+} from '@oasisprotocol/ui-library/src/components/dropdown-menu'
 import { AccountAvatar } from '../AccountAvatar'
 import { useDisconnect } from 'wagmi'
 import { useIsMobile } from '@oasisprotocol/ui-library/src/hooks/use-mobile'