From c4c759fdbf42dea24a94d9729b6118596fb6ba1e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 May 2025 16:19:15 +0000 Subject: [PATCH 1/4] fix(deps): update material-ui monorepo to v7 --- package.json | 10 ++-- yarn.lock | 155 +++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 137 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index dcc88767..81d904b4 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "dependencies": { "@ai-sdk/react": "1.2.12", "@emotion/cache": "^11.14.0", - "@mui/utils": "^6.1.6", + "@mui/utils": "^7.0.0", "better-react-mathjax": "^2.3.0", "classnames": "^2.5.1", "fetch-retry": "^6.0.0", @@ -84,8 +84,8 @@ "@faker-js/faker": "^9.0.0", "@jest/environment": "^29.7.0", "@mui/lab": "6.0.0-dev.240424162023-9968b4889d", - "@mui/material": "^6.1.6", - "@mui/system": "^6.1.6", + "@mui/material": "^7.0.0", + "@mui/system": "^7.0.0", "@remixicon/react": "^4.2.0", "@storybook/addon-actions": "^8.6.7", "@storybook/addon-essentials": "^8.6.7", @@ -146,8 +146,8 @@ "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", "@mui/lab": "*", - "@mui/material": "^6.1.6", - "@mui/system": "^6.1.6", + "@mui/material": "^7.0.0", + "@mui/system": "^7.0.0", "@remixicon/react": "^4.2.0", "react": "^18 || ^19", "react-dom": "^18 || ^19" diff --git a/yarn.lock b/yarn.lock index ada40549..c00a93e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1443,6 +1443,13 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.27.1": + version: 7.27.3 + resolution: "@babel/runtime@npm:7.27.3" + checksum: 10/c1975b37bfc3f24a32c0beb4999d4302a33a70d0599fb3d42a9baf836fcd615de7ae36eff2fbbc7451c892d3dcc9314a90c3f1f3b337f5617f6c5b826d2dbd54 + languageName: node + linkType: hard + "@babel/template@npm:^7.25.9, @babel/template@npm:^7.26.9, @babel/template@npm:^7.27.0, @babel/template@npm:^7.3.3": version: 7.27.0 resolution: "@babel/template@npm:7.27.0" @@ -2793,9 +2800,9 @@ __metadata: "@faker-js/faker": "npm:^9.0.0" "@jest/environment": "npm:^29.7.0" "@mui/lab": "npm:6.0.0-dev.240424162023-9968b4889d" - "@mui/material": "npm:^6.1.6" - "@mui/system": "npm:^6.1.6" - "@mui/utils": "npm:^6.1.6" + "@mui/material": "npm:^7.0.0" + "@mui/system": "npm:^7.0.0" + "@mui/utils": "npm:^7.0.0" "@remixicon/react": "npm:^4.2.0" "@storybook/addon-actions": "npm:^8.6.7" "@storybook/addon-essentials": "npm:^8.6.7" @@ -2865,8 +2872,8 @@ __metadata: "@emotion/react": ^11.11.1 "@emotion/styled": ^11.11.0 "@mui/lab": "*" - "@mui/material": ^6.1.6 - "@mui/system": ^6.1.6 + "@mui/material": ^7.0.0 + "@mui/system": ^7.0.0 "@remixicon/react": ^4.2.0 react: ^18 || ^19 react-dom: ^18 || ^19 @@ -2909,10 +2916,10 @@ __metadata: languageName: node linkType: hard -"@mui/core-downloads-tracker@npm:^6.4.11": - version: 6.4.11 - resolution: "@mui/core-downloads-tracker@npm:6.4.11" - checksum: 10/78f01e6449d01eddd0956e21b1e716353025653689808978be964be0d4ce927f0379fe4e15f387576ebf7d6a4f42451e5f5016f868e332d38ac32fc5a5452be3 +"@mui/core-downloads-tracker@npm:^7.1.0": + version: 7.1.0 + resolution: "@mui/core-downloads-tracker@npm:7.1.0" + checksum: 10/bf625749ef497f1707d12ef0ab85db0da1417c47df39ef91207de283c8fcd4ef1aab4ce2c4a1f1db532e88a9ba8133d0cc4348cb83a28692047b74fb9952a151 languageName: node linkType: hard @@ -2945,26 +2952,26 @@ __metadata: languageName: node linkType: hard -"@mui/material@npm:^6.1.6": - version: 6.4.11 - resolution: "@mui/material@npm:6.4.11" +"@mui/material@npm:^7.0.0": + version: 7.1.0 + resolution: "@mui/material@npm:7.1.0" dependencies: - "@babel/runtime": "npm:^7.26.0" - "@mui/core-downloads-tracker": "npm:^6.4.11" - "@mui/system": "npm:^6.4.11" - "@mui/types": "npm:~7.2.24" - "@mui/utils": "npm:^6.4.9" + "@babel/runtime": "npm:^7.27.1" + "@mui/core-downloads-tracker": "npm:^7.1.0" + "@mui/system": "npm:^7.1.0" + "@mui/types": "npm:^7.4.2" + "@mui/utils": "npm:^7.1.0" "@popperjs/core": "npm:^2.11.8" "@types/react-transition-group": "npm:^4.4.12" clsx: "npm:^2.1.1" csstype: "npm:^3.1.3" prop-types: "npm:^15.8.1" - react-is: "npm:^19.0.0" + react-is: "npm:^19.1.0" react-transition-group: "npm:^4.4.5" peerDependencies: "@emotion/react": ^11.5.0 "@emotion/styled": ^11.3.0 - "@mui/material-pigment-css": ^6.4.11 + "@mui/material-pigment-css": ^7.1.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 @@ -2977,7 +2984,7 @@ __metadata: optional: true "@types/react": optional: true - checksum: 10/aa100d42d5fd702447dedd7cddba087149ede9682154cd595b79778783c0b76993cc37b43722852187c02cb1eceb911c55b1808aff69d8a8709153ffb85fc030 + checksum: 10/1fd402e341dc2402c63a410b25ef3edfedd34ded0d79d3964f9121e97ec11f5db33d8a9c4c509bd0b8e881ea6c96e1c2de94a691e83a73e2bb3d262fce54546d languageName: node linkType: hard @@ -2998,6 +3005,23 @@ __metadata: languageName: node linkType: hard +"@mui/private-theming@npm:^7.1.0": + version: 7.1.0 + resolution: "@mui/private-theming@npm:7.1.0" + dependencies: + "@babel/runtime": "npm:^7.27.1" + "@mui/utils": "npm:^7.1.0" + prop-types: "npm:^15.8.1" + 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 + checksum: 10/3c8d0515b578371b669bd000f5f2a9b64554715d3f5fbeae856b0a73a7ddbf8beb1ab9bbfaf2420f53038264533fb36d07facf41be4a8b13787efa6971e701ec + languageName: node + linkType: hard + "@mui/styled-engine@npm:^6.4.11": version: 6.4.11 resolution: "@mui/styled-engine@npm:6.4.11" @@ -3021,7 +3045,30 @@ __metadata: languageName: node linkType: hard -"@mui/system@npm:^6.0.0-dev.240424162023-9968b4889d, @mui/system@npm:^6.1.6, @mui/system@npm:^6.4.11": +"@mui/styled-engine@npm:^7.1.0": + version: 7.1.0 + resolution: "@mui/styled-engine@npm:7.1.0" + dependencies: + "@babel/runtime": "npm:^7.27.1" + "@emotion/cache": "npm:^11.13.5" + "@emotion/serialize": "npm:^1.3.3" + "@emotion/sheet": "npm:^1.4.0" + csstype: "npm:^3.1.3" + prop-types: "npm:^15.8.1" + peerDependencies: + "@emotion/react": ^11.4.1 + "@emotion/styled": ^11.3.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@emotion/react": + optional: true + "@emotion/styled": + optional: true + checksum: 10/7e6425443f4628f149a1ed2216117f50632334730115de060e8e9d9a9be5a7d1910d93213877438630938db7f3392b97b6aeb7d616db1668616c988b8cb5af4d + languageName: node + linkType: hard + +"@mui/system@npm:^6.0.0-dev.240424162023-9968b4889d": version: 6.4.11 resolution: "@mui/system@npm:6.4.11" dependencies: @@ -3049,6 +3096,34 @@ __metadata: languageName: node linkType: hard +"@mui/system@npm:^7.0.0, @mui/system@npm:^7.1.0": + version: 7.1.0 + resolution: "@mui/system@npm:7.1.0" + dependencies: + "@babel/runtime": "npm:^7.27.1" + "@mui/private-theming": "npm:^7.1.0" + "@mui/styled-engine": "npm:^7.1.0" + "@mui/types": "npm:^7.4.2" + "@mui/utils": "npm:^7.1.0" + clsx: "npm:^2.1.1" + csstype: "npm:^3.1.3" + prop-types: "npm:^15.8.1" + peerDependencies: + "@emotion/react": ^11.5.0 + "@emotion/styled": ^11.3.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 + "@emotion/styled": + optional: true + "@types/react": + optional: true + checksum: 10/5fb53c071d83acf7d51ef8f862c9a7aa86527d64882a651dbdf521cd8a6965690508b1d4bee6fcab032cd3985831a6af14f97770abc061c2149fd3a4d831cca3 + languageName: node + linkType: hard + "@mui/types@npm:^7.2.14": version: 7.4.1 resolution: "@mui/types@npm:7.4.1" @@ -3063,6 +3138,20 @@ __metadata: languageName: node linkType: hard +"@mui/types@npm:^7.4.2": + version: 7.4.2 + resolution: "@mui/types@npm:7.4.2" + dependencies: + "@babel/runtime": "npm:^7.27.1" + peerDependencies: + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 10/0fedf7ed5f8f9fe88df2657a704bf674e5e4b03f726765e7797044fe4ef7504c60b88aa65edaef00e23e412153bf990d5421f125c3865790071899d049fd597b + languageName: node + linkType: hard + "@mui/types@npm:~7.2.24": version: 7.2.24 resolution: "@mui/types@npm:7.2.24" @@ -3075,7 +3164,7 @@ __metadata: languageName: node linkType: hard -"@mui/utils@npm:^6.0.0-alpha.1, @mui/utils@npm:^6.0.0-alpha.3, @mui/utils@npm:^6.1.6, @mui/utils@npm:^6.4.9": +"@mui/utils@npm:^6.0.0-alpha.1, @mui/utils@npm:^6.0.0-alpha.3, @mui/utils@npm:^6.4.9": version: 6.4.9 resolution: "@mui/utils@npm:6.4.9" dependencies: @@ -3095,6 +3184,26 @@ __metadata: languageName: node linkType: hard +"@mui/utils@npm:^7.0.0, @mui/utils@npm:^7.1.0": + version: 7.1.0 + resolution: "@mui/utils@npm:7.1.0" + dependencies: + "@babel/runtime": "npm:^7.27.1" + "@mui/types": "npm:^7.4.2" + "@types/prop-types": "npm:^15.7.14" + clsx: "npm:^2.1.1" + prop-types: "npm:^15.8.1" + react-is: "npm:^19.1.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 + checksum: 10/8fbfc343331f600fe0691474032aa1b91d5ffff920ee1404b4e4626931e5852320b023b10eec680d2f1b24d469f8aec5439d1e81fc4aa20eaacb488a56a5b68e + languageName: node + linkType: hard + "@napi-rs/wasm-runtime@npm:^0.2.9": version: 0.2.9 resolution: "@napi-rs/wasm-runtime@npm:0.2.9" @@ -14979,7 +15088,7 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^19.0.0": +"react-is@npm:^19.0.0, react-is@npm:^19.1.0": version: 19.1.0 resolution: "react-is@npm:19.1.0" checksum: 10/4aceca94492032a19411138bf68c6ca7dce4abee7ae6c7f23db9291d2dff14d6a643717b176ef9a151e8cdf6a2b71fdbc59fd998328e086a6f752512304a252b From 381d6d0ff90d1a5e968898d126130d6fabcdf7f6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 May 2025 18:48:35 +0000 Subject: [PATCH 2/4] fix(deps): update material-ui monorepo to v7 --- package.json | 10 ++-- yarn.lock | 155 +++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 137 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 53776075..a229936f 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "dependencies": { "@ai-sdk/react": "1.2.12", "@emotion/cache": "^11.14.0", - "@mui/utils": "^6.1.6", + "@mui/utils": "^7.0.0", "better-react-mathjax": "^2.3.0", "classnames": "^2.5.1", "conventional-changelog-conventionalcommits": "^9.0.0", @@ -85,8 +85,8 @@ "@faker-js/faker": "^9.0.0", "@jest/environment": "^29.7.0", "@mui/lab": "6.0.0-dev.240424162023-9968b4889d", - "@mui/material": "^6.1.6", - "@mui/system": "^6.1.6", + "@mui/material": "^7.0.0", + "@mui/system": "^7.0.0", "@remixicon/react": "^4.2.0", "@storybook/addon-actions": "^8.6.7", "@storybook/addon-essentials": "^8.6.7", @@ -146,8 +146,8 @@ "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", "@mui/lab": "*", - "@mui/material": "^6.1.6", - "@mui/system": "^6.1.6", + "@mui/material": "^7.0.0", + "@mui/system": "^7.0.0", "@remixicon/react": "^4.2.0", "react": "^18 || ^19", "react-dom": "^18 || ^19" diff --git a/yarn.lock b/yarn.lock index d4a32182..a6e55efc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1443,6 +1443,13 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.27.1": + version: 7.27.3 + resolution: "@babel/runtime@npm:7.27.3" + checksum: 10/c1975b37bfc3f24a32c0beb4999d4302a33a70d0599fb3d42a9baf836fcd615de7ae36eff2fbbc7451c892d3dcc9314a90c3f1f3b337f5617f6c5b826d2dbd54 + languageName: node + linkType: hard + "@babel/template@npm:^7.25.9, @babel/template@npm:^7.26.9, @babel/template@npm:^7.27.0, @babel/template@npm:^7.3.3": version: 7.27.0 resolution: "@babel/template@npm:7.27.0" @@ -2793,9 +2800,9 @@ __metadata: "@faker-js/faker": "npm:^9.0.0" "@jest/environment": "npm:^29.7.0" "@mui/lab": "npm:6.0.0-dev.240424162023-9968b4889d" - "@mui/material": "npm:^6.1.6" - "@mui/system": "npm:^6.1.6" - "@mui/utils": "npm:^6.1.6" + "@mui/material": "npm:^7.0.0" + "@mui/system": "npm:^7.0.0" + "@mui/utils": "npm:^7.0.0" "@remixicon/react": "npm:^4.2.0" "@storybook/addon-actions": "npm:^8.6.7" "@storybook/addon-essentials": "npm:^8.6.7" @@ -2865,8 +2872,8 @@ __metadata: "@emotion/react": ^11.11.1 "@emotion/styled": ^11.11.0 "@mui/lab": "*" - "@mui/material": ^6.1.6 - "@mui/system": ^6.1.6 + "@mui/material": ^7.0.0 + "@mui/system": ^7.0.0 "@remixicon/react": ^4.2.0 react: ^18 || ^19 react-dom: ^18 || ^19 @@ -2909,10 +2916,10 @@ __metadata: languageName: node linkType: hard -"@mui/core-downloads-tracker@npm:^6.4.11": - version: 6.4.11 - resolution: "@mui/core-downloads-tracker@npm:6.4.11" - checksum: 10/78f01e6449d01eddd0956e21b1e716353025653689808978be964be0d4ce927f0379fe4e15f387576ebf7d6a4f42451e5f5016f868e332d38ac32fc5a5452be3 +"@mui/core-downloads-tracker@npm:^7.1.0": + version: 7.1.0 + resolution: "@mui/core-downloads-tracker@npm:7.1.0" + checksum: 10/bf625749ef497f1707d12ef0ab85db0da1417c47df39ef91207de283c8fcd4ef1aab4ce2c4a1f1db532e88a9ba8133d0cc4348cb83a28692047b74fb9952a151 languageName: node linkType: hard @@ -2945,26 +2952,26 @@ __metadata: languageName: node linkType: hard -"@mui/material@npm:^6.1.6": - version: 6.4.11 - resolution: "@mui/material@npm:6.4.11" +"@mui/material@npm:^7.0.0": + version: 7.1.0 + resolution: "@mui/material@npm:7.1.0" dependencies: - "@babel/runtime": "npm:^7.26.0" - "@mui/core-downloads-tracker": "npm:^6.4.11" - "@mui/system": "npm:^6.4.11" - "@mui/types": "npm:~7.2.24" - "@mui/utils": "npm:^6.4.9" + "@babel/runtime": "npm:^7.27.1" + "@mui/core-downloads-tracker": "npm:^7.1.0" + "@mui/system": "npm:^7.1.0" + "@mui/types": "npm:^7.4.2" + "@mui/utils": "npm:^7.1.0" "@popperjs/core": "npm:^2.11.8" "@types/react-transition-group": "npm:^4.4.12" clsx: "npm:^2.1.1" csstype: "npm:^3.1.3" prop-types: "npm:^15.8.1" - react-is: "npm:^19.0.0" + react-is: "npm:^19.1.0" react-transition-group: "npm:^4.4.5" peerDependencies: "@emotion/react": ^11.5.0 "@emotion/styled": ^11.3.0 - "@mui/material-pigment-css": ^6.4.11 + "@mui/material-pigment-css": ^7.1.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 @@ -2977,7 +2984,7 @@ __metadata: optional: true "@types/react": optional: true - checksum: 10/aa100d42d5fd702447dedd7cddba087149ede9682154cd595b79778783c0b76993cc37b43722852187c02cb1eceb911c55b1808aff69d8a8709153ffb85fc030 + checksum: 10/1fd402e341dc2402c63a410b25ef3edfedd34ded0d79d3964f9121e97ec11f5db33d8a9c4c509bd0b8e881ea6c96e1c2de94a691e83a73e2bb3d262fce54546d languageName: node linkType: hard @@ -2998,6 +3005,23 @@ __metadata: languageName: node linkType: hard +"@mui/private-theming@npm:^7.1.0": + version: 7.1.0 + resolution: "@mui/private-theming@npm:7.1.0" + dependencies: + "@babel/runtime": "npm:^7.27.1" + "@mui/utils": "npm:^7.1.0" + prop-types: "npm:^15.8.1" + 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 + checksum: 10/3c8d0515b578371b669bd000f5f2a9b64554715d3f5fbeae856b0a73a7ddbf8beb1ab9bbfaf2420f53038264533fb36d07facf41be4a8b13787efa6971e701ec + languageName: node + linkType: hard + "@mui/styled-engine@npm:^6.4.11": version: 6.4.11 resolution: "@mui/styled-engine@npm:6.4.11" @@ -3021,7 +3045,30 @@ __metadata: languageName: node linkType: hard -"@mui/system@npm:^6.0.0-dev.240424162023-9968b4889d, @mui/system@npm:^6.1.6, @mui/system@npm:^6.4.11": +"@mui/styled-engine@npm:^7.1.0": + version: 7.1.0 + resolution: "@mui/styled-engine@npm:7.1.0" + dependencies: + "@babel/runtime": "npm:^7.27.1" + "@emotion/cache": "npm:^11.13.5" + "@emotion/serialize": "npm:^1.3.3" + "@emotion/sheet": "npm:^1.4.0" + csstype: "npm:^3.1.3" + prop-types: "npm:^15.8.1" + peerDependencies: + "@emotion/react": ^11.4.1 + "@emotion/styled": ^11.3.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@emotion/react": + optional: true + "@emotion/styled": + optional: true + checksum: 10/7e6425443f4628f149a1ed2216117f50632334730115de060e8e9d9a9be5a7d1910d93213877438630938db7f3392b97b6aeb7d616db1668616c988b8cb5af4d + languageName: node + linkType: hard + +"@mui/system@npm:^6.0.0-dev.240424162023-9968b4889d": version: 6.4.11 resolution: "@mui/system@npm:6.4.11" dependencies: @@ -3049,6 +3096,34 @@ __metadata: languageName: node linkType: hard +"@mui/system@npm:^7.0.0, @mui/system@npm:^7.1.0": + version: 7.1.0 + resolution: "@mui/system@npm:7.1.0" + dependencies: + "@babel/runtime": "npm:^7.27.1" + "@mui/private-theming": "npm:^7.1.0" + "@mui/styled-engine": "npm:^7.1.0" + "@mui/types": "npm:^7.4.2" + "@mui/utils": "npm:^7.1.0" + clsx: "npm:^2.1.1" + csstype: "npm:^3.1.3" + prop-types: "npm:^15.8.1" + peerDependencies: + "@emotion/react": ^11.5.0 + "@emotion/styled": ^11.3.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 + "@emotion/styled": + optional: true + "@types/react": + optional: true + checksum: 10/5fb53c071d83acf7d51ef8f862c9a7aa86527d64882a651dbdf521cd8a6965690508b1d4bee6fcab032cd3985831a6af14f97770abc061c2149fd3a4d831cca3 + languageName: node + linkType: hard + "@mui/types@npm:^7.2.14": version: 7.4.1 resolution: "@mui/types@npm:7.4.1" @@ -3063,6 +3138,20 @@ __metadata: languageName: node linkType: hard +"@mui/types@npm:^7.4.2": + version: 7.4.2 + resolution: "@mui/types@npm:7.4.2" + dependencies: + "@babel/runtime": "npm:^7.27.1" + peerDependencies: + "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 10/0fedf7ed5f8f9fe88df2657a704bf674e5e4b03f726765e7797044fe4ef7504c60b88aa65edaef00e23e412153bf990d5421f125c3865790071899d049fd597b + languageName: node + linkType: hard + "@mui/types@npm:~7.2.24": version: 7.2.24 resolution: "@mui/types@npm:7.2.24" @@ -3075,7 +3164,7 @@ __metadata: languageName: node linkType: hard -"@mui/utils@npm:^6.0.0-alpha.1, @mui/utils@npm:^6.0.0-alpha.3, @mui/utils@npm:^6.1.6, @mui/utils@npm:^6.4.9": +"@mui/utils@npm:^6.0.0-alpha.1, @mui/utils@npm:^6.0.0-alpha.3, @mui/utils@npm:^6.4.9": version: 6.4.9 resolution: "@mui/utils@npm:6.4.9" dependencies: @@ -3095,6 +3184,26 @@ __metadata: languageName: node linkType: hard +"@mui/utils@npm:^7.0.0, @mui/utils@npm:^7.1.0": + version: 7.1.0 + resolution: "@mui/utils@npm:7.1.0" + dependencies: + "@babel/runtime": "npm:^7.27.1" + "@mui/types": "npm:^7.4.2" + "@types/prop-types": "npm:^15.7.14" + clsx: "npm:^2.1.1" + prop-types: "npm:^15.8.1" + react-is: "npm:^19.1.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 + checksum: 10/8fbfc343331f600fe0691474032aa1b91d5ffff920ee1404b4e4626931e5852320b023b10eec680d2f1b24d469f8aec5439d1e81fc4aa20eaacb488a56a5b68e + languageName: node + linkType: hard + "@napi-rs/wasm-runtime@npm:^0.2.9": version: 0.2.9 resolution: "@napi-rs/wasm-runtime@npm:0.2.9" @@ -14979,7 +15088,7 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^19.0.0": +"react-is@npm:^19.0.0, react-is@npm:^19.1.0": version: 19.1.0 resolution: "react-is@npm:19.1.0" checksum: 10/4aceca94492032a19411138bf68c6ca7dce4abee7ae6c7f23db9291d2dff14d6a643717b176ef9a151e8cdf6a2b71fdbc59fd998328e086a6f752512304a252b From e690e5f0426d905687468b558a81d84faeb5ae89 Mon Sep 17 00:00:00 2001 From: Jon Kafton <939376+jonkafton@users.noreply.github.com> Date: Wed, 28 May 2025 21:05:49 +0200 Subject: [PATCH 3/4] MUI v7 compatibility upgrades --- package.json | 4 +- .../Button/ActionButton.stories.tsx | 2 +- src/components/Button/Button.stories.tsx | 2 +- src/components/Input/Input.stories.tsx | 2 +- yarn.lock | 221 ++---------------- 5 files changed, 26 insertions(+), 205 deletions(-) diff --git a/package.json b/package.json index a229936f..937fcf9b 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "@emotion/styled": "^11.11.0", "@faker-js/faker": "^9.0.0", "@jest/environment": "^29.7.0", - "@mui/lab": "6.0.0-dev.240424162023-9968b4889d", + "@mui/lab": "^7.0.0-beta.12", "@mui/material": "^7.0.0", "@mui/system": "^7.0.0", "@remixicon/react": "^4.2.0", @@ -145,7 +145,7 @@ "peerDependencies": { "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", - "@mui/lab": "*", + "@mui/lab": "^7.0.0-beta.1", "@mui/material": "^7.0.0", "@mui/system": "^7.0.0", "@remixicon/react": "^4.2.0", diff --git a/src/components/Button/ActionButton.stories.tsx b/src/components/Button/ActionButton.stories.tsx index 8b2f7650..099d11fa 100644 --- a/src/components/Button/ActionButton.stories.tsx +++ b/src/components/Button/ActionButton.stories.tsx @@ -2,7 +2,7 @@ import * as React from "react" import type { Meta, StoryObj } from "@storybook/react" import { ActionButton, ActionButtonLink, DEFAULT_PROPS } from "./ActionButton" import type { ActionButtonProps } from "./ActionButton" -import Grid from "@mui/material/Grid2" +import Grid from "@mui/material/Grid" import Stack from "@mui/material/Stack" import { RiArrowLeftLine, diff --git a/src/components/Button/Button.stories.tsx b/src/components/Button/Button.stories.tsx index 754f2cd1..c4f71ac4 100644 --- a/src/components/Button/Button.stories.tsx +++ b/src/components/Button/Button.stories.tsx @@ -2,7 +2,7 @@ import * as React from "react" import type { Meta, StoryObj } from "@storybook/react" import { Button, ButtonLink } from "./Button" import type { ButtonProps } from "./Button" -import Grid from "@mui/material/Grid2" +import Grid from "@mui/material/Grid" import Stack from "@mui/material/Stack" import { RiArrowLeftLine, diff --git a/src/components/Input/Input.stories.tsx b/src/components/Input/Input.stories.tsx index 58635a98..def1ce14 100644 --- a/src/components/Input/Input.stories.tsx +++ b/src/components/Input/Input.stories.tsx @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react" import { Input, AdornmentButton } from "./Input" import type { InputProps } from "./Input" import Stack from "@mui/material/Stack" -import Grid from "@mui/material/Grid2" +import Grid from "@mui/material/Grid" import { RiCalendarLine, RiCloseLine, RiSearchLine } from "@remixicon/react" import { fn } from "@storybook/test" import { enumValues } from "../../story-utils" diff --git a/yarn.lock b/yarn.lock index a6e55efc..9fcaf5b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1427,7 +1427,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.24.4, @babel/runtime@npm:^7.26.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7": +"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.24.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7": version: 7.27.0 resolution: "@babel/runtime@npm:7.27.0" dependencies: @@ -1436,13 +1436,6 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.27.0": - version: 7.27.1 - resolution: "@babel/runtime@npm:7.27.1" - checksum: 10/34cefcbf781ea5a4f1b93f8563327b9ac82694bebdae91e8bd9d7f58d084cbe5b9a6e7f94d77076e15b0bcdaa0040a36cb30737584028df6c4673b4c67b2a31d - languageName: node - linkType: hard - "@babel/runtime@npm:^7.27.1": version: 7.27.3 resolution: "@babel/runtime@npm:7.27.3" @@ -1950,44 +1943,6 @@ __metadata: languageName: node linkType: hard -"@floating-ui/core@npm:^1.6.0": - version: 1.6.9 - resolution: "@floating-ui/core@npm:1.6.9" - dependencies: - "@floating-ui/utils": "npm:^0.2.9" - checksum: 10/656fcd383da17fffca2efa0635cbe3c0b835c3312949e30bd19d05bf42479f2ac22aaf336a6a31cb160621fc6f35cfc9e115e76c5cf48ba96e33474d123ced22 - languageName: node - linkType: hard - -"@floating-ui/dom@npm:^1.0.0": - version: 1.6.13 - resolution: "@floating-ui/dom@npm:1.6.13" - dependencies: - "@floating-ui/core": "npm:^1.6.0" - "@floating-ui/utils": "npm:^0.2.9" - checksum: 10/4bb732baf3270007741bcdc91be1de767b2bb5d8b891eb838e5f1e7c4cccad998643dbdd4e8b8cec4c5d12c9898f80febc68e9793dd6e26a445283c4fb1b6a78 - languageName: node - linkType: hard - -"@floating-ui/react-dom@npm:^2.0.8": - version: 2.1.2 - resolution: "@floating-ui/react-dom@npm:2.1.2" - dependencies: - "@floating-ui/dom": "npm:^1.0.0" - peerDependencies: - react: ">=16.8.0" - react-dom: ">=16.8.0" - checksum: 10/2a67dc8499674e42ff32c7246bded185bb0fdd492150067caf9568569557ac4756a67787421d8604b0f241e5337de10762aee270d9aeef106d078a0ff13596c4 - languageName: node - linkType: hard - -"@floating-ui/utils@npm:^0.2.9": - version: 0.2.9 - resolution: "@floating-ui/utils@npm:0.2.9" - checksum: 10/0ca786347db3dd8d9034b86d1449fabb96642788e5900cc5f2aee433cd7b243efbcd7a165bead50b004ee3f20a90ddebb6a35296fc41d43cfd361b6f01b69ffb - languageName: node - linkType: hard - "@humanwhocodes/config-array@npm:^0.13.0": version: 0.13.0 resolution: "@humanwhocodes/config-array@npm:0.13.0" @@ -2799,7 +2754,7 @@ __metadata: "@emotion/styled": "npm:^11.11.0" "@faker-js/faker": "npm:^9.0.0" "@jest/environment": "npm:^29.7.0" - "@mui/lab": "npm:6.0.0-dev.240424162023-9968b4889d" + "@mui/lab": "npm:^7.0.0-beta.12" "@mui/material": "npm:^7.0.0" "@mui/system": "npm:^7.0.0" "@mui/utils": "npm:^7.0.0" @@ -2871,7 +2826,7 @@ __metadata: peerDependencies: "@emotion/react": ^11.11.1 "@emotion/styled": ^11.11.0 - "@mui/lab": "*" + "@mui/lab": ^7.0.0 "@mui/material": ^7.0.0 "@mui/system": ^7.0.0 "@remixicon/react": ^4.2.0 @@ -2894,28 +2849,6 @@ __metadata: languageName: node linkType: hard -"@mui/base@npm:5.0.0-beta.42": - version: 5.0.0-beta.42 - resolution: "@mui/base@npm:5.0.0-beta.42" - dependencies: - "@babel/runtime": "npm:^7.24.4" - "@floating-ui/react-dom": "npm:^2.0.8" - "@mui/types": "npm:^7.2.14" - "@mui/utils": "npm:^6.0.0-alpha.1" - "@popperjs/core": "npm:^2.11.8" - clsx: "npm:^2.1.0" - prop-types: "npm:^15.8.1" - peerDependencies: - "@types/react": ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - react-dom: ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - "@types/react": - optional: true - checksum: 10/0fba94046780e73a4bb994d9a07106897ec878741a369b95a2c1996b7bc6d1ab400402f5d8f4e558ab166f3cd9cb2d851e373b256705a842bae5de0b59e68c74 - languageName: node - linkType: hard - "@mui/core-downloads-tracker@npm:^7.1.0": version: 7.1.0 resolution: "@mui/core-downloads-tracker@npm:7.1.0" @@ -2923,32 +2856,34 @@ __metadata: languageName: node linkType: hard -"@mui/lab@npm:6.0.0-dev.240424162023-9968b4889d": - version: 6.0.0-dev.240424162023-9968b4889d - resolution: "@mui/lab@npm:6.0.0-dev.240424162023-9968b4889d" +"@mui/lab@npm:^7.0.0-beta.12": + version: 7.0.0-beta.12 + resolution: "@mui/lab@npm:7.0.0-beta.12" dependencies: - "@babel/runtime": "npm:^7.24.4" - "@mui/base": "npm:5.0.0-beta.42" - "@mui/system": "npm:^6.0.0-dev.240424162023-9968b4889d" - "@mui/types": "npm:^7.2.14" - "@mui/utils": "npm:^6.0.0-alpha.3" - clsx: "npm:^2.1.0" + "@babel/runtime": "npm:^7.27.1" + "@mui/system": "npm:^7.1.0" + "@mui/types": "npm:^7.4.2" + "@mui/utils": "npm:^7.1.0" + clsx: "npm:^2.1.1" prop-types: "npm:^15.8.1" peerDependencies: "@emotion/react": ^11.5.0 "@emotion/styled": ^11.3.0 - "@mui/material": ^6.0.0-dev.240424162023-9968b4889d - "@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": ^7.1.0 + "@mui/material-pigment-css": ^7.1.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 - checksum: 10/53a3d034828e5f1ddbfba24b040a320c5b12d1ec4f3cffac35ef68ee4b3cc154eaab5e13b19157f5e6d36e4b44dfddfcf2fc717514b898b85c3111bd7f30bef0 + checksum: 10/47ff948bab7edc7013d9c69b692459c1a823e7cb9e392f1f648608cb121b7ccd76f62318de46fce7d469695b389250bc62dac53c1190f9be543923146cdcf0fd languageName: node linkType: hard @@ -2988,23 +2923,6 @@ __metadata: languageName: node linkType: hard -"@mui/private-theming@npm:^6.4.9": - version: 6.4.9 - resolution: "@mui/private-theming@npm:6.4.9" - dependencies: - "@babel/runtime": "npm:^7.26.0" - "@mui/utils": "npm:^6.4.9" - prop-types: "npm:^15.8.1" - 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 - checksum: 10/d2e6b24001e82cb3a0c6115a54610ba0ee0abea64befe7fb5567fb8753fdc40b86eb77d399b1c014b1b8425c250f7bb3ee32171bb538f19bda5ce7a0d897a102 - languageName: node - linkType: hard - "@mui/private-theming@npm:^7.1.0": version: 7.1.0 resolution: "@mui/private-theming@npm:7.1.0" @@ -3022,29 +2940,6 @@ __metadata: languageName: node linkType: hard -"@mui/styled-engine@npm:^6.4.11": - version: 6.4.11 - resolution: "@mui/styled-engine@npm:6.4.11" - dependencies: - "@babel/runtime": "npm:^7.26.0" - "@emotion/cache": "npm:^11.13.5" - "@emotion/serialize": "npm:^1.3.3" - "@emotion/sheet": "npm:^1.4.0" - csstype: "npm:^3.1.3" - prop-types: "npm:^15.8.1" - peerDependencies: - "@emotion/react": ^11.4.1 - "@emotion/styled": ^11.3.0 - react: ^17.0.0 || ^18.0.0 || ^19.0.0 - peerDependenciesMeta: - "@emotion/react": - optional: true - "@emotion/styled": - optional: true - checksum: 10/390e8b71ed5da54033961cc08969172ba00897b7a36fb5638c86bc2a2998e89b0fb83bc8f324bf0a9fd6147315d0236dbdc5bec12150ee4b2928c0fd4a3aac19 - languageName: node - linkType: hard - "@mui/styled-engine@npm:^7.1.0": version: 7.1.0 resolution: "@mui/styled-engine@npm:7.1.0" @@ -3068,34 +2963,6 @@ __metadata: languageName: node linkType: hard -"@mui/system@npm:^6.0.0-dev.240424162023-9968b4889d": - version: 6.4.11 - resolution: "@mui/system@npm:6.4.11" - dependencies: - "@babel/runtime": "npm:^7.26.0" - "@mui/private-theming": "npm:^6.4.9" - "@mui/styled-engine": "npm:^6.4.11" - "@mui/types": "npm:~7.2.24" - "@mui/utils": "npm:^6.4.9" - clsx: "npm:^2.1.1" - csstype: "npm:^3.1.3" - prop-types: "npm:^15.8.1" - peerDependencies: - "@emotion/react": ^11.5.0 - "@emotion/styled": ^11.3.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 - "@emotion/styled": - optional: true - "@types/react": - optional: true - checksum: 10/49a205206413ef2cffd9134b2b62d3a4697ce26eca6d03cedd725fe06682dc8985f9755e5730521da2215bc1dcf1d40fb58c39f57da1fd8252e4101acfad7119 - languageName: node - linkType: hard - "@mui/system@npm:^7.0.0, @mui/system@npm:^7.1.0": version: 7.1.0 resolution: "@mui/system@npm:7.1.0" @@ -3124,20 +2991,6 @@ __metadata: languageName: node linkType: hard -"@mui/types@npm:^7.2.14": - version: 7.4.1 - resolution: "@mui/types@npm:7.4.1" - dependencies: - "@babel/runtime": "npm:^7.27.0" - peerDependencies: - "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 - peerDependenciesMeta: - "@types/react": - optional: true - checksum: 10/34ec01b01b161f9df82e40ddd53ef0f52af1fba645a0ecdc7f93bacb48727433d0f60726647a4e2fe03749ee0a7bb85957f8ec48f7b28f691263d9db99c891a4 - languageName: node - linkType: hard - "@mui/types@npm:^7.4.2": version: 7.4.2 resolution: "@mui/types@npm:7.4.2" @@ -3152,38 +3005,6 @@ __metadata: languageName: node linkType: hard -"@mui/types@npm:~7.2.24": - version: 7.2.24 - resolution: "@mui/types@npm:7.2.24" - peerDependencies: - "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 - peerDependenciesMeta: - "@types/react": - optional: true - checksum: 10/5ed4f90ec62c7df901e58b53011bf6b377b48e13b07de9eeb15c7a6f3f759310f0682b64685c7762f660fad6edf4c8e05595313c93810fc63c54270b899b4a75 - languageName: node - linkType: hard - -"@mui/utils@npm:^6.0.0-alpha.1, @mui/utils@npm:^6.0.0-alpha.3, @mui/utils@npm:^6.4.9": - version: 6.4.9 - resolution: "@mui/utils@npm:6.4.9" - dependencies: - "@babel/runtime": "npm:^7.26.0" - "@mui/types": "npm:~7.2.24" - "@types/prop-types": "npm:^15.7.14" - clsx: "npm:^2.1.1" - prop-types: "npm:^15.8.1" - react-is: "npm:^19.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 - checksum: 10/4769956cc79283f9813d2984cd92b647528e4456eaea582c60b599d2db0a132ae4a10bf03ad28e8241463cd0ec2df1d56c0c4958f7c39d998241f93fc91c3ad4 - languageName: node - linkType: hard - "@mui/utils@npm:^7.0.0, @mui/utils@npm:^7.1.0": version: 7.1.0 resolution: "@mui/utils@npm:7.1.0" @@ -7297,7 +7118,7 @@ __metadata: languageName: node linkType: hard -"clsx@npm:^2.1.0, clsx@npm:^2.1.1": +"clsx@npm:^2.1.1": version: 2.1.1 resolution: "clsx@npm:2.1.1" checksum: 10/cdfb57fa6c7649bbff98d9028c2f0de2f91c86f551179541cf784b1cfdc1562dcb951955f46d54d930a3879931a980e32a46b598acaea274728dbe068deca919 @@ -15088,7 +14909,7 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^19.0.0, react-is@npm:^19.1.0": +"react-is@npm:^19.1.0": version: 19.1.0 resolution: "react-is@npm:19.1.0" checksum: 10/4aceca94492032a19411138bf68c6ca7dce4abee7ae6c7f23db9291d2dff14d6a643717b176ef9a151e8cdf6a2b71fdbc59fd998328e086a6f752512304a252b From e4df5844a2ade49c5cf7b1564b97fc1be6546fb4 Mon Sep 17 00:00:00 2001 From: Jon Kafton <939376+jonkafton@users.noreply.github.com> Date: Wed, 28 May 2025 21:28:49 +0200 Subject: [PATCH 4/4] ^7 range --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 937fcf9b..b818f142 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "peerDependencies": { "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", - "@mui/lab": "^7.0.0-beta.1", + "@mui/lab": "^7.0.0", "@mui/material": "^7.0.0", "@mui/system": "^7.0.0", "@remixicon/react": "^4.2.0", diff --git a/yarn.lock b/yarn.lock index c899fada..9fcaf5b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2826,7 +2826,7 @@ __metadata: peerDependencies: "@emotion/react": ^11.11.1 "@emotion/styled": ^11.11.0 - "@mui/lab": ^7.0.0-beta.1 + "@mui/lab": ^7.0.0 "@mui/material": ^7.0.0 "@mui/system": ^7.0.0 "@remixicon/react": ^4.2.0