Skip to content

Commit c99e65f

Browse files
fix(with-remix-material-ui): example is broken #6868
2 parents ec95a5e + aed7d15 commit c99e65f

4 files changed

Lines changed: 41 additions & 29 deletions

File tree

examples/with-remix-material-ui/app/entry.server.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import type { EntryContext } from "@remix-run/node";
22
import { RemixServer } from "@remix-run/react";
33
import { renderToString } from "react-dom/server";
4+
import CssBaseline from "@mui/material/CssBaseline";
5+
import GlobalStyles from "@mui/material/GlobalStyles";
6+
import { ColorModeContextProvider } from "~/contexts/ColorModeContext";
7+
import { ClientStyleCacheProvider } from "~/contexts/ClientStyleContext";
48

59
export default function handleRequest(
610
request: Request,
@@ -9,7 +13,13 @@ export default function handleRequest(
913
remixContext: EntryContext,
1014
) {
1115
const markup = renderToString(
12-
<RemixServer context={remixContext} url={request.url} />,
16+
<ClientStyleCacheProvider>
17+
<ColorModeContextProvider>
18+
<CssBaseline />
19+
<GlobalStyles styles={{ html: { WebkitFontSmoothing: "auto" } }} />
20+
<RemixServer context={remixContext} url={request.url} />
21+
</ColorModeContextProvider>
22+
</ClientStyleCacheProvider>,
1323
);
1424

1525
responseHeaders.set("Content-Type", "text/html");

examples/with-remix-material-ui/app/root.tsx

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -97,34 +97,32 @@ export default function App() {
9797
<GitHubBanner />
9898
<RefineKbarProvider>
9999
<RefineSnackbarProvider>
100-
<RefineKbarProvider>
101-
<Refine
102-
routerProvider={routerProvider}
103-
dataProvider={dataProvider(API_URL)}
104-
notificationProvider={useNotificationProvider}
105-
authProvider={authProvider}
106-
resources={[
107-
{
108-
name: "blog_posts",
109-
list: "/blog-posts",
110-
create: "/blog-posts/create",
111-
edit: "/blog-posts/edit/:id",
112-
show: "/blog-posts/show/:id",
113-
meta: {
114-
canDelete: true,
115-
},
100+
<Refine
101+
routerProvider={routerProvider}
102+
dataProvider={dataProvider(API_URL)}
103+
notificationProvider={useNotificationProvider}
104+
authProvider={authProvider}
105+
resources={[
106+
{
107+
name: "blog_posts",
108+
list: "/blog-posts",
109+
create: "/blog-posts/create",
110+
edit: "/blog-posts/edit/:id",
111+
show: "/blog-posts/show/:id",
112+
meta: {
113+
canDelete: true,
116114
},
117-
]}
118-
options={{
119-
syncWithLocation: true,
120-
warnWhenUnsavedChanges: true,
121-
}}
122-
>
123-
<Outlet />
124-
<UnsavedChangesNotifier />
125-
<RefineKbar />
126-
</Refine>
127-
</RefineKbarProvider>
115+
},
116+
]}
117+
options={{
118+
syncWithLocation: true,
119+
warnWhenUnsavedChanges: true,
120+
}}
121+
>
122+
<Outlet />
123+
<UnsavedChangesNotifier />
124+
<RefineKbar />
125+
</Refine>
128126
</RefineSnackbarProvider>
129127
</RefineKbarProvider>
130128
</Document>

examples/with-remix-material-ui/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"js-cookie": "^3.0.1",
3232
"nookies": "^2.5.2",
3333
"react": "^18.0.0",
34-
"react-dom": "^18.0.0"
34+
"react-dom": "^18.0.0",
35+
"react-transition-group": "^4.4.5"
3536
},
3637
"devDependencies": {
3738
"@remix-run/dev": "^2.3.1",

pnpm-lock.yaml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)