diff options
author | Kristóf Marussy <kristof@marussy.com> | 2022-04-19 02:40:25 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2022-05-16 00:55:01 +0200 |
commit | e95c17947ab36d82e7c401577912e9ddffadd0c6 (patch) | |
tree | 9ef5b18def985656388ee91a8afdce1153e6d1eb /packages/renderer/src/index.tsx | |
parent | chore(deps): Bump yarn version (diff) | |
download | sophie-e95c17947ab36d82e7c401577912e9ddffadd0c6.tar.gz sophie-e95c17947ab36d82e7c401577912e9ddffadd0c6.tar.zst sophie-e95c17947ab36d82e7c401577912e9ddffadd0c6.zip |
fix(renderer): Make RTL flipping more resilient to hot reloading
It seems moving the emotion cache into a separate file makes vite less
likely to try to hot-reload @emotion/cache (which would fail due to
creating the default cache twice).
We still have some vite hot reload problems, possibly connecte to
loading versions of react components with a different number of hook
calls.
Signed-off-by: Kristóf Marussy <kristof@marussy.com>
Diffstat (limited to 'packages/renderer/src/index.tsx')
-rw-r--r-- | packages/renderer/src/index.tsx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/renderer/src/index.tsx b/packages/renderer/src/index.tsx index 2722d3b..72a9ffd 100644 --- a/packages/renderer/src/index.tsx +++ b/packages/renderer/src/index.tsx | |||
@@ -33,6 +33,7 @@ import StoreProvider from './components/StoreProvider'; | |||
33 | import ThemeProvider from './components/ThemeProvider'; | 33 | import ThemeProvider from './components/ThemeProvider'; |
34 | import { exposeToReduxDevtools, hotReload } from './devTools'; | 34 | import { exposeToReduxDevtools, hotReload } from './devTools'; |
35 | import RtlCacheProvider from './i18n/RtlCacheProvider'; | 35 | import RtlCacheProvider from './i18n/RtlCacheProvider'; |
36 | import createRtlCache from './i18n/createRtlCache'; | ||
36 | import loadRendererLocalization from './i18n/loadRendererLoalization'; | 37 | import loadRendererLocalization from './i18n/loadRendererLoalization'; |
37 | import { createAndConnectRendererStore } from './stores/RendererStore'; | 38 | import { createAndConnectRendererStore } from './stores/RendererStore'; |
38 | import { getLogger } from './utils/log'; | 39 | import { getLogger } from './utils/log'; |
@@ -66,13 +67,15 @@ const disposeSetHtmlLang = autorun(() => { | |||
66 | }); | 67 | }); |
67 | addDisposer(store, disposeSetHtmlLang); | 68 | addDisposer(store, disposeSetHtmlLang); |
68 | 69 | ||
70 | const rtlCache = createRtlCache(); | ||
71 | |||
69 | const App = lazy(() => import('./components/App')); | 72 | const App = lazy(() => import('./components/App')); |
70 | 73 | ||
71 | function Root(): JSX.Element { | 74 | function Root(): JSX.Element { |
72 | return ( | 75 | return ( |
73 | <React.StrictMode> | 76 | <React.StrictMode> |
74 | <StoreProvider store={store}> | 77 | <StoreProvider store={store}> |
75 | <RtlCacheProvider> | 78 | <RtlCacheProvider rtlCache={rtlCache}> |
76 | <ThemeProvider> | 79 | <ThemeProvider> |
77 | <CssBaseline enableColorScheme /> | 80 | <CssBaseline enableColorScheme /> |
78 | <Suspense fallback={<Loading />}> | 81 | <Suspense fallback={<Loading />}> |