From f58502e244c5248774a962fb6e3a4bd31e544ea4 Mon Sep 17 00:00:00 2001 From: garronej Date: Sun, 2 Oct 2022 17:40:38 +0200 Subject: [PATCH] Demo Next.js setup should use only one cache --- src/test/apps/ssr/pages/_app.tsx | 18 +++++------------- src/test/apps/ssr/pages/_document.tsx | 7 ++----- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/test/apps/ssr/pages/_app.tsx b/src/test/apps/ssr/pages/_app.tsx index 1d513db..cc75078 100644 --- a/src/test/apps/ssr/pages/_app.tsx +++ b/src/test/apps/ssr/pages/_app.tsx @@ -6,21 +6,13 @@ import { createTheme } from "@mui/material/styles"; import CssBaseline from "@mui/material/CssBaseline"; import { useIsDarkModeEnabled, withIsDarkModeEnabled } from "../shared/isDarkModeEnabled"; import { createEmotionSsrAdvancedApproach } from "tss-react/next"; -import { TssCacheProvider } from "tss-react"; const { - augmentDocumentWithEmotionCache: augmentDocumentWithEmotionCache_mui, - withAppEmotionCache: withAppEmotionCache_mui -} = createEmotionSsrAdvancedApproach({ "key": "mui", "prepend": true }); + augmentDocumentWithEmotionCache, + withAppEmotionCache +} = createEmotionSsrAdvancedApproach({ "key": "css" }); -export { augmentDocumentWithEmotionCache_mui }; - -const { - augmentDocumentWithEmotionCache: augmentDocumentWithEmotionCache_tss, - withAppEmotionCache: withAppEmotionCache_tss -} = createEmotionSsrAdvancedApproach({ "key": "tss" }, TssCacheProvider); - -export { augmentDocumentWithEmotionCache_tss }; +export { augmentDocumentWithEmotionCache }; export function App({ Component, pageProps }: AppProps) { @@ -74,4 +66,4 @@ export function App({ Component, pageProps }: AppProps) { } -export default withAppEmotionCache_mui(withAppEmotionCache_tss(withIsDarkModeEnabled(App))); \ No newline at end of file +export default withAppEmotionCache(withIsDarkModeEnabled(App)); \ No newline at end of file diff --git a/src/test/apps/ssr/pages/_document.tsx b/src/test/apps/ssr/pages/_document.tsx index 4a8fa08..a7e069a 100644 --- a/src/test/apps/ssr/pages/_document.tsx +++ b/src/test/apps/ssr/pages/_document.tsx @@ -1,9 +1,6 @@ import Document from "next/document"; -import { augmentDocumentWithEmotionCache_mui, augmentDocumentWithEmotionCache_tss } from "./_app"; +import { augmentDocumentWithEmotionCache } from "./_app"; -augmentDocumentWithEmotionCache_mui(Document); -augmentDocumentWithEmotionCache_tss(Document); +augmentDocumentWithEmotionCache(Document); export default Document; - -