Skip to content

Commit

Permalink
Merge branch 'master' into docs/fix-signin-page
Browse files Browse the repository at this point in the history
  • Loading branch information
bharatkashyap authored Nov 14, 2024
2 parents 96c608c + 30a00e9 commit 438d5c9
Show file tree
Hide file tree
Showing 20 changed files with 427 additions and 433 deletions.
6 changes: 2 additions & 4 deletions .github/ISSUE_TEMPLATE/1.bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@ body:
description: |
**⚠️ Issues that we can't reproduce can't be fixed.**
Provide a link to a live example and an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant.
Please provide a link to a live example and an unambiguous set of steps to reproduce this bug.
value: |
Link to live example: (required)
Steps:
1.
1. Open this link to live example: (required)
2.
3.
- type: textarea
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
uses: github/codeql-action/init@9278e421667d5d90a2839487a482448c4ec7df4d # v3.27.2
with:
languages: typescript
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -29,4 +29,4 @@ jobs:
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
uses: github/codeql-action/analyze@9278e421667d5d90a2839487a482448c4ec7df4d # v3.27.2
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
uses: github/codeql-action/upload-sarif@9278e421667d5d90a2839487a482448c4ec7df4d # v3.27.2
with:
sarif_file: results.sarif
24 changes: 12 additions & 12 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
"@babel/plugin-transform-object-assign": "7.25.9",
"@babel/runtime-corejs2": "7.26.0",
"@date-io/date-fns-jalali": "3.1.1",
"@docsearch/react": "3.6.3",
"@docsearch/react": "3.7.0",
"@emotion/cache": "11.13.1",
"@emotion/react": "11.13.3",
"@emotion/server": "11.11.0",
"@emotion/styled": "11.13.0",
"@mui/base": "5.0.0-beta.61",
"@mui/docs": "6.1.6",
"@mui/icons-material": "6.1.6",
"@mui/internal-markdown": "^1.0.19",
"@mui/docs": "6.1.7",
"@mui/icons-material": "6.1.7",
"@mui/internal-markdown": "^1.0.20",
"@mui/joy": "5.0.0-beta.48",
"@mui/lab": "6.0.0-beta.14",
"@mui/material": "6.1.6",
"@mui/material-nextjs": "6.1.6",
"@mui/styles": "6.1.6",
"@mui/system": "6.1.6",
"@mui/utils": "6.1.6",
"@mui/lab": "6.0.0-beta.15",
"@mui/material": "6.1.7",
"@mui/material-nextjs": "6.1.7",
"@mui/styles": "6.1.7",
"@mui/system": "6.1.7",
"@mui/utils": "6.1.7",
"@mui/x-date-pickers": "7.22.2",
"@mui/x-date-pickers-pro": "7.22.2",
"@mui/x-license": "7.21.0",
Expand Down Expand Up @@ -67,15 +67,15 @@
"lodash": "4.17.21",
"lz-string": "1.5.0",
"markdown-to-jsx": "7.5.0",
"next": "^14.2.16",
"next": "^14.2.17",
"nprogress": "0.2.0",
"postcss": "8.4.47",
"prismjs": "1.29.0",
"prop-types": "15.8.1",
"react": "18.3.1",
"react-docgen": "7.0.3",
"react-dom": "18.3.1",
"react-hook-form": "7.53.1",
"react-hook-form": "7.53.2",
"react-is": "18.3.1",
"react-router": "6.26.2",
"react-router-dom": "6.26.2",
Expand Down
6 changes: 2 additions & 4 deletions docs/src/modules/components/ExamplesGrid/core-examples.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ export default function examples() {
source: 'https://github.com/mui/toolpad/tree/master/examples/core/auth-nextjs-email',
codesandbox:
'https://codesandbox.io/s/github/mui/toolpad/tree/master/examples/core/auth-nextjs-email',
stackblitz:
'https://stackblitz.com/github/mui/toolpad/tree/master/examples/core/auth-nextjs-email',
},
{
title: 'Vite with React Router',
Expand Down Expand Up @@ -75,15 +73,15 @@ export default function examples() {
source: 'https://github.com/mui/toolpad/tree/master/examples/core/auth-nextjs-passkey/',
codesandbox:
'https://codesandbox.io/s/github/mui/toolpad/tree/master/examples/core/auth-nextjs-passkey',
stackblitz:
'https://stackblitz.com/github/mui/toolpad/tree/master/examples/core/auth-nextjs-passkey',
},
{
title: 'Vite with React Router and authentication',
description:
'This app shows you to how to get started using Toolpad Core with Vite, React Router and any external authentication provider',
src: '/static/toolpad/docs/core/vite-react-router.png',
source: 'https://github.com/mui/toolpad/tree/master/examples/core/auth-vite',
codesandbox:
'https://codesandbox.io/s/github/mui/toolpad/tree/master/examples/core/auth-vite',
},
{
title: 'Custom theme with Auth.js and Next.js App router',
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 @@ -16,7 +16,7 @@
"@prisma/client": "5.19.1",
"@simplewebauthn/browser": "9.0.1",
"@simplewebauthn/server": "9.0.3",
"@toolpad/core": "workspace:*",
"@toolpad/core": "latest",
"next": "^14",
"next-auth": "5.0.0-beta.20",
"react": "18.3.1",
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": "https://pkg.csb.dev/mui/toolpad/commit/179144e3/@toolpad/core",
"@toolpad/core": "latest",
"next": "^14",
"next-auth": "^5.0.0-beta.20",
"react": "^18",
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": "workspace:*",
"@toolpad/core": "latest",
"react": "^18",
"react-dom": "^18",
"react-router-dom": "^6"
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
"@babel/preset-typescript": "7.26.0",
"@mui/internal-babel-plugin-resolve-imports": "1.0.18",
"@mui/internal-docs-utils": "1.0.15",
"@mui/internal-markdown": "1.0.19",
"@mui/internal-scripts": "1.0.26",
"@mui/monorepo": "github:mui/material-ui#0ceedb8bc1f2f3bad9c6adf5a9d8f97a45a3c8b3",
"@mui/internal-markdown": "1.0.20",
"@mui/internal-scripts": "1.0.27",
"@mui/monorepo": "github:mui/material-ui#4b229d3bb9133cc479e0b742754a1055136162a4",
"@mui/x-charts": "7.22.2",
"@next/eslint-plugin-next": "14.2.16",
"@next/eslint-plugin-next": "14.2.17",
"@playwright/test": "1.47.2",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "16.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-toolpad-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@toolpad/core": "workspace:*",
"@toolpad/utils": "workspace:*",
"chalk": "5.3.0",
"execa": "9.4.1",
"execa": "9.5.1",
"invariant": "2.2.4",
"semver": "7.6.3",
"tar": "7.4.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/toolpad-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
},
"dependencies": {
"@babel/runtime": "^7.26.0",
"@mui/lab": "6.0.0-beta.14",
"@mui/utils": "6.1.6",
"@mui/lab": "6.0.0-beta.15",
"@mui/utils": "6.1.7",
"@toolpad/utils": "workspace:*",
"@vitejs/plugin-react": "4.3.3",
"client-only": "^0.0.1",
Expand All @@ -65,15 +65,15 @@
"prop-types": "15.8.1"
},
"devDependencies": {
"@mui/icons-material": "6.1.6",
"@mui/material": "6.1.6",
"@mui/icons-material": "6.1.7",
"@mui/material": "6.1.7",
"@types/invariant": "2.2.37",
"@types/prop-types": "15.7.13",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@types/sinon": "^17.0.3",
"@vitest/browser": "2.1.4",
"next": "^14.2.16",
"next": "^14.2.17",
"next-router-mock": "^0.9.13",
"playwright": "^1.47.2",
"react-router-dom": "6.26.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/toolpad-core/src/SignInPage/SignInPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ function SignInPage(props: SignInPageProps) {
spacing={1}
>
<FormControlLabel
control={<Checkbox value="remember" color="primary" />}
control={<Checkbox name="remember" value="true" color="primary" />}
label="Remember me"
slotProps={{ typography: { color: 'textSecondary' } }}
/>
Expand Down
10 changes: 5 additions & 5 deletions packages/toolpad-studio-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@
"url": "https://github.com/mui/toolpad/issues"
},
"dependencies": {
"@mui/icons-material": "6.1.6",
"@mui/lab": "6.0.0-beta.14",
"@mui/material": "6.1.6",
"@mui/icons-material": "6.1.7",
"@mui/lab": "6.0.0-beta.15",
"@mui/material": "6.1.7",
"@mui/x-charts": "7.22.2",
"@mui/x-data-grid-premium": "7.22.2",
"@mui/x-date-pickers": "7.22.2",
"@mui/x-license": "7.21.0",
"@tanstack/react-query": "5.59.19",
"@tanstack/react-query": "5.59.20",
"@toolpad/studio-runtime": "workspace:*",
"@toolpad/utils": "workspace:*",
"dayjs": "1.11.13",
"invariant": "2.2.4",
"markdown-to-jsx": "7.5.0",
"react-error-boundary": "4.0.13",
"react-hook-form": "7.53.1"
"react-hook-form": "7.53.2"
},
"devDependencies": {
"@types/invariant": "2.2.37",
Expand Down
6 changes: 3 additions & 3 deletions packages/toolpad-studio-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"url": "https://github.com/mui/toolpad/issues"
},
"dependencies": {
"@auth/core": "0.37.2",
"@mui/material": "6.1.6",
"@tanstack/react-query": "5.59.19",
"@auth/core": "0.37.3",
"@mui/material": "6.1.7",
"@tanstack/react-query": "5.59.20",
"@toolpad/utils": "workspace:*",
"@types/json-schema": "7.0.15",
"@webcontainer/env": "1.1.1",
Expand Down
24 changes: 12 additions & 12 deletions packages/toolpad-studio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,27 +56,27 @@
}
},
"dependencies": {
"@auth/core": "0.37.2",
"@auth/core": "0.37.3",
"@emotion/cache": "11.13.1",
"@emotion/react": "11.13.3",
"@emotion/server": "11.11.0",
"@emotion/styled": "11.13.0",
"@googleapis/drive": "8.14.0",
"@googleapis/sheets": "9.3.1",
"@mui/icons-material": "6.1.6",
"@mui/lab": "6.0.0-beta.14",
"@mui/material": "6.1.6",
"@mui/system": "6.1.6",
"@mui/icons-material": "6.1.7",
"@mui/lab": "6.0.0-beta.15",
"@mui/material": "6.1.7",
"@mui/system": "6.1.7",
"@mui/types": "7.2.19",
"@mui/utils": "6.1.6",
"@mui/utils": "6.1.7",
"@mui/x-charts": "7.22.2",
"@mui/x-data-grid": "7.22.2",
"@mui/x-data-grid-premium": "7.22.2",
"@mui/x-date-pickers": "7.22.2",
"@mui/x-date-pickers-pro": "7.22.2",
"@mui/x-tree-view": "7.22.1",
"@tanstack/react-query": "5.59.19",
"@tanstack/react-query-devtools": "5.59.19",
"@tanstack/react-query": "5.59.20",
"@tanstack/react-query-devtools": "5.59.20",
"@toolpad/core": "workspace:*",
"@toolpad/studio-components": "workspace:*",
"@toolpad/studio-runtime": "workspace:*",
Expand All @@ -93,13 +93,13 @@
"chokidar": "3.6.0",
"clsx": "2.1.1",
"compression": "^1.7.5",
"concurrently": "9.0.1",
"concurrently": "9.1.0",
"cors": "2.8.5",
"csstype": "3.1.3",
"dayjs": "1.11.13",
"dotenv": "16.4.5",
"esbuild": "0.24.0",
"execa": "9.4.1",
"execa": "9.5.1",
"express": "4.21.1",
"find-up": "7.0.0",
"fractional-indexing": "3.2.0",
Expand All @@ -115,7 +115,7 @@
"markdown-to-jsx": "7.5.0",
"mime": "4.0.4",
"monaco-editor": "0.52.0",
"mysql2": "3.11.3",
"mysql2": "3.11.4",
"nanoid": "5.0.8",
"node-fetch": "2.7.0",
"node-fetch-har": "1.0.1",
Expand All @@ -130,7 +130,7 @@
"react-dev-utils": "12.0.1",
"react-dom": "18.3.1",
"react-error-boundary": "4.0.13",
"react-hook-form": "7.53.1",
"react-hook-form": "7.53.2",
"react-inspector": "6.0.2",
"react-is": "18.3.1",
"react-resizable-panels": "2.1.6",
Expand Down
10 changes: 5 additions & 5 deletions playground/nextjs-pages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"devDependencies": {
"@emotion/react": "11.13.3",
"@emotion/styled": "11.13.0",
"@mui/icons-material": "6.1.6",
"@mui/material": "6.1.6",
"@mui/material-nextjs": "6.1.6",
"@mui/icons-material": "6.1.7",
"@mui/material": "6.1.7",
"@mui/material-nextjs": "6.1.7",
"@toolpad/core": "workspace:*",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"eslint-config-next": "14.2.16",
"next": "14.2.16",
"eslint-config-next": "14.2.17",
"next": "14.2.17",
"next-auth": "5.0.0-beta.22",
"react": "18.3.1",
"react-dom": "18.3.1"
Expand Down
12 changes: 6 additions & 6 deletions playground/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"devDependencies": {
"@emotion/react": "11.13.3",
"@emotion/styled": "11.13.0",
"@mui/icons-material": "6.1.6",
"@mui/lab": "6.0.0-beta.14",
"@mui/material": "6.1.6",
"@mui/material-nextjs": "6.1.6",
"@mui/icons-material": "6.1.7",
"@mui/lab": "6.0.0-beta.15",
"@mui/material": "6.1.7",
"@mui/material-nextjs": "6.1.7",
"@toolpad/core": "workspace:*",
"@types/node": "^20.17.6",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"eslint-config-next": "14.2.16",
"next": "14.2.16",
"eslint-config-next": "14.2.17",
"next": "14.2.17",
"next-auth": "5.0.0-beta.22",
"react": "18.3.1",
"react-dom": "18.3.1"
Expand Down
4 changes: 2 additions & 2 deletions playground/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"devDependencies": {
"@emotion/react": "11.13.3",
"@emotion/styled": "11.13.0",
"@mui/icons-material": "6.1.6",
"@mui/material": "6.1.6",
"@mui/icons-material": "6.1.7",
"@mui/material": "6.1.7",
"@toolpad/core": "workspace:*",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
Expand Down
Loading

0 comments on commit 438d5c9

Please sign in to comment.