Skip to content
New issue

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

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

Upgrade to MUI v5 for React 18 / 19 compat #113

Merged
merged 51 commits into from
Jun 25, 2024

Conversation

markerikson
Copy link
Collaborator

Cherry-picked the entire commit sequence from:

…add @mui/icons-material

# Conflicts:
#	yarn.lock
First, the color changes indicated at https://mui.com/material-ui/migration/v5-component-changes/#update-default-indicatorcolor-and-textcolor-prop-values

Second, remove the the trailing "px" a number rather than string when passing values to the react-virtualized List component.  See
https://mui.com/material-ui/migration/v5-style-changes/\#%E2%9C%85-remove-px-suffix
this was causing the slider-based cypress tests to fail.
appBar was still over the date picker in mobile screen size, failing one of the cypress:run:mobile tests.  See also
https://mui.com/material-ui/migration/v5-component-changes/\#fix-z-index-issues
…inLayout.tsx

review, remove class for root and use ampersand instead, adding a flexGrow:1 to get styling as before
…vBar.tsx,

review, appBarShift was incorrectly considered a child of root; fixed that with removal of space between & and ., lint
…tificationListItem.tsx

review, lint, no issues
…ansactionAmount.tsx

lint, remove space between & and . because classes are conditionally applied
…ansactionCreateStepOne.tsx

lint and review, no issues
…ansactionCreateStepTwo.tsx

lint, review, no issues
…ansactionCreateStepThree.tsx

lint, review, no issues
…ansactionDateRangeFilter.tsx

lint, review, no issues
timheilman and others added 21 commits June 24, 2024 20:43
…ansactionItem.tsx

lint, review, problems with SmallAvatar, fixed manually
…ansactionListAmountRangeFilter.tsx

lint, review, did not work really at all, fixed by using sx prop rather than classes at all
…ansactionListFilters.tsx

lint, review, no issues
…erSettingsForm.tsx

lint, review, form did not want to play nice with classes, fixed with sx for submit button and styled wrapping div for form
had apparently accidentally failed-to-checkin TransactionInfiniteList and userSearchForm, but both were reviewed and had no issues
minor style fixups to be rid of the dependency causing the peer dependency warning
* chore: fix typings issues from yarn start when starting the backend dev server

* reseed data as test shouldnt fail for new users

* fix aws exports not failing RWA if missing

* use @cypress/vite-dev-server to use different port from app so users can go between e2e and ct at the same time

* fix types

* run prettier

* fix unit tests

* fix linting issue by breaking chainable up
…o#1535)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…o#1538)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
which is not failing after the upgrade to MUI v5.  See
cypress-io#1278
cypress-io#1521)

* build: replace express-graphql with graphql-http and graphql-playground-middleware-express

toward resolution of issue cypress-io#1420 and cypress-io#1508

* fix: go ahead and preempt provision of GET at /graphql by graphql-http

with graphql-playground-middleware-express, rather than serving it from GET /gql-playground. This preserves functionality closer to as it was with express-graphql.

* fix: whoops did not mean to modify database.json

* Update backend/app.ts

Co-authored-by: Cacie Prins <cacieprins@users.noreply.github.com>

* style: do not pollute type system with one-off inline types

* fix: consume rename commited on github from reviewer suggestion

* style: do not pollute Query.ts either with one-off inline types

* build: empty commit to clear perhaps spurious circleCI failure on firefox

all specs passing on firefox locally.

---------

Co-authored-by: Cacie Prins <cacieprins@users.noreply.github.com>
no longer overlapping.  Instead eat up space to right of avatars.
@markerikson markerikson merged commit 3649741 into develop Jun 25, 2024
2 checks passed
@markerikson markerikson deleted the feature/PRO-697-muiv5-update branch June 25, 2024 01:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants