Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Janpot committed May 31, 2024
2 parents c5aa694 + f62b846 commit 2dda637
Show file tree
Hide file tree
Showing 8 changed files with 119 additions and 119 deletions.
6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"@emotion/styled": "11.11.5",
"@mui/base": "5.0.0-beta.40",
"@mui/docs": "6.0.0-dev.240424162023-9968b4889d",
"@mui/icons-material": "5.15.18",
"@mui/icons-material": "5.15.19",
"@mui/internal-markdown": "^1.0.1",
"@mui/joy": "5.0.0-beta.36",
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "5.15.18",
"@mui/material": "5.15.19",
"@mui/material-nextjs": "5.15.11",
"@mui/styles": "5.15.18",
"@mui/styles": "5.15.19",
"@mui/utils": "5.15.14",
"@mui/x-license": "7.2.1",
"@toolpad/core": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/toolpad-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
"prop-types": "15.8.1"
},
"devDependencies": {
"@mui/icons-material": "5.15.18",
"@mui/material": "5.15.18",
"@mui/icons-material": "5.15.19",
"@mui/material": "5.15.19",
"@types/invariant": "2.2.37",
"@types/prop-types": "15.7.12",
"@types/react": "18.3.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/toolpad-studio-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"url": "https://github.com/mui/mui-toolpad/issues"
},
"dependencies": {
"@mui/icons-material": "5.15.18",
"@mui/icons-material": "5.15.19",
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "5.15.18",
"@mui/material": "5.15.19",
"@mui/x-charts": "7.5.1",
"@mui/x-data-grid-premium": "7.5.1",
"@mui/x-date-pickers": "7.5.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/toolpad-studio-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"dependencies": {
"@auth/core": "0.31.0",
"@mui/material": "5.15.18",
"@mui/material": "5.15.19",
"@tanstack/react-query": "5.39.0",
"@toolpad/utils": "workspace:*",
"@types/json-schema": "7.0.15",
Expand Down
6 changes: 3 additions & 3 deletions packages/toolpad-studio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"@emotion/styled": "11.11.5",
"@googleapis/drive": "8.8.0",
"@googleapis/sheets": "7.0.0",
"@mui/icons-material": "5.15.18",
"@mui/icons-material": "5.15.19",
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "5.15.18",
"@mui/material": "5.15.19",
"@mui/system": "5.15.15",
"@mui/types": "7.2.14",
"@mui/utils": "5.15.14",
Expand Down Expand Up @@ -113,7 +113,7 @@
"markdown-to-jsx": "7.4.7",
"mime": "4.0.3",
"monaco-editor": "0.49.0",
"mysql2": "3.9.7",
"mysql2": "3.9.8",
"nanoid": "5.0.7",
"node-fetch": "2.7.0",
"node-fetch-har": "1.0.1",
Expand Down
4 changes: 2 additions & 2 deletions playground/toolpad-core-nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"devDependencies": {
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.5",
"@mui/icons-material": "5.15.18",
"@mui/material": "5.15.18",
"@mui/icons-material": "5.15.19",
"@mui/material": "5.15.19",
"@toolpad/core": "workspace:*",
"@types/react": "18.3.1",
"@types/react-dom": "18.3.0",
Expand Down
210 changes: 105 additions & 105 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@toolpad/studio-tests",
"private": true,
"devDependencies": {
"@mui/material": "5.15.18",
"@mui/material": "5.15.19",
"@toolpad/studio": "workspace:*",
"@toolpad/utils": "workspace:*",
"@types/invariant": "2.2.37",
Expand Down

0 comments on commit 2dda637

Please sign in to comment.