Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into refactor-nav-sele…
Browse files Browse the repository at this point in the history
…cted-item
  • Loading branch information
apedroferreira committed Jan 16, 2025
2 parents 9acf943 + d43bd63 commit 98e83dc
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion examples/core/auth-nextjs-email/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@mui/material-nextjs": "^6",
"@toolpad/core": "latest",
"@toolpad/core": "^0.12.0",
"@prisma/client": "^5",
"@auth/prisma-adapter": "^2",
"next": "^15",
Expand Down
2 changes: 1 addition & 1 deletion examples/core/auth-nextjs-pages-nextauth-4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@mui/material-nextjs": "^6",
"@toolpad/core": "latest",
"@toolpad/core": "^0.12.0",
"next": "^15",
"next-auth": "^4.24.10",
"react": "^19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/core/auth-nextjs-pages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@mui/material-nextjs": "^6",
"@toolpad/core": "latest",
"@toolpad/core": "^0.12.0",
"next": "^15",
"next-auth": "5.0.0-beta.25",
"react": "^19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/core/auth-nextjs-passkey/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@prisma/client": "^5",
"@simplewebauthn/browser": "^9",
"@simplewebauthn/server": "^9",
"@toolpad/core": "latest",
"@toolpad/core": "^0.12.0",
"next": "^15",
"next-auth": "5.0.0-beta.25",
"react": "^19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/core/auth-nextjs-themed/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"dayjs": "^1",
"clsx": "^2",
"@react-spring/web": "^9",
"@toolpad/core": "latest",
"@toolpad/core": "^0.12.0",
"next": "^15",
"next-auth": "^5.0.0-beta.25",
"react": "^19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/core/auth-nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@mui/material-nextjs": "^6",
"@toolpad/core": "latest",
"@toolpad/core": "^0.12.0",
"next": "^15",
"next-auth": "5.0.0-beta.25",
"react": "^19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/core/auth-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@emotion/styled": "^11",
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@toolpad/core": "latest",
"@toolpad/core": "^0.12.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-router": "^7"
Expand Down
2 changes: 1 addition & 1 deletion examples/core/firebase-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@emotion/styled": "^11",
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@toolpad/core": "latest",
"@toolpad/core": "^0.12.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-router": "^7"
Expand Down
2 changes: 1 addition & 1 deletion examples/core/tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"react": "^19.0.0",
"react-dom": "^19.0.0",
"next": "^15",
"@toolpad/core": "latest",
"@toolpad/core": "^0.12.0",
"@mui/material": "^6",
"@mui/material-nextjs": "^6",
"@mui/icons-material": "^6",
Expand Down
2 changes: 1 addition & 1 deletion examples/core/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@emotion/styled": "^11",
"@mui/icons-material": "^6",
"@mui/material": "^6",
"@toolpad/core": "latest",
"@toolpad/core": "^0.12.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-router": "^7"
Expand Down
1 change: 0 additions & 1 deletion packages/toolpad-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
"dependencies": {
"invariant": "2.2.4",
"prettier": "3.4.1",
"react": "^19.0.0",
"react-is": "^19.0.0",
"title": "4.0.1",
"yaml": "2.5.1",
Expand Down
2 changes: 1 addition & 1 deletion pnpm-lock.yaml

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

0 comments on commit 98e83dc

Please sign in to comment.