From a235a7accd37720b6176fc5f0d2d029e0be425fa Mon Sep 17 00:00:00 2001 From: Baptiste Arnaud Date: Fri, 29 Dec 2023 10:12:13 +0100 Subject: [PATCH] :zap: Attempt to fix tolgee random crash due to provider not detected --- apps/builder/package.json | 4 +-- .../{public/locales => src/i18n}/de.json | 0 .../{public/locales => src/i18n}/en.json | 0 .../{public/locales => src/i18n}/es.json | 0 .../{public/locales => src/i18n}/fr.json | 0 .../{public/locales => src/i18n}/pt-BR.json | 0 .../{public/locales => src/i18n}/pt.json | 0 .../{public/locales => src/i18n}/ro.json | 0 apps/builder/src/lib/tolgee.tsx | 14 +++++----- apps/builder/src/pages/_app.tsx | 23 ++++++++------- pnpm-lock.yaml | 28 +++++++++---------- 11 files changed, 36 insertions(+), 33 deletions(-) rename apps/builder/{public/locales => src/i18n}/de.json (100%) rename apps/builder/{public/locales => src/i18n}/en.json (100%) rename apps/builder/{public/locales => src/i18n}/es.json (100%) rename apps/builder/{public/locales => src/i18n}/fr.json (100%) rename apps/builder/{public/locales => src/i18n}/pt-BR.json (100%) rename apps/builder/{public/locales => src/i18n}/pt.json (100%) rename apps/builder/{public/locales => src/i18n}/ro.json (100%) diff --git a/apps/builder/package.json b/apps/builder/package.json index d375dd654..7c885d6e3 100644 --- a/apps/builder/package.json +++ b/apps/builder/package.json @@ -31,8 +31,8 @@ "@sentry/nextjs": "7.77.0", "@tanstack/react-query": "4.29.19", "@tanstack/react-table": "8.9.3", - "@tolgee/format-icu": "5.13.3", - "@tolgee/react": "5.13.3", + "@tolgee/format-icu": "5.19.0", + "@tolgee/react": "5.19.0", "@trpc/client": "10.40.0", "@trpc/next": "10.40.0", "@trpc/react-query": "10.40.0", diff --git a/apps/builder/public/locales/de.json b/apps/builder/src/i18n/de.json similarity index 100% rename from apps/builder/public/locales/de.json rename to apps/builder/src/i18n/de.json diff --git a/apps/builder/public/locales/en.json b/apps/builder/src/i18n/en.json similarity index 100% rename from apps/builder/public/locales/en.json rename to apps/builder/src/i18n/en.json diff --git a/apps/builder/public/locales/es.json b/apps/builder/src/i18n/es.json similarity index 100% rename from apps/builder/public/locales/es.json rename to apps/builder/src/i18n/es.json diff --git a/apps/builder/public/locales/fr.json b/apps/builder/src/i18n/fr.json similarity index 100% rename from apps/builder/public/locales/fr.json rename to apps/builder/src/i18n/fr.json diff --git a/apps/builder/public/locales/pt-BR.json b/apps/builder/src/i18n/pt-BR.json similarity index 100% rename from apps/builder/public/locales/pt-BR.json rename to apps/builder/src/i18n/pt-BR.json diff --git a/apps/builder/public/locales/pt.json b/apps/builder/src/i18n/pt.json similarity index 100% rename from apps/builder/public/locales/pt.json rename to apps/builder/src/i18n/pt.json diff --git a/apps/builder/public/locales/ro.json b/apps/builder/src/i18n/ro.json similarity index 100% rename from apps/builder/public/locales/ro.json rename to apps/builder/src/i18n/ro.json diff --git a/apps/builder/src/lib/tolgee.tsx b/apps/builder/src/lib/tolgee.tsx index a4842c6c6..89ef97243 100644 --- a/apps/builder/src/lib/tolgee.tsx +++ b/apps/builder/src/lib/tolgee.tsx @@ -1,12 +1,12 @@ import { DevTools, Tolgee } from '@tolgee/react' import { FormatIcu } from '@tolgee/format-icu' -import en from '../../public/locales/en.json' -import fr from '../../public/locales/fr.json' -import de from '../../public/locales/de.json' -import pt from '../../public/locales/pt.json' -import ptBR from '../../public/locales/pt-BR.json' -import es from '../../public/locales/es.json' -import ro from '../../public/locales/ro.json' +import en from '../i18n/en.json' +import fr from '../i18n/fr.json' +import de from '../i18n/de.json' +import pt from '../i18n/pt.json' +import ptBR from '../i18n/pt-BR.json' +import es from '../i18n/es.json' +import ro from '../i18n/ro.json' import { env } from '@typebot.io/env' export const tolgee = Tolgee() diff --git a/apps/builder/src/pages/_app.tsx b/apps/builder/src/pages/_app.tsx index d44712c9a..2b4858883 100644 --- a/apps/builder/src/pages/_app.tsx +++ b/apps/builder/src/pages/_app.tsx @@ -28,22 +28,26 @@ initPostHogIfEnabled() const { ToastContainer, toast } = createStandaloneToast(customTheme) const App = ({ Component, pageProps }: AppProps) => { + const router = useRouter() + const ssrTolgee = useTolgeeSSR(tolgee, router.locale) + useRouterProgressBar() - const { query, pathname, locale } = useRouter() - const ssrTolgee = useTolgeeSSR(tolgee, locale) useEffect(() => { - if (pathname.endsWith('/edit') || pathname.endsWith('/analytics')) { + if ( + router.pathname.endsWith('/edit') || + router.pathname.endsWith('/analytics') + ) { document.body.style.overflow = 'hidden' document.body.classList.add('disable-scroll-x-behavior') } else { document.body.style.overflow = 'auto' document.body.classList.remove('disable-scroll-x-behavior') } - }, [pathname]) + }, [router.pathname]) useEffect(() => { - const newPlan = query.stripe?.toString() + const newPlan = router.query.stripe?.toString() if (newPlan === Plan.STARTER || newPlan === Plan.PRO) toast({ position: 'top-right', @@ -51,9 +55,9 @@ const App = ({ Component, pageProps }: AppProps) => { title: 'Upgrade success!', description: `Workspace upgraded to ${toTitleCase(newPlan)} 🎉`, }) - }, [query.stripe]) + }, [router.query.stripe]) - const typebotId = query.typebotId?.toString() + const typebotId = router.query.typebotId?.toString() return ( <> @@ -65,9 +69,8 @@ const App = ({ Component, pageProps }: AppProps) => { - {!pathname.endsWith('edit') && isCloudProdInstance() && ( - - )} + {!router.pathname.endsWith('edit') && + isCloudProdInstance() && } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fced0f769..e4f21de3b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -87,11 +87,11 @@ importers: specifier: 8.9.3 version: 8.9.3(react-dom@18.2.0)(react@18.2.0) '@tolgee/format-icu': - specifier: 5.13.3 - version: 5.13.3 + specifier: 5.19.0 + version: 5.19.0 '@tolgee/react': - specifier: 5.13.3 - version: 5.13.3(react@18.2.0) + specifier: 5.19.0 + version: 5.19.0(react@18.2.0) '@trpc/client': specifier: 10.40.0 version: 10.40.0(@trpc/server@10.40.0) @@ -7563,27 +7563,27 @@ packages: - typescript dev: true - /@tolgee/core@5.13.3: - resolution: {integrity: sha512-w6O+HVMOci6zqUPjuvY+o1aNfKxEMaHvKn6Px5aELAhhM0McNxVfHdfGMaTsfYvcQT/1UfjIqctLtTOqKaylsw==} + /@tolgee/core@5.19.0: + resolution: {integrity: sha512-5zOkxjtxUBEC8xTWtYU5r6bvwHK80s95zH4Y4uLkTcIYTRvn4kY7Z5/Hg5/hyIApA6P8taOrNy/m5favxCmREQ==} dev: false - /@tolgee/format-icu@5.13.3: - resolution: {integrity: sha512-TyyeHRskPhVCcaZ1Ns/JKR7scy2AIOYVt+uOZ3wHn9FXN67F1+9Xgf/WnYB6+F47l7Cp719kWnB+uovIoIZNeg==} + /@tolgee/format-icu@5.19.0: + resolution: {integrity: sha512-hV8MJEFrN90nAWNWHsz7RZy7S/23cIuETZ3exKGlu7m397BTtqT/52eE3bh4lcAeKwvhfF+v/hWT+vZrkNxmwA==} dev: false - /@tolgee/react@5.13.3(react@18.2.0): - resolution: {integrity: sha512-zWbQZDsdU0GYqCDVq7YASLiMQkMpMvumjOIcucCHk8VS6EIBxAJq/cSelT+3iUXVNtgGHEe+GGZp1MGune67gA==} + /@tolgee/react@5.19.0(react@18.2.0): + resolution: {integrity: sha512-FYQyymza7NQ/aqPZqpm/7ErHI7T8QeptbjKDSekomaN6nxifumSzYpuvjhBX+y2o/z1HGdqWZR9sc1IJU0VAwQ==} peerDependencies: react: ^16.14.0 || ^17.0.1 || ^18.1.0 dependencies: - '@tolgee/web': 5.13.3 + '@tolgee/web': 5.19.0 react: 18.2.0 dev: false - /@tolgee/web@5.13.3: - resolution: {integrity: sha512-CwOyRQl+V21QhGFNWPmSV8L7cIhxsOeU5ivLyO6YXV9LWnTXNxHlS5apDzfXR2RCGbwHHYAsii7bghXn77pNhA==} + /@tolgee/web@5.19.0: + resolution: {integrity: sha512-a57howuvHz6KGDg8wu6K1KxuBlTUD/AV0+1UKj+2xiFECNQSqwP8/bGO+9Hb9xkNqVxx+l1R13xK9XSZMGXNhw==} dependencies: - '@tolgee/core': 5.13.3 + '@tolgee/core': 5.19.0 dev: false /@tootallnate/once@2.0.0: