chore: manual fixes and other dep updates

core/components/link/index.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useLocale } from 'next-intl';
-import { ComponentPropsWithRef, ElementRef, forwardRef, useReducer } from 'react';
+import { ComponentPropsWithRef, ComponentRef, forwardRef, useReducer } from 'react';
 
 import { cn } from '~/lib/utils';
 
@@ -26,7 +26,7 @@ type Props = NextLinkProps & PrefetchOptions;
  * prefetch behavior and 'auto' for prefetch kind. This approach provides a balance between optimizing
  * page load performance and resource usage. https://nextjs.org/docs/app/api-reference/components/link#prefetch
  */
-export const Link = forwardRef<ElementRef<'a'>, Props>(
+export const Link = forwardRef<ComponentRef<'a'>, Props>(
   (
     { href, prefetch = 'hover', prefetchKind = 'auto', children, className, locale, ...rest },
     ref,
@@ -42,10 +42,18 @@ export const Link = forwardRef<ElementRef<'a'>, Props>(
         return;
       }
 
-      // PrefetchKind enum is not exported
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      router.prefetch(String(href), { kind: prefetchKind });
+      if (typeof href === 'string') {
+        // PrefetchKind enum is not exported
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error
+        router.prefetch(String(href), { kind: prefetchKind });
+      } else {
+        // PrefetchKind enum is not exported
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-expect-error
+        router.prefetch(href.href, { kind: prefetchKind });
+      }
+
       setPrefetched();
     };
 

core/components/ui/button/button.tsx

@@ -1,6 +1,6 @@
 import { Slot } from '@radix-ui/react-slot';
 import { Loader2 as Spinner } from 'lucide-react';
-import { ComponentPropsWithRef, ElementRef, forwardRef } from 'react';
+import { ComponentPropsWithRef, ComponentRef, forwardRef } from 'react';
 
 import { cn } from '~/lib/utils';
 
@@ -11,7 +11,7 @@ interface Props extends ComponentPropsWithRef<'button'> {
   variant?: 'primary' | 'secondary' | 'subtle';
 }
 
-const Button = forwardRef<ElementRef<'button'>, Props>(
+const Button = forwardRef<ComponentRef<'button'>, Props>(
   (
     {
       asChild = false,

core/components/ui/form/checkbox/checkbox.tsx

@@ -1,14 +1,14 @@
 import * as CheckboxPrimitive from '@radix-ui/react-checkbox';
 import { Check } from 'lucide-react';
-import { ComponentPropsWithRef, ElementRef, forwardRef } from 'react';
+import { ComponentPropsWithRef, ComponentRef, forwardRef } from 'react';
 
 import { cn } from '~/lib/utils';
 
 interface Props extends ComponentPropsWithRef<typeof CheckboxPrimitive.Root> {
   error?: boolean;
 }
 
-const Checkbox = forwardRef<ElementRef<typeof CheckboxPrimitive.Root>, Props>(
+const Checkbox = forwardRef<ComponentRef<typeof CheckboxPrimitive.Root>, Props>(
   ({ className, defaultChecked, error = false, onCheckedChange, ...props }, ref) => {
     return (
       <CheckboxPrimitive.Root

core/components/ui/form/counter/counter.tsx

@@ -2,7 +2,7 @@ import { ChevronDown, ChevronUp } from 'lucide-react';
 import { useTranslations } from 'next-intl';
 import {
   ComponentPropsWithRef,
-  ElementRef,
+  ComponentRef,
   forwardRef,
   useImperativeHandle,
   useRef,
@@ -34,9 +34,9 @@ const getDefaultValue = (defaultValue: number | '', min: number, max: number) =>
   return defaultValue;
 };
 
-type CounterRef = ElementRef<'input'> | null;
+type CounterRef = ComponentRef<'input'> | null;
 
-const Counter = forwardRef<ElementRef<'input'>, Props>(
+const Counter = forwardRef<ComponentRef<'input'>, Props>(
   (
     {
       children,

core/components/ui/form/date-picker/date-picker.tsx

@@ -3,7 +3,7 @@ import { CalendarIcon, ChevronLeftIcon, ChevronRightIcon } from 'lucide-react';
 import {
   ComponentPropsWithoutRef,
   ComponentPropsWithRef,
-  ElementRef,
+  ComponentRef,
   forwardRef,
   useState,
 } from 'react';
@@ -52,7 +52,7 @@ interface Props extends Omit<ComponentPropsWithRef<'input'>, 'defaultValue' | 'o
   disabledDays?: DayPickerSingleProps['disabled'];
 }
 
-const DatePicker = forwardRef<ElementRef<'input'>, Props>(
+const DatePicker = forwardRef<ComponentRef<'input'>, Props>(
   (
     {
       defaultValue,

core/components/ui/form/form.tsx

@@ -1,5 +1,5 @@
 import * as FormPrimitive from '@radix-ui/react-form';
-import { ComponentPropsWithRef, ElementRef, forwardRef } from 'react';
+import { ComponentPropsWithRef, ComponentRef, forwardRef } from 'react';
 
 import { cn } from '~/lib/utils';
 
@@ -21,12 +21,10 @@ type ValidationFunction =
   | ((value: string, formData: FormData) => boolean)
   | ((value: string, formData: FormData) => Promise<boolean>);
 type ControlValidationPatterns = ValidationPattern | ValidationFunction;
-type BuiltInValidityState = {
-  [pattern in ValidationPattern]: boolean;
-};
+type BuiltInValidityState = Record<ValidationPattern, boolean>;
 
 const Form = forwardRef<
-  ElementRef<typeof FormPrimitive.Root>,
+  ComponentRef<typeof FormPrimitive.Root>,
   ComponentPropsWithRef<typeof FormPrimitive.Root>
 >(({ className, ...props }, ref) => (
   <FormPrimitive.Root className={cn('text-base', className)} ref={ref} {...props} />
@@ -35,7 +33,7 @@ const Form = forwardRef<
 Form.displayName = FormPrimitive.Form.displayName;
 
 const Field = forwardRef<
-  ElementRef<typeof FormPrimitive.Field>,
+  ComponentRef<typeof FormPrimitive.Field>,
   ComponentPropsWithRef<typeof FormPrimitive.Field>
 >(({ className, children, ...props }, ref) => (
   <FormPrimitive.Field className={cn(className)} ref={ref} {...props}>
@@ -46,7 +44,7 @@ const Field = forwardRef<
 Field.displayName = 'Field';
 
 const FieldMessage = forwardRef<
-  ElementRef<typeof FormPrimitive.Message>,
+  ComponentRef<typeof FormPrimitive.Message>,
   ComponentPropsWithRef<typeof FormPrimitive.Message>
 >(({ className, children, ...props }, ref) => (
   <FormPrimitive.Message className={cn(className)} ref={ref} {...props}>
@@ -60,7 +58,7 @@ interface FieldLabelProps extends ComponentPropsWithRef<typeof Label> {
   isRequired?: boolean;
 }
 
-const FieldLabel = forwardRef<ElementRef<typeof Label>, FieldLabelProps>(
+const FieldLabel = forwardRef<ComponentRef<typeof Label>, FieldLabelProps>(
   ({ className, children, isRequired, ...props }, ref) => (
     <Label
       className={cn('inline-flex w-full items-center justify-between', className)}
@@ -78,7 +76,7 @@ const FieldLabel = forwardRef<ElementRef<typeof Label>, FieldLabelProps>(
 FieldLabel.displayName = 'FieldLabel';
 
 const FieldControl = forwardRef<
-  ElementRef<typeof FormPrimitive.Control>,
+  ComponentRef<typeof FormPrimitive.Control>,
   ComponentPropsWithRef<typeof FormPrimitive.Control>
 >(({ className, children, ...props }, ref) => (
   <FormPrimitive.Control className={cn(className)} ref={ref} {...props}>
@@ -89,7 +87,7 @@ const FieldControl = forwardRef<
 FieldControl.displayName = 'FieldControl';
 
 const FormSubmit = forwardRef<
-  ElementRef<typeof FormPrimitive.Submit>,
+  ComponentRef<typeof FormPrimitive.Submit>,
   ComponentPropsWithRef<typeof FormPrimitive.Submit>
 >(({ className, children, ...props }, ref) => (
   <FormPrimitive.Submit className={cn(className)} ref={ref} {...props}>

core/components/ui/form/input/input.tsx

@@ -1,5 +1,5 @@
 import { AlertCircle } from 'lucide-react';
-import { ComponentPropsWithRef, ElementRef, forwardRef, ReactNode } from 'react';
+import { ComponentPropsWithRef, ComponentRef, forwardRef, ReactNode } from 'react';
 
 import { cn } from '~/lib/utils';
 
@@ -8,7 +8,7 @@ interface Props extends ComponentPropsWithRef<'input'> {
   icon?: ReactNode;
 }
 
-const Input = forwardRef<ElementRef<'input'>, Props>(
+const Input = forwardRef<ComponentRef<'input'>, Props>(
   ({ className, children, error = false, icon, type = 'text', ...props }, ref) => (
     <div className={cn('relative', className)}>
       <input

core/components/ui/form/pick-list/pick-list.tsx

@@ -1,5 +1,5 @@
 import * as RadioGroupPrimitive from '@radix-ui/react-radio-group';
-import { ComponentPropsWithRef, ElementRef, forwardRef, useId } from 'react';
+import { ComponentPropsWithRef, ComponentRef, forwardRef, useId } from 'react';
 
 import { Image } from '~/components/image';
 import { cn } from '~/lib/utils';
@@ -23,7 +23,7 @@ interface Props extends ComponentPropsWithRef<typeof RadioGroupPrimitive.Root> {
   items: Item[];
 }
 
-const PickList = forwardRef<ElementRef<typeof RadioGroupPrimitive.Root>, Props>(
+const PickList = forwardRef<ComponentRef<typeof RadioGroupPrimitive.Root>, Props>(
   ({ children, error = false, items, className, ...props }, ref) => {
     const id = useId();
 

core/components/ui/form/rectangle-list/rectangle-list.tsx

@@ -1,5 +1,5 @@
 import * as RadioGroupPrimitive from '@radix-ui/react-radio-group';
-import { ComponentPropsWithRef, ElementRef, forwardRef, useId } from 'react';
+import { ComponentPropsWithRef, ComponentRef, forwardRef, useId } from 'react';
 
 import { cn } from '~/lib/utils';
 
@@ -13,7 +13,7 @@ interface Props extends ComponentPropsWithRef<typeof RadioGroupPrimitive.Root> {
   items: Item[];
 }
 
-const RectangleList = forwardRef<ElementRef<typeof RadioGroupPrimitive.Root>, Props>(
+const RectangleList = forwardRef<ComponentRef<typeof RadioGroupPrimitive.Root>, Props>(
   ({ children, className, error = false, items, ...props }, ref) => {
     const id = useId();
 

core/components/ui/form/select/select.tsx

@@ -1,6 +1,6 @@
 import * as SelectPrimitive from '@radix-ui/react-select';
 import { Check, ChevronDown, ChevronDownIcon, ChevronUpIcon } from 'lucide-react';
-import { ComponentPropsWithRef, ElementRef, forwardRef, ReactNode, useId } from 'react';
+import { ComponentPropsWithRef, ComponentRef, forwardRef, ReactNode, useId } from 'react';
 
 import { cn } from '~/lib/utils';
 
@@ -17,7 +17,7 @@ interface Props extends ComponentPropsWithRef<typeof SelectPrimitive.Root> {
   placeholder?: string | ReactNode;
 }
 
-const Select = forwardRef<ElementRef<typeof SelectPrimitive.Trigger>, Props>(
+const Select = forwardRef<ComponentRef<typeof SelectPrimitive.Trigger>, Props>(
   ({ children, id: triggerId, label, options, placeholder, error = false, ...props }, ref) => {
     const id = useId();
 

core/components/ui/form/swatch/swatch.tsx

@@ -1,5 +1,5 @@
 import * as RadioGroupPrimitive from '@radix-ui/react-radio-group';
-import { ComponentPropsWithRef, ElementRef, forwardRef, useId } from 'react';
+import { ComponentPropsWithRef, ComponentRef, forwardRef, useId } from 'react';
 
 import { cn } from '~/lib/utils';
 
@@ -14,7 +14,7 @@ interface Props extends ComponentPropsWithRef<typeof RadioGroupPrimitive.Root> {
   swatches: Swatch[];
 }
 
-const Swatch = forwardRef<ElementRef<typeof RadioGroupPrimitive.Root>, Props>(
+const Swatch = forwardRef<ComponentRef<typeof RadioGroupPrimitive.Root>, Props>(
   ({ children, className, error = false, swatches, ...props }, ref) => {
     const id = useId();
 

core/components/ui/form/text-area/text-area.tsx

@@ -1,12 +1,12 @@
-import { ComponentPropsWithRef, ElementRef, forwardRef } from 'react';
+import { ComponentPropsWithRef, ComponentRef, forwardRef } from 'react';
 
 import { cn } from '~/lib/utils';
 
 interface Props extends ComponentPropsWithRef<'textarea'> {
   error?: boolean;
 }
 
-const TextArea = forwardRef<ElementRef<'textarea'>, Props>(
+const TextArea = forwardRef<ComponentRef<'textarea'>, Props>(
   ({ className, error = false, ...props }, ref) => {
     return (
       <textarea

core/components/ui/header/input.tsx

@@ -2,7 +2,7 @@
 
 import { Search, Loader2 as Spinner, X } from 'lucide-react';
 import { useTranslations } from 'next-intl';
-import { ComponentPropsWithRef, ElementRef, forwardRef } from 'react';
+import { ComponentPropsWithRef, ComponentRef, forwardRef } from 'react';
 
 import { Button } from '../button';
 
@@ -13,7 +13,7 @@ interface Props extends ComponentPropsWithRef<'input'> {
   showClear?: boolean;
 }
 
-export const Input = forwardRef<ElementRef<'input'>, Props>(
+export const Input = forwardRef<ComponentRef<'input'>, Props>(
   ({ className, pending, showClear, onClickClear, ...props }, ref) => {
     const t = useTranslations('Components.Header');
 

core/lib/bodl/bodl-events.d.ts

@@ -76,7 +76,7 @@ declare module '@bigcommerce/bodl-events' {
     private eventEmitter;
     private historyManager?;
     private updateBodl;
-    constructor(eventEmitter: EventEmitter, historyManager?: HistoryManager | undefined);
+    constructor(eventEmitter: EventEmitter, historyManager?: HistoryManager);
     emit(eventName: string, payload: BoldEventPayload): boolean;
     on(eventName: string, callback: (payload: BoldEventPayload) => void): this;
     off(eventName: string, callback: (payload: BoldEventPayload) => void): this;

core/lib/kv/adapters/bc.ts

@@ -25,7 +25,6 @@ class Kv {
     return value;
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters
   async mget<T extends unknown[]>(keys: string[]): Promise<{ [K in keyof T]: T[K] | null }> {
     const normalizedKeys = Array.isArray(keys) ? keys : [keys];
 

core/package.json

@@ -46,9 +46,9 @@
     "next": "15.0.4",
     "next-auth": "5.0.0-beta.25",
     "next-intl": "^3.26.0",
-    "react": "19.0.0-rc-5c56b873-20241107",
+    "react": "^19.0.0",
     "react-day-picker": "^8.10.0",
-    "react-dom": "19.0.0-rc-5c56b873-20241107",
+    "react-dom": "^19.0.0",
     "react-google-recaptcha": "^3.1.0",
     "react-hook-form": "^7.54.0",
     "react-hot-toast": "^2.4.1",
@@ -71,8 +71,8 @@
     "@types/gtag.js": "^0.0.20",
     "@types/lodash.debounce": "^4.0.9",
     "@types/node": "^20.17.9",
-    "@types/react": "npm:types-react@19.0.0-rc.1",
-    "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
+    "@types/react": "^19.0.1",
+    "@types/react-dom": "^19.0.1",
     "@types/react-google-recaptcha": "^2.1.9",
     "@types/uuid": "^10.0.0",
     "autoprefixer": "^10.4.20",

package.json

@@ -12,7 +12,7 @@
   "license": "MIT",
   "version": "0.1.0",
   "private": true,
-  "packageManager": "pnpm@9.7.0",
+  "packageManager": "pnpm@9.15.0",
   "scripts": {
     "dev": "dotenv -e .env.local -- turbo run dev",
     "build": "dotenv -e .env.local -- turbo run build",
@@ -25,11 +25,5 @@
     "dotenv-cli": "^7.4.4",
     "turbo": "^2.3.3",
     "typescript": "^5.7.2"
-  },
-  "pnpm": {
-    "overrides": {
-      "@types/react": "npm:[email protected]",
-      "@types/react-dom": "npm:[email protected]"
-    }
   }
 }