Skip to content
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
26 changes: 13 additions & 13 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@
"@radix-ui/react-icons": "^1.3.0",
"@react-email/components": "^0.0.19",
"@react-email/render": "^0.0.15",
"@tabler/icons-react": "^3.36.1",
"@tabler/icons-react": "^3.41.1",
"@tailwindcss/typography": "^0.5.13",
"@tanstack/react-query": "^5.37.1",
"@tanstack/react-query": "^5.100.6",
"@tanstack/react-table": "^8.17.3",
"@total-typescript/ts-reset": "^0.5.1",
"@trpc/client": "next",
"@trpc/react-query": "next",
"@trpc/server": "next",
"@trpc/client": "^11.17.0",
"@trpc/react-query": "^11.17.0",
"@trpc/server": "^11.17.0",
"avvvatars-react": "^0.4.2",
"better-auth": "^1.2.0",
"date-fns": "^3.6.0",
"disposable-email-domains": "^1.0.62",
"framer-motion": "^11.2.10",
"lucide-react": "^0.379.0",
"minio": "^8.0.0",
"next": "16.1.5",
"minio": "^8.0.7",
"next": "16.2.4",
"next-themes": "^0.3.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.51.5",
"react-hook-form": "^7.74.0",
"server-only": "^0.0.1",
"sonner": "^1.4.41",
"superjson": "^2.2.1",
Expand All @@ -52,14 +52,14 @@
"devDependencies": {
"@formbase/tailwind": "workspace:*",
"@formbase/tsconfig": "workspace:*",
"@tailwindcss/postcss": "^4.1.18",
"@types/node": "^20.12.12",
"@types/react": "^18.3.2",
"@tailwindcss/postcss": "^4.2.4",
"@types/node": "^20.19.39",
"@types/react": "^18.3.28",
"@types/react-dom": "^18.3.0",
"dotenv": "^16.4.5",
"eslint-config-formbase": "workspace:*",
"postcss": "^8.4.38",
"postcss": "^8.5.12",
"shiki": "^1.6.3",
"tailwindcss": "^4.1.18"
"tailwindcss": "^4.2.4"
}
}
516 changes: 197 additions & 319 deletions bun.lock

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"tests"
],
"scripts": {
"app": "bun run dev --filter=web",
"app": "bun run dev --filter=@formbase/web",
"build": "turbo build",
"clean": "rimraf --glob **/node_modules **/dist **/.turbo **/.next **/.astro **/.eslintcache bun.lock **/.tsbuildinfo **/test-results",
"d": "bun install && bun docker:start && bun run dev",
Expand All @@ -27,24 +27,24 @@
},
"devDependencies": {
"@formbase/tsconfig": "workspace:*",
"@ianvs/prettier-plugin-sort-imports": "^4.2.1",
"@types/eslint": "^8.56.10",
"@typescript-eslint/eslint-plugin": "^7.10.0",
"@typescript-eslint/parser": "^7.10.0",
"eslint": "^8.57.0",
"@ianvs/prettier-plugin-sort-imports": "^4.7.1",
"@types/eslint": "^8.56.12",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"eslint": "^8.57.1",
"eslint-config-formbase": "workspace:*",
"eslint-plugin-eslint-comments": "^3.2.0",
"prettier": "^3.2.5",
"prettier": "^3.8.3",
"prettier-plugin-astro": "^0.13.0",
"prettier-plugin-curly": "^0.2.1",
"prettier-plugin-jsdoc": "^1.3.0",
"prettier-plugin-packagejson": "^2.5.0",
"prettier-plugin-curly": "^0.2.2",
"prettier-plugin-jsdoc": "^1.8.0",
"prettier-plugin-packagejson": "^2.5.22",
"prettier-plugin-tailwindcss": "^0.5.14",
"rimraf": "^5.0.7",
"turbo": "^2.0.0",
"rimraf": "^5.0.10",
"turbo": "^2.9.6",
"typescript": "5.8.2"
},
"packageManager": "bun@1.3.2",
"packageManager": "bun@1.3.11",
"dependencies": {
"disposable-email-domains": "^1.0.62"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"@formbase/db": "workspace:*",
"@formbase/env": "workspace:*",
"@formbase/utils": "workspace:*",
"@trpc/server": "next",
"@trpc/server": "^11.17.0",
"superjson": "^2.2.1",
"trpc-to-openapi": "^2.0.0",
"zod": "^3.23.8"
},
"devDependencies": {
"@formbase/tsconfig": "workspace:*",
"@types/node": "^20.12.12",
"@types/node": "^20.19.39",
"eslint-config-formbase": "workspace:*"
}
}
6 changes: 3 additions & 3 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
"@formbase/env": "workspace:*",
"@formbase/utils": "workspace:*",
"better-auth": "^1.2.0",
"next": "16.1.5",
"next": "16.2.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"zod": "^3.23.8"
},
"devDependencies": {
"@formbase/tsconfig": "workspace:*",
"@types/node": "^20.12.12",
"@types/react": "^18.3.2",
"@types/node": "^20.19.39",
"@types/react": "^18.3.28",
"@types/react-dom": "^18.3.0",
"eslint-config-formbase": "workspace:*"
}
Expand Down
12 changes: 6 additions & 6 deletions packages/config/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
"typecheck": "tsc --noEmit --tsBuildInfoFile .tsbuildinfo"
},
"dependencies": {
"@typescript-eslint/eslint-plugin": "^7.10.0",
"@typescript-eslint/parser": "^7.10.0"
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0"
},
"devDependencies": {
"@formbase/tsconfig": "workspace:*",
"astro-eslint-parser": "^1.0.2",
"eslint-config-next": "^16.1.1",
"astro-eslint-parser": "^1.4.0",
"eslint-config-next": "^16.2.4",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^4.6.2"
}
}
4 changes: 2 additions & 2 deletions packages/config/tailwind/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"@tailwindcss/container-queries": "^0.1.1",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.13",
"tailwindcss": "^4.1.18",
"tailwindcss": "^4.2.4",
"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
"@formbase/tsconfig": "workspace:*",
"@types/node": "^20.12.12",
"@types/node": "^20.19.39",
"eslint-config-formbase": "workspace:*"
}
}
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
},
"devDependencies": {
"@formbase/tsconfig": "workspace:*",
"@microsoft/api-extractor": "^7.47.8",
"@types/node": "^20.12.12",
"@microsoft/api-extractor": "^7.58.7",
"@types/node": "^20.19.39",
"eslint-config-formbase": "workspace:*",
"tsup": "^8.0.2"
}
Expand Down
5 changes: 2 additions & 3 deletions packages/email/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
},
"devDependencies": {
"@formbase/tsconfig": "workspace:*",
"@types/node": "^20.12.12",
"@types/nodemailer": "^6.4.17",
"@types/node": "^20.19.39",
"@types/nodemailer": "^6.4.23",
"eslint-config-formbase": "workspace:*"
}
}

2 changes: 1 addition & 1 deletion packages/env/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"devDependencies": {
"@formbase/tsconfig": "workspace:*",
"@types/node": "^20.12.12",
"@types/node": "^20.19.39",
"eslint-config-formbase": "workspace:*"
}
}
22 changes: 11 additions & 11 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"@base-ui/react": "^1.0.0",
"@hookform/resolvers": "^3.4.2",
"@tabler/icons-react": "^3.36.1",
"@tabler/icons-react": "^3.41.1",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "^1.1.1",
Expand All @@ -25,13 +25,13 @@
"embla-carousel-react": "^8.6.0",
"input-otp": "^1.4.2",
"react": "^18.3.1",
"react-day-picker": "^9.13.0",
"react-day-picker": "^9.14.0",
"react-dom": "^18.3.1",
"react-hook-form": "^7.51.5",
"react-resizable-panels": "^4.2.0",
"react-hook-form": "^7.74.0",
"react-resizable-panels": "^4.10.0",
"recharts": "^2.15.4",
"sonner": "^2.0.7",
"tailwind-merge": "^3.4.0",
"tailwind-merge": "^3.5.0",
"tw-animate-css": "^1.4.0",
"vaul": "^1.1.2",
"zod": "^3.23.8"
Expand All @@ -40,14 +40,14 @@
"@formbase/tailwind": "workspace:*",
"@formbase/tsconfig": "workspace:*",
"@formbase/utils": "workspace:*",
"@microsoft/api-extractor": "^7.43.7",
"@tailwindcss/postcss": "^4.1.18",
"@types/node": "^20.12.12",
"@types/react": "^18.3.2",
"@microsoft/api-extractor": "^7.58.7",
"@tailwindcss/postcss": "^4.2.4",
"@types/node": "^20.19.39",
"@types/react": "^18.3.28",
"@types/react-dom": "^18.3.0",
"eslint-config-formbase": "workspace:*",
"pkg-types": "^1.1.1",
"postcss": "^8.4.38",
"tailwindcss": "^4.1.18"
"postcss": "^8.5.12",
"tailwindcss": "^4.2.4"
}
}
27 changes: 12 additions & 15 deletions packages/ui/primitives/form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import * as React from 'react';

import type { ControllerProps, FieldPath, FieldValues } from 'react-hook-form';

import { useRender } from '@base-ui/react/use-render';
import { Controller, FormProvider, useFormContext } from 'react-hook-form';

import { Label } from '../primitives/label';
Expand Down Expand Up @@ -97,23 +96,21 @@ function FormLabel({
);
}

function FormControl({
render,
...props
}: useRender.ComponentProps<'div'>) {
type FormControlProps = React.HTMLAttributes<HTMLElement> & {
children: React.ReactElement<React.HTMLAttributes<HTMLElement>>;
};

function FormControl({ children, ...props }: FormControlProps) {
const { error, formItemId, formDescriptionId, formMessageId } =
useFormField();

return useRender({
render,
props: {
id: formItemId,
'aria-describedby': !error
? formDescriptionId
: `${formDescriptionId} ${formMessageId}`,
'aria-invalid': !!error,
...props,
},
return React.cloneElement(children, {
...props,
id: formItemId,
'aria-describedby': !error
? formDescriptionId
: `${formDescriptionId} ${formMessageId}`,
'aria-invalid': !!error,
});
}

Expand Down
6 changes: 3 additions & 3 deletions packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
},
"dependencies": {
"clsx": "^2.1.1",
"nanoid": "^5.0.9",
"tailwind-merge": "^2.3.0"
"nanoid": "^5.1.9",
"tailwind-merge": "^2.6.1"
},
"devDependencies": {
"@formbase/env": "workspace:*",
"@formbase/tsconfig": "workspace:*",
"@types/node": "^20.12.12",
"@types/node": "^20.19.39",
"eslint-config-formbase": "workspace:*"
}
}
22 changes: 12 additions & 10 deletions tests/e2e/auth.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,18 @@ test.describe('Authentication', () => {
await page.goto('/login');

// Check page title and description
await expect(page.getByText('Formbase Log In')).toBeVisible();
await expect(
page.getByText('Log in to your account to access your dashboard'),
page.getByRole('heading', { name: 'Sign in to your account' }),
).toBeVisible();
await expect(
page.getByRole('link', { name: 'Sign up' }),
).toBeVisible();

// Check form elements
await expect(page.getByPlaceholder('email@example.com')).toBeVisible();
await expect(page.getByPlaceholder('********')).toBeVisible();
await expect(
page.getByRole('button', { name: 'Log In', exact: true }),
page.getByRole('button', { name: 'Sign in', exact: true }),
).toBeVisible();
});

Expand All @@ -28,7 +30,7 @@ test.describe('Authentication', () => {
.getByPlaceholder('email@example.com')
.fill('invalid@example.com');
await page.getByPlaceholder('********').fill('wrongpassword');
await page.getByRole('button', { name: 'Log In', exact: true }).click();
await page.getByRole('button', { name: 'Sign in', exact: true }).click();

// Wait for error message
await expect(page.getByText(/invalid|error|incorrect/i)).toBeVisible({
Expand All @@ -43,7 +45,7 @@ test.describe('Authentication', () => {
.getByPlaceholder('email@example.com')
.fill(E2E_TEST_USER.email);
await page.getByPlaceholder('********').fill(E2E_TEST_USER.password);
await page.getByRole('button', { name: 'Log In', exact: true }).click();
await page.getByRole('button', { name: 'Sign in', exact: true }).click();

// Should redirect to dashboard
await page.waitForURL(/.*dashboard/, { timeout: 15000 });
Expand All @@ -58,7 +60,7 @@ test.describe('Authentication', () => {
.getByPlaceholder('email@example.com')
.fill(E2E_TEST_USER.email);
await page.getByPlaceholder('********').fill(E2E_TEST_USER.password);
await page.getByRole('button', { name: 'Log In', exact: true }).click();
await page.getByRole('button', { name: 'Sign in', exact: true }).click();
await page.waitForURL(/.*dashboard/, { timeout: 15000 });

// Now try to visit login page again
Expand All @@ -77,15 +79,15 @@ test.describe('Authentication', () => {
.getByPlaceholder('email@example.com')
.fill(E2E_TEST_USER.email);
await page.getByPlaceholder('********').fill(E2E_TEST_USER.password);
await page.getByRole('button', { name: 'Log In', exact: true }).click();
await page.getByRole('button', { name: 'Sign in', exact: true }).click();
await page.waitForURL(/.*dashboard/, { timeout: 15000 });

// Open user menu dropdown (avatar button in header showing user initials)
const userMenuButton = page.locator('header button').last();
await userMenuButton.click();

// Click logout in the dropdown menu (it's a button, not menuitem)
await page.getByRole('button', { name: /sign\s*out/i }).click();
// click sign out in the user menu
await page.getByRole('menuitem', { name: /sign\s*out/i }).click();

// Confirm the sign out dialog
await page.getByRole('button', { name: 'Okay' }).click();
Expand Down Expand Up @@ -114,7 +116,7 @@ test.describe('Authentication', () => {
.getByPlaceholder('email@example.com')
.fill(E2E_TEST_USER.email);
await page.getByPlaceholder('********').fill(E2E_TEST_USER.password);
await page.getByRole('button', { name: 'Log In', exact: true }).click();
await page.getByRole('button', { name: 'Sign in', exact: true }).click();
await page.waitForURL(/.*dashboard/, { timeout: 15000 });

// Dashboard should show the main heading
Expand Down
Loading
Loading