From 855050f91955e093ce56ef7fb1de66fdaac03809 Mon Sep 17 00:00:00 2001 From: Dino Danic Date: Mon, 23 Oct 2023 10:32:15 +0200 Subject: [PATCH] primitives --- packages/cli/package.json | 2 +- packages/ui/components/primitives/cluster.tsx | 6 +++--- packages/ui/components/primitives/lib/utils.ts | 6 ++++++ packages/ui/index.ts | 1 + pnpm-lock.yaml | 3 +++ 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 packages/ui/components/primitives/lib/utils.ts create mode 100644 packages/ui/index.ts diff --git a/packages/cli/package.json b/packages/cli/package.json index c1fdcec..909fe9c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@kodiui/cli", - "version": "0.1.15", + "version": "0.1.16", "description": "", "main": "dist/index.js", "type": "module", diff --git a/packages/ui/components/primitives/cluster.tsx b/packages/ui/components/primitives/cluster.tsx index 4eadf08..9f99f06 100644 --- a/packages/ui/components/primitives/cluster.tsx +++ b/packages/ui/components/primitives/cluster.tsx @@ -1,8 +1,8 @@ import React from "react"; -import { cn } from "@/lib/utils"; -import { GapVariants } from "./tokens/spacing"; -import { FlexVariants } from "./tokens/flex"; +import { GapVariants, gapVariants } from "./tokens/spacing"; +import { FlexVariants, flexVariants } from "./tokens/flex"; +import { cn } from "./lib/utils"; export type BoxProps = React.HTMLAttributes & GapVariants & diff --git a/packages/ui/components/primitives/lib/utils.ts b/packages/ui/components/primitives/lib/utils.ts new file mode 100644 index 0000000..a5ef193 --- /dev/null +++ b/packages/ui/components/primitives/lib/utils.ts @@ -0,0 +1,6 @@ +import { clsx, type ClassValue } from "clsx"; +import { twMerge } from "tailwind-merge"; + +export function cn(...inputs: ClassValue[]) { + return twMerge(clsx(inputs)); +} diff --git a/packages/ui/index.ts b/packages/ui/index.ts new file mode 100644 index 0000000..3070686 --- /dev/null +++ b/packages/ui/index.ts @@ -0,0 +1 @@ +export * from './components/primitives/cluster' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 95b6227..dfd82b1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -84,6 +84,9 @@ importers: typescript: specifier: ^5 version: 5.2.2 + ui: + specifier: workspace:* + version: link:../../packages/ui packages/cli: dependencies: