Skip to content

Commit

Permalink
Merge branch 'master' into fix/cta-example-path
Browse files Browse the repository at this point in the history
  • Loading branch information
bharatkashyap authored Jan 16, 2025
2 parents 232fdbb + 44ce709 commit a4015fd
Show file tree
Hide file tree
Showing 17 changed files with 524 additions and 538 deletions.
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@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
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@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
2 changes: 1 addition & 1 deletion .github/workflows/maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:
- run: echo "${{ github.actor }}"
- name: check if prs are dirty
uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
with:
dirtyLabel: 'PR: out-of-date'
removeOnDirtyLabel: 'PR: ready to ship'
Expand Down
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@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
with:
sarif_file: results.sarif
20 changes: 10 additions & 10 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@
"@mui/base": "5.0.0-beta.68",
"@mui/docs": "6.3.1",
"@mui/icons-material": "6.3.1",
"@mui/internal-markdown": "^1.0.24",
"@mui/internal-markdown": "1.0.24",
"@mui/joy": "5.0.0-beta.51",
"@mui/lab": "6.0.0-beta.22",
"@mui/material": "6.3.1",
"@mui/material-nextjs": "6.3.1",
"@mui/styles": "6.3.1",
"@mui/system": "6.3.1",
"@mui/utils": "6.3.1",
"@mui/x-date-pickers": "7.22.2",
"@mui/x-date-pickers-pro": "7.22.2",
"@mui/x-license": "7.23.5",
"@mui/x-date-pickers": "7.23.6",
"@mui/x-date-pickers-pro": "7.23.6",
"@mui/x-license": "7.23.6",
"@toolpad/core": "workspace:*",
"@toolpad/studio": "workspace:*",
"@trendmicro/react-interpolate": "0.5.5",
Expand Down Expand Up @@ -65,14 +65,14 @@
"jss-rtl": "0.3.0",
"lodash": "4.17.21",
"lz-string": "1.5.0",
"markdown-to-jsx": "7.7.0",
"next": "^15.1.3",
"markdown-to-jsx": "7.7.3",
"next": "^15.1.4",
"nprogress": "0.2.0",
"postcss": "8.4.49",
"prismjs": "1.29.0",
"prop-types": "15.8.1",
"react": "^19.0.0",
"react-docgen": "7.0.3",
"react-docgen": "5.4.3",
"react-dom": "^19.0.0",
"react-hook-form": "7.53.2",
"react-is": "^19.0.0",
Expand All @@ -82,7 +82,7 @@
"react-simple-typewriter": "5.0.1",
"react-transition-group": "4.4.5",
"recast": "0.23.9",
"rimraf": "5.0.10",
"rimraf": "6.0.1",
"styled-components": "6.1.13",
"stylis": "4.3.4",
"stylis-plugin-rtl": "npm:stylis-plugin-rtl@^2.1.1",
Expand All @@ -98,12 +98,12 @@
"@types/doctrine": "0.0.9",
"@types/json-schema": "7.0.15",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@types/react-dom": "^19.0.3",
"@types/react-is": "^19.0.0",
"@types/react-swipeable-views": "^0.13.6",
"cpy-cli": "5.0.0",
"cross-fetch": "4.0.0",
"typescript": "5.7.2",
"typescript": "5.5.4",
"typescript-to-proptypes": "2.2.1"
}
}
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 @@ -21,7 +21,7 @@
},
"devDependencies": {
"typescript": "^5",
"@types/node": "^20.17.6",
"@types/node": "^20.17.12",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"eslint": "^8",
Expand Down
2 changes: 1 addition & 1 deletion examples/studio/with-prisma-data-provider/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"@types/qrcode": "^1.5.5",
"prisma": "^5.16.1",
"ts-node": "^10.9.2",
"typescript": "^5.5.2"
"typescript": "^5"
}
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
"@mui/internal-docs-utils": "1.0.16",
"@mui/internal-markdown": "1.0.24",
"@mui/internal-scripts": "1.0.32",
"@mui/monorepo": "github:mui/material-ui#0221d17856a63d89e832d49f652b1e189ab7b7cf",
"@mui/x-charts": "7.23.2",
"@next/eslint-plugin-next": "14.2.22",
"@mui/monorepo": "github:mui/material-ui#dd69cf07e7aace1efad91e5b8e733c7efcf6c02c",
"@mui/x-charts": "7.23.6",
"@next/eslint-plugin-next": "14.2.23",
"@playwright/test": "1.47.2",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "16.1.0",
Expand Down Expand Up @@ -93,7 +93,7 @@
"eslint-plugin-react-hooks": "5.1.0",
"eslint-plugin-testing-library": "^6.5.0",
"eslint-plugin-typescript-enum": "2.1.0",
"execa": "9.5.1",
"execa": "9.5.2",
"fast-glob": "^3.3.2",
"format-util": "1.0.5",
"fs-extra": "11.2.0",
Expand All @@ -108,7 +108,7 @@
"regenerator-runtime": "0.14.1",
"remark": "15.0.1",
"rimraf": "6.0.1",
"typescript": "5.7.2",
"typescript": "5.5.4",
"unist-util-visit": "5.0.0",
"vitest-dom": "0.1.1",
"vitest-fail-on-console": "0.7.1"
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 @@ -70,10 +70,10 @@
"@types/invariant": "2.2.37",
"@types/prop-types": "15.7.14",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@types/react-dom": "^19.0.3",
"@types/sinon": "^17.0.3",
"@vitest/browser": "2.1.8",
"next": "^15.1.3",
"next": "^15.1.4",
"next-router-mock": "^0.9.13",
"playwright": "^1.47.2",
"react-router": "7.1.0",
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 @@ -44,16 +44,16 @@
"@mui/icons-material": "6.3.1",
"@mui/lab": "6.0.0-beta.22",
"@mui/material": "6.3.1",
"@mui/x-charts": "7.23.2",
"@mui/x-data-grid-premium": "7.23.5",
"@mui/x-date-pickers": "7.23.3",
"@mui/x-license": "7.23.5",
"@mui/x-charts": "7.23.6",
"@mui/x-data-grid-premium": "7.23.6",
"@mui/x-date-pickers": "7.23.6",
"@mui/x-license": "7.23.6",
"@tanstack/react-query": "5.61.3",
"@toolpad/studio-runtime": "workspace:*",
"@toolpad/utils": "workspace:*",
"dayjs": "1.11.13",
"invariant": "2.2.4",
"markdown-to-jsx": "7.7.0",
"markdown-to-jsx": "7.7.3",
"react-error-boundary": "4.0.13",
"react-hook-form": "7.53.2"
},
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 @@ -65,7 +65,7 @@
},
"peerDependencies": {
"react": "^18.0.0 || ^19.0.0",
"vm-browserify": "^1.1.2"
"vm-browserify": "1.1.2"
},
"peerDependenciesMeta": {
"vm-browserify": {
Expand Down
22 changes: 11 additions & 11 deletions packages/toolpad-studio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@
"@mui/system": "6.3.1",
"@mui/types": "7.2.21",
"@mui/utils": "6.3.1",
"@mui/x-charts": "7.23.2",
"@mui/x-data-grid": "7.23.5",
"@mui/x-data-grid-premium": "7.23.5",
"@mui/x-date-pickers": "7.23.3",
"@mui/x-date-pickers-pro": "7.23.3",
"@mui/x-license": "7.23.5",
"@mui/x-tree-view": "7.23.2",
"@mui/x-charts": "7.23.6",
"@mui/x-data-grid": "7.23.6",
"@mui/x-data-grid-premium": "7.23.6",
"@mui/x-date-pickers": "7.23.6",
"@mui/x-date-pickers-pro": "7.23.6",
"@mui/x-license": "7.23.6",
"@mui/x-tree-view": "7.23.6",
"@tanstack/react-query": "5.61.3",
"@tanstack/react-query-devtools": "5.61.3",
"@toolpad/core": "workspace:*",
Expand All @@ -101,7 +101,7 @@
"dotenv": "16.4.7",
"esbuild": "0.24.2",
"execa": "9.5.2",
"express": "4.21.1",
"express": "4.21.2",
"find-up": "7.0.0",
"fractional-indexing": "3.2.0",
"get-port": "7.1.0",
Expand All @@ -113,7 +113,7 @@
"json5": "2.2.3",
"latest-version": "9.0.0",
"lodash-es": "4.17.21",
"markdown-to-jsx": "7.7.0",
"markdown-to-jsx": "7.7.3",
"mime": "4.0.4",
"monaco-editor": "0.52.0",
"mysql2": "3.11.4",
Expand All @@ -125,7 +125,7 @@
"perf-cascade": "3.0.3",
"pg": "8.13.1",
"piscina": "4.7.0",
"prettier": "3.3.3",
"prettier": "3.4.1",
"pretty-bytes": "6.1.1",
"react": "^19.0.0",
"react-dev-utils": "12.0.1",
Expand Down Expand Up @@ -163,7 +163,7 @@
"@types/node-fetch": "2.6.12",
"@types/pg": "8.11.10",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@types/react-dom": "^19.0.3",
"@types/react-is": "^19.0.0",
"@types/semver": "7.5.8",
"@types/serialize-javascript": "5.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/toolpad-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"dependencies": {
"invariant": "2.2.4",
"prettier": "3.3.3",
"prettier": "3.4.1",
"react": "^19.0.0",
"react-is": "^19.0.0",
"title": "4.0.1",
Expand Down
6 changes: 3 additions & 3 deletions playground/nextjs-pages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"@mui/material-nextjs": "6.3.1",
"@toolpad/core": "workspace:*",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"eslint-config-next": "15.1.3",
"next": "15.1.3",
"@types/react-dom": "^19.0.3",
"eslint-config-next": "15.1.4",
"next": "^15.1.4",
"next-auth": "5.0.0-beta.25",
"react": "^19.0.0",
"react-dom": "^19.0.0"
Expand Down
6 changes: 3 additions & 3 deletions playground/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"@toolpad/core": "workspace:*",
"@types/node": "^20.17.12",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"eslint-config-next": "15.1.3",
"next": "15.1.3",
"@types/react-dom": "^19.0.3",
"eslint-config-next": "15.1.4",
"next": "^15.1.4",
"next-auth": "5.0.0-beta.25",
"react": "^19.0.0",
"react-dom": "^19.0.0"
Expand Down
4 changes: 2 additions & 2 deletions playground/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"@mui/material": "6.3.1",
"@toolpad/core": "workspace:*",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"@types/react-dom": "^19.0.3",
"@vitejs/plugin-react": "4.3.4",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-router": "^7.1.0",
"react-router": "7.1.0",
"vite": "5.4.11"
}
}
Loading

0 comments on commit a4015fd

Please sign in to comment.