zaid.marzguioui/myeasycms-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: force Zod v3, replace deprecated Supabase vars in local dev, updated Dev Tool (#425)

Browse Source 
* - Replaced Supabase local environment variables
- Updates packages
- Force Zod v3 if peer deps require Zod v4
- Updated Dev Tool

* Use correct field for pnpm overrides

* Fix inaccuracies in the Agents files; fix type casting in `useForm`

* Updated lock file

* Be more specific when intercepting POST request in flaky e2e test
This commit is contained in:
Giancarlo Buomprisco
2025-12-13 12:20:15 +08:00
committed by GitHub
parent cba62d21ae
commit 9681e1f90b
31 changed files with 414 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/dev-tool/app/lib/connectivity-service.ts
View File

@@ -95,8 +95,7 @@ class ConnectivityService {
try {
const response = await fetch(endpoint, {
headers: {
apikey,
Authorization: `Bearer ${adminKey}`,
apikey: adminKey,
},
});

63
apps/dev-tool/app/variables/components/app-environment-variables-manager.tsx
View File

@@ -73,36 +73,51 @@ function EnvListDisplay({
}
>
<div className="bg-muted/50 sticky top-0 flex flex-col gap-y-1 rounded-lg p-4">
<div className={'sticky top-0 h-full overflow-auto pb-16 break-all'}>
<div
className={
'sticky top-0 flex h-full flex-col overflow-auto pb-16 break-all'
}
>
{groups.map((group) => (
<div className="mb-4" key={group.category}>
<span># {group.category}</span>
{group.variables.map((variable) => {
const model = envVariables.find(
(item) => item.name === variable.key,
);
<div className="flex flex-col gap-y-1">
{group.variables.map((variable) => {
const model = envVariables.find(
(item) => item.name === variable.key,
);
const isSecret = model?.secret;
const value =
isSecret && hideSecret
? '••••••••'
: variable.effectiveValue;
const isSecret = model?.secret;
return (
<Link
href={`#var_${variable.key.toLowerCase()}`}
className={cn('block transition-all hover:underline', {
['text-orange-500']: variable.isOverridden,
['text-destructive']: !variable.validation.success,
['opacity-20']: !variable.isVisible,
})}
key={variable.key}
>
<span>{variable.key}</span>: {value}
</Link>
);
})}
const value =
isSecret && hideSecret
? '••••••••'
: variable.effectiveValue;
return (
<Link
href={`#var_${variable.key.toLowerCase()}`}
className={cn(
'hover:bg-accent block p-px transition-all',
{
['text-orange-500']: variable.isOverridden,
['text-destructive']: !variable.validation.success,
['opacity-20']: !variable.isVisible,
},
)}
key={variable.key}
>
<b>{variable.key}</b>:{' '}
{value && (
<span className={'bg-muted rounded p-0.5'}>
{value}
</span>
)}
</Link>
);
})}
</div>
</div>
))}
</div>

2
apps/dev-tool/app/variables/lib/env-variables-model.ts
View File

@@ -411,7 +411,6 @@ export const envVariables: EnvVariableModel[] = [
name: 'NEXT_PUBLIC_SUPABASE_ANON_KEY',
description: 'Your Supabase anonymous API key.',
category: 'Supabase',
required: true,
type: 'string',
deprecated: {
reason: 'Replaced by new JWT signing key system',
@@ -450,7 +449,6 @@ export const envVariables: EnvVariableModel[] = [
description: 'Your Supabase service role key (keep this secret!).',
category: 'Supabase',
secret: true,
required: true,
type: 'string',
deprecated: {
reason: 'Renamed for consistency with new JWT signing key system',

6
apps/dev-tool/package.json
View File

@@ -4,7 +4,7 @@
"private": true,
"scripts": {
"clean": "git clean -xdf .next .turbo node_modules",
"dev": "next dev --port=3010 | pino-pretty -c",
"dev": "next dev --port=3011 | pino-pretty -c",
"format": "prettier --check --write \"**/*.{ts,tsx}\" --ignore-path=\"../../.prettierignore\""
},
"dependencies": {
@@ -13,7 +13,7 @@
"@hookform/resolvers": "^5.2.2",
"@tanstack/react-query": "catalog:",
"ai": "5.0.108",
"lucide-react": "^0.556.0",
"lucide-react": "^0.561.0",
"next": "catalog:",
"nodemailer": "^7.0.11",
"react": "catalog:",
@@ -29,7 +29,7 @@
"@kit/shared": "workspace:*",
"@kit/tsconfig": "workspace:*",
"@kit/ui": "workspace:*",
"@tailwindcss/postcss": "^4.1.17",
"@tailwindcss/postcss": "^4.1.18",
"@types/node": "catalog:",
"@types/nodemailer": "7.0.4",
"@types/react": "catalog:",

4
apps/e2e/tests/team-accounts/team-accounts.po.ts
View File

@@ -165,7 +165,9 @@ export class TeamAccountsPageObject {
await this.page.click(`[data-test="role-option-${newRole}"]`);
// Wait for the update to complete and page to reload
const response = this.page.waitForResponse('**/members');
const response = this.page.waitForResponse(response => {
return response.url().includes('members') && response.request().method() === 'POST'
});
return Promise.all([
this.page.click('[data-test="confirm-update-member-role"]'),

4
apps/web/.env.development
View File

@@ -3,8 +3,8 @@
# SUPABASE
NEXT_PUBLIC_SUPABASE_URL=http://127.0.0.1:54321
NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0
SUPABASE_SERVICE_ROLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU
NEXT_PUBLIC_SUPABASE_PUBLIC_KEY=sb_publishable_ACJWlzQHlZjBrEguHvfOxg_3BJgxAaH
SUPABASE_SECRET_KEY=sb_secret_N7UND0UgjKTVK-Uodkm0Hg_xSvEMPvz
## THIS IS FOR DEVELOPMENT ONLY - DO NOT USE IN PRODUCTION
SUPABASE_DB_WEBHOOK_SECRET=WEBHOOKSECRET

4
apps/web/.env.test
View File

@@ -3,8 +3,8 @@ NEXT_PUBLIC_CI=true
# SUPABASE
NEXT_PUBLIC_SUPABASE_URL=http://127.0.0.1:54321
NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0
SUPABASE_SERVICE_ROLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU
NEXT_PUBLIC_SUPABASE_PUBLIC_KEY=sb_publishable_ACJWlzQHlZjBrEguHvfOxg_3BJgxAaH
SUPABASE_SECRET_KEY=sb_secret_N7UND0UgjKTVK-Uodkm0Hg_xSvEMPvz
## THIS IS FOR DEVELOPMENT ONLY - DO NOT USE IN PRODUCTION
SUPABASE_DB_WEBHOOK_SECRET=WEBHOOKSECRET

4
apps/web/package.json
View File

@@ -60,14 +60,14 @@
"@tanstack/react-query": "catalog:",
"@tanstack/react-table": "^8.21.3",
"date-fns": "^4.1.0",
"lucide-react": "^0.556.0",
"lucide-react": "^0.561.0",
"next": "catalog:",
"next-sitemap": "^4.2.3",
"next-themes": "0.4.6",
"react": "catalog:",
"react-dom": "catalog:",
"react-hook-form": "^7.68.0",
"react-i18next": "^16.4.0",
"react-i18next": "^16.5.0",
"recharts": "2.15.3",
"tailwind-merge": "^3.4.0",
"tw-animate-css": "catalog:",

7
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "next-supabase-saas-kit-turbo",
"version": "2.21.14",
"version": "2.21.15",
"private": true,
"sideEffects": false,
"engines": {
@@ -38,6 +38,11 @@
},
"prettier": "@kit/prettier-config",
"packageManager": "pnpm@10.19.0",
"pnpm": {
"overrides": {
"zod": "3.25.76"
}
},
"devDependencies": {
"@manypkg/cli": "^0.25.1",
"@turbo/gen": "^2.6.3",

4
packages/billing/gateway/package.json
View File

@@ -29,11 +29,11 @@
"@supabase/supabase-js": "catalog:",
"@types/react": "catalog:",
"date-fns": "^4.1.0",
"lucide-react": "^0.556.0",
"lucide-react": "^0.561.0",
"next": "catalog:",
"react": "catalog:",
"react-hook-form": "^7.68.0",
"react-i18next": "^16.4.0",
"react-i18next": "^16.5.0",
"zod": "catalog:"
},
"typesVersions": {

4
packages/features/accounts/package.json
View File

@@ -38,13 +38,13 @@
"@tanstack/react-query": "catalog:",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"lucide-react": "^0.556.0",
"lucide-react": "^0.561.0",
"next": "catalog:",
"next-themes": "0.4.6",
"react": "catalog:",
"react-dom": "catalog:",
"react-hook-form": "^7.68.0",
"react-i18next": "^16.4.0",
"react-i18next": "^16.5.0",
"zod": "catalog:"
},
"prettier": "@kit/prettier-config",

2
packages/features/admin/package.json
View File

@@ -24,7 +24,7 @@
"@tanstack/react-query": "catalog:",
"@tanstack/react-table": "^8.21.3",
"@types/react": "catalog:",
"lucide-react": "^0.556.0",
"lucide-react": "^0.561.0",
"next": "catalog:",
"react": "catalog:",
"react-dom": "catalog:",

2
packages/features/admin/src/components/admin-create-user-dialog.tsx
View File

@@ -42,7 +42,7 @@ export function AdminCreateUserDialog(props: React.PropsWithChildren) {
const [error, setError] = useState<string | null>(null);
const [open, setOpen] = useState(false);
const form = useForm<CreateUserSchemaType>({
const form = useForm({
resolver: zodResolver(CreateUserSchema),
defaultValues: {
email: '',

4
packages/features/auth/package.json
View File

@@ -32,10 +32,10 @@
"@supabase/supabase-js": "catalog:",
"@tanstack/react-query": "catalog:",
"@types/react": "catalog:",
"lucide-react": "^0.556.0",
"lucide-react": "^0.561.0",
"next": "catalog:",
"react-hook-form": "^7.68.0",
"react-i18next": "^16.4.0",
"react-i18next": "^16.5.0",
"sonner": "^2.0.7",
"zod": "catalog:"
},

2
packages/features/auth/src/components/password-reset-request-container.tsx
View File

@@ -39,7 +39,7 @@ export function PasswordResetRequestContainer(params: {
const error = resetPasswordMutation.error;
const success = resetPasswordMutation.data;
const form = useForm<z.infer<typeof PasswordResetSchema>>({
const form = useForm({
resolver: zodResolver(PasswordResetSchema),
defaultValues: {
email: '',

2
packages/features/auth/src/components/password-sign-in-form.tsx
View File

@@ -40,7 +40,7 @@ export function PasswordSignInForm({
}) {
const { t } = useTranslation('auth');
const form = useForm<z.infer<typeof PasswordSignInSchema>>({
const form = useForm({
resolver: zodResolver(PasswordSignInSchema),
defaultValues: {
email: '',

3
packages/features/auth/src/components/update-password-form.tsx
View File

@@ -7,7 +7,6 @@ import { ExclamationTriangleIcon } from '@radix-ui/react-icons';
import { useForm } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
import { toast } from 'sonner';
import type { z } from 'zod';
import { useUpdateUser } from '@kit/supabase/hooks/use-update-user-mutation';
import { Alert, AlertDescription, AlertTitle } from '@kit/ui/alert';
@@ -34,7 +33,7 @@ export function UpdatePasswordForm(params: {
const router = useRouter();
const { t } = useTranslation();
const form = useForm<z.infer<typeof PasswordResetSchema>>({
const form = useForm({
resolver: zodResolver(PasswordResetSchema),
defaultValues: {
password: '',

4
packages/features/notifications/package.json
View File

@@ -22,10 +22,10 @@
"@supabase/supabase-js": "catalog:",
"@tanstack/react-query": "catalog:",
"@types/react": "catalog:",
"lucide-react": "^0.556.0",
"lucide-react": "^0.561.0",
"react": "catalog:",
"react-dom": "catalog:",
"react-i18next": "^16.4.0"
"react-i18next": "^16.5.0"
},
"prettier": "@kit/prettier-config",
"typesVersions": {

4
packages/features/team-accounts/package.json
View File

@@ -43,12 +43,12 @@
"@types/react-dom": "catalog:",
"class-variance-authority": "^0.7.1",
"date-fns": "^4.1.0",
"lucide-react": "^0.556.0",
"lucide-react": "^0.561.0",
"next": "catalog:",
"react": "catalog:",
"react-dom": "catalog:",
"react-hook-form": "^7.68.0",
"react-i18next": "^16.4.0",
"react-i18next": "^16.5.0",
"zod": "catalog:"
},
"prettier": "@kit/prettier-config",

3
packages/features/team-accounts/src/components/create-team-account-dialog.tsx
View File

@@ -6,7 +6,6 @@ import { isRedirectError } from 'next/dist/client/components/redirect-error';
import { zodResolver } from '@hookform/resolvers/zod';
import { useForm } from 'react-hook-form';
import { z } from 'zod';
import { Alert, AlertDescription, AlertTitle } from '@kit/ui/alert';
import { Button } from '@kit/ui/button';
@@ -65,7 +64,7 @@ function CreateOrganizationAccountForm(props: { onClose: () => void }) {
const [error, setError] = useState<boolean>();
const [pending, startTransition] = useTransition();
const form = useForm<z.infer<typeof CreateTeamSchema>>({
const form = useForm({
defaultValues: {
name: '',
},

6
packages/features/team-accounts/src/components/members/transfer-ownership-dialog.tsx
View File

@@ -75,11 +75,7 @@ function TransferOrganizationOwnershipForm({
const [error, setError] = useState<boolean>();
const { data: user } = useUser();
const form = useForm<{
accountId: string;
userId: string;
otp: string;
}>({
const form = useForm({
resolver: zodResolver(TransferOwnershipConfirmationSchema),
defaultValues: {
accountId,

2
packages/i18n/package.json
View File

@@ -24,7 +24,7 @@
"next": "catalog:",
"react": "catalog:",
"react-dom": "catalog:",
"react-i18next": "^16.4.0"
"react-i18next": "^16.5.0"
},
"dependencies": {
"i18next": "25.7.2",

2
packages/monitoring/sentry/package.json
View File

@@ -16,7 +16,7 @@
"./config/server": "./src/sentry.client.server.ts"
},
"dependencies": {
"@sentry/nextjs": "^10.29.0"
"@sentry/nextjs": "^10.30.0"
},
"devDependencies": {
"@kit/eslint-config": "workspace:*",

4
packages/otp/src/components/verify-otp-form.tsx
View File

@@ -69,7 +69,7 @@ export function VerifyOtpForm({
const [, setVerificationSuccess] = useState(false);
// Email form
const emailForm = useForm<z.infer<typeof SendOtpSchema>>({
const emailForm = useForm({
resolver: zodResolver(SendOtpSchema),
defaultValues: {
email,
@@ -77,7 +77,7 @@ export function VerifyOtpForm({
});
// OTP verification form
const otpForm = useForm<z.infer<typeof VerifyOtpSchema>>({
const otpForm = useForm({
resolver: zodResolver(VerifyOtpSchema),
defaultValues: {
otp: '',

4
packages/ui/AGENTS.md
View File

@@ -24,10 +24,10 @@ NB: imports must follow the convention "@kit/ui/<name>", no matter the folder th
- Use **Tailwind CSS v4** with semantic classes
- Prefer Shadcn-ui classes like `bg-background`, `text-muted-foreground`
- Use `cn()` utility from `@kit/ui/cn` for class merging
- Use `cn()` utility from `@kit/ui/utils` for class merging
```tsx
import { cn } from '@kit/ui/cn';
import { cn } from '@kit/ui/utils';
function MyComponent({ className }) {
return (

4
packages/ui/CLAUDE.md
View File

@@ -21,10 +21,10 @@ import { Trans } from '@kit/ui/trans';
- Use **Tailwind CSS v4** with semantic classes
- Prefer Shadcn-ui classes like `bg-background`, `text-muted-foreground`
- Use `cn()` utility from `@kit/ui/cn` for class merging
- Use `cn()` utility from `@kit/ui/utils` for class merging
```tsx
import { cn } from '@kit/ui/cn';
import { cn } from '@kit/ui/utils';
function MyComponent({ className }) {
return (

4
packages/ui/package.json
View File

@@ -14,7 +14,7 @@
"clsx": "^2.1.1",
"cmdk": "1.1.1",
"input-otp": "1.4.2",
"lucide-react": "^0.556.0",
"lucide-react": "^0.561.0",
"radix-ui": "1.4.3",
"react-dropzone": "^14.3.8",
"react-top-loading-bar": "3.0.2",
@@ -38,7 +38,7 @@
"prettier": "^3.7.4",
"react-day-picker": "^9.12.0",
"react-hook-form": "^7.68.0",
"react-i18next": "^16.4.0",
"react-i18next": "^16.5.0",
"sonner": "^2.0.7",
"tailwindcss": "catalog:",
"tailwindcss-animate": "^1.0.7",

2
packages/ui/src/makerkit/marketing/newsletter-signup.tsx
View File

@@ -34,7 +34,7 @@ export function NewsletterSignup({
className,
...props
}: NewsletterSignupProps) {
const form = useForm<NewsletterFormValues>({
const form = useForm({
resolver: zodResolver(NewsletterFormSchema),
defaultValues: {
email: '',

653
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

10
pnpm-workspace.yaml
View File

@@ -7,19 +7,19 @@ catalog:
'@next/bundle-analyzer': 16.0.10
'@next/eslint-plugin-next': 16.0.10
'@supabase/supabase-js': 2.87.1
'@tailwindcss/postcss': 4.1.17
'@tailwindcss/postcss': 4.1.18
'@tanstack/react-query': 5.90.12
'@types/node': 24.10.2
'@types/node': 25.0.1
'@types/react': 19.2.7
'@types/react-dom': 19.2.3
eslint-config-next: 16.0.10
next: 16.0.10
react: 19.2.3
react-dom: 19.2.3
supabase: 2.65.7
tailwindcss: 4.1.17
supabase: 2.67.0
tailwindcss: 4.1.18
tw-animate-css: 1.4.0
zod: 3.25.74
zod: 3.25.76
onlyBuiltDependencies:
- '@tailwindcss/oxide'