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.

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

Upgrade monorepo #2023

Merged
merged 6 commits into from
May 17, 2023
Merged

Upgrade monorepo #2023

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4aff4e2
Upgrade monorepo
bharatkashyap May 16, 2023
1bd087d
Fix: eslint
bharatkashyap May 16, 2023
2a823c0
Does this work
bharatkashyap May 16, 2023
ebe5272
Bring back import/no-cycle
bharatkashyap May 17, 2023
c5ebd2d
Merge branch 'master' into update-monorepo-5.13.0
bharatkashyap May 17, 2023
2063b59
Use override and eslint-disable cli
bharatkashyap May 17, 2023
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
1 change: 1 addition & 0 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ module.exports = {
rules: {
...baseline.rules,
'import/prefer-default-export': ['off'],
'import/no-cycle': ['error', { ignoreExternal: true }],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps we can use an override just like in https://github.com/mui/material-ui/pull/37223/files so that we benefit from the perf boost as well?

// TODO move rule into the main repo once it has upgraded
'@typescript-eslint/return-await': ['off'],

Expand Down
1 change: 0 additions & 1 deletion packages/toolpad-app/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env node
/* eslint-disable */

const { default: cli } = require('./dist/cli');

Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,8 +1403,8 @@
react-transition-group "^4.4.5"

"@mui/monorepo@https://github.com/mui/material-ui.git":
version "5.12.3"
resolved "https://github.com/mui/material-ui.git#086becb197899ca7295d5d9559dbcfb2450caaaa"
version "5.13.0"
resolved "https://github.com/mui/material-ui.git#ea7201aa8f2cc6295d9c51b866b595757ad992c4"

"@mui/private-theming@^5.13.1":
version "5.13.1"
Expand Down