Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[examples] Updated Remix examples with the lates changes using React 18 #35092

Merged
merged 3 commits into from
Nov 24, 2022
Merged

[examples] Updated Remix examples with the lates changes using React 18 #35092

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a16f05
updated entry.client.tsx for Remix latest and React 18
58bits Nov 10, 2022
dc60ffb
fixed eslint error - removed unused StrictMode import
58bits Nov 16, 2022
0a9c893
fixes with prettier
58bits Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions examples/remix-with-typescript/app/entry.client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as React from 'react';
import { useState } from 'react';
import { hydrate } from 'react-dom';
import { startTransition, StrictMode } from "react";
import { hydrateRoot } from "react-dom/client";
import { RemixBrowser } from 'remix';
import { CacheProvider } from '@emotion/react';
import { ThemeProvider } from '@mui/material/styles';
Expand Down Expand Up @@ -31,13 +32,25 @@ function ClientCacheProvider({ children }: ClientCacheProviderProps) {
);
}

hydrate(
<ClientCacheProvider>
<ThemeProvider theme={theme}>
{/* CssBaseline kickstart an elegant, consistent, and simple baseline to build upon. */}
<CssBaseline />
<RemixBrowser />
</ThemeProvider>
</ClientCacheProvider>,
document,
);
const hydrate = () => {
startTransition(() => {
hydrateRoot(
document,
<ClientCacheProvider>
<ThemeProvider theme={theme}>
{/* CssBaseline kickstart an elegant, consistent, and simple baseline to build upon. */}
<CssBaseline />
<RemixBrowser />
</ThemeProvider>
</ClientCacheProvider>,
);
});
};

if (window.requestIdleCallback) {
window.requestIdleCallback(hydrate);
} else {
// Safari doesn't support requestIdleCallback
// https://caniuse.com/requestidlecallback
window.setTimeout(hydrate, 1);
}
2 changes: 2 additions & 0 deletions examples/remix-with-typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
"@emotion/server": "latest",
"@emotion/styled": "latest",
"@mui/material": "latest",
"@remix-run/node": "latest",
"@remix-run/react": "latest",
"@remix-run/serve": "latest",
"@remix-run/server-runtime": "latest",
"react": "latest",
"react-dom": "latest",
"remix": "latest"
Expand Down