fix: merge upstream, fix locale duplicate, add missing catalog deps
Some checks failed
Workflow / ʦ TypeScript (push) Failing after 12m20s
Workflow / ⚫️ Test (push) Has been skipped

- Merged upstream/main (MakerKit latest fixes)
- Fixed locales.tsx: removed hardcoded 'de' duplicate (defaultLocale already = 'de')
- Added missing pnpm catalog entries for custom packages:
  @measured/puck, @react-pdf/renderer, @tiptap/*, exceljs, iban, papaparse
- CACHE_BUST=7 for full rebuild
This commit is contained in:
Zaid Marzguioui
2026-04-01 11:02:06 +02:00
parent 8d9d62ca56
commit 1687735de0
4 changed files with 2268 additions and 11 deletions

View File

@@ -13,20 +13,26 @@ catalog:
'@makerkit/data-loader-supabase-nextjs': ^1.2.5
'@manypkg/cli': ^0.25.1
'@markdoc/markdoc': ^0.5.7
'@measured/puck': ^0.20.2
'@marsidev/react-turnstile': ^1.5.0
'@modelcontextprotocol/sdk': 1.28.0
'@next/bundle-analyzer': 16.2.1
'@nosecone/next': 1.3.1
'@playwright/test': ^1.58.2
'@react-email/components': 1.0.10
'@react-pdf/renderer': ^4.3.2
'@sentry/nextjs': 10.46.0
'@stripe/react-stripe-js': 6.1.0
'@stripe/stripe-js': 9.0.1
'@supabase/ssr': ^0.10.0
'@supabase/supabase-js': 2.101.0
'@types/papaparse': ^5.5.0
'@tailwindcss/postcss': ^4.2.2
'@tanstack/react-query': 5.95.2
'@tanstack/react-table': ^8.21.3
'@tiptap/pm': ^3.21.0
'@tiptap/react': ^3.21.0
'@tiptap/starter-kit': ^3.21.0
'@turbo/gen': ^2.9.1
'@types/node': 25.5.0
'@types/nodemailer': 7.0.11
@@ -41,7 +47,9 @@ catalog:
date-fns: ^4.1.0
dotenv: 17.3.1
embla-carousel-react: ^8.6.0
exceljs: ^4.4.0
input-otp: ^1.4.2
iban: ^0.0.14
lucide-react: 1.7.0
nanoid: ^5.1.7
next: 16.2.1
@@ -54,6 +62,7 @@ catalog:
nodemailer: 8.0.4
oxfmt: ^0.42.0
oxlint: ^1.57.0
papaparse: ^5.5.3
pino: 10.3.1
pino-pretty: 13.0.0
postgres: 3.4.8