Resolve merge conflicts: keep React 19 patterns without forwardRef

- Maintained React 19 patterns in all form components (no forwardRef usage)
- Preserved all other changes from medusa-forms branch
- Components now use FC<Props> with destructured ref parameter
- All form components maintain consistent React 19 ref handling pattern

Author: codegen-sh[bot]

.cursor/rules/monorepo-organization.mdc

@@ -1,6 +1,7 @@
 ---
-type: Always
 description: Monorepo structure and import conventions for the lambda-curry/forms repository
+globs: 
+alwaysApply: false
 ---
 
 You are an expert in monorepo architecture, package management, and TypeScript module organization.
@@ -169,7 +170,7 @@ src/
 {
   "peerDependencies": {
     "react": "^19.0.0",
-    "remix-hook-form": "7.0.0"
+    "remix-hook-form": "7.0.1"
   },
   "dependencies": {
     "@radix-ui/react-slot": "^1.1.2",

.yarn/releases/yarn-4.9.1.cjs

@@ -1 +1,3 @@
 nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.9.1.cjs

.yarnrc.yml

@@ -12,8 +12,7 @@ const config: StorybookConfig = {
   stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
   addons: [
     getAbsolutePath('@storybook/addon-links'),
-    getAbsolutePath('@storybook/addon-essentials'),
-    getAbsolutePath('@storybook/addon-interactions'),
+    getAbsolutePath("@storybook/addon-docs")
   ],
   framework: {
     name: getAbsolutePath('@storybook/react-vite'),

apps/docs/.storybook/main.ts

@@ -1,4 +1,4 @@
-import type { Preview } from '@storybook/react';
+import type { Preview } from '@storybook/react-vite';
 import '../src/main.css';
 
 const preview: Preview = {

apps/docs/.storybook/preview.ts

@@ -11,29 +11,30 @@
     "test:local": "test-storybook"
   },
   "dependencies": {
+    "@hookform/error-message": "^2.0.0",
+    "@hookform/resolvers": "^3.9.1",
     "@lambdacurry/forms": "*",
-    "@storybook/addon-essentials": "^8.6.7",
-    "@storybook/addon-interactions": "^8.6.7",
-    "@storybook/addon-links": "^8.6.7",
-    "@storybook/blocks": "^8.6.7",
-    "@storybook/react": "^8.6.7",
-    "@storybook/react-vite": "^8.6.7",
-    "@storybook/test": "^8.6.7",
-    "storybook": "^8.6.7"
+    "@lambdacurry/medusa-forms": "*",
+    "@storybook/addon-links": "^9.0.1",
+    "@storybook/react-vite": "^9.0.1",
+    "react": "^19.0.0",
+    "react-hook-form": "^7.51.0",
+    "react-router": "^7.6.1",
+    "remix-hook-form": "^7.0.1",
+    "storybook": "^9.0.1"
   },
   "devDependencies": {
     "@react-router/dev": "^7.0.0",
+    "@storybook/addon-docs": "^9.0.1",
     "@storybook/test-runner": "^0.22.0",
     "@storybook/testing-library": "^0.2.2",
+    "@tailwindcss/postcss": "^4.1.8",
     "@tailwindcss/vite": "^4.0.0",
     "@types/react": "^19.0.0",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "autoprefixer": "^10.4.20",
     "http-server": "^14.1.1",
-    "react": "^19.0.0",
-    "react-router": "^7.0.0",
-    "react-router-dom": "^7.0.0",
     "start-server-and-test": "^2.0.11",
     "tailwindcss": "^4.0.0",
     "typescript": "^5.7.2",

apps/docs/package.json

@@ -1,6 +1,6 @@
+import { Outlet } from 'react-router';
 // Example of setting up the middleware in root.tsx
 import { unstable_extractFormDataMiddleware } from 'remix-hook-form/middleware';
-import { Outlet } from 'react-router-dom';
 
 // Export the middleware for React Router 7
 export const unstable_middleware = [unstable_extractFormDataMiddleware()];

apps/docs/src/examples/root-example.tsx

@@ -1,38 +1,25 @@
-import type { Decorator } from '@storybook/react';
+import type { Decorator } from '@storybook/react-vite';
 import type { ComponentType } from 'react';
 import {
   type ActionFunction,
-  type IndexRouteObject,
   type LinksFunction,
   type LoaderFunction,
   type MetaFunction,
-  type NonIndexRouteObject,
-  RouterProvider,
-  createMemoryRouter,
-} from 'react-router-dom';
+  createRoutesStub,
+} from 'react-router';
 
-export type StubRouteObject = StubIndexRouteObject | StubNonIndexRouteObject;
-
-interface StubNonIndexRouteObject
-  extends Omit<NonIndexRouteObject, 'loader' | 'action' | 'element' | 'errorElement' | 'children'> {
+export interface StubRouteObject {
+  path?: string;
+  index?: boolean;
   loader?: LoaderFunction;
   action?: ActionFunction;
-  children?: StubRouteObject[];
   meta?: MetaFunction;
   links?: LinksFunction;
-  // biome-ignore lint/suspicious/noExplicitAny: allow any here
+  // biome-ignore lint/suspicious/noExplicitAny: allow any here for Storybook compatibility
   Component?: ComponentType<any>;
-}
-
-interface StubIndexRouteObject
-  extends Omit<IndexRouteObject, 'loader' | 'action' | 'element' | 'errorElement' | 'children'> {
-  loader?: LoaderFunction;
-  action?: ActionFunction;
   children?: StubRouteObject[];
-  meta?: MetaFunction;
-  links?: LinksFunction;
-  // biome-ignore lint/suspicious/noExplicitAny: allow any here
-  Component?: ComponentType<any>;
+  // biome-ignore lint/suspicious/noExplicitAny: allow any here for Storybook compatibility
+  errorElement?: any;
 }
 
 interface RemixStubOptions {
@@ -42,34 +29,28 @@ interface RemixStubOptions {
 
 export const withReactRouterStubDecorator = (options: RemixStubOptions): Decorator => {
   const { routes, initialPath = '/' } = options;
-  // This outer function runs once when Storybook loads the story meta
 
   return (Story, context) => {
-    // This inner function runs when the story component actually renders
+    // Map routes to include the Story component if no Component is provided
     const mappedRoutes = routes.map((route) => ({
       ...route,
       Component: route.Component ?? (() => <Story {...context.args} />),
     }));
 
     // Get the base path (without existing query params from options)
     const basePath = initialPath.split('?')[0];
-    
+
     // Get the current search string from the actual browser window, if available
     // If not available, use a default search string with parameters needed for the data table
-    const currentWindowSearch = typeof window !== 'undefined' 
-      ? window.location.search 
-      : '?page=0&pageSize=10';
-    
+    const currentWindowSearch = typeof window !== 'undefined' ? window.location.search : '?page=0&pageSize=10';
+
     // Combine them for the initial entry
     const actualInitialPath = `${basePath}${currentWindowSearch}`;
 
-    // Create a memory router, initializing it with the path derived from the window's search params
-    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-    const router = createMemoryRouter(mappedRoutes as any, {
-      initialEntries: [actualInitialPath], // Use the path combined with window.location.search
-    });
+    // Use React Router's official createRoutesStub
+    const Stub = createRoutesStub(mappedRoutes);
 
-    return <RouterProvider router={router} />;
+    return <Stub initialEntries={[actualInitialPath]} />;
   };
 };