Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into esm-layout
Browse files Browse the repository at this point in the history
  • Loading branch information
Janpot committed Feb 19, 2025
2 parents 9f0088f + 6f93322 commit 1eadc9c
Show file tree
Hide file tree
Showing 20 changed files with 406 additions and 351 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@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
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@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
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@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
with:
sarif_file: results.sarif
12 changes: 6 additions & 6 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"@mui/styles": "6.3.1",
"@mui/system": "6.3.1",
"@mui/utils": "6.3.1",
"@mui/x-date-pickers": "7.25.0",
"@mui/x-date-pickers-pro": "7.25.0",
"@mui/x-license": "7.25.0",
"@mui/x-date-pickers": "7.27.0",
"@mui/x-date-pickers-pro": "7.27.0",
"@mui/x-license": "7.26.0",
"@toolpad/core": "workspace:*",
"@toolpad/studio": "workspace:*",
"@trendmicro/react-interpolate": "0.5.5",
Expand Down Expand Up @@ -66,7 +66,7 @@
"lodash": "4.17.21",
"lz-string": "1.5.0",
"markdown-to-jsx": "7.7.3",
"next": "^15.1.6",
"next": "^15.1.7",
"nprogress": "0.2.0",
"postcss": "8.4.49",
"prismjs": "1.29.0",
Expand All @@ -83,8 +83,8 @@
"react-transition-group": "4.4.5",
"recast": "0.23.9",
"rimraf": "6.0.1",
"styled-components": "6.1.14",
"stylis": "4.3.5",
"styled-components": "6.1.15",
"stylis": "4.3.6",
"stylis-plugin-rtl": "npm:stylis-plugin-rtl@^2.1.1",
"stylis-plugin-rtl-sc": "npm:stylis-plugin-rtl@^2.1.1",
"webpack-bundle-analyzer": "4.10.2",
Expand Down
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 @@ -23,7 +23,7 @@
},
"devDependencies": {
"typescript": "^5",
"@types/node": "^20.17.16",
"@types/node": "^20.17.19",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"eslint": "^8",
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 @@ -21,7 +21,7 @@
},
"devDependencies": {
"typescript": "^5",
"@types/node": "^20.17.16",
"@types/node": "^20.17.19",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"eslint": "^8",
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 @@ -21,7 +21,7 @@
},
"devDependencies": {
"typescript": "^5",
"@types/node": "^20.17.16",
"@types/node": "^20.17.19",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"eslint": "^8",
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 @@ -27,7 +27,7 @@
"react-dom": "^19.0.0"
},
"devDependencies": {
"@types/node": "^20.17.16",
"@types/node": "^20.17.19",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"eslint": "^8",
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 @@ -19,7 +19,7 @@
},
"devDependencies": {
"typescript": "^5",
"@types/node": "^20.17.16",
"@types/node": "^20.17.19",
"@types/react": "^19.0.0",
"@types/react-dom": "^19.0.0",
"eslint": "^8",
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 @@ -20,7 +20,7 @@
},
"devDependencies": {
"typescript": "^5",
"@types/node": "^20.17.16",
"@types/node": "^20.17.19",
"@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 @@ -14,7 +14,7 @@
"qrcode": "^1.5.3"
},
"devDependencies": {
"@types/node": "^20.17.16",
"@types/node": "^20.17.19",
"@types/qrcode": "^1.5.5",
"prisma": "^5.16.1",
"ts-node": "^10.9.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/studio/with-prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"qrcode": "^1.5.3"
},
"devDependencies": {
"@types/node": "^20.17.16",
"@types/node": "^20.17.19",
"@types/qrcode": "^1.5.5",
"prisma": "^5.16.1",
"ts-node": "^10.9.2",
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"@mui/internal-markdown": "1.0.24",
"@mui/internal-scripts": "1.0.32",
"@mui/monorepo": "github:mui/material-ui#f273fa539871f6ed744bc60ff9fad0c6230b5c1f",
"@mui/x-charts": "7.25.0",
"@next/eslint-plugin-next": "14.2.23",
"@mui/x-charts": "7.27.0",
"@next/eslint-plugin-next": "14.2.24",
"@playwright/test": "1.47.2",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "16.1.0",
Expand All @@ -67,11 +67,11 @@
"@types/fs-extra": "11.0.4",
"@types/gtag.js": "0.0.20",
"@types/invariant": "2.2.37",
"@types/node": "^20.17.16",
"@types/node": "^20.17.19",
"@types/yargs": "17.0.33",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"@vitest/coverage-v8": "2.1.8",
"@vitest/coverage-v8": "2.1.9",
"babel-plugin-react-remove-properties": "0.3.0",
"babel-plugin-transform-react-remove-prop-types": "0.4.24",
"chalk": "5.3.0",
Expand Down Expand Up @@ -137,7 +137,7 @@
},
"resolutions": {
"google-auth-library": "*",
"@types/node": "^20.17.16"
"@types/node": "^20.17.19"
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion packages/create-toolpad-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"devDependencies": {
"@types/inquirer": "9.0.7",
"@types/invariant": "2.2.37",
"@types/node": "^20.17.16",
"@types/node": "^20.17.19",
"@types/semver": "7.5.8",
"@types/tar": "6.1.13",
"@types/yargs": "17.0.33",
Expand Down
2 changes: 1 addition & 1 deletion packages/toolpad-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@types/react-dom": "^19.0.3",
"@types/sinon": "^17.0.3",
"@vitest/browser": "2.1.9",
"next": "^15.1.6",
"next": "^15.1.7",
"next-router-mock": "^0.9.13",
"playwright": "^1.47.2",
"react-router": "7.1.5",
Expand Down
8 changes: 4 additions & 4 deletions packages/toolpad-studio-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"@mui/icons-material": "6.3.1",
"@mui/lab": "6.0.0-beta.22",
"@mui/material": "6.3.1",
"@mui/x-charts": "7.25.0",
"@mui/x-data-grid-premium": "7.25.0",
"@mui/x-date-pickers": "7.25.0",
"@mui/x-license": "7.25.0",
"@mui/x-charts": "7.27.0",
"@mui/x-data-grid-premium": "7.27.0",
"@mui/x-date-pickers": "7.27.0",
"@mui/x-license": "7.26.0",
"@tanstack/react-query": "5.61.3",
"@toolpad/studio-runtime": "workspace:*",
"@toolpad/utils": "workspace:*",
Expand Down
20 changes: 10 additions & 10 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.25.0",
"@mui/x-data-grid": "7.25.0",
"@mui/x-data-grid-premium": "7.25.0",
"@mui/x-date-pickers": "7.25.0",
"@mui/x-date-pickers-pro": "7.25.0",
"@mui/x-license": "7.25.0",
"@mui/x-tree-view": "7.25.0",
"@mui/x-charts": "7.27.0",
"@mui/x-data-grid": "7.27.0",
"@mui/x-data-grid-premium": "7.27.0",
"@mui/x-date-pickers": "7.27.0",
"@mui/x-date-pickers-pro": "7.27.0",
"@mui/x-license": "7.26.0",
"@mui/x-tree-view": "7.26.0",
"@tanstack/react-query": "5.61.3",
"@tanstack/react-query-devtools": "5.61.3",
"@toolpad/core": "workspace:*",
Expand All @@ -84,7 +84,7 @@
"@toolpad/utils": "workspace:*",
"@types/cors": "2.8.17",
"@types/json-schema": "7.0.15",
"@types/node": "^20.17.16",
"@types/node": "^20.17.19",
"@types/react-dev-utils": "9.0.15",
"@vitejs/plugin-react": "4.3.4",
"@webcontainer/env": "1.1.1",
Expand Down Expand Up @@ -123,7 +123,7 @@
"open-editor": "5.0.0",
"path-to-regexp": "6.3.0",
"perf-cascade": "3.0.3",
"pg": "8.13.1",
"pg": "8.13.3",
"piscina": "4.7.0",
"prettier": "3.4.2",
"pretty-bytes": "6.1.1",
Expand All @@ -140,7 +140,7 @@
"serialize-javascript": "6.0.2",
"superjson": "2.0.0",
"typescript": "5.5.4",
"vite": "5.4.12",
"vite": "5.4.14",
"vm-browserify": "1.1.2",
"whatwg-url": "14.0.0",
"ws": "8.18.0",
Expand Down
4 changes: 2 additions & 2 deletions playground/nextjs-pages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"@toolpad/core": "workspace:*",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"eslint-config-next": "15.1.6",
"next": "^15.1.6",
"eslint-config-next": "15.1.7",
"next": "^15.1.7",
"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 @@ -13,11 +13,11 @@
"@mui/material": "6.3.1",
"@mui/material-nextjs": "6.3.1",
"@toolpad/core": "workspace:*",
"@types/node": "^20.17.16",
"@types/node": "^20.17.19",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"eslint-config-next": "15.1.6",
"next": "^15.1.6",
"eslint-config-next": "15.1.7",
"next": "^15.1.7",
"next-auth": "5.0.0-beta.25",
"react": "^19.0.0",
"react-dom": "^19.0.0"
Expand Down
Loading

0 comments on commit 1eadc9c

Please sign in to comment.