Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: move packages/components into core #767

Merged
merged 4 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
{ "repo": "bigcommerce/catalyst" }
],
"commit": false,
"fixed": [["@bigcommerce/components"]],
"linked": [],
"access": "public",
"privatePackages": {
Expand Down
5 changes: 5 additions & 0 deletions .changeset/hungry-points-wash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@bigcommerce/catalyst-core": patch
---

Move /packages/components into core, update related configurations.
Original file line number Diff line number Diff line change
@@ -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<{
Expand Down
22 changes: 11 additions & 11 deletions apps/core/app/[locale]/(default)/(faceted)/_components/facets.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Skeleton } from '@bigcommerce/components/skeleton';
import { Skeleton } from '~/components/ui/skeleton';

export const SkeletonIU = () => (
<div>
Expand Down
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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<Awaited<ReturnType<typeof getCustomerAddresses>>>['addresses'];

Expand Down
16 changes: 8 additions & 8 deletions apps/core/app/[locale]/(default)/blog/[blogId]/page.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
'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';
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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions apps/core/app/[locale]/(default)/compare/page.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
'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,
FieldLabel,
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';
Expand Down
20 changes: 10 additions & 10 deletions apps/core/app/[locale]/(default)/login/_components/login-form.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
'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,
FieldLabel,
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';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
'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,
FieldLabel,
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';

Expand Down
2 changes: 1 addition & 1 deletion apps/core/app/[locale]/(default)/login/page.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Loading
Loading