From e6eb1d887f64578e44ff0c0e60c535aa71982fd9 Mon Sep 17 00:00:00 2001 From: Jonas Hungershausen Date: Wed, 5 Feb 2025 09:01:07 +0100 Subject: [PATCH] chore: fix build issues --- package-lock.json | 8 ++++---- package.json | 2 +- packages/react/vite.config.mts | 3 ++- src/react-components/provider.tsx | 2 +- src/theme/consts.ts | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index c6f177ae8..f530c47b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "@nx/storybook": "20.1.0", "@nx/vite": "20.1.0", "@nx/web": "20.1.0", - "@ory/client": "1.6.2", + "@ory/client": "1.16.5", "@playwright/experimental-ct-react": "1.46.0", "@preact/preset-vite": "2.5.0", "@storybook/addon-docs": "8.3.0", @@ -9208,9 +9208,9 @@ } }, "node_modules/@ory/client": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/@ory/client/-/client-1.6.2.tgz", - "integrity": "sha512-eeSkFZsrX/hLaariBg2I9PQWueE9IVAV3Tps5UE7CYEvrGziFB1zdv8joQDGMss5O3Yv/CSlSf4rOwTeENDqBg==", + "version": "1.16.5", + "resolved": "https://registry.npmjs.org/@ory/client/-/client-1.16.5.tgz", + "integrity": "sha512-OM6AAihiX0D/LEDz/s5EQfmr9Ieyyv/QJKmcNZXQ+B6mNAZ9RGdz6bzSxo1cQr2m2+5ksDtEDlCMzpBgYkiMPg==", "dev": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 3499e26a9..20e56452c 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@nx/storybook": "20.1.0", "@nx/vite": "20.1.0", "@nx/web": "20.1.0", - "@ory/client": "1.6.2", + "@ory/client": "1.16.5", "@playwright/experimental-ct-react": "1.46.0", "@preact/preset-vite": "2.5.0", "@storybook/addon-docs": "8.3.0", diff --git a/packages/react/vite.config.mts b/packages/react/vite.config.mts index fffd58a6a..076a2a175 100644 --- a/packages/react/vite.config.mts +++ b/packages/react/vite.config.mts @@ -14,7 +14,8 @@ export default defineConfig({ css: { postcss: { plugins: [ - autoprefixer({}), // add options if needed + // eslint-disable-next-line @typescript-eslint/no-explicit-any + autoprefixer({}) as any, // add options if needed ], }, }, diff --git a/src/react-components/provider.tsx b/src/react-components/provider.tsx index 5293736db..823111d2a 100644 --- a/src/react-components/provider.tsx +++ b/src/react-components/provider.tsx @@ -223,7 +223,7 @@ export const IntlProvider = < let translation = locales.en if (props.locale && props.locale in locales) { - translation = locales[props.locale as locale] + translation = { ...locales.en, ...locales[props.locale as locale] } } const intlProps = isCustomTranslations(props) diff --git a/src/theme/consts.ts b/src/theme/consts.ts index 949e66d0e..46a654fa1 100644 --- a/src/theme/consts.ts +++ b/src/theme/consts.ts @@ -78,7 +78,7 @@ export interface Theme { } export const defaultFont: Font = { - fontFamily: `"Inter", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;"`, + fontFamily: `"Inter", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;`, fontFamilyMono: "JetBrainsMono", fontStyle: "normal", }