From 8c6e82467fc2fd7a923c79281c036cd5007be267 Mon Sep 17 00:00:00 2001 From: Salman Mohammed Date: Wed, 17 May 2023 22:26:32 -0400 Subject: [PATCH 1/9] feat: next js 13 app router with mui5 --- .../material-next-app-router-ts/.gitignore | 36 ++++++++++++++++++ .../material-next-app-router-ts/README.md | 31 +++++++++++++++ .../material-next-app-router-ts/next-env.d.ts | 5 +++ .../next.config.js | 16 ++++++++ .../material-next-app-router-ts/package.json | 31 +++++++++++++++ .../public/.gitkeep | 0 .../src/app/favicon.ico | Bin 0 -> 25931 bytes .../src/app/layout.tsx | 18 +++++++++ .../src/app/page.tsx | 7 ++++ .../src/components/CopyRight/Copyright.tsx | 15 ++++++++ .../src/components/ProTip/ProTip.tsx | 21 ++++++++++ .../Theme/ThemeRegistry/ThemeRegistry.tsx | 21 ++++++++++ .../components/Theme/ThemeRegistry/theme.ts | 8 ++++ .../src/layouts/Home/Home.tsx | 27 +++++++++++++ .../material-next-app-router-ts/tsconfig.json | 29 ++++++++++++++ 15 files changed, 265 insertions(+) create mode 100644 examples/material-next-app-router-ts/.gitignore create mode 100644 examples/material-next-app-router-ts/README.md create mode 100644 examples/material-next-app-router-ts/next-env.d.ts create mode 100644 examples/material-next-app-router-ts/next.config.js create mode 100644 examples/material-next-app-router-ts/package.json create mode 100644 examples/material-next-app-router-ts/public/.gitkeep create mode 100644 examples/material-next-app-router-ts/src/app/favicon.ico create mode 100644 examples/material-next-app-router-ts/src/app/layout.tsx create mode 100644 examples/material-next-app-router-ts/src/app/page.tsx create mode 100644 examples/material-next-app-router-ts/src/components/CopyRight/Copyright.tsx create mode 100644 examples/material-next-app-router-ts/src/components/ProTip/ProTip.tsx create mode 100644 examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/ThemeRegistry.tsx create mode 100644 examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/theme.ts create mode 100644 examples/material-next-app-router-ts/src/layouts/Home/Home.tsx create mode 100644 examples/material-next-app-router-ts/tsconfig.json diff --git a/examples/material-next-app-router-ts/.gitignore b/examples/material-next-app-router-ts/.gitignore new file mode 100644 index 00000000000000..28c8a5adb7c034 --- /dev/null +++ b/examples/material-next-app-router-ts/.gitignore @@ -0,0 +1,36 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage + +# next.js +/.next/ +/out/ + +# production +/build + +# misc +.DS_Store +*.pem + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* +.pnpm-debug.log* + +# local env files +.env*.local + +# vercel +.vercel + +# typescript +*.tsbuildinfo +# next-env.d.ts diff --git a/examples/material-next-app-router-ts/README.md b/examples/material-next-app-router-ts/README.md new file mode 100644 index 00000000000000..3379b38c210837 --- /dev/null +++ b/examples/material-next-app-router-ts/README.md @@ -0,0 +1,31 @@ +# Material UI - Next.js App Router example in TypeScript + +## How to use + +Download the example [or clone the repo](https://github.com/mui/material-ui): + + + +```sh +curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-next-app-router-ts +cd material-next-app-router-ts +``` + +Install it and run: + +```sh +npm install +npm run dev +``` + +## The idea behind the example + +The project uses [Next.js](https://github.com/vercel/next.js), which is a framework for server-rendered React apps. +It includes `@mui/material` and its peer dependencies, including [Emotion](https://emotion.sh/docs/introduction), the default style engine in Material UI v5. If you prefer, you can [use styled-components instead](https://mui.com/material-ui/guides/interoperability/#styled-components). + +## What's next? + + + +You now have a working example project. +You can head back to the documentation, continuing browsing it from the [templates](https://mui.com/material-ui/getting-started/templates/) section. diff --git a/examples/material-next-app-router-ts/next-env.d.ts b/examples/material-next-app-router-ts/next-env.d.ts new file mode 100644 index 00000000000000..4f11a03dc6cc37 --- /dev/null +++ b/examples/material-next-app-router-ts/next-env.d.ts @@ -0,0 +1,5 @@ +/// +/// + +// NOTE: This file should not be edited +// see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/examples/material-next-app-router-ts/next.config.js b/examples/material-next-app-router-ts/next.config.js new file mode 100644 index 00000000000000..9e4af23de6ad5d --- /dev/null +++ b/examples/material-next-app-router-ts/next.config.js @@ -0,0 +1,16 @@ +/** @type {import('next').NextConfig} */ +const nextConfig = { + reactStrictMode: true, + swcMinify: true, + modularizeImports: { + '@mui/icons-material': { + transform: '@mui/icons-material/{{member}}' + } + }, + experimental: { + appDir: true, + typedRoutes: true + } +}; + +module.exports = nextConfig; diff --git a/examples/material-next-app-router-ts/package.json b/examples/material-next-app-router-ts/package.json new file mode 100644 index 00000000000000..747b4dcfff893c --- /dev/null +++ b/examples/material-next-app-router-ts/package.json @@ -0,0 +1,31 @@ +{ + "name": "material-next-app-router-ts", + "version": "5.0.0", + "private": true, + "scripts": { + "dev": "next dev", + "build": "next build", + "start": "next start", + "lint": "next lint", + "post-update": "echo \"codesandbox preview only, need an update\" && yarn upgrade --latest" + }, + "dependencies": { + "@emotion/cache": "latest", + "@emotion/react": "latest", + "@emotion/styled": "latest", + "@mui/icons-material": "latest", + "@mui/material": "latest", + "next": "latest", + "react": "latest", + "react-dom": "latest", + "tss-react": "latest" + }, + "devDependencies": { + "@types/node": "latest", + "@types/react": "latest", + "@types/react-dom": "latest", + "eslint": "latest", + "eslint-config-next": "latest", + "typescript": "latest" + } +} diff --git a/examples/material-next-app-router-ts/public/.gitkeep b/examples/material-next-app-router-ts/public/.gitkeep new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/examples/material-next-app-router-ts/src/app/favicon.ico b/examples/material-next-app-router-ts/src/app/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..718d6fea4835ec2d246af9800eddb7ffb276240c GIT binary patch literal 25931 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 LrJugUA?W`A8`#=m literal 0 HcmV?d00001 diff --git a/examples/material-next-app-router-ts/src/app/layout.tsx b/examples/material-next-app-router-ts/src/app/layout.tsx new file mode 100644 index 00000000000000..cf4a4b77c30e4d --- /dev/null +++ b/examples/material-next-app-router-ts/src/app/layout.tsx @@ -0,0 +1,18 @@ +import ThemeRegistry from '@/components/Theme/ThemeRegistry/ThemeRegistry'; + +export const metadata = { + title: 'Next App with MUI5', + description: 'next app with mui5' +}; + +const RootLayout = ({children}: {children: React.ReactNode}) => { + return ( + + + {children} + + + ); +}; + +export default RootLayout; diff --git a/examples/material-next-app-router-ts/src/app/page.tsx b/examples/material-next-app-router-ts/src/app/page.tsx new file mode 100644 index 00000000000000..345892d9d93b8f --- /dev/null +++ b/examples/material-next-app-router-ts/src/app/page.tsx @@ -0,0 +1,7 @@ +import {Home} from '@/layouts/Home/Home'; + +const RootPage = () => { + return ; +}; + +export default RootPage; diff --git a/examples/material-next-app-router-ts/src/components/CopyRight/Copyright.tsx b/examples/material-next-app-router-ts/src/components/CopyRight/Copyright.tsx new file mode 100644 index 00000000000000..e677bcafd09700 --- /dev/null +++ b/examples/material-next-app-router-ts/src/components/CopyRight/Copyright.tsx @@ -0,0 +1,15 @@ +'use client'; + +import {Typography, Link as MuiLink} from '@mui/material'; + +export const Copyright = () => { + return ( + + {'Copyright © '} + + Your Website + + {new Date().getFullYear()}. + + ); +}; diff --git a/examples/material-next-app-router-ts/src/components/ProTip/ProTip.tsx b/examples/material-next-app-router-ts/src/components/ProTip/ProTip.tsx new file mode 100644 index 00000000000000..9367c561151edd --- /dev/null +++ b/examples/material-next-app-router-ts/src/components/ProTip/ProTip.tsx @@ -0,0 +1,21 @@ +'use client'; + +import {SvgIconProps, SvgIcon, Typography, Link as MuiLink} from '@mui/material'; + +const LightBulbIcon = (props: SvgIconProps) => { + return ( + + + + ); +}; + +export const ProTip = () => { + return ( + + + Pro tip: See more templates in the MUI + documentation. + + ); +}; diff --git a/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/ThemeRegistry.tsx b/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/ThemeRegistry.tsx new file mode 100644 index 00000000000000..eaa2a22d8e0055 --- /dev/null +++ b/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/ThemeRegistry.tsx @@ -0,0 +1,21 @@ +'use client'; + +import React from 'react'; +import {ThemeProvider} from '@mui/material/styles'; +import CssBaseline from '@mui/material/CssBaseline'; +import {NextAppDirEmotionCacheProvider} from 'tss-react/next/appDir'; + +import theme from './theme'; + +const ThemeRegistry = ({children}: React.PropsWithChildren) => { + return ( + <> + + + {children} + + + ); +}; + +export default ThemeRegistry; diff --git a/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/theme.ts b/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/theme.ts new file mode 100644 index 00000000000000..67b75adb1d5bef --- /dev/null +++ b/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/theme.ts @@ -0,0 +1,8 @@ +'use client'; + +import {createTheme, ThemeOptions} from '@mui/material/styles'; + +// When needed::: first argument is needed if you have your enterprise theme, and second argument is to override your enterprise theme. +const defaultTheme = createTheme({}, {} satisfies ThemeOptions); + +export default defaultTheme; diff --git a/examples/material-next-app-router-ts/src/layouts/Home/Home.tsx b/examples/material-next-app-router-ts/src/layouts/Home/Home.tsx new file mode 100644 index 00000000000000..66832703f3e0ce --- /dev/null +++ b/examples/material-next-app-router-ts/src/layouts/Home/Home.tsx @@ -0,0 +1,27 @@ +'use client'; + +import {Container, Box, Typography} from '@mui/material'; +import {Copyright} from '@/components/CopyRight/Copyright'; +import {ProTip} from '@/components/ProTip/ProTip'; + +export const Home = () => { + return ( + + + + Material UI - Next.js example using App Router in TypeScript + + + + + + ); +}; diff --git a/examples/material-next-app-router-ts/tsconfig.json b/examples/material-next-app-router-ts/tsconfig.json new file mode 100644 index 00000000000000..6a9c1a2e7a02a6 --- /dev/null +++ b/examples/material-next-app-router-ts/tsconfig.json @@ -0,0 +1,29 @@ +{ + "compilerOptions": { + "target": "es5", + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "incremental": true, + "plugins": [ + { + "name": "next" + } + ], + "baseUrl": ".", + "paths": { + "@/*": ["./src/*"] + } + }, + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], + "exclude": ["node_modules"] +} From f6aaa9199998e3e840ea0674fb16fb47aef61c7f Mon Sep 17 00:00:00 2001 From: Salman Mohammed Date: Thu, 18 May 2023 21:16:23 -0400 Subject: [PATCH 2/9] feat: lint and prettier fix --- .../src/app/layout.tsx | 9 ++++----- .../src/app/page.tsx | 10 +++++----- .../src/components/CopyRight/Copyright.tsx | 7 ++++--- .../src/components/ProTip/ProTip.tsx | 18 ++++++++++-------- .../Theme/ThemeRegistry/ThemeRegistry.tsx | 18 ++++++++---------- .../src/layouts/Home/Home.tsx | 13 +++++++------ 6 files changed, 38 insertions(+), 37 deletions(-) diff --git a/examples/material-next-app-router-ts/src/app/layout.tsx b/examples/material-next-app-router-ts/src/app/layout.tsx index cf4a4b77c30e4d..0bf9d7a47e0df0 100644 --- a/examples/material-next-app-router-ts/src/app/layout.tsx +++ b/examples/material-next-app-router-ts/src/app/layout.tsx @@ -1,11 +1,12 @@ +import * as React from 'react'; import ThemeRegistry from '@/components/Theme/ThemeRegistry/ThemeRegistry'; export const metadata = { title: 'Next App with MUI5', - description: 'next app with mui5' + description: 'next app with mui5', }; -const RootLayout = ({children}: {children: React.ReactNode}) => { +export default function RootLayout({ children }: { children: React.ReactNode }) { return ( @@ -13,6 +14,4 @@ const RootLayout = ({children}: {children: React.ReactNode}) => { ); -}; - -export default RootLayout; +} diff --git a/examples/material-next-app-router-ts/src/app/page.tsx b/examples/material-next-app-router-ts/src/app/page.tsx index 345892d9d93b8f..c7e0ffb00bb08d 100644 --- a/examples/material-next-app-router-ts/src/app/page.tsx +++ b/examples/material-next-app-router-ts/src/app/page.tsx @@ -1,7 +1,7 @@ -import {Home} from '@/layouts/Home/Home'; +import * as React from 'react'; -const RootPage = () => { - return ; -}; +import Home from '@/layouts/Home/Home'; -export default RootPage; +export default function RootPage() { + return ; +} diff --git a/examples/material-next-app-router-ts/src/components/CopyRight/Copyright.tsx b/examples/material-next-app-router-ts/src/components/CopyRight/Copyright.tsx index e677bcafd09700..c162d5474c0755 100644 --- a/examples/material-next-app-router-ts/src/components/CopyRight/Copyright.tsx +++ b/examples/material-next-app-router-ts/src/components/CopyRight/Copyright.tsx @@ -1,8 +1,9 @@ 'use client'; -import {Typography, Link as MuiLink} from '@mui/material'; +import * as React from 'react'; +import { Typography, Link as MuiLink } from '@mui/material'; -export const Copyright = () => { +export default function Copyright() { return ( {'Copyright © '} @@ -12,4 +13,4 @@ export const Copyright = () => { {new Date().getFullYear()}. ); -}; +} diff --git a/examples/material-next-app-router-ts/src/components/ProTip/ProTip.tsx b/examples/material-next-app-router-ts/src/components/ProTip/ProTip.tsx index 9367c561151edd..e137145e366e28 100644 --- a/examples/material-next-app-router-ts/src/components/ProTip/ProTip.tsx +++ b/examples/material-next-app-router-ts/src/components/ProTip/ProTip.tsx @@ -1,21 +1,23 @@ 'use client'; -import {SvgIconProps, SvgIcon, Typography, Link as MuiLink} from '@mui/material'; +import * as React from 'react'; +import { SvgIconProps, SvgIcon, Typography, Link as MuiLink } from '@mui/material'; -const LightBulbIcon = (props: SvgIconProps) => { +function LightBulbIcon(props: SvgIconProps) { return ( ); -}; +} -export const ProTip = () => { +export default function ProTip() { return ( - - - Pro tip: See more templates in the MUI + + + Pro tip: See more{' '} + templates in the MUI documentation. ); -}; +} diff --git a/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/ThemeRegistry.tsx b/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/ThemeRegistry.tsx index eaa2a22d8e0055..bd162c4eb9fdfe 100644 --- a/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/ThemeRegistry.tsx +++ b/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/ThemeRegistry.tsx @@ -1,21 +1,19 @@ 'use client'; -import React from 'react'; -import {ThemeProvider} from '@mui/material/styles'; +import * as React from 'react'; +import { ThemeProvider } from '@mui/material/styles'; import CssBaseline from '@mui/material/CssBaseline'; -import {NextAppDirEmotionCacheProvider} from 'tss-react/next/appDir'; +import { NextAppDirEmotionCacheProvider } from 'tss-react/next/appDir'; import theme from './theme'; -const ThemeRegistry = ({children}: React.PropsWithChildren) => { +export default function ThemeRegistry({ children }: { children: React.ReactNode }) { return ( - <> + - + {children} - + ); -}; - -export default ThemeRegistry; +} diff --git a/examples/material-next-app-router-ts/src/layouts/Home/Home.tsx b/examples/material-next-app-router-ts/src/layouts/Home/Home.tsx index 66832703f3e0ce..b25f2e4972af1a 100644 --- a/examples/material-next-app-router-ts/src/layouts/Home/Home.tsx +++ b/examples/material-next-app-router-ts/src/layouts/Home/Home.tsx @@ -1,10 +1,11 @@ 'use client'; -import {Container, Box, Typography} from '@mui/material'; -import {Copyright} from '@/components/CopyRight/Copyright'; -import {ProTip} from '@/components/ProTip/ProTip'; +import * as React from 'react'; +import { Container, Box, Typography } from '@mui/material'; +import Copyright from '@/components/CopyRight/Copyright'; +import ProTip from '@/components/ProTip/ProTip'; -export const Home = () => { +export default function Home() { return ( { display: 'flex', flexDirection: 'column', justifyContent: 'center', - alignItems: 'center' + alignItems: 'center', }} > @@ -24,4 +25,4 @@ export const Home = () => { ); -}; +} From 9d371793576b9116258ed7250824c44aa430ac27 Mon Sep 17 00:00:00 2001 From: Salman Mohammed Date: Thu, 18 May 2023 21:47:43 -0400 Subject: [PATCH 3/9] feat: prettier fix --- examples/material-next-app-router-ts/next.config.js | 8 ++++---- .../src/components/Theme/ThemeRegistry/theme.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/material-next-app-router-ts/next.config.js b/examples/material-next-app-router-ts/next.config.js index 9e4af23de6ad5d..674a2958fc1e7b 100644 --- a/examples/material-next-app-router-ts/next.config.js +++ b/examples/material-next-app-router-ts/next.config.js @@ -4,13 +4,13 @@ const nextConfig = { swcMinify: true, modularizeImports: { '@mui/icons-material': { - transform: '@mui/icons-material/{{member}}' - } + transform: '@mui/icons-material/{{member}}', + }, }, experimental: { appDir: true, - typedRoutes: true - } + typedRoutes: true, + }, }; module.exports = nextConfig; diff --git a/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/theme.ts b/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/theme.ts index 67b75adb1d5bef..c12a1e49296024 100644 --- a/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/theme.ts +++ b/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/theme.ts @@ -1,6 +1,6 @@ 'use client'; -import {createTheme, ThemeOptions} from '@mui/material/styles'; +import { createTheme, ThemeOptions } from '@mui/material/styles'; // When needed::: first argument is needed if you have your enterprise theme, and second argument is to override your enterprise theme. const defaultTheme = createTheme({}, {} satisfies ThemeOptions); From b4c8fddff70ce211267869728b9a3b30601ec2ad Mon Sep 17 00:00:00 2001 From: Salman Mohammed Date: Sat, 20 May 2023 10:57:05 -0400 Subject: [PATCH 4/9] Remove appDir from experimental in the next configuration. --- examples/material-next-app-router-ts/next.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/material-next-app-router-ts/next.config.js b/examples/material-next-app-router-ts/next.config.js index 674a2958fc1e7b..8f38ce8a78f870 100644 --- a/examples/material-next-app-router-ts/next.config.js +++ b/examples/material-next-app-router-ts/next.config.js @@ -8,7 +8,6 @@ const nextConfig = { }, }, experimental: { - appDir: true, typedRoutes: true, }, }; From 34796222fd2bc9c450463a255f4eed18a787e727 Mon Sep 17 00:00:00 2001 From: Salman Mohammed Date: Mon, 22 May 2023 13:18:47 -0400 Subject: [PATCH 5/9] addressed review comments --- .../material-next-app-router-ts/README.md | 2 +- .../next.config.js | 3 - .../material-next-app-router-ts/package.json | 3 +- .../src/components/CopyRight/Copyright.tsx | 7 +- .../src/components/ProTip/ProTip.tsx | 9 +-- .../Theme/ThemeRegistry/EmotionCache.tsx | 68 +++++++++++++++++++ .../Theme/ThemeRegistry/ThemeRegistry.tsx | 2 +- .../src/layouts/Home/Home.tsx | 4 +- 8 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/EmotionCache.tsx diff --git a/examples/material-next-app-router-ts/README.md b/examples/material-next-app-router-ts/README.md index 3379b38c210837..53f57470584c06 100644 --- a/examples/material-next-app-router-ts/README.md +++ b/examples/material-next-app-router-ts/README.md @@ -7,7 +7,7 @@ Download the example [or clone the repo](https://github.com/mui/material-ui): ```sh -curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-next-app-router-ts +curl https://codeload.github.com/mui/material-ui/tar.gz/master | tar -xz --strip=2 material-ui-master/examples/material-next-ts cd material-next-app-router-ts ``` diff --git a/examples/material-next-app-router-ts/next.config.js b/examples/material-next-app-router-ts/next.config.js index 8f38ce8a78f870..78ff974e7e2f4e 100644 --- a/examples/material-next-app-router-ts/next.config.js +++ b/examples/material-next-app-router-ts/next.config.js @@ -7,9 +7,6 @@ const nextConfig = { transform: '@mui/icons-material/{{member}}', }, }, - experimental: { - typedRoutes: true, - }, }; module.exports = nextConfig; diff --git a/examples/material-next-app-router-ts/package.json b/examples/material-next-app-router-ts/package.json index 747b4dcfff893c..c1375cb7c48b24 100644 --- a/examples/material-next-app-router-ts/package.json +++ b/examples/material-next-app-router-ts/package.json @@ -17,8 +17,7 @@ "@mui/material": "latest", "next": "latest", "react": "latest", - "react-dom": "latest", - "tss-react": "latest" + "react-dom": "latest" }, "devDependencies": { "@types/node": "latest", diff --git a/examples/material-next-app-router-ts/src/components/CopyRight/Copyright.tsx b/examples/material-next-app-router-ts/src/components/CopyRight/Copyright.tsx index c162d5474c0755..02dd5984cd85cb 100644 --- a/examples/material-next-app-router-ts/src/components/CopyRight/Copyright.tsx +++ b/examples/material-next-app-router-ts/src/components/CopyRight/Copyright.tsx @@ -1,15 +1,16 @@ 'use client'; import * as React from 'react'; -import { Typography, Link as MuiLink } from '@mui/material'; +import Typography from '@mui/material/Typography'; +import Link from '@mui/material/Link'; export default function Copyright() { return ( {'Copyright © '} - + Your Website - + {new Date().getFullYear()}. ); diff --git a/examples/material-next-app-router-ts/src/components/ProTip/ProTip.tsx b/examples/material-next-app-router-ts/src/components/ProTip/ProTip.tsx index e137145e366e28..746aeb8ce5a60e 100644 --- a/examples/material-next-app-router-ts/src/components/ProTip/ProTip.tsx +++ b/examples/material-next-app-router-ts/src/components/ProTip/ProTip.tsx @@ -1,7 +1,9 @@ 'use client'; import * as React from 'react'; -import { SvgIconProps, SvgIcon, Typography, Link as MuiLink } from '@mui/material'; +import Typography from '@mui/material/Typography'; +import Link from '@mui/material/Link'; +import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon'; function LightBulbIcon(props: SvgIconProps) { return ( @@ -15,9 +17,8 @@ export default function ProTip() { return ( - Pro tip: See more{' '} - templates in the MUI - documentation. + Pro tip: See more templates in + the MUI documentation. ); } diff --git a/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/EmotionCache.tsx b/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/EmotionCache.tsx new file mode 100644 index 00000000000000..8bb208ec68cb5c --- /dev/null +++ b/examples/material-next-app-router-ts/src/components/Theme/ThemeRegistry/EmotionCache.tsx @@ -0,0 +1,68 @@ +'use client'; + +import * as React from 'react'; +import createCache from '@emotion/cache'; +import { useServerInsertedHTML } from 'next/navigation'; +import { CacheProvider as DefaultCacheProvider } from '@emotion/react'; +import type { EmotionCache, Options as OptionsOfCreateCache } from '@emotion/cache'; + +export type NextAppDirEmotionCacheProviderProps = { + /** This is the options passed to createCache() from 'import createCache from "@emotion/cache"' */ + options: Omit; + /** By default from 'import { CacheProvider } from "@emotion/react"' */ + CacheProvider?: (props: { + value: EmotionCache; + children: React.ReactNode; + }) => React.JSX.Element | null; + children: React.ReactNode; +}; + +export function NextAppDirEmotionCacheProvider(props: NextAppDirEmotionCacheProviderProps) { + const { options, CacheProvider = DefaultCacheProvider, children } = props; + + const [{ cache, flush }] = React.useState(() => { + // eslint-disable-next-line @typescript-eslint/no-shadow + const cache = createCache(options); + cache.compat = true; + const prevInsert = cache.insert; + let inserted: string[] = []; + cache.insert = (...args) => { + const serialized = args[1]; + if (cache.inserted[serialized.name] === undefined) { + inserted.push(serialized.name); + } + return prevInsert(...args); + }; + // eslint-disable-next-line @typescript-eslint/no-shadow + const flush = () => { + const prevInserted = inserted; + inserted = []; + return prevInserted; + }; + return { cache, flush }; + }); + + useServerInsertedHTML(() => { + const names = flush(); + if (names.length === 0) { + return null; + } + let styles = ''; + // eslint-disable-next-line no-restricted-syntax + for (const name of names) { + styles += cache.inserted[name]; + } + return ( +