From 4d7a115cb4672bd78c4d98db88bb0510eb654b10 Mon Sep 17 00:00:00 2001 From: Kevin Pastor Date: Wed, 28 Aug 2024 21:43:14 -0400 Subject: [PATCH] feat: upgrade to mui 6 --- package.json | 8 +- pnpm-lock.yaml | 218 ++++++++++-------- src/app/(app)/_components/layout/content.tsx | 10 +- src/app/(app)/_components/layout/footer.tsx | 2 +- .../(app)/mots/_components/letter-section.tsx | 2 +- src/app/(app)/mots/_components/word-link.tsx | 10 +- .../providers/theme-provider/index.tsx | 15 +- .../providers/theme-provider/theme.ts | 12 +- 8 files changed, 154 insertions(+), 123 deletions(-) diff --git a/package.json b/package.json index 3a6b4c16..85c1bc50 100644 --- a/package.json +++ b/package.json @@ -31,10 +31,10 @@ "@emotion/styled": "^11.13.0", "@hcaptcha/react-hcaptcha": "^1.11.0", "@hookform/resolvers": "^3.9.0", - "@mui/icons-material": "^5.16.7", - "@mui/lab": "5.0.0-alpha.172", - "@mui/material": "^5.16.7", - "@mui/material-nextjs": "^5.16.6", + "@mui/icons-material": "^6.0.0", + "@mui/lab": "6.0.0-beta.8", + "@mui/material": "^6.0.0", + "@mui/material-nextjs": "^6.0.0", "@next/env": "^14.2.7", "@vercel/analytics": "^1.3.1", "@vercel/speed-insights": "^1.0.12", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 44fcba29..f2a59b57 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,17 +30,17 @@ importers: specifier: ^3.9.0 version: 3.9.0(react-hook-form@7.53.0(react@18.3.1)) '@mui/icons-material': - specifier: ^5.16.7 - version: 5.16.7(@mui/material@5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) + specifier: ^6.0.0 + version: 6.0.0(@mui/material@6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/lab': - specifier: 5.0.0-alpha.172 - version: 5.0.0-alpha.172(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/material@5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 6.0.0-beta.8 + version: 6.0.0-beta.8(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/material@6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^6.0.0 + version: 6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material-nextjs': - specifier: ^5.16.6 - version: 5.16.6(@emotion/cache@11.13.1)(@mui/material@5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.4)(next@14.2.7(@babel/core@7.25.2)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + specifier: ^6.0.0 + version: 6.0.0(@emotion/cache@11.13.1)(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(next@14.2.7(@babel/core@7.25.2)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@next/env': specifier: ^14.2.7 version: 14.2.7 @@ -52,7 +52,7 @@ importers: version: 1.0.12(next@14.2.7(@babel/core@7.25.2)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@vitest/coverage-istanbul': specifier: ^2.0.5 - version: 2.0.5(vitest@2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@14.12.3)) + version: 2.0.5(vitest@2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@15.0.0)) dataloader: specifier: ^2.2.2 version: 2.2.2 @@ -113,7 +113,7 @@ importers: version: 8.5.0(@stryker-mutator/core@8.5.0)(typescript@5.5.4) '@stryker-mutator/vitest-runner': specifier: ^8.5.0 - version: 8.5.0(@stryker-mutator/core@8.5.0)(vitest@2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@14.12.3)) + version: 8.5.0(@stryker-mutator/core@8.5.0)(vitest@2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@15.0.0)) '@stylistic/eslint-plugin': specifier: ^1.8.1 version: 1.8.1(eslint@8.57.0)(typescript@5.5.4) @@ -185,7 +185,7 @@ importers: version: 4.3.2(typescript@5.5.4)(vite@5.4.2(@types/node@20.16.1)) vitest: specifier: ^2.0.5 - version: 2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@14.12.3) + version: 2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@15.0.0) packages: @@ -831,9 +831,9 @@ packages: resolution: {integrity: sha512-3rDakgJZ77+RiQUuSK69t1F0m8BQKA8Vh5DCS5V0DWvNY67zob2JhhQrhCO0AKLGINTRSFd1tBaHcJTkhefoSw==} engines: {node: '>=18'} - '@mui/base@5.0.0-beta.40': - resolution: {integrity: sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==} - engines: {node: '>=12.0.0'} + '@mui/base@5.0.0-beta.58': + resolution: {integrity: sha512-P0E7ZrxOuyYqBvVv9w8k7wm+Xzx/KRu+BGgFcR2htTsGCpJNQJCSUXNUZ50MUmSU9hzqhwbQWNXhV1MBTl6F7A==} + engines: {node: '>=14.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 react: ^17.0.0 || ^18.0.0 @@ -842,48 +842,51 @@ packages: '@types/react': optional: true - '@mui/core-downloads-tracker@5.16.7': - resolution: {integrity: sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ==} + '@mui/core-downloads-tracker@6.0.0': + resolution: {integrity: sha512-x5qg4ndVmSY5jzp1AgSQSh/iI3H3oN30JwSQAKCIopH6iHGyqEzLx5/gZVbpWzlzt5xoeX8eubqPzEiUo8ClYg==} - '@mui/icons-material@5.16.7': - resolution: {integrity: sha512-UrGwDJCXEszbDI7yV047BYU5A28eGJ79keTCP4cc74WyncuVrnurlmIRxaHL8YK+LI1Kzq+/JM52IAkNnv4u+Q==} - engines: {node: '>=12.0.0'} + '@mui/icons-material@6.0.0': + resolution: {integrity: sha512-rtQSoztIpGtl+Uy2mZ00VtrSxt8jnPqcCZ4MPBVVfJdxyxVRe04snkckGmPGMn4PwjSGiiu9wAVdBTkmXJzfyA==} + engines: {node: '>=14.0.0'} peerDependencies: - '@mui/material': ^5.0.0 - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 + '@mui/material': ^6.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@types/react': optional: true - '@mui/lab@5.0.0-alpha.172': - resolution: {integrity: sha512-stpa3WTsDE1HamFR4eeS6Bhxalm+u9FhzzNph/PrDMdWSRBHlJs2mqvZ6FEoO22O7MOCwNMqbXTkvEwsyEf0ew==} - engines: {node: '>=12.0.0'} + '@mui/lab@6.0.0-beta.8': + resolution: {integrity: sha512-U87EIThhqhkeBtiK5Pi0siNDMfrbUbVKTE3cNqnyReUyW7rPKEDkBWKvLoSzqlRP2gA1GNMk0tEZX6bia1Vihg==} + engines: {node: '>=14.0.0'} peerDependencies: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 - '@mui/material': '>=5.15.0' - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - react-dom: ^17.0.0 || ^18.0.0 + '@mui/material': ^6.0.0 + '@mui/material-pigment-css': ^6.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@emotion/react': optional: true '@emotion/styled': optional: true + '@mui/material-pigment-css': + optional: true '@types/react': optional: true - '@mui/material-nextjs@5.16.6': - resolution: {integrity: sha512-Y64ybP5Pmy+GCUcu3SuMnc25CqFwBQkRn6XNXyhvc1mhR48Iq0oFKjoO5ncqfhm58OwPClIRW2tecP/PTdGNJw==} - engines: {node: '>=12.0.0'} + '@mui/material-nextjs@6.0.0': + resolution: {integrity: sha512-1ffvNLAaZ2r3yahe49YZtCZxGA9spsmnebJq9I6I/chOlxkUfHUvS4Z552rdLWSvBVTW8So+NCI1N49l9LZIjw==} + engines: {node: '>=14.0.0'} peerDependencies: '@emotion/cache': ^11.11.0 + '@emotion/react': ^11.11.4 '@emotion/server': ^11.11.0 - '@mui/material': ^5.0.0 - '@types/react': ^17.0.0 || ^18.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 next: ^13.0.0 || ^14.0.0 - react: ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@emotion/cache': optional: true @@ -892,54 +895,57 @@ packages: '@types/react': optional: true - '@mui/material@5.16.7': - resolution: {integrity: sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg==} - engines: {node: '>=12.0.0'} + '@mui/material@6.0.0': + resolution: {integrity: sha512-pU8L/bvoK3bBYM0MUCr8EHgdFbYwB3LIZ1yr1FWI2dZBA/751oy2qr7UgMnZznGCq+C9pTp1EOugF9FhW0G6xg==} + engines: {node: '>=14.0.0'} peerDependencies: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - react-dom: ^17.0.0 || ^18.0.0 + '@mui/material-pigment-css': ^6.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@emotion/react': optional: true '@emotion/styled': optional: true + '@mui/material-pigment-css': + optional: true '@types/react': optional: true - '@mui/private-theming@5.16.6': - resolution: {integrity: sha512-rAk+Rh8Clg7Cd7shZhyt2HGTTE5wYKNSJ5sspf28Fqm/PZ69Er9o6KX25g03/FG2dfpg5GCwZh/xOojiTfm3hw==} - engines: {node: '>=12.0.0'} + '@mui/private-theming@6.0.0': + resolution: {integrity: sha512-GaURgp4wl/E4X/v2wF7joYYR8Skzf+LBtBHi/Vb6FlwrMGiZGW9gatPPpK89aB64NZ25UPwPsXupWPoOdbmSMg==} + engines: {node: '>=14.0.0'} peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@types/react': optional: true - '@mui/styled-engine@5.16.6': - resolution: {integrity: sha512-zaThmS67ZmtHSWToTiHslbI8jwrmITcN93LQaR2lKArbvS7Z3iLkwRoiikNWutx9MBs8Q6okKvbZq1RQYB3v7g==} - engines: {node: '>=12.0.0'} + '@mui/styled-engine@6.0.0': + resolution: {integrity: sha512-V/i+XixLUzulE1tSwlf9iJXipuD1J9XBV1Z1Yezfc0p42wAvoB9dIJImfUNMjvAsjdgw1CoRoebROQlLLy8HsQ==} + engines: {node: '>=14.0.0'} peerDependencies: '@emotion/react': ^11.4.1 '@emotion/styled': ^11.3.0 - react: ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@emotion/react': optional: true '@emotion/styled': optional: true - '@mui/system@5.16.7': - resolution: {integrity: sha512-Jncvs/r/d/itkxh7O7opOunTqbbSSzMTHzZkNLM+FjAOg+cYAZHrPDlYe1ZGKUYORwwb2XexlWnpZp0kZ4AHuA==} - engines: {node: '>=12.0.0'} + '@mui/system@6.0.0': + resolution: {integrity: sha512-Y1Luj5aApIN+FnrdZTwd/UvL3QC53nHHweaWco27vO9WLC/s/bLYFR6sO9hdib2wIGLr3WCQJGUafeGpz5OWzw==} + engines: {node: '>=14.0.0'} peerDependencies: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@emotion/react': optional: true @@ -956,12 +962,22 @@ packages: '@types/react': optional: true - '@mui/utils@5.16.6': - resolution: {integrity: sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA==} - engines: {node: '>=12.0.0'} + '@mui/utils@6.0.0': + resolution: {integrity: sha512-6MlZc3Kv/KctTkq6EQyi5p1UKtJpBxcmTyqxM3HucbdhAZuUMRTYYipLVQRqvDqiUisqQcev3QDFKx1b7DMCwg==} + engines: {node: '>=14.0.0'} peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + '@types/react': + optional: true + + '@mui/utils@6.0.0-rc.0': + resolution: {integrity: sha512-tBp0ILEXDL0bbDDT8PnZOjCqSm5Dfk2N0Z45uzRw+wVl6fVvloC9zw8avl+OdX1Bg3ubs/ttKn8nRNv17bpM5A==} + engines: {node: '>=14.0.0'} + peerDependencies: + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@types/react': optional: true @@ -2328,9 +2344,9 @@ packages: resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==} engines: {node: '>=10'} - happy-dom@14.12.3: - resolution: {integrity: sha512-vsYlEs3E9gLwA1Hp+w3qzu+RUDFf4VTT8cyKqVICoZ2k7WM++Qyd2LwzyTi5bqMJFiIC/vNpTDYuxdreENRK/g==} - engines: {node: '>=16.0.0'} + happy-dom@15.0.0: + resolution: {integrity: sha512-DsvANUcxxY20iCo3Yllm7dqwzPVPduGfVFxa7mONwMBLczFeQgkN0LpDir1kIY322JMh+hrcPV3aGLyHCESDlA==} + engines: {node: '>=18.0.0'} has-bigints@1.0.2: resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} @@ -4432,12 +4448,12 @@ snapshots: outvariant: 1.4.3 strict-event-emitter: 0.5.1 - '@mui/base@5.0.0-beta.40(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@mui/base@5.0.0-beta.58(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.4 '@floating-ui/react-dom': 2.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/types': 7.2.16(@types/react@18.3.4) - '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 6.0.0-rc.0(@types/react@18.3.4)(react@18.3.1) '@popperjs/core': 2.11.8 clsx: 2.1.1 prop-types: 15.8.1 @@ -4446,24 +4462,24 @@ snapshots: optionalDependencies: '@types/react': 18.3.4 - '@mui/core-downloads-tracker@5.16.7': {} + '@mui/core-downloads-tracker@6.0.0': {} - '@mui/icons-material@5.16.7(@mui/material@5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.4)(react@18.3.1)': + '@mui/icons-material@6.0.0(@mui/material@6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.4)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.4 - '@mui/material': 5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': 6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 optionalDependencies: '@types/react': 18.3.4 - '@mui/lab@5.0.0-alpha.172(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/material@5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@mui/lab@6.0.0-beta.8(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/material@6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.4 - '@mui/base': 5.0.0-beta.40(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/material': 5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': 5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) + '@mui/base': 5.0.0-beta.58(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': 6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': 6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/types': 7.2.16(@types/react@18.3.4) - '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 6.0.0(@types/react@18.3.4)(react@18.3.1) clsx: 2.1.1 prop-types: 15.8.1 react: 18.3.1 @@ -4473,23 +4489,23 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@types/react': 18.3.4 - '@mui/material-nextjs@5.16.6(@emotion/cache@11.13.1)(@mui/material@5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.4)(next@14.2.7(@babel/core@7.25.2)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': + '@mui/material-nextjs@6.0.0(@emotion/cache@11.13.1)(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(next@14.2.7(@babel/core@7.25.2)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.4 - '@mui/material': 5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@emotion/react': 11.13.3(@types/react@18.3.4)(react@18.3.1) next: 14.2.7(@babel/core@7.25.2)(@playwright/test@1.46.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 optionalDependencies: '@emotion/cache': 11.13.1 '@types/react': 18.3.4 - '@mui/material@5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@mui/material@6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.4 - '@mui/core-downloads-tracker': 5.16.7 - '@mui/system': 5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) + '@mui/core-downloads-tracker': 6.0.0 + '@mui/system': 6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/types': 7.2.16(@types/react@18.3.4) - '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 6.0.0(@types/react@18.3.4)(react@18.3.1) '@popperjs/core': 2.11.8 '@types/react-transition-group': 4.4.11 clsx: 2.1.1 @@ -4504,16 +4520,16 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@types/react': 18.3.4 - '@mui/private-theming@5.16.6(@types/react@18.3.4)(react@18.3.1)': + '@mui/private-theming@6.0.0(@types/react@18.3.4)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.4 - '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 6.0.0(@types/react@18.3.4)(react@18.3.1) prop-types: 15.8.1 react: 18.3.1 optionalDependencies: '@types/react': 18.3.4 - '@mui/styled-engine@5.16.6(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(react@18.3.1)': + '@mui/styled-engine@6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.4 '@emotion/cache': 11.13.1 @@ -4524,13 +4540,13 @@ snapshots: '@emotion/react': 11.13.3(@types/react@18.3.4)(react@18.3.1) '@emotion/styled': 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) - '@mui/system@5.16.7(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1)': + '@mui/system@6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.4 - '@mui/private-theming': 5.16.6(@types/react@18.3.4)(react@18.3.1) - '@mui/styled-engine': 5.16.6(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(react@18.3.1) + '@mui/private-theming': 6.0.0(@types/react@18.3.4)(react@18.3.1) + '@mui/styled-engine': 6.0.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(react@18.3.1) '@mui/types': 7.2.16(@types/react@18.3.4) - '@mui/utils': 5.16.6(@types/react@18.3.4)(react@18.3.1) + '@mui/utils': 6.0.0(@types/react@18.3.4)(react@18.3.1) clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 @@ -4544,7 +4560,19 @@ snapshots: optionalDependencies: '@types/react': 18.3.4 - '@mui/utils@5.16.6(@types/react@18.3.4)(react@18.3.1)': + '@mui/utils@6.0.0(@types/react@18.3.4)(react@18.3.1)': + dependencies: + '@babel/runtime': 7.25.4 + '@mui/types': 7.2.16(@types/react@18.3.4) + '@types/prop-types': 15.7.12 + clsx: 2.1.1 + prop-types: 15.8.1 + react: 18.3.1 + react-is: 18.3.1 + optionalDependencies: + '@types/react': 18.3.4 + + '@mui/utils@6.0.0-rc.0(@types/react@18.3.4)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.4 '@mui/types': 7.2.16(@types/react@18.3.4) @@ -4749,13 +4777,13 @@ snapshots: '@stryker-mutator/util@8.5.0': {} - '@stryker-mutator/vitest-runner@8.5.0(@stryker-mutator/core@8.5.0)(vitest@2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@14.12.3))': + '@stryker-mutator/vitest-runner@8.5.0(@stryker-mutator/core@8.5.0)(vitest@2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@15.0.0))': dependencies: '@stryker-mutator/api': 8.5.0 '@stryker-mutator/core': 8.5.0 '@stryker-mutator/util': 8.5.0 tslib: 2.6.3 - vitest: 2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@14.12.3) + vitest: 2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@15.0.0) '@stylistic/eslint-plugin-js@1.8.1(eslint@8.57.0)': dependencies: @@ -5120,7 +5148,7 @@ snapshots: magic-string: 0.30.11 msw: 2.3.5(typescript@5.5.4) sirv: 2.0.4 - vitest: 2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@14.12.3) + vitest: 2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@15.0.0) ws: 8.18.0 optionalDependencies: playwright: 1.46.1 @@ -5129,7 +5157,7 @@ snapshots: - typescript - utf-8-validate - '@vitest/coverage-istanbul@2.0.5(vitest@2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@14.12.3))': + '@vitest/coverage-istanbul@2.0.5(vitest@2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@15.0.0))': dependencies: '@istanbuljs/schema': 0.1.3 debug: 4.3.6 @@ -5141,7 +5169,7 @@ snapshots: magicast: 0.3.5 test-exclude: 7.0.1 tinyrainbow: 1.2.0 - vitest: 2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@14.12.3) + vitest: 2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@15.0.0) transitivePeerDependencies: - supports-color @@ -6226,7 +6254,7 @@ snapshots: dependencies: duplexer: 0.1.2 - happy-dom@14.12.3: + happy-dom@15.0.0: dependencies: entities: 4.5.0 webidl-conversions: 7.0.0 @@ -7473,7 +7501,7 @@ snapshots: '@types/node': 20.16.1 fsevents: 2.3.3 - vitest@2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@14.12.3): + vitest@2.0.5(@types/node@20.16.1)(@vitest/browser@2.0.5)(happy-dom@15.0.0): dependencies: '@ampproject/remapping': 2.3.0 '@vitest/expect': 2.0.5 @@ -7497,7 +7525,7 @@ snapshots: optionalDependencies: '@types/node': 20.16.1 '@vitest/browser': 2.0.5(playwright@1.46.1)(typescript@5.5.4)(vitest@2.0.5) - happy-dom: 14.12.3 + happy-dom: 15.0.0 transitivePeerDependencies: - less - lightningcss diff --git a/src/app/(app)/_components/layout/content.tsx b/src/app/(app)/_components/layout/content.tsx index 116e64ad..69b9d6b9 100644 --- a/src/app/(app)/_components/layout/content.tsx +++ b/src/app/(app)/_components/layout/content.tsx @@ -1,4 +1,4 @@ -import { Container, Unstable_Grid2 as Grid, Stack } from "@mui/material"; +import { Container, Grid2 as Grid, Stack } from "@mui/material"; import { type PropsWithChildren, type ReactNode } from "react"; import { ErrorBoundary } from "./error-boundary"; @@ -13,14 +13,16 @@ export const Content = ({ children }: PropsWithChildren): ReactNode => ( spacing={2} py={2} > - + }> {children} ( align="center" variant="subtitle2" > - © 2023 Lexique Québécois + © 2024 Lexique Québécois ); diff --git a/src/app/(app)/mots/_components/letter-section.tsx b/src/app/(app)/mots/_components/letter-section.tsx index 1c090f3a..4a93c6c0 100644 --- a/src/app/(app)/mots/_components/letter-section.tsx +++ b/src/app/(app)/mots/_components/letter-section.tsx @@ -1,4 +1,4 @@ -import { Unstable_Grid2 as Grid, Typography } from "@mui/material"; +import { Grid2 as Grid, Typography } from "@mui/material"; import { type ReactNode } from "react"; import { WordLink } from "./word-link"; diff --git a/src/app/(app)/mots/_components/word-link.tsx b/src/app/(app)/mots/_components/word-link.tsx index 60d3f664..e96b0b24 100644 --- a/src/app/(app)/mots/_components/word-link.tsx +++ b/src/app/(app)/mots/_components/word-link.tsx @@ -1,4 +1,4 @@ -import { Unstable_Grid2 as Grid, Link } from "@mui/material"; +import { Grid2 as Grid, Link } from "@mui/material"; import NextLink from "next/link"; import { type ReactNode } from "react"; @@ -15,9 +15,11 @@ export const WordLink = ({ word, isLast = false }: Props): ReactNode => { return ( ( - {getInitColorSchemeScript({ defaultMode })} - + {children} - + ); diff --git a/src/app/_components/providers/theme-provider/theme.ts b/src/app/_components/providers/theme-provider/theme.ts index 0c6ac01f..e1637930 100644 --- a/src/app/_components/providers/theme-provider/theme.ts +++ b/src/app/_components/providers/theme-provider/theme.ts @@ -2,7 +2,7 @@ import type { } from "@mui/lab/themeAugmentation"; import { Slide } from "@mui/material"; import { common } from "@mui/material/colors"; import { outlinedInputClasses } from "@mui/material/OutlinedInput"; -import { type CSSInterpolation, type CssVarsTheme, type Theme, alpha, experimental_extendTheme as extendTheme, lighten } from "@mui/material/styles"; +import { type CSSInterpolation, type CssVarsTheme, type Theme, alpha, createTheme, lighten } from "@mui/material/styles"; import { font } from "./font"; @@ -47,7 +47,12 @@ const darkElevationOverlay = { [24]: 0.16 } as const satisfies Record; -export const theme = extendTheme({ +export const colorSchemeSelector: string = "class"; + +export const theme = createTheme({ + cssVariables: { + colorSchemeSelector + }, colorSchemes: { light: { palette: { @@ -390,9 +395,6 @@ export const theme = extendTheme({ } }, styleOverrides: { - root: ({ theme: { vars: { palette } } }) => ({ - color: palette.common.onBackground - }), gutterBottom: { marginBottom: "0.5em" },