From 53341e27aa9b0df63981dec753652430bcd93489 Mon Sep 17 00:00:00 2001 From: Jorge Moya Date: Tue, 30 Apr 2024 14:57:37 -0500 Subject: [PATCH] chore: move /components into core, update imports --- .changeset/config.json | 1 - .changeset/hungry-points-wash.md | 5 +++ .../(faceted)/_components/breadcrumbs.tsx | 10 +++--- .../(faceted)/_components/facets.tsx | 22 ++++++------ .../(faceted)/_components/mobile-side-nav.tsx | 11 +++--- .../(faceted)/_components/refine-by.tsx | 3 +- .../(faceted)/_components/skeleton-ui.tsx | 2 +- .../(faceted)/_components/sort-by.tsx | 3 +- .../[tab]/_components/account-tabs.tsx | 2 +- .../[tab]/_components/addresses-list.tsx | 2 +- .../[locale]/(default)/blog/[blogId]/page.tsx | 16 ++++----- .../cart/_components/checkout-button.tsx | 3 +- .../cart/_components/coupon-code/index.tsx | 6 ++-- .../_components/shipping-estimator/index.tsx | 2 +- .../cart/_components/shipping-info/index.tsx | 8 ++--- .../_components/shipping-options/index.tsx | 8 ++--- .../shipping-options/submit-button.tsx | 3 +- .../compare/_components/add-to-cart.tsx | 3 +- .../app/[locale]/(default)/compare/page.tsx | 4 +-- .../_components/change-password-form.tsx | 18 +++++----- .../login/_components/login-form.tsx | 20 +++++------ .../login/_components/reset-password-form.tsx | 19 ++++++----- .../app/[locale]/(default)/login/page.tsx | 2 +- .../[slug]/_components/gallery/index.tsx | 8 ++--- .../[slug]/_components/review-summary.tsx | 2 +- .../product/[slug]/_components/reviews.tsx | 2 +- .../contact/[id]/contact-us/index.tsx | 23 +++++++------ apps/core/components/blog-post-card/index.tsx | 10 +++--- apps/core/components/compare-drawer/index.tsx | 14 ++++---- apps/core/components/footer/footer.tsx | 3 +- apps/core/components/header/cart-icon.tsx | 3 +- apps/core/components/header/cart.tsx | 2 +- apps/core/components/header/header-nav.tsx | 12 +++---- apps/core/components/header/index.tsx | 16 ++++----- apps/core/components/hero/index.tsx | 7 ++-- .../product-card-carousel/index.tsx | 8 ++--- .../product-card-carousel/pagination.tsx | 2 +- .../components/product-card/add-to-cart.tsx | 3 +- .../components/product-card/cart/index.tsx | 3 +- apps/core/components/product-card/compare.tsx | 5 +-- apps/core/components/product-card/index.tsx | 14 ++++---- .../components/product-form/add-to-cart.tsx | 3 +- .../product-form/fields/checkbox-field.tsx | 5 ++- .../product-form/fields/date-field.tsx | 4 +-- .../fields/multi-line-text-field.tsx | 5 ++- .../fields/multiple-choice-field.tsx | 12 +++---- .../product-form/fields/number-field.tsx | 5 ++- .../product-form/fields/quantity-field.tsx | 5 +-- .../product-form/fields/text-field.tsx | 5 ++- apps/core/components/product-form/index.tsx | 2 +- apps/core/components/product-sheet/index.tsx | 9 ++--- .../product-sheet/product-sheet-content.tsx | 2 +- apps/core/components/quick-search/index.tsx | 20 +++++------ apps/core/components/search-form/index.tsx | 7 ++-- .../components/ui}/accordion/accordion.tsx | 0 .../core/components/ui}/accordion/index.ts | 0 .../core/components/ui}/badge/badge.tsx | 0 .../core/components/ui}/badge/index.ts | 0 .../ui}/blog-post-card/blog-post-card.tsx | 0 .../components/ui}/blog-post-card/index.ts | 0 .../ui}/breadcrumbs/breadcrumbs.tsx | 0 .../core/components/ui}/breadcrumbs/index.ts | 0 .../core/components/ui}/button/button.tsx | 0 .../core/components/ui}/button/index.ts | 0 .../core/components/ui}/calendar/calendar.tsx | 0 .../core/components/ui}/calendar/index.ts | 0 .../core/components/ui}/carousel/carousel.tsx | 0 .../core/components/ui}/carousel/index.ts | 0 .../core/components/ui}/checkbox/checkbox.tsx | 0 .../core/components/ui}/checkbox/index.ts | 0 .../core/components/ui}/counter/counter.tsx | 0 .../core/components/ui}/counter/index.ts | 0 .../ui}/date-picker/date-picker.tsx | 0 .../core/components/ui}/date-picker/index.ts | 0 .../core/components/ui}/dialog/dialog.tsx | 0 .../core/components/ui}/dialog/index.ts | 0 .../ui}/file-chooser/file-chooser.tsx | 0 .../core/components/ui}/file-chooser/index.ts | 0 .../core/components/ui}/footer/footer.tsx | 0 .../core/components/ui}/footer/index.ts | 0 .../core/components/ui}/form/form.tsx | 0 .../core/components/ui}/form/index.ts | 0 .../core/components/ui}/gallery/gallery.tsx | 0 .../core/components/ui}/gallery/index.ts | 0 .../core/components/ui}/input/index.ts | 0 .../core/components/ui}/input/input.tsx | 0 .../core/components/ui}/label/index.ts | 0 .../core/components/ui}/label/label.tsx | 0 .../core/components/ui}/message/index.ts | 0 .../core/components/ui}/message/message.tsx | 0 .../components/ui}/navigation-menu/index.ts | 0 .../ui}/navigation-menu/navigation-menu.tsx | 0 .../core/components/ui}/pick-list/index.ts | 0 .../components/ui}/pick-list/pick-list.tsx | 0 .../core/components/ui}/popover/index.ts | 0 .../core/components/ui}/popover/popover.tsx | 0 .../core/components/ui}/product-card/index.ts | 0 .../ui}/product-card/product-card.tsx | 0 .../core/components/ui}/radio-group/index.ts | 0 .../ui}/radio-group/radio-group.tsx | 0 .../core/components/ui}/rating/index.ts | 0 .../core/components/ui}/rating/rating.tsx | 0 .../ui}/rating/star-icons/star-empty.tsx | 0 .../ui}/rating/star-icons/star-filled.tsx | 0 .../ui}/rating/star-icons/star-half.tsx | 0 .../components/ui}/rectangle-list/index.ts | 0 .../ui}/rectangle-list/rectangle-list.tsx | 0 .../core/components/ui}/select/index.ts | 0 .../core/components/ui}/select/select.tsx | 0 .../core/components/ui}/sheet/index.ts | 0 .../core/components/ui}/sheet/sheet.tsx | 0 .../core/components/ui}/skeleton/index.ts | 0 .../core/components/ui}/skeleton/skeleton.tsx | 0 .../core/components/ui}/slideshow/index.ts | 0 .../components/ui}/slideshow/slideshow.tsx | 0 .../core/components/ui}/swatch/index.ts | 0 .../core/components/ui}/swatch/swatch.tsx | 0 .../core/components/ui}/tabs/index.ts | 0 .../core/components/ui}/tabs/tabs.tsx | 0 .../core/components/ui}/tag/index.ts | 0 .../core/components/ui}/tag/tag.tsx | 0 .../core/components/ui}/text-area/index.ts | 0 .../components/ui}/text-area/text-area.tsx | 0 packages/components/.eslintrc.cjs | 20 ----------- packages/components/CHANGELOG.md | 34 ------------------- packages/components/postcss.config.js | 6 ---- packages/components/prettier.config.js | 12 ------- packages/components/src/lib/utils.ts | 6 ---- packages/components/tsconfig.json | 34 ------------------- 129 files changed, 204 insertions(+), 302 deletions(-) create mode 100644 .changeset/hungry-points-wash.md rename {packages/components/src/components => apps/core/components/ui}/accordion/accordion.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/accordion/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/badge/badge.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/badge/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/blog-post-card/blog-post-card.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/blog-post-card/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/breadcrumbs/breadcrumbs.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/breadcrumbs/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/button/button.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/button/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/calendar/calendar.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/calendar/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/carousel/carousel.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/carousel/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/checkbox/checkbox.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/checkbox/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/counter/counter.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/counter/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/date-picker/date-picker.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/date-picker/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/dialog/dialog.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/dialog/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/file-chooser/file-chooser.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/file-chooser/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/footer/footer.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/footer/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/form/form.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/form/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/gallery/gallery.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/gallery/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/input/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/input/input.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/label/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/label/label.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/message/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/message/message.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/navigation-menu/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/navigation-menu/navigation-menu.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/pick-list/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/pick-list/pick-list.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/popover/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/popover/popover.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/product-card/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/product-card/product-card.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/radio-group/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/radio-group/radio-group.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/rating/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/rating/rating.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/rating/star-icons/star-empty.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/rating/star-icons/star-filled.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/rating/star-icons/star-half.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/rectangle-list/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/rectangle-list/rectangle-list.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/select/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/select/select.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/sheet/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/sheet/sheet.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/skeleton/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/skeleton/skeleton.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/slideshow/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/slideshow/slideshow.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/swatch/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/swatch/swatch.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/tabs/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/tabs/tabs.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/tag/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/tag/tag.tsx (100%) rename {packages/components/src/components => apps/core/components/ui}/text-area/index.ts (100%) rename {packages/components/src/components => apps/core/components/ui}/text-area/text-area.tsx (100%) delete mode 100644 packages/components/.eslintrc.cjs delete mode 100644 packages/components/CHANGELOG.md delete mode 100644 packages/components/postcss.config.js delete mode 100644 packages/components/prettier.config.js delete mode 100644 packages/components/src/lib/utils.ts delete mode 100644 packages/components/tsconfig.json diff --git a/.changeset/config.json b/.changeset/config.json index f0c56d522..6a3647476 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -5,7 +5,6 @@ { "repo": "bigcommerce/catalyst" } ], "commit": false, - "fixed": [["@bigcommerce/components"]], "linked": [], "access": "public", "privatePackages": { diff --git a/.changeset/hungry-points-wash.md b/.changeset/hungry-points-wash.md new file mode 100644 index 000000000..17ecb2ad2 --- /dev/null +++ b/.changeset/hungry-points-wash.md @@ -0,0 +1,5 @@ +--- +"@bigcommerce/catalyst-core": patch +--- + +Move /packages/components into core, update related configurations. diff --git a/apps/core/app/[locale]/(default)/(faceted)/_components/breadcrumbs.tsx b/apps/core/app/[locale]/(default)/(faceted)/_components/breadcrumbs.tsx index c593036ae..a0bf7eb8d 100644 --- a/apps/core/app/[locale]/(default)/(faceted)/_components/breadcrumbs.tsx +++ b/apps/core/app/[locale]/(default)/(faceted)/_components/breadcrumbs.tsx @@ -1,12 +1,12 @@ -import { - BreadcrumbDivider, - BreadcrumbItem, - Breadcrumbs as ComponentsBreadcrumbs, -} from '@bigcommerce/components/breadcrumbs'; import { ChevronRight } from 'lucide-react'; import { Fragment } from 'react'; import { Link } from '~/components/link'; +import { + BreadcrumbDivider, + BreadcrumbItem, + Breadcrumbs as ComponentsBreadcrumbs, +} from '~/components/ui/breadcrumbs'; interface Props { breadcrumbs: Array<{ diff --git a/apps/core/app/[locale]/(default)/(faceted)/_components/facets.tsx b/apps/core/app/[locale]/(default)/(faceted)/_components/facets.tsx index dc31a48e5..0740f412e 100644 --- a/apps/core/app/[locale]/(default)/(faceted)/_components/facets.tsx +++ b/apps/core/app/[locale]/(default)/(faceted)/_components/facets.tsx @@ -1,21 +1,21 @@ 'use client'; -import { - Accordion, - AccordionContent, - AccordionItem, - AccordionTrigger, -} from '@bigcommerce/components/accordion'; -import { Button } from '@bigcommerce/components/button'; -import { Checkbox } from '@bigcommerce/components/checkbox'; -import { Input } from '@bigcommerce/components/input'; -import { Label } from '@bigcommerce/components/label'; -import { Rating } from '@bigcommerce/components/rating'; import { usePathname, useRouter, useSearchParams } from 'next/navigation'; import { useTranslations } from 'next-intl'; import { FormEvent, useRef } from 'react'; import { Link } from '~/components/link'; +import { + Accordion, + AccordionContent, + AccordionItem, + AccordionTrigger, +} from '~/components/ui/accordion'; +import { Button } from '~/components/ui/button'; +import { Checkbox } from '~/components/ui/checkbox'; +import { Input } from '~/components/ui/input'; +import { Label } from '~/components/ui/label'; +import { Rating } from '~/components/ui/rating'; import { cn } from '~/lib/utils'; import type { Facet, PageType } from '../types'; diff --git a/apps/core/app/[locale]/(default)/(faceted)/_components/mobile-side-nav.tsx b/apps/core/app/[locale]/(default)/(faceted)/_components/mobile-side-nav.tsx index 147b23427..c27edd980 100644 --- a/apps/core/app/[locale]/(default)/(faceted)/_components/mobile-side-nav.tsx +++ b/apps/core/app/[locale]/(default)/(faceted)/_components/mobile-side-nav.tsx @@ -1,6 +1,10 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; +import { Filter } from 'lucide-react'; +import { useTranslations } from 'next-intl'; +import { PropsWithChildren, useEffect, useState } from 'react'; + +import { Button } from '~/components/ui/button'; import { Sheet, SheetClose, @@ -9,10 +13,7 @@ import { SheetOverlay, SheetTitle, SheetTrigger, -} from '@bigcommerce/components/sheet'; -import { Filter } from 'lucide-react'; -import { useTranslations } from 'next-intl'; -import { PropsWithChildren, useEffect, useState } from 'react'; +} from '~/components/ui/sheet'; export const MobileSideNav = ({ children }: PropsWithChildren) => { const [open, setOpen] = useState(false); diff --git a/apps/core/app/[locale]/(default)/(faceted)/_components/refine-by.tsx b/apps/core/app/[locale]/(default)/(faceted)/_components/refine-by.tsx index 54dabbefd..5bf8a55fb 100644 --- a/apps/core/app/[locale]/(default)/(faceted)/_components/refine-by.tsx +++ b/apps/core/app/[locale]/(default)/(faceted)/_components/refine-by.tsx @@ -1,9 +1,10 @@ 'use client'; -import { Tag, TagAction, TagContent } from '@bigcommerce/components/tag'; import { usePathname, useRouter, useSearchParams } from 'next/navigation'; import { useTranslations } from 'next-intl'; +import { Tag, TagAction, TagContent } from '~/components/ui/tag'; + import type { Facet, PageType, PublicParamKeys } from '../types'; export interface Props { diff --git a/apps/core/app/[locale]/(default)/(faceted)/_components/skeleton-ui.tsx b/apps/core/app/[locale]/(default)/(faceted)/_components/skeleton-ui.tsx index fa6ea3ffc..4fb05e69c 100644 --- a/apps/core/app/[locale]/(default)/(faceted)/_components/skeleton-ui.tsx +++ b/apps/core/app/[locale]/(default)/(faceted)/_components/skeleton-ui.tsx @@ -1,4 +1,4 @@ -import { Skeleton } from '@bigcommerce/components/skeleton'; +import { Skeleton } from '~/components/ui/skeleton'; export const SkeletonIU = () => (
diff --git a/apps/core/app/[locale]/(default)/(faceted)/_components/sort-by.tsx b/apps/core/app/[locale]/(default)/(faceted)/_components/sort-by.tsx index 3ed1a83e6..7e55455fc 100644 --- a/apps/core/app/[locale]/(default)/(faceted)/_components/sort-by.tsx +++ b/apps/core/app/[locale]/(default)/(faceted)/_components/sort-by.tsx @@ -1,9 +1,10 @@ 'use client'; -import { Select, SelectContent, SelectItem } from '@bigcommerce/components/select'; import { usePathname, useRouter, useSearchParams } from 'next/navigation'; import { useTranslations } from 'next-intl'; +import { Select, SelectContent, SelectItem } from '~/components/ui/select'; + export function SortBy() { const router = useRouter(); const pathname = usePathname(); diff --git a/apps/core/app/[locale]/(default)/account/[tab]/_components/account-tabs.tsx b/apps/core/app/[locale]/(default)/account/[tab]/_components/account-tabs.tsx index 1f97be808..f22f0d736 100644 --- a/apps/core/app/[locale]/(default)/account/[tab]/_components/account-tabs.tsx +++ b/apps/core/app/[locale]/(default)/account/[tab]/_components/account-tabs.tsx @@ -1,10 +1,10 @@ 'use client'; -import { Tabs, TabsContent, TabsList, TabsTrigger } from '@bigcommerce/components/tabs'; import { useTranslations } from 'next-intl'; import { PropsWithChildren } from 'react'; import { Link } from '~/components/link'; +import { Tabs, TabsContent, TabsList, TabsTrigger } from '~/components/ui/tabs'; import { TabType } from '../layout'; diff --git a/apps/core/app/[locale]/(default)/account/[tab]/_components/addresses-list.tsx b/apps/core/app/[locale]/(default)/account/[tab]/_components/addresses-list.tsx index 6d47c931c..2edef68a7 100644 --- a/apps/core/app/[locale]/(default)/account/[tab]/_components/addresses-list.tsx +++ b/apps/core/app/[locale]/(default)/account/[tab]/_components/addresses-list.tsx @@ -1,8 +1,8 @@ -import { Button } from '@bigcommerce/components/button'; import { useTranslations } from 'next-intl'; import { getCustomerAddresses } from '~/client/queries/get-customer-addresses'; import { Link } from '~/components/link'; +import { Button } from '~/components/ui/button'; type Addresses = NonNullable>>['addresses']; diff --git a/apps/core/app/[locale]/(default)/blog/[blogId]/page.tsx b/apps/core/app/[locale]/(default)/blog/[blogId]/page.tsx index da60f871e..05a89f9b5 100644 --- a/apps/core/app/[locale]/(default)/blog/[blogId]/page.tsx +++ b/apps/core/app/[locale]/(default)/blog/[blogId]/page.tsx @@ -1,11 +1,3 @@ -import { - BlogPostAuthor, - BlogPostBanner, - BlogPostDate, - BlogPostImage, - BlogPostTitle, -} from '@bigcommerce/components/blog-post-card'; -import { Tag, TagContent } from '@bigcommerce/components/tag'; import type { Metadata } from 'next'; import { notFound } from 'next/navigation'; import { getFormatter } from 'next-intl/server'; @@ -14,6 +6,14 @@ import { getBlogPost } from '~/client/queries/get-blog-post'; import { BcImage } from '~/components/bc-image'; import { Link } from '~/components/link'; import { SharingLinks } from '~/components/sharing-links'; +import { + BlogPostAuthor, + BlogPostBanner, + BlogPostDate, + BlogPostImage, + BlogPostTitle, +} from '~/components/ui/blog-post-card'; +import { Tag, TagContent } from '~/components/ui/tag'; import { LocaleType } from '~/i18n'; interface Props { diff --git a/apps/core/app/[locale]/(default)/cart/_components/checkout-button.tsx b/apps/core/app/[locale]/(default)/cart/_components/checkout-button.tsx index c0a5978a3..7db9b54b8 100644 --- a/apps/core/app/[locale]/(default)/cart/_components/checkout-button.tsx +++ b/apps/core/app/[locale]/(default)/cart/_components/checkout-button.tsx @@ -1,6 +1,5 @@ -import { Button } from '@bigcommerce/components/button'; - import { getCheckoutUrl } from '~/client/management/get-checkout-url'; +import { Button } from '~/components/ui/button'; export const CheckoutButton = async ({ cartId, label }: { cartId: string; label: string }) => { const checkoutUrl = await getCheckoutUrl(cartId); diff --git a/apps/core/app/[locale]/(default)/cart/_components/coupon-code/index.tsx b/apps/core/app/[locale]/(default)/cart/_components/coupon-code/index.tsx index 5bcc5e28c..1cde87dca 100644 --- a/apps/core/app/[locale]/(default)/cart/_components/coupon-code/index.tsx +++ b/apps/core/app/[locale]/(default)/cart/_components/coupon-code/index.tsx @@ -1,8 +1,5 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; -import { Field, FieldControl, FieldMessage, Form, FormSubmit } from '@bigcommerce/components/form'; -import { Input } from '@bigcommerce/components/input'; import { AlertCircle, Loader2 as Spinner } from 'lucide-react'; import { useFormatter, useTranslations } from 'next-intl'; import { useEffect, useState } from 'react'; @@ -10,6 +7,9 @@ import { useFormStatus } from 'react-dom'; import { toast } from 'react-hot-toast'; import { FragmentOf } from '~/client/graphql'; +import { Button } from '~/components/ui/button'; +import { Field, FieldControl, FieldMessage, Form, FormSubmit } from '~/components/ui/form'; +import { Input } from '~/components/ui/input'; import { applyCouponCode } from './apply-coupon-code'; import { CouponCodeFragment } from './fragment'; diff --git a/apps/core/app/[locale]/(default)/cart/_components/shipping-estimator/index.tsx b/apps/core/app/[locale]/(default)/cart/_components/shipping-estimator/index.tsx index 97cefcd5c..63220a484 100644 --- a/apps/core/app/[locale]/(default)/cart/_components/shipping-estimator/index.tsx +++ b/apps/core/app/[locale]/(default)/cart/_components/shipping-estimator/index.tsx @@ -1,11 +1,11 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; import { useFormatter, useTranslations } from 'next-intl'; import { useEffect, useRef, useState } from 'react'; import { FragmentOf } from '~/client/graphql'; import { ExistingResultType } from '~/client/util'; +import { Button } from '~/components/ui/button'; import { ShippingInfo } from '../shipping-info'; import { ShippingOptions } from '../shipping-options'; diff --git a/apps/core/app/[locale]/(default)/cart/_components/shipping-info/index.tsx b/apps/core/app/[locale]/(default)/cart/_components/shipping-info/index.tsx index ee373901c..9fb1e31c2 100644 --- a/apps/core/app/[locale]/(default)/cart/_components/shipping-info/index.tsx +++ b/apps/core/app/[locale]/(default)/cart/_components/shipping-info/index.tsx @@ -1,7 +1,3 @@ -import { Button } from '@bigcommerce/components/button'; -import { Field, FieldControl, FieldLabel, Form, FormSubmit } from '@bigcommerce/components/form'; -import { Input } from '@bigcommerce/components/input'; -import { Select, SelectContent, SelectItem } from '@bigcommerce/components/select'; import { AlertCircle, Loader2 as Spinner } from 'lucide-react'; import { useTranslations } from 'next-intl'; import { useEffect, useReducer } from 'react'; @@ -11,6 +7,10 @@ import { toast } from 'react-hot-toast'; import { getShippingCountries } from '~/app/[locale]/(default)/cart/_components/shipping-estimator/get-shipping-countries'; import { FragmentOf } from '~/client/graphql'; import { ExistingResultType } from '~/client/util'; +import { Button } from '~/components/ui/button'; +import { Field, FieldControl, FieldLabel, Form, FormSubmit } from '~/components/ui/form'; +import { Input } from '~/components/ui/input'; +import { Select, SelectContent, SelectItem } from '~/components/ui/select'; import { cn } from '~/lib/utils'; import { ShippingInfoFragment } from './fragment'; diff --git a/apps/core/app/[locale]/(default)/cart/_components/shipping-options/index.tsx b/apps/core/app/[locale]/(default)/cart/_components/shipping-options/index.tsx index bd93c9e9f..0226af696 100644 --- a/apps/core/app/[locale]/(default)/cart/_components/shipping-options/index.tsx +++ b/apps/core/app/[locale]/(default)/cart/_components/shipping-options/index.tsx @@ -1,12 +1,12 @@ -import { Field, FieldLabel, Form, FormSubmit } from '@bigcommerce/components/form'; -import { Label } from '@bigcommerce/components/label'; -import { Message } from '@bigcommerce/components/message'; -import { RadioGroup, RadioItem } from '@bigcommerce/components/radio-group'; import { AlertCircle } from 'lucide-react'; import { useFormatter, useTranslations } from 'next-intl'; import { toast } from 'react-hot-toast'; import { FragmentOf } from '~/client/graphql'; +import { Field, FieldLabel, Form, FormSubmit } from '~/components/ui/form'; +import { Label } from '~/components/ui/label'; +import { Message } from '~/components/ui/message'; +import { RadioGroup, RadioItem } from '~/components/ui/radio-group'; import { ShippingOptionsFragment } from './fragment'; import { SubmitButton } from './submit-button'; diff --git a/apps/core/app/[locale]/(default)/cart/_components/shipping-options/submit-button.tsx b/apps/core/app/[locale]/(default)/cart/_components/shipping-options/submit-button.tsx index 571c3900a..09ebbefa3 100644 --- a/apps/core/app/[locale]/(default)/cart/_components/shipping-options/submit-button.tsx +++ b/apps/core/app/[locale]/(default)/cart/_components/shipping-options/submit-button.tsx @@ -1,8 +1,9 @@ -import { Button } from '@bigcommerce/components/button'; import { Loader2 as Spinner } from 'lucide-react'; import { useTranslations } from 'next-intl'; import { useFormStatus } from 'react-dom'; +import { Button } from '~/components/ui/button'; + export const SubmitButton = () => { const t = useTranslations('Cart.SubmitShippingCost'); const { pending } = useFormStatus(); diff --git a/apps/core/app/[locale]/(default)/compare/_components/add-to-cart.tsx b/apps/core/app/[locale]/(default)/compare/_components/add-to-cart.tsx index 739cf1b78..5c09e42a5 100644 --- a/apps/core/app/[locale]/(default)/compare/_components/add-to-cart.tsx +++ b/apps/core/app/[locale]/(default)/compare/_components/add-to-cart.tsx @@ -1,10 +1,11 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; import { Loader2 as Spinner } from 'lucide-react'; import { useTranslations } from 'next-intl'; import { useFormStatus } from 'react-dom'; +import { Button } from '~/components/ui/button'; + export const AddToCart = ({ disabled = false, productName, diff --git a/apps/core/app/[locale]/(default)/compare/page.tsx b/apps/core/app/[locale]/(default)/compare/page.tsx index 9440dc9b1..9a7590a7a 100644 --- a/apps/core/app/[locale]/(default)/compare/page.tsx +++ b/apps/core/app/[locale]/(default)/compare/page.tsx @@ -1,6 +1,4 @@ import { removeEdgesAndNodes } from '@bigcommerce/catalyst-client'; -import { Button } from '@bigcommerce/components/button'; -import { Rating } from '@bigcommerce/components/rating'; import { NextIntlClientProvider } from 'next-intl'; import { getMessages, getTranslations } from 'next-intl/server'; import * as z from 'zod'; @@ -13,6 +11,8 @@ import { BcImage } from '~/components/bc-image'; import { Link } from '~/components/link'; import { Pricing, PricingFragment } from '~/components/pricing'; import { SearchForm } from '~/components/search-form'; +import { Button } from '~/components/ui/button'; +import { Rating } from '~/components/ui/rating'; import { LocaleType } from '~/i18n'; import { cn } from '~/lib/utils'; diff --git a/apps/core/app/[locale]/(default)/login/_components/change-password-form.tsx b/apps/core/app/[locale]/(default)/login/_components/change-password-form.tsx index e6bcae97f..310ba4085 100644 --- a/apps/core/app/[locale]/(default)/login/_components/change-password-form.tsx +++ b/apps/core/app/[locale]/(default)/login/_components/change-password-form.tsx @@ -1,6 +1,11 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; +import { Loader2 as Spinner } from 'lucide-react'; +import { useTranslations } from 'next-intl'; +import { ChangeEvent, useRef, useState } from 'react'; +import { useFormState, useFormStatus } from 'react-dom'; + +import { Button } from '~/components/ui/button'; import { Field, FieldControl, @@ -8,14 +13,9 @@ import { FieldMessage, Form, FormSubmit, -} from '@bigcommerce/components/form'; -import { Input } from '@bigcommerce/components/input'; -import { Message } from '@bigcommerce/components/message'; -import { Loader2 as Spinner } from 'lucide-react'; -import { useTranslations } from 'next-intl'; -import { ChangeEvent, useRef, useState } from 'react'; -import { useFormState, useFormStatus } from 'react-dom'; - +} from '~/components/ui/form'; +import { Input } from '~/components/ui/input'; +import { Message } from '~/components/ui/message'; import { useRouter } from '~/navigation'; import { submitChangePasswordForm } from '../_actions/submit-change-password-form'; diff --git a/apps/core/app/[locale]/(default)/login/_components/login-form.tsx b/apps/core/app/[locale]/(default)/login/_components/login-form.tsx index 8035ef0b8..cd747771e 100644 --- a/apps/core/app/[locale]/(default)/login/_components/login-form.tsx +++ b/apps/core/app/[locale]/(default)/login/_components/login-form.tsx @@ -1,6 +1,12 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; +import { Loader2 as Spinner } from 'lucide-react'; +import { useTranslations } from 'next-intl'; +import { ChangeEvent, useState } from 'react'; +import { useFormState, useFormStatus } from 'react-dom'; + +import { Link } from '~/components/link'; +import { Button } from '~/components/ui/button'; import { Field, FieldControl, @@ -8,15 +14,9 @@ import { FieldMessage, Form, FormSubmit, -} from '@bigcommerce/components/form'; -import { Input } from '@bigcommerce/components/input'; -import { Message } from '@bigcommerce/components/message'; -import { Loader2 as Spinner } from 'lucide-react'; -import { useTranslations } from 'next-intl'; -import { ChangeEvent, useState } from 'react'; -import { useFormState, useFormStatus } from 'react-dom'; - -import { Link } from '~/components/link'; +} from '~/components/ui/form'; +import { Input } from '~/components/ui/input'; +import { Message } from '~/components/ui/message'; import { submitLoginForm } from '../_actions/submit-login-form'; diff --git a/apps/core/app/[locale]/(default)/login/_components/reset-password-form.tsx b/apps/core/app/[locale]/(default)/login/_components/reset-password-form.tsx index 0991d4dbc..d9626572d 100644 --- a/apps/core/app/[locale]/(default)/login/_components/reset-password-form.tsx +++ b/apps/core/app/[locale]/(default)/login/_components/reset-password-form.tsx @@ -1,6 +1,12 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; +import { Loader2 as Spinner } from 'lucide-react'; +import { useTranslations } from 'next-intl'; +import { ChangeEvent, useRef, useState } from 'react'; +import { useFormStatus } from 'react-dom'; +import ReCaptcha from 'react-google-recaptcha'; + +import { Button } from '~/components/ui/button'; import { Field, FieldControl, @@ -8,14 +14,9 @@ import { FieldMessage, Form, FormSubmit, -} from '@bigcommerce/components/form'; -import { Input } from '@bigcommerce/components/input'; -import { Message } from '@bigcommerce/components/message'; -import { Loader2 as Spinner } from 'lucide-react'; -import { useTranslations } from 'next-intl'; -import { ChangeEvent, useRef, useState } from 'react'; -import { useFormStatus } from 'react-dom'; -import ReCaptcha from 'react-google-recaptcha'; +} from '~/components/ui/form'; +import { Input } from '~/components/ui/input'; +import { Message } from '~/components/ui/message'; import { submitResetPasswordForm } from '../_actions/submit-reset-password-form'; diff --git a/apps/core/app/[locale]/(default)/login/page.tsx b/apps/core/app/[locale]/(default)/login/page.tsx index f7391dc48..36522640f 100644 --- a/apps/core/app/[locale]/(default)/login/page.tsx +++ b/apps/core/app/[locale]/(default)/login/page.tsx @@ -1,9 +1,9 @@ -import { Button } from '@bigcommerce/components/button'; import { NextIntlClientProvider } from 'next-intl'; import { getMessages, getTranslations } from 'next-intl/server'; import { getReCaptchaSettings } from '~/client/queries/get-recaptcha-settings'; import { Link } from '~/components/link'; +import { Button } from '~/components/ui/button'; import { LocaleType } from '~/i18n'; import { ChangePasswordForm } from './_components/change-password-form'; diff --git a/apps/core/app/[locale]/(default)/product/[slug]/_components/gallery/index.tsx b/apps/core/app/[locale]/(default)/product/[slug]/_components/gallery/index.tsx index 4fac3c4ab..8d65ef77b 100644 --- a/apps/core/app/[locale]/(default)/product/[slug]/_components/gallery/index.tsx +++ b/apps/core/app/[locale]/(default)/product/[slug]/_components/gallery/index.tsx @@ -1,6 +1,9 @@ 'use client'; import { removeEdgesAndNodes } from '@bigcommerce/catalyst-client'; + +import { FragmentOf } from '~/client/graphql'; +import { BcImage } from '~/components/bc-image'; import { Gallery as ComponentsGallery, GalleryContent, @@ -9,10 +12,7 @@ import { GalleryThumbnail, GalleryThumbnailItem, GalleryThumbnailList, -} from '@bigcommerce/components/gallery'; - -import { FragmentOf } from '~/client/graphql'; -import { BcImage } from '~/components/bc-image'; +} from '~/components/ui/gallery'; import { GalleryFragment } from './fragment'; diff --git a/apps/core/app/[locale]/(default)/product/[slug]/_components/review-summary.tsx b/apps/core/app/[locale]/(default)/product/[slug]/_components/review-summary.tsx index 0d964803f..c354a52ea 100644 --- a/apps/core/app/[locale]/(default)/product/[slug]/_components/review-summary.tsx +++ b/apps/core/app/[locale]/(default)/product/[slug]/_components/review-summary.tsx @@ -1,8 +1,8 @@ -import { Rating } from '@bigcommerce/components/rating'; import { getLocale, getTranslations } from 'next-intl/server'; import { useId } from 'react'; import { getProductReviews } from '~/client/queries/get-product-reviews'; +import { Rating } from '~/components/ui/rating'; import { cn } from '~/lib/utils'; interface Props { diff --git a/apps/core/app/[locale]/(default)/product/[slug]/_components/reviews.tsx b/apps/core/app/[locale]/(default)/product/[slug]/_components/reviews.tsx index cce163ea3..d57363dbb 100644 --- a/apps/core/app/[locale]/(default)/product/[slug]/_components/reviews.tsx +++ b/apps/core/app/[locale]/(default)/product/[slug]/_components/reviews.tsx @@ -1,7 +1,7 @@ -import { Rating } from '@bigcommerce/components/rating'; import { getFormatter, getTranslations } from 'next-intl/server'; import { getProductReviews } from '~/client/queries/get-product-reviews'; +import { Rating } from '~/components/ui/rating'; import { ProductReviewSchema } from './product-review-schema'; diff --git a/apps/core/app/[locale]/(default)/webpages/contact/[id]/contact-us/index.tsx b/apps/core/app/[locale]/(default)/webpages/contact/[id]/contact-us/index.tsx index 2e28bb52f..662dab4e0 100644 --- a/apps/core/app/[locale]/(default)/webpages/contact/[id]/contact-us/index.tsx +++ b/apps/core/app/[locale]/(default)/webpages/contact/[id]/contact-us/index.tsx @@ -1,6 +1,13 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; +import { type FragmentOf } from 'gql.tada'; +import { Loader2 as Spinner } from 'lucide-react'; +import { useTranslations } from 'next-intl'; +import { ChangeEvent, useRef, useState } from 'react'; +import { useFormStatus } from 'react-dom'; +import ReCaptcha from 'react-google-recaptcha'; + +import { Button } from '~/components/ui/button'; import { Field, FieldControl, @@ -8,16 +15,10 @@ import { FieldMessage, Form, FormSubmit, -} from '@bigcommerce/components/form'; -import { Input } from '@bigcommerce/components/input'; -import { Message } from '@bigcommerce/components/message'; -import { TextArea } from '@bigcommerce/components/text-area'; -import { type FragmentOf } from 'gql.tada'; -import { Loader2 as Spinner } from 'lucide-react'; -import { useTranslations } from 'next-intl'; -import { ChangeEvent, useRef, useState } from 'react'; -import { useFormStatus } from 'react-dom'; -import ReCaptcha from 'react-google-recaptcha'; +} from '~/components/ui/form'; +import { Input } from '~/components/ui/input'; +import { Message } from '~/components/ui/message'; +import { TextArea } from '~/components/ui/text-area'; import { submitContactForm } from './_actions/submit-contact-form'; import { ContactUsFragment } from './fragment'; diff --git a/apps/core/components/blog-post-card/index.tsx b/apps/core/components/blog-post-card/index.tsx index 2a03ac39e..7dbe728eb 100644 --- a/apps/core/components/blog-post-card/index.tsx +++ b/apps/core/components/blog-post-card/index.tsx @@ -1,3 +1,7 @@ +import { getFormatter, getLocale } from 'next-intl/server'; + +import { FragmentOf, graphql } from '~/client/graphql'; +import { Link } from '~/components/link'; import { BlogPostAuthor, BlogPostBanner, @@ -6,11 +10,7 @@ import { BlogPostImage, BlogPostTitle, BlogPostCard as ComponentsBlogPostCard, -} from '@bigcommerce/components/blog-post-card'; -import { getFormatter, getLocale } from 'next-intl/server'; - -import { FragmentOf, graphql } from '~/client/graphql'; -import { Link } from '~/components/link'; +} from '~/components/ui/blog-post-card'; import { BcImage } from '../bc-image'; diff --git a/apps/core/components/compare-drawer/index.tsx b/apps/core/components/compare-drawer/index.tsx index 5eeb57e26..d4941bd40 100644 --- a/apps/core/components/compare-drawer/index.tsx +++ b/apps/core/components/compare-drawer/index.tsx @@ -1,18 +1,18 @@ 'use client'; -import { - Accordion, - AccordionContent, - AccordionItem, - AccordionTrigger, -} from '@bigcommerce/components/accordion'; -import { Button } from '@bigcommerce/components/button'; import { X } from 'lucide-react'; import { usePathname } from 'next/navigation'; import { useTranslations } from 'next-intl'; import { CheckedProduct, useCompareProductsContext } from '~/app/contexts/compare-products-context'; import { Link } from '~/components/link'; +import { + Accordion, + AccordionContent, + AccordionItem, + AccordionTrigger, +} from '~/components/ui/accordion'; +import { Button } from '~/components/ui/button'; import { BcImage } from '../bc-image'; diff --git a/apps/core/components/footer/footer.tsx b/apps/core/components/footer/footer.tsx index 13fe3e815..fce91581d 100644 --- a/apps/core/components/footer/footer.tsx +++ b/apps/core/components/footer/footer.tsx @@ -1,6 +1,5 @@ -import { Footer as ComponentsFooter, FooterSection } from '@bigcommerce/components/footer'; - import { FragmentOf, graphql } from '~/client/graphql'; +import { Footer as ComponentsFooter, FooterSection } from '~/components/ui/footer'; import { StoreLogo, StoreLogoFragment } from '../store-logo'; diff --git a/apps/core/components/header/cart-icon.tsx b/apps/core/components/header/cart-icon.tsx index 51f804646..2cbcbbc85 100644 --- a/apps/core/components/header/cart-icon.tsx +++ b/apps/core/components/header/cart-icon.tsx @@ -1,10 +1,11 @@ 'use client'; -import { Badge } from '@bigcommerce/components/badge'; import { ShoppingCart } from 'lucide-react'; import { useEffect, useState } from 'react'; import { z } from 'zod'; +import { Badge } from '~/components/ui/badge'; + export const CartQuantityResponseSchema = z.object({ count: z.number(), }); diff --git a/apps/core/components/header/cart.tsx b/apps/core/components/header/cart.tsx index 41c6b6e30..9c29d8bf8 100644 --- a/apps/core/components/header/cart.tsx +++ b/apps/core/components/header/cart.tsx @@ -1,9 +1,9 @@ -import { NavigationMenuLink } from '@bigcommerce/components/navigation-menu'; import { cookies } from 'next/headers'; import { ReactNode } from 'react'; import { getCart } from '~/client/queries/get-cart'; import { Link } from '~/components/link'; +import { NavigationMenuLink } from '~/components/ui/navigation-menu'; import { CartIcon } from './cart-icon'; diff --git a/apps/core/components/header/header-nav.tsx b/apps/core/components/header/header-nav.tsx index 4c33b1c25..6838209fb 100644 --- a/apps/core/components/header/header-nav.tsx +++ b/apps/core/components/header/header-nav.tsx @@ -1,15 +1,15 @@ +import { ChevronDown, User } from 'lucide-react'; + +import { getSessionCustomerId } from '~/auth'; +import { FragmentOf, graphql } from '~/client/graphql'; +import { Link } from '~/components/link'; import { NavigationMenuContent, NavigationMenuItem, NavigationMenuLink, NavigationMenuList, NavigationMenuTrigger, -} from '@bigcommerce/components/navigation-menu'; -import { ChevronDown, User } from 'lucide-react'; - -import { getSessionCustomerId } from '~/auth'; -import { FragmentOf, graphql } from '~/client/graphql'; -import { Link } from '~/components/link'; +} from '~/components/ui/navigation-menu'; import { cn } from '~/lib/utils'; export const HeaderNavFragment = graphql(` diff --git a/apps/core/components/header/index.tsx b/apps/core/components/header/index.tsx index 27be68db0..7ced96c8d 100644 --- a/apps/core/components/header/index.tsx +++ b/apps/core/components/header/index.tsx @@ -1,4 +1,10 @@ -import { Button } from '@bigcommerce/components/button'; +import { ShoppingCart, User } from 'lucide-react'; +import { ReactNode, Suspense } from 'react'; + +import { getSessionCustomerId } from '~/auth'; +import { FragmentOf, graphql } from '~/client/graphql'; +import { Link } from '~/components/link'; +import { Button } from '~/components/ui/button'; import { NavigationMenu, NavigationMenuCollapsed, @@ -6,13 +12,7 @@ import { NavigationMenuLink, NavigationMenuList, NavigationMenuToggle, -} from '@bigcommerce/components/navigation-menu'; -import { ShoppingCart, User } from 'lucide-react'; -import { ReactNode, Suspense } from 'react'; - -import { getSessionCustomerId } from '~/auth'; -import { FragmentOf, graphql } from '~/client/graphql'; -import { Link } from '~/components/link'; +} from '~/components/ui/navigation-menu'; import { QuickSearch } from '../quick-search'; import { StoreLogo, StoreLogoFragment } from '../store-logo'; diff --git a/apps/core/components/hero/index.tsx b/apps/core/components/hero/index.tsx index d99bb1f23..91285f188 100644 --- a/apps/core/components/hero/index.tsx +++ b/apps/core/components/hero/index.tsx @@ -1,4 +1,6 @@ -import { Button } from '@bigcommerce/components/button'; +import Image from 'next/image'; + +import { Button } from '~/components/ui/button'; import { Slideshow, SlideshowAutoplayControl, @@ -8,8 +10,7 @@ import { SlideshowPagination, SlideshowPreviousIndicator, SlideshowSlide, -} from '@bigcommerce/components/slideshow'; -import Image from 'next/image'; +} from '~/components/ui/slideshow'; import SlideshowBG from './slideshow-bg-01.jpg'; diff --git a/apps/core/components/product-card-carousel/index.tsx b/apps/core/components/product-card-carousel/index.tsx index 9e3c9f30c..73013b23a 100644 --- a/apps/core/components/product-card-carousel/index.tsx +++ b/apps/core/components/product-card-carousel/index.tsx @@ -1,13 +1,13 @@ +import { useId } from 'react'; + +import { graphql, ResultOf } from '~/client/graphql'; import { Carousel, CarouselContent, CarouselItem, CarouselNextIndicator, CarouselPreviousIndicator, -} from '@bigcommerce/components/carousel'; -import { useId } from 'react'; - -import { graphql, ResultOf } from '~/client/graphql'; +} from '~/components/ui/carousel'; import { ProductCard, ProductCardFragment } from '../product-card'; diff --git a/apps/core/components/product-card-carousel/pagination.tsx b/apps/core/components/product-card-carousel/pagination.tsx index 65e799dd9..872e9c628 100644 --- a/apps/core/components/product-card-carousel/pagination.tsx +++ b/apps/core/components/product-card-carousel/pagination.tsx @@ -1,6 +1,6 @@ 'use client'; -import { CarouselPagination, CarouselPaginationTab } from '@bigcommerce/components/carousel'; +import { CarouselPagination, CarouselPaginationTab } from '~/components/ui/carousel'; interface Props { id: string; diff --git a/apps/core/components/product-card/add-to-cart.tsx b/apps/core/components/product-card/add-to-cart.tsx index 432eaa339..e6d0ade96 100644 --- a/apps/core/components/product-card/add-to-cart.tsx +++ b/apps/core/components/product-card/add-to-cart.tsx @@ -1,10 +1,11 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; import { Loader2 as Spinner } from 'lucide-react'; import { useTranslations } from 'next-intl'; import { useFormStatus } from 'react-dom'; +import { Button } from '~/components/ui/button'; + export const AddToCart = ({ disabled = false }: { disabled?: boolean }) => { const { pending } = useFormStatus(); const t = useTranslations('Product.ProductSheet'); diff --git a/apps/core/components/product-card/cart/index.tsx b/apps/core/components/product-card/cart/index.tsx index 613e7da78..8c5981026 100644 --- a/apps/core/components/product-card/cart/index.tsx +++ b/apps/core/components/product-card/cart/index.tsx @@ -1,12 +1,13 @@ 'use client'; import { removeEdgesAndNodes } from '@bigcommerce/catalyst-client'; -import { Button } from '@bigcommerce/components/button'; import { AlertCircle, Check } from 'lucide-react'; import { usePathname, useSearchParams } from 'next/navigation'; import { useTranslations } from 'next-intl'; import { toast } from 'react-hot-toast'; +import { Button } from '~/components/ui/button'; + import { Link } from '../../link'; import { addToCart } from '../_actions/add-to-cart'; import { AddToCart } from '../add-to-cart'; diff --git a/apps/core/components/product-card/compare.tsx b/apps/core/components/product-card/compare.tsx index b894622b5..daeea050f 100644 --- a/apps/core/components/product-card/compare.tsx +++ b/apps/core/components/product-card/compare.tsx @@ -1,10 +1,11 @@ 'use client'; -import { Checkbox } from '@bigcommerce/components/checkbox'; -import { Label } from '@bigcommerce/components/label'; import { useTranslations } from 'next-intl'; import { useEffect, useId, useState } from 'react'; +import { Checkbox } from '~/components/ui/checkbox'; +import { Label } from '~/components/ui/label'; + import { useCompareProductsContext } from '../../app/contexts/compare-products-context'; export const Compare = ({ diff --git a/apps/core/components/product-card/index.tsx b/apps/core/components/product-card/index.tsx index 685db0489..214d5cecb 100644 --- a/apps/core/components/product-card/index.tsx +++ b/apps/core/components/product-card/index.tsx @@ -1,3 +1,8 @@ +import { useTranslations } from 'next-intl'; +import { useId } from 'react'; + +import { graphql, ResultOf } from '~/client/graphql'; +import { Link } from '~/components/link'; import { ProductCard as ComponentsProductCard, ProductCardImage, @@ -5,13 +10,8 @@ import { ProductCardInfoBrandName, ProductCardInfoPrice, ProductCardInfoProductName, -} from '@bigcommerce/components/product-card'; -import { Rating } from '@bigcommerce/components/rating'; -import { useTranslations } from 'next-intl'; -import { useId } from 'react'; - -import { graphql, ResultOf } from '~/client/graphql'; -import { Link } from '~/components/link'; +} from '~/components/ui/product-card'; +import { Rating } from '~/components/ui/rating'; import { cn } from '~/lib/utils'; import { BcImage } from '../bc-image'; diff --git a/apps/core/components/product-form/add-to-cart.tsx b/apps/core/components/product-form/add-to-cart.tsx index 10e47a2b6..366e82509 100644 --- a/apps/core/components/product-form/add-to-cart.tsx +++ b/apps/core/components/product-form/add-to-cart.tsx @@ -1,10 +1,11 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; import { ShoppingCart, Loader2 as Spinner } from 'lucide-react'; import { useTranslations } from 'next-intl'; import { useFormContext } from 'react-hook-form'; +import { Button } from '~/components/ui/button'; + export const AddToCart = ({ disabled = false }: { disabled?: boolean }) => { const { formState } = useFormContext(); const { isSubmitting } = formState; diff --git a/apps/core/components/product-form/fields/checkbox-field.tsx b/apps/core/components/product-form/fields/checkbox-field.tsx index c81ac628e..2d3d82dc9 100644 --- a/apps/core/components/product-form/fields/checkbox-field.tsx +++ b/apps/core/components/product-form/fields/checkbox-field.tsx @@ -1,8 +1,7 @@ -import { Checkbox } from '@bigcommerce/components/checkbox'; -import { Label } from '@bigcommerce/components/label'; - import { getProduct } from '~/client/queries/get-product'; import { ExistingResultType, Unpacked } from '~/client/util'; +import { Checkbox } from '~/components/ui/checkbox'; +import { Label } from '~/components/ui/label'; import { useProductFieldController } from '../use-product-form'; diff --git a/apps/core/components/product-form/fields/date-field.tsx b/apps/core/components/product-form/fields/date-field.tsx index f1970ae29..83e1fb036 100644 --- a/apps/core/components/product-form/fields/date-field.tsx +++ b/apps/core/components/product-form/fields/date-field.tsx @@ -1,9 +1,9 @@ -import { DatePicker } from '@bigcommerce/components/date-picker'; -import { Label } from '@bigcommerce/components/label'; import { useFormatter } from 'next-intl'; import { getProduct } from '~/client/queries/get-product'; import { ExistingResultType, Unpacked } from '~/client/util'; +import { DatePicker } from '~/components/ui/date-picker'; +import { Label } from '~/components/ui/label'; import { useProductFieldController } from '../use-product-form'; diff --git a/apps/core/components/product-form/fields/multi-line-text-field.tsx b/apps/core/components/product-form/fields/multi-line-text-field.tsx index 3cbe4c188..d924f5d77 100644 --- a/apps/core/components/product-form/fields/multi-line-text-field.tsx +++ b/apps/core/components/product-form/fields/multi-line-text-field.tsx @@ -1,8 +1,7 @@ -import { Label } from '@bigcommerce/components/label'; -import { TextArea } from '@bigcommerce/components/text-area'; - import { getProduct } from '~/client/queries/get-product'; import { ExistingResultType, Unpacked } from '~/client/util'; +import { Label } from '~/components/ui/label'; +import { TextArea } from '~/components/ui/text-area'; import { useProductFieldController } from '../use-product-form'; diff --git a/apps/core/components/product-form/fields/multiple-choice-field.tsx b/apps/core/components/product-form/fields/multiple-choice-field.tsx index 479affee2..de10fe29d 100644 --- a/apps/core/components/product-form/fields/multiple-choice-field.tsx +++ b/apps/core/components/product-form/fields/multiple-choice-field.tsx @@ -1,14 +1,14 @@ -import { Label } from '@bigcommerce/components/label'; -import { PickList, PickListItem } from '@bigcommerce/components/pick-list'; -import { RadioGroup, RadioItem } from '@bigcommerce/components/radio-group'; -import { RectangleList, RectangleListItem } from '@bigcommerce/components/rectangle-list'; -import { Select, SelectContent, SelectItem } from '@bigcommerce/components/select'; -import { Swatch, SwatchItem } from '@bigcommerce/components/swatch'; import { usePathname, useRouter, useSearchParams } from 'next/navigation'; import { getProduct } from '~/client/queries/get-product'; import { ExistingResultType, Unpacked } from '~/client/util'; import { BcImage } from '~/components/bc-image'; +import { Label } from '~/components/ui/label'; +import { PickList, PickListItem } from '~/components/ui/pick-list'; +import { RadioGroup, RadioItem } from '~/components/ui/radio-group'; +import { RectangleList, RectangleListItem } from '~/components/ui/rectangle-list'; +import { Select, SelectContent, SelectItem } from '~/components/ui/select'; +import { Swatch, SwatchItem } from '~/components/ui/swatch'; import { useProductFieldController } from '../use-product-form'; diff --git a/apps/core/components/product-form/fields/number-field.tsx b/apps/core/components/product-form/fields/number-field.tsx index 9fe9843d7..dc24b455b 100644 --- a/apps/core/components/product-form/fields/number-field.tsx +++ b/apps/core/components/product-form/fields/number-field.tsx @@ -1,8 +1,7 @@ -import { Counter } from '@bigcommerce/components/counter'; -import { Label } from '@bigcommerce/components/label'; - import { getProduct } from '~/client/queries/get-product'; import { ExistingResultType, Unpacked } from '~/client/util'; +import { Counter } from '~/components/ui/counter'; +import { Label } from '~/components/ui/label'; import { useProductFieldController } from '../use-product-form'; diff --git a/apps/core/components/product-form/fields/quantity-field.tsx b/apps/core/components/product-form/fields/quantity-field.tsx index b48cd56bb..f4c6a244e 100644 --- a/apps/core/components/product-form/fields/quantity-field.tsx +++ b/apps/core/components/product-form/fields/quantity-field.tsx @@ -1,7 +1,8 @@ -import { Counter } from '@bigcommerce/components/counter'; -import { Label } from '@bigcommerce/components/label'; import { useTranslations } from 'next-intl'; +import { Counter } from '~/components/ui/counter'; +import { Label } from '~/components/ui/label'; + import { useProductFieldController } from '../use-product-form'; export const QuantityField = () => { diff --git a/apps/core/components/product-form/fields/text-field.tsx b/apps/core/components/product-form/fields/text-field.tsx index 37aeed6df..0090db72b 100644 --- a/apps/core/components/product-form/fields/text-field.tsx +++ b/apps/core/components/product-form/fields/text-field.tsx @@ -1,8 +1,7 @@ -import { Input } from '@bigcommerce/components/input'; -import { Label } from '@bigcommerce/components/label'; - import { getProduct } from '~/client/queries/get-product'; import { ExistingResultType, Unpacked } from '~/client/util'; +import { Input } from '~/components/ui/input'; +import { Label } from '~/components/ui/label'; import { useProductFieldController } from '../use-product-form'; diff --git a/apps/core/components/product-form/index.tsx b/apps/core/components/product-form/index.tsx index 6f0669fd4..b2cdf370c 100644 --- a/apps/core/components/product-form/index.tsx +++ b/apps/core/components/product-form/index.tsx @@ -1,6 +1,5 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; import { AlertCircle, Check, Heart } from 'lucide-react'; import { useTranslations } from 'next-intl'; import { FormProvider } from 'react-hook-form'; @@ -8,6 +7,7 @@ import { toast } from 'react-hot-toast'; import { getProduct } from '~/client/queries/get-product'; import { ExistingResultType } from '~/client/util'; +import { Button } from '~/components/ui/button'; import { Link } from '../link'; diff --git a/apps/core/components/product-sheet/index.tsx b/apps/core/components/product-sheet/index.tsx index 2db7f40a9..ec5aab290 100644 --- a/apps/core/components/product-sheet/index.tsx +++ b/apps/core/components/product-sheet/index.tsx @@ -1,5 +1,9 @@ 'use client'; +import { usePathname, useRouter, useSearchParams } from 'next/navigation'; +import { useTranslations } from 'next-intl'; +import { useEffect, useState } from 'react'; + import { Sheet, SheetClose, @@ -7,10 +11,7 @@ import { SheetHeader, SheetOverlay, SheetTitle, -} from '@bigcommerce/components/sheet'; -import { usePathname, useRouter, useSearchParams } from 'next/navigation'; -import { useTranslations } from 'next-intl'; -import { useEffect, useState } from 'react'; +} from '~/components/ui/sheet'; import { ProductSheetContent } from './product-sheet-content'; diff --git a/apps/core/components/product-sheet/product-sheet-content.tsx b/apps/core/components/product-sheet/product-sheet-content.tsx index df247c0e4..8f33b5b7b 100644 --- a/apps/core/components/product-sheet/product-sheet-content.tsx +++ b/apps/core/components/product-sheet/product-sheet-content.tsx @@ -1,6 +1,5 @@ 'use client'; -import { Rating } from '@bigcommerce/components/rating'; import { Loader2 as Spinner } from 'lucide-react'; import { useSearchParams } from 'next/navigation'; import { useFormatter, useTranslations } from 'next-intl'; @@ -8,6 +7,7 @@ import { useEffect, useId, useState } from 'react'; import { getProduct } from '~/client/queries/get-product'; import { ProductForm } from '~/components/product-form'; +import { Rating } from '~/components/ui/rating'; import { cn } from '~/lib/utils'; import { BcImage } from '../bc-image'; diff --git a/apps/core/components/quick-search/index.tsx b/apps/core/components/quick-search/index.tsx index f7b01a748..4044b0e5d 100644 --- a/apps/core/components/quick-search/index.tsx +++ b/apps/core/components/quick-search/index.tsx @@ -1,8 +1,14 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; -import { Field, FieldControl, Form } from '@bigcommerce/components/form'; -import { Input, InputIcon } from '@bigcommerce/components/input'; +import debounce from 'lodash.debounce'; +import { Search, Loader2 as Spinner, X } from 'lucide-react'; +import { PropsWithChildren, useEffect, useRef, useState } from 'react'; + +import { getQuickSearchResults } from '~/client/queries/get-quick-search-results'; +import { ExistingResultType } from '~/client/util'; +import { Button } from '~/components/ui/button'; +import { Field, FieldControl, Form } from '~/components/ui/form'; +import { Input, InputIcon } from '~/components/ui/input'; import { Sheet, SheetClose, @@ -10,13 +16,7 @@ import { SheetOverlay, SheetTitle, SheetTrigger, -} from '@bigcommerce/components/sheet'; -import debounce from 'lodash.debounce'; -import { Search, Loader2 as Spinner, X } from 'lucide-react'; -import { PropsWithChildren, useEffect, useRef, useState } from 'react'; - -import { getQuickSearchResults } from '~/client/queries/get-quick-search-results'; -import { ExistingResultType } from '~/client/util'; +} from '~/components/ui/sheet'; import { cn } from '~/lib/utils'; import { BcImage } from '../bc-image'; diff --git a/apps/core/components/search-form/index.tsx b/apps/core/components/search-form/index.tsx index 600669d06..1ae65bc68 100644 --- a/apps/core/components/search-form/index.tsx +++ b/apps/core/components/search-form/index.tsx @@ -1,12 +1,13 @@ 'use client'; -import { Button } from '@bigcommerce/components/button'; -import { Field, FieldControl, Form, FormSubmit } from '@bigcommerce/components/form'; -import { Input } from '@bigcommerce/components/input'; import { Loader2 as Spinner } from 'lucide-react'; import { useTranslations } from 'next-intl'; import { useFormStatus } from 'react-dom'; +import { Button } from '~/components/ui/button'; +import { Field, FieldControl, Form, FormSubmit } from '~/components/ui/form'; +import { Input } from '~/components/ui/input'; + interface Props { initialTerm?: string; } diff --git a/packages/components/src/components/accordion/accordion.tsx b/apps/core/components/ui/accordion/accordion.tsx similarity index 100% rename from packages/components/src/components/accordion/accordion.tsx rename to apps/core/components/ui/accordion/accordion.tsx diff --git a/packages/components/src/components/accordion/index.ts b/apps/core/components/ui/accordion/index.ts similarity index 100% rename from packages/components/src/components/accordion/index.ts rename to apps/core/components/ui/accordion/index.ts diff --git a/packages/components/src/components/badge/badge.tsx b/apps/core/components/ui/badge/badge.tsx similarity index 100% rename from packages/components/src/components/badge/badge.tsx rename to apps/core/components/ui/badge/badge.tsx diff --git a/packages/components/src/components/badge/index.ts b/apps/core/components/ui/badge/index.ts similarity index 100% rename from packages/components/src/components/badge/index.ts rename to apps/core/components/ui/badge/index.ts diff --git a/packages/components/src/components/blog-post-card/blog-post-card.tsx b/apps/core/components/ui/blog-post-card/blog-post-card.tsx similarity index 100% rename from packages/components/src/components/blog-post-card/blog-post-card.tsx rename to apps/core/components/ui/blog-post-card/blog-post-card.tsx diff --git a/packages/components/src/components/blog-post-card/index.ts b/apps/core/components/ui/blog-post-card/index.ts similarity index 100% rename from packages/components/src/components/blog-post-card/index.ts rename to apps/core/components/ui/blog-post-card/index.ts diff --git a/packages/components/src/components/breadcrumbs/breadcrumbs.tsx b/apps/core/components/ui/breadcrumbs/breadcrumbs.tsx similarity index 100% rename from packages/components/src/components/breadcrumbs/breadcrumbs.tsx rename to apps/core/components/ui/breadcrumbs/breadcrumbs.tsx diff --git a/packages/components/src/components/breadcrumbs/index.ts b/apps/core/components/ui/breadcrumbs/index.ts similarity index 100% rename from packages/components/src/components/breadcrumbs/index.ts rename to apps/core/components/ui/breadcrumbs/index.ts diff --git a/packages/components/src/components/button/button.tsx b/apps/core/components/ui/button/button.tsx similarity index 100% rename from packages/components/src/components/button/button.tsx rename to apps/core/components/ui/button/button.tsx diff --git a/packages/components/src/components/button/index.ts b/apps/core/components/ui/button/index.ts similarity index 100% rename from packages/components/src/components/button/index.ts rename to apps/core/components/ui/button/index.ts diff --git a/packages/components/src/components/calendar/calendar.tsx b/apps/core/components/ui/calendar/calendar.tsx similarity index 100% rename from packages/components/src/components/calendar/calendar.tsx rename to apps/core/components/ui/calendar/calendar.tsx diff --git a/packages/components/src/components/calendar/index.ts b/apps/core/components/ui/calendar/index.ts similarity index 100% rename from packages/components/src/components/calendar/index.ts rename to apps/core/components/ui/calendar/index.ts diff --git a/packages/components/src/components/carousel/carousel.tsx b/apps/core/components/ui/carousel/carousel.tsx similarity index 100% rename from packages/components/src/components/carousel/carousel.tsx rename to apps/core/components/ui/carousel/carousel.tsx diff --git a/packages/components/src/components/carousel/index.ts b/apps/core/components/ui/carousel/index.ts similarity index 100% rename from packages/components/src/components/carousel/index.ts rename to apps/core/components/ui/carousel/index.ts diff --git a/packages/components/src/components/checkbox/checkbox.tsx b/apps/core/components/ui/checkbox/checkbox.tsx similarity index 100% rename from packages/components/src/components/checkbox/checkbox.tsx rename to apps/core/components/ui/checkbox/checkbox.tsx diff --git a/packages/components/src/components/checkbox/index.ts b/apps/core/components/ui/checkbox/index.ts similarity index 100% rename from packages/components/src/components/checkbox/index.ts rename to apps/core/components/ui/checkbox/index.ts diff --git a/packages/components/src/components/counter/counter.tsx b/apps/core/components/ui/counter/counter.tsx similarity index 100% rename from packages/components/src/components/counter/counter.tsx rename to apps/core/components/ui/counter/counter.tsx diff --git a/packages/components/src/components/counter/index.ts b/apps/core/components/ui/counter/index.ts similarity index 100% rename from packages/components/src/components/counter/index.ts rename to apps/core/components/ui/counter/index.ts diff --git a/packages/components/src/components/date-picker/date-picker.tsx b/apps/core/components/ui/date-picker/date-picker.tsx similarity index 100% rename from packages/components/src/components/date-picker/date-picker.tsx rename to apps/core/components/ui/date-picker/date-picker.tsx diff --git a/packages/components/src/components/date-picker/index.ts b/apps/core/components/ui/date-picker/index.ts similarity index 100% rename from packages/components/src/components/date-picker/index.ts rename to apps/core/components/ui/date-picker/index.ts diff --git a/packages/components/src/components/dialog/dialog.tsx b/apps/core/components/ui/dialog/dialog.tsx similarity index 100% rename from packages/components/src/components/dialog/dialog.tsx rename to apps/core/components/ui/dialog/dialog.tsx diff --git a/packages/components/src/components/dialog/index.ts b/apps/core/components/ui/dialog/index.ts similarity index 100% rename from packages/components/src/components/dialog/index.ts rename to apps/core/components/ui/dialog/index.ts diff --git a/packages/components/src/components/file-chooser/file-chooser.tsx b/apps/core/components/ui/file-chooser/file-chooser.tsx similarity index 100% rename from packages/components/src/components/file-chooser/file-chooser.tsx rename to apps/core/components/ui/file-chooser/file-chooser.tsx diff --git a/packages/components/src/components/file-chooser/index.ts b/apps/core/components/ui/file-chooser/index.ts similarity index 100% rename from packages/components/src/components/file-chooser/index.ts rename to apps/core/components/ui/file-chooser/index.ts diff --git a/packages/components/src/components/footer/footer.tsx b/apps/core/components/ui/footer/footer.tsx similarity index 100% rename from packages/components/src/components/footer/footer.tsx rename to apps/core/components/ui/footer/footer.tsx diff --git a/packages/components/src/components/footer/index.ts b/apps/core/components/ui/footer/index.ts similarity index 100% rename from packages/components/src/components/footer/index.ts rename to apps/core/components/ui/footer/index.ts diff --git a/packages/components/src/components/form/form.tsx b/apps/core/components/ui/form/form.tsx similarity index 100% rename from packages/components/src/components/form/form.tsx rename to apps/core/components/ui/form/form.tsx diff --git a/packages/components/src/components/form/index.ts b/apps/core/components/ui/form/index.ts similarity index 100% rename from packages/components/src/components/form/index.ts rename to apps/core/components/ui/form/index.ts diff --git a/packages/components/src/components/gallery/gallery.tsx b/apps/core/components/ui/gallery/gallery.tsx similarity index 100% rename from packages/components/src/components/gallery/gallery.tsx rename to apps/core/components/ui/gallery/gallery.tsx diff --git a/packages/components/src/components/gallery/index.ts b/apps/core/components/ui/gallery/index.ts similarity index 100% rename from packages/components/src/components/gallery/index.ts rename to apps/core/components/ui/gallery/index.ts diff --git a/packages/components/src/components/input/index.ts b/apps/core/components/ui/input/index.ts similarity index 100% rename from packages/components/src/components/input/index.ts rename to apps/core/components/ui/input/index.ts diff --git a/packages/components/src/components/input/input.tsx b/apps/core/components/ui/input/input.tsx similarity index 100% rename from packages/components/src/components/input/input.tsx rename to apps/core/components/ui/input/input.tsx diff --git a/packages/components/src/components/label/index.ts b/apps/core/components/ui/label/index.ts similarity index 100% rename from packages/components/src/components/label/index.ts rename to apps/core/components/ui/label/index.ts diff --git a/packages/components/src/components/label/label.tsx b/apps/core/components/ui/label/label.tsx similarity index 100% rename from packages/components/src/components/label/label.tsx rename to apps/core/components/ui/label/label.tsx diff --git a/packages/components/src/components/message/index.ts b/apps/core/components/ui/message/index.ts similarity index 100% rename from packages/components/src/components/message/index.ts rename to apps/core/components/ui/message/index.ts diff --git a/packages/components/src/components/message/message.tsx b/apps/core/components/ui/message/message.tsx similarity index 100% rename from packages/components/src/components/message/message.tsx rename to apps/core/components/ui/message/message.tsx diff --git a/packages/components/src/components/navigation-menu/index.ts b/apps/core/components/ui/navigation-menu/index.ts similarity index 100% rename from packages/components/src/components/navigation-menu/index.ts rename to apps/core/components/ui/navigation-menu/index.ts diff --git a/packages/components/src/components/navigation-menu/navigation-menu.tsx b/apps/core/components/ui/navigation-menu/navigation-menu.tsx similarity index 100% rename from packages/components/src/components/navigation-menu/navigation-menu.tsx rename to apps/core/components/ui/navigation-menu/navigation-menu.tsx diff --git a/packages/components/src/components/pick-list/index.ts b/apps/core/components/ui/pick-list/index.ts similarity index 100% rename from packages/components/src/components/pick-list/index.ts rename to apps/core/components/ui/pick-list/index.ts diff --git a/packages/components/src/components/pick-list/pick-list.tsx b/apps/core/components/ui/pick-list/pick-list.tsx similarity index 100% rename from packages/components/src/components/pick-list/pick-list.tsx rename to apps/core/components/ui/pick-list/pick-list.tsx diff --git a/packages/components/src/components/popover/index.ts b/apps/core/components/ui/popover/index.ts similarity index 100% rename from packages/components/src/components/popover/index.ts rename to apps/core/components/ui/popover/index.ts diff --git a/packages/components/src/components/popover/popover.tsx b/apps/core/components/ui/popover/popover.tsx similarity index 100% rename from packages/components/src/components/popover/popover.tsx rename to apps/core/components/ui/popover/popover.tsx diff --git a/packages/components/src/components/product-card/index.ts b/apps/core/components/ui/product-card/index.ts similarity index 100% rename from packages/components/src/components/product-card/index.ts rename to apps/core/components/ui/product-card/index.ts diff --git a/packages/components/src/components/product-card/product-card.tsx b/apps/core/components/ui/product-card/product-card.tsx similarity index 100% rename from packages/components/src/components/product-card/product-card.tsx rename to apps/core/components/ui/product-card/product-card.tsx diff --git a/packages/components/src/components/radio-group/index.ts b/apps/core/components/ui/radio-group/index.ts similarity index 100% rename from packages/components/src/components/radio-group/index.ts rename to apps/core/components/ui/radio-group/index.ts diff --git a/packages/components/src/components/radio-group/radio-group.tsx b/apps/core/components/ui/radio-group/radio-group.tsx similarity index 100% rename from packages/components/src/components/radio-group/radio-group.tsx rename to apps/core/components/ui/radio-group/radio-group.tsx diff --git a/packages/components/src/components/rating/index.ts b/apps/core/components/ui/rating/index.ts similarity index 100% rename from packages/components/src/components/rating/index.ts rename to apps/core/components/ui/rating/index.ts diff --git a/packages/components/src/components/rating/rating.tsx b/apps/core/components/ui/rating/rating.tsx similarity index 100% rename from packages/components/src/components/rating/rating.tsx rename to apps/core/components/ui/rating/rating.tsx diff --git a/packages/components/src/components/rating/star-icons/star-empty.tsx b/apps/core/components/ui/rating/star-icons/star-empty.tsx similarity index 100% rename from packages/components/src/components/rating/star-icons/star-empty.tsx rename to apps/core/components/ui/rating/star-icons/star-empty.tsx diff --git a/packages/components/src/components/rating/star-icons/star-filled.tsx b/apps/core/components/ui/rating/star-icons/star-filled.tsx similarity index 100% rename from packages/components/src/components/rating/star-icons/star-filled.tsx rename to apps/core/components/ui/rating/star-icons/star-filled.tsx diff --git a/packages/components/src/components/rating/star-icons/star-half.tsx b/apps/core/components/ui/rating/star-icons/star-half.tsx similarity index 100% rename from packages/components/src/components/rating/star-icons/star-half.tsx rename to apps/core/components/ui/rating/star-icons/star-half.tsx diff --git a/packages/components/src/components/rectangle-list/index.ts b/apps/core/components/ui/rectangle-list/index.ts similarity index 100% rename from packages/components/src/components/rectangle-list/index.ts rename to apps/core/components/ui/rectangle-list/index.ts diff --git a/packages/components/src/components/rectangle-list/rectangle-list.tsx b/apps/core/components/ui/rectangle-list/rectangle-list.tsx similarity index 100% rename from packages/components/src/components/rectangle-list/rectangle-list.tsx rename to apps/core/components/ui/rectangle-list/rectangle-list.tsx diff --git a/packages/components/src/components/select/index.ts b/apps/core/components/ui/select/index.ts similarity index 100% rename from packages/components/src/components/select/index.ts rename to apps/core/components/ui/select/index.ts diff --git a/packages/components/src/components/select/select.tsx b/apps/core/components/ui/select/select.tsx similarity index 100% rename from packages/components/src/components/select/select.tsx rename to apps/core/components/ui/select/select.tsx diff --git a/packages/components/src/components/sheet/index.ts b/apps/core/components/ui/sheet/index.ts similarity index 100% rename from packages/components/src/components/sheet/index.ts rename to apps/core/components/ui/sheet/index.ts diff --git a/packages/components/src/components/sheet/sheet.tsx b/apps/core/components/ui/sheet/sheet.tsx similarity index 100% rename from packages/components/src/components/sheet/sheet.tsx rename to apps/core/components/ui/sheet/sheet.tsx diff --git a/packages/components/src/components/skeleton/index.ts b/apps/core/components/ui/skeleton/index.ts similarity index 100% rename from packages/components/src/components/skeleton/index.ts rename to apps/core/components/ui/skeleton/index.ts diff --git a/packages/components/src/components/skeleton/skeleton.tsx b/apps/core/components/ui/skeleton/skeleton.tsx similarity index 100% rename from packages/components/src/components/skeleton/skeleton.tsx rename to apps/core/components/ui/skeleton/skeleton.tsx diff --git a/packages/components/src/components/slideshow/index.ts b/apps/core/components/ui/slideshow/index.ts similarity index 100% rename from packages/components/src/components/slideshow/index.ts rename to apps/core/components/ui/slideshow/index.ts diff --git a/packages/components/src/components/slideshow/slideshow.tsx b/apps/core/components/ui/slideshow/slideshow.tsx similarity index 100% rename from packages/components/src/components/slideshow/slideshow.tsx rename to apps/core/components/ui/slideshow/slideshow.tsx diff --git a/packages/components/src/components/swatch/index.ts b/apps/core/components/ui/swatch/index.ts similarity index 100% rename from packages/components/src/components/swatch/index.ts rename to apps/core/components/ui/swatch/index.ts diff --git a/packages/components/src/components/swatch/swatch.tsx b/apps/core/components/ui/swatch/swatch.tsx similarity index 100% rename from packages/components/src/components/swatch/swatch.tsx rename to apps/core/components/ui/swatch/swatch.tsx diff --git a/packages/components/src/components/tabs/index.ts b/apps/core/components/ui/tabs/index.ts similarity index 100% rename from packages/components/src/components/tabs/index.ts rename to apps/core/components/ui/tabs/index.ts diff --git a/packages/components/src/components/tabs/tabs.tsx b/apps/core/components/ui/tabs/tabs.tsx similarity index 100% rename from packages/components/src/components/tabs/tabs.tsx rename to apps/core/components/ui/tabs/tabs.tsx diff --git a/packages/components/src/components/tag/index.ts b/apps/core/components/ui/tag/index.ts similarity index 100% rename from packages/components/src/components/tag/index.ts rename to apps/core/components/ui/tag/index.ts diff --git a/packages/components/src/components/tag/tag.tsx b/apps/core/components/ui/tag/tag.tsx similarity index 100% rename from packages/components/src/components/tag/tag.tsx rename to apps/core/components/ui/tag/tag.tsx diff --git a/packages/components/src/components/text-area/index.ts b/apps/core/components/ui/text-area/index.ts similarity index 100% rename from packages/components/src/components/text-area/index.ts rename to apps/core/components/ui/text-area/index.ts diff --git a/packages/components/src/components/text-area/text-area.tsx b/apps/core/components/ui/text-area/text-area.tsx similarity index 100% rename from packages/components/src/components/text-area/text-area.tsx rename to apps/core/components/ui/text-area/text-area.tsx diff --git a/packages/components/.eslintrc.cjs b/packages/components/.eslintrc.cjs deleted file mode 100644 index 9cc7abd30..000000000 --- a/packages/components/.eslintrc.cjs +++ /dev/null @@ -1,20 +0,0 @@ -// @ts-check - -/** @type {import('eslint').Linter.Config} */ -const config = { - root: true, - extends: [ - '@bigcommerce/catalyst/base', - '@bigcommerce/catalyst/react', - '@bigcommerce/catalyst/next', - '@bigcommerce/catalyst/prettier', - ], - rules: { - '@typescript-eslint/naming-convention': 'off', - '@next/next/no-html-link-for-pages': 'off', - 'import/dynamic-import-chunkname': 'off', - 'no-underscore-dangle': ['error', { allow: ['__typename'] }], - }, -}; - -module.exports = config; diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md deleted file mode 100644 index d9ebdb2dc..000000000 --- a/packages/components/CHANGELOG.md +++ /dev/null @@ -1,34 +0,0 @@ -# @bigcommerce/components - -## 0.3.0 - -### Patch Changes - -- [#757](https://github.com/bigcommerce/catalyst/pull/757) [`dac0199`](https://github.com/bigcommerce/catalyst/commit/dac019989c9c1a81526689dc9e75c9d3a0d0dce3) Thanks [@chanceaclark](https://github.com/chanceaclark)! - Update styles to scroll when Select content is long. - -## 0.2.0 - -### Minor Changes - -- [#717](https://github.com/bigcommerce/catalyst/pull/717) [`5af4856`](https://github.com/bigcommerce/catalyst/commit/5af4856510406080d75a1e1db16fe55f86082264) Thanks [@bc-alexsaiannyi](https://github.com/bc-alexsaiannyi)! - Add tabs component - -### Patch Changes - -- [#638](https://github.com/bigcommerce/catalyst/pull/638) [`a1f7970`](https://github.com/bigcommerce/catalyst/commit/a1f797098eee668b4f8bf6763100d71d3882cb45) Thanks [@bc-alexsaiannyi](https://github.com/bc-alexsaiannyi)! - Add reset password functionality - Update props for message field - -- [#735](https://github.com/bigcommerce/catalyst/pull/735) [`3db9c5f`](https://github.com/bigcommerce/catalyst/commit/3db9c5fa603299a5c5a9a12bd5408f9024677b20) Thanks [@deini](https://github.com/deini)! - Bump dependencies - -- [#721](https://github.com/bigcommerce/catalyst/pull/721) [`e4dab93`](https://github.com/bigcommerce/catalyst/commit/e4dab93222b2a19d469315266b2d4627a7967294) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Use focus-visible in Carousel - -## 0.1.2 - -### Patch Changes - -- [#680](https://github.com/bigcommerce/catalyst/pull/680) [`5af0e66`](https://github.com/bigcommerce/catalyst/commit/5af0e66e7b065ea1d158a0d062a6c3216752d5be) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Extend colors in Tailwind config. - -## 0.1.1 - -### Patch Changes - -- [#644](https://github.com/bigcommerce/catalyst/pull/644) [`a2ce3b5`](https://github.com/bigcommerce/catalyst/commit/a2ce3b5caf37dcd75cf449648ce3e5b795dc80f7) Thanks [@christensenep](https://github.com/christensenep)! - Use focus-visible instead of focus for focus-related styling diff --git a/packages/components/postcss.config.js b/packages/components/postcss.config.js deleted file mode 100644 index 12a703d90..000000000 --- a/packages/components/postcss.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - plugins: { - tailwindcss: {}, - autoprefixer: {}, - }, -}; diff --git a/packages/components/prettier.config.js b/packages/components/prettier.config.js deleted file mode 100644 index 33e192977..000000000 --- a/packages/components/prettier.config.js +++ /dev/null @@ -1,12 +0,0 @@ -// @ts-check - -/** @type {import("prettier").Config} */ -const config = { - printWidth: 100, - singleQuote: true, - trailingComma: 'all', - plugins: ['prettier-plugin-tailwindcss'], - tailwindFunctions: ['cn'], -}; - -module.exports = config; diff --git a/packages/components/src/lib/utils.ts b/packages/components/src/lib/utils.ts deleted file mode 100644 index 9ad0df426..000000000 --- a/packages/components/src/lib/utils.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { type ClassValue, clsx } from 'clsx'; -import { twMerge } from 'tailwind-merge'; - -export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)); -} diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json deleted file mode 100644 index 58659dcbb..000000000 --- a/packages/components/tsconfig.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "display": "Default", - "compilerOptions": { - "target": "esnext", - "lib": [ - "dom", - "dom.iterable", - "esnext" - ], - "jsx": "react-jsx", - "module": "ESNext", - "composite": false, - "declaration": true, - "declarationMap": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "inlineSources": false, - "incremental": true, - "isolatedModules": true, - "moduleResolution": "node", - "noUnusedLocals": false, - "noUnusedParameters": false, - "preserveWatchOutput": true, - "skipLibCheck": true, - "strict": true, - "paths": { - "~/*": ["./src/*"] - }, - "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json" - }, - "include": ["."], - "exclude": ["node_modules", "dist"] -}