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

@@ -8,5 +8,6 @@ import { defaultLocale } from './default-locale';
*/
export const locales: string[] = [
defaultLocale,
'de', // German — primary locale for MyEasyCMS
// Add other locales here as needed. defaultLocale ('de') is already included above.
// 'en', // English (uncomment to enable)
];