Skip to content

Upgrade to MUI v6, MUI X v7, styled-components v6, and Vite 8 #607

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

Draft
somethingnew2-0 wants to merge 1 commit into
base: pcollins/remove-react-hook-form-mui
Choose a base branch
from
Draft

Upgrade to MUI v6, MUI X v7, styled-components v6, and Vite 8 #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2,066 changes: 851 additions & 1,215 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

35 changes: 9 additions & 26 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"type": "module",
"dependencies": {
"@mui/base": "^5.0.0-beta.28",
"@mui/icons-material": "^5.15.15",
"@mui/lab": "^5.0.0-alpha.154",
"@mui/material": "^5.15.15",
"@mui/styled-engine-sc": "^5.14.7",
"@mui/x-data-grid": "^6.18.4",
"@mui/x-date-pickers": "^6.18.4",
"@mui/icons-material": "^6.5.0",
"@mui/lab": "^6.0.1-beta.36",
"@mui/material": "^6.5.0",
"@mui/styled-engine-sc": "^6.4.9",
"@mui/x-data-grid": "^7.29.13",
"@mui/x-date-pickers": "^7.29.4",
"@sentry/react": "^8.34.0",
"@tanstack/react-query": "^5.101.0",
"confetti-cannon": "^2.3.2",
Expand All @@ -21,7 +21,7 @@
"react-hook-form": "^7.51.2",
"react-markdown": "^10.1.0",
"react-router-dom": "^7.18.2",
"styled-components": "^5.3.11"
"styled-components": "^6.1.13"
},
"scripts": {
"tsc": "./node_modules/.bin/tsc",
Expand Down Expand Up @@ -65,33 +65,16 @@
"@types/react": "^18.2.74",
"@types/react-dom": "^18.2.24",
"@types/styled-components": "^5.1.26",
"@vitejs/plugin-react": "^4.7.0",
"@vitejs/plugin-react": "^6.1.0",
"@vitest/ui": "^4.1.8",
"husky": "^8.0.3",
"jsdom": "^26.1.0",
"lint-staged": "^15.2.10",
"prettier": "^3.2.5",
"typescript": "^4.9.5",
"vite": "^7.3.2",
"vite": "^8.2.2",
"vitest": "^4.1.8"
},
"optionalDependencies": {
"@rollup/rollup-darwin-arm64": "4.60.1",
"@rollup/rollup-darwin-x64": "4.60.1",
"@rollup/rollup-linux-arm-gnueabihf": "4.60.1",
"@rollup/rollup-linux-arm-musleabihf": "4.60.1",
"@rollup/rollup-linux-arm64-gnu": "4.60.1",
"@rollup/rollup-linux-arm64-musl": "4.60.1",
"@rollup/rollup-linux-ppc64-gnu": "4.60.1",
"@rollup/rollup-linux-riscv64-gnu": "4.60.1",
"@rollup/rollup-linux-riscv64-musl": "4.60.1",
"@rollup/rollup-linux-s390x-gnu": "4.60.1",
"@rollup/rollup-linux-x64-gnu": "4.60.1",
"@rollup/rollup-linux-x64-musl": "4.60.1",
"@rollup/rollup-win32-arm64-msvc": "4.60.1",
"@rollup/rollup-win32-ia32-msvc": "4.60.1",
"@rollup/rollup-win32-x64-msvc": "4.60.1"
},
"lint-staged": {
"*.{js,ts,jsx,tsx}": "prettier --write"
},
Expand Down
6 changes: 4 additions & 2 deletions src/components/DateRange.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,11 @@ function HighlightDay(props: PickersDayProps<Dayjs> & {startDate?: Dayjs; endDat
);
}

// The `false` type argument selects the text-field DOM structure the picker uses by default,
// which is the one that forwards the `InputProps`/`inputProps` that ButtonField reads below.
interface ButtonFieldProps
extends UseDateFieldProps<Dayjs>,
BaseSingleInputFieldProps<Dayjs | null, Dayjs, FieldSection, DateValidationError> {
extends UseDateFieldProps<Dayjs, false>,
BaseSingleInputFieldProps<Dayjs | null, Dayjs, FieldSection, false, DateValidationError> {
setOpen?: React.Dispatch<React.SetStateAction<boolean>>;
startDate: Dayjs | null;
tmpStartDate: Dayjs | null;
Expand Down
4 changes: 2 additions & 2 deletions src/config/loadAccessConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function validate_override_config(overrideConfig) {

function loadOverrideConfig(accessConfig) {
const envConfigPath = process.env.ACCESS_CONFIG_FILE
? path.resolve(__dirname, '../../config', process.env.ACCESS_CONFIG_FILE)
? path.resolve(import.meta.dirname, '../../config', process.env.ACCESS_CONFIG_FILE)
: null;
if (envConfigPath) {
if (fs.existsSync(envConfigPath)) {
Expand All @@ -81,7 +81,7 @@ function loadOverrideConfig(accessConfig) {
}

function loadDefaultConfig() {
const defaultConfigPath = path.resolve(__dirname, '../../config/config.default.json');
const defaultConfigPath = path.resolve(import.meta.dirname, '../../config/config.default.json');
const defaultConfig = JSON.parse(fs.readFileSync(defaultConfigPath, 'utf8'));

return getConfig(defaultConfig, FRONTEND);
Expand Down
2 changes: 1 addition & 1 deletion src/pages/group_requests/List.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export default function ListGroupRequests() {
renderOption={(props, option, state) => {
const [id, displayName, group_name, status, resolver] = option.split(';');
return (
<li key={id} {...props}>
<li {...props} key={id}>
<Grid container alignItems="center">
<Grid item>
<Box>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/requests/List.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export default function ListRequests() {
renderOption={(props, option, state) => {
const [id, displayName, ownership, group, status, resolver] = option.split(';');
return (
<li key={id} {...props}>
<li {...props} key={id}>
<Grid container alignItems="center">
<Grid item>
<Box>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/role_requests/List.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export default function ListRoleRequests() {
renderOption={(props, option, state) => {
const [id, displayName, ownership, group, status, resolver] = option.split(';');
return (
<li key={id} {...props}>
<li {...props} key={id}>
<Grid container alignItems="center">
<Grid item>
<Box>
Expand Down
2 changes: 1 addition & 1 deletion vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {readFileSync} from 'node:fs';
import {defineConfig, loadEnv} from 'vite';
import react from '@vitejs/plugin-react';
import {sentryVitePlugin} from '@sentry/vite-plugin';
import {loadAccessConfig} from './src/config/loadAccessConfig';
import {loadAccessConfig} from './src/config/loadAccessConfig.js';

const accessConfig = loadAccessConfig();

Expand Down