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

Jump to bottom

Fix issues from trying MUI ESM branch #3417

Merged
merged 5 commits into from
Apr 22, 2024
Merged

Fix issues from trying MUI ESM branch #3417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
42fbecb
Try MUI ESM branch
Janpot Apr 18, 2024
7878481
Update pnpm-lock.yaml
Janpot Apr 18, 2024
a3651ee
remove unused scripts
Janpot Apr 20, 2024
6c6bb80
Update pnpm-lock.yaml
Janpot Apr 22, 2024
f474e29
Merge remote-tracking branch 'upstream/master' into try-mui-esm
Janpot Apr 22, 2024
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 changes: 1 addition & 1 deletion docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@mui/joy": "5.0.0-beta.32",
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "5.15.15",
"@mui/material-nextjs": "^5.15.11",
"@mui/material-nextjs": "5.15.11",
"@mui/styles": "5.15.15",
"@mui/utils": "5.15.14",
"@mui/x-license": "7.2.0",
Expand Down
4 changes: 0 additions & 4 deletions packages/toolpad-studio/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
"lint": "prettier --check .",
"fix": "prettier --write .",
"build:cli": "tsup",
"build:typings": "tsx ./scripts/typings.mts",
"dev:cli": "tsup --watch",
"dev:typings": "pnpm build:typings",
"waitForApp": "tsx ./scripts/waitForApp.mts",
"check-types": "tsup && tsc --noEmit",
"test": "vitest run"
},
Expand Down Expand Up @@ -71,7 +68,6 @@
"@vitejs/plugin-react": "4.2.1",
"@webcontainer/env": "1.1.1",
"abort-controller": "3.0.0",
"arg": "5.0.2",
"basic-auth": "2.0.1",
"chalk": "5.3.0",
"chokidar": "3.6.0",
Expand Down
7 changes: 0 additions & 7 deletions packages/toolpad-studio/scripts/tsconfig.json
View file
Open in desktop

This file was deleted.

111 changes: 0 additions & 111 deletions packages/toolpad-studio/scripts/typings.mts
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions packages/toolpad-studio/scripts/waitForApp.mts
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions packages/toolpad-studio/scripts/waitForDb.mts
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions packages/toolpad-studio/src/toolpadDataSources/local/client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import PlayArrowIcon from '@mui/icons-material/PlayArrow';
import { TabContext, TabList } from '@mui/lab';
import { useBrowserJsRuntime } from '@toolpad/studio-runtime/jsBrowserRuntime';
import { errorFrom } from '@toolpad/utils/errors';

import { useQuery } from '@tanstack/react-query';
import Grid2 from '@mui/material/Unstable_Grid2/Grid2';
import Grid2 from '@mui/material/Unstable_Grid2';
Comment on lines -11 to +10
Copy link
Member

@oliviertassinari oliviertassinari Apr 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I'm adding this to illustrate mui/material-ui#31096.

I'm also doing a step forward to be able to fail the CI mui/material-ui#41970

import TabPanel from '../../components/TabPanel';
import { ClientDataSource, QueryEditorProps } from '../../types';
import { LocalPrivateApi, LocalQuery, LocalConnectionParams } from './types';
Expand Down
9 changes: 1 addition & 8 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading