wip: fix lint

bigcommerce · Jan 30, 2024 · b240fb1 · b240fb1
1 parent 5ea0bf6
commit b240fb1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/apps/docs/stories/NavigationMenu.stories.tsx b/apps/docs/stories/NavigationMenu.stories.tsx
@@ -1,4 +1,5 @@
 import { Badge } from '@bigcommerce/reactant/Badge';
+import { cn } from '@bigcommerce/reactant/cn';
 import {
   NavigationMenu,
   NavigationMenuCollapsed,
@@ -12,8 +13,6 @@ import {
 import type { Meta, StoryObj } from '@storybook/react';
 import { ChevronDown, MenuSquare, Search, ShoppingCart, User, XSquare } from 'lucide-react';
 
-import { cn } from '~/lib/utils';
-
 const meta = {
   component: NavigationMenu,
   tags: ['autodocs'],

diff --git a/apps/docs/tsconfig.json b/apps/docs/tsconfig.json
@@ -20,9 +20,7 @@
     "jsx": "preserve",
     "incremental": true,
     "baseUrl": ".",
-    "paths": {
-      "~/lib/*": ["./lib/*"]
-    },
+    "paths": {},
     "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
   },
   "include": [

diff --git a/apps/docs/vite.config.js b/apps/docs/vite.config.js
@@ -0,0 +1,10 @@
+import path from 'path';
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  resolve: {
+    alias: {
+      '~': path.resolve(__dirname, './'),
+    },
+  },
+});
diff --git a/packages/reactant/package.json b/packages/reactant/package.json
@@ -8,7 +8,7 @@
     "./package.json": "./package.json",
     "./postcss-config": "./postcss.config.js",
     "./tailwind-config": "./tailwind.config.js",
-    "./cs": "./src/utils/cs.ts",
+    "./cn": "./src/lib/utils.ts",
     "./*": "./src/components/*/index.ts"
   },
   "scripts": {

diff --git a/packages/reactant/src/components/Calendar/Calendar.tsx b/packages/reactant/src/components/Calendar/Calendar.tsx
@@ -3,6 +3,7 @@ import * as React from 'react';
 import { DayPicker } from 'react-day-picker';
 
 import { cn } from '~/lib/utils';
+
 import { buttonVariants } from '../Button';
 
 export type CalendarProps = React.ComponentProps<typeof DayPicker>;

diff --git a/packages/reactant/src/components/FileChooser/FileChooser.tsx b/packages/reactant/src/components/FileChooser/FileChooser.tsx
@@ -1,6 +1,7 @@
 import { ElementRef, forwardRef } from 'react';
 
 import { cn } from '~/lib/utils';
+
 import { Input, InputProps } from '../Input';
 
 export const FileChooser = forwardRef<ElementRef<'input'>, InputProps>(

diff --git a/packages/reactant/src/components/Form/Form.tsx b/packages/reactant/src/components/Form/Form.tsx
@@ -2,6 +2,7 @@ import * as FormPrimitive from '@radix-ui/react-form';
 import { ComponentPropsWithRef, ElementRef, forwardRef } from 'react';
 
 import { cn } from '~/lib/utils';
+
 import { Label } from '../Label';
 
 type ValidationPattern =