Skip to content

Commit

Permalink
Merge branch 'master' into renovate/prettier-3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
JCQuintas authored Dec 2, 2024
2 parents 0b39f57 + 259a3d4 commit 4e2cb5f
Show file tree
Hide file tree
Showing 7 changed files with 194 additions and 209 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codspeed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- run: pnpm --filter @mui/x-charts build
- run: pnpm --filter @mui/x-charts-pro build
- name: Run benchmarks
uses: CodSpeedHQ/action@fa1dcde8d58f2ab0b407a6a24d6cc5a8c1444a8c
uses: CodSpeedHQ/action@513a19673a831f139e8717bf45ead67e47f00044
with:
run: pnpm --filter @mui-x-internal/performance-charts test:performance
token: ${{ secrets.CODSPEED_TOKEN }}
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"@mui/internal-scripts": "^1.0.28",
"@types/chance": "^1.1.6",
"@types/d3-scale": "^4.0.8",
"@types/d3-scale-chromatic": "^3.0.3",
"@types/d3-scale-chromatic": "^3.1.0",
"@types/doctrine": "^0.0.9",
"@types/gtag.js": "^0.0.20",
"@types/lodash": "^4.17.13",
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"@mui/internal-markdown": "^1.0.21",
"@mui/internal-test-utils": "^1.0.22",
"@mui/material": "^5.16.8",
"@mui/monorepo": "github:mui/material-ui#821784419eefb89e4ce7b66c4b602a1e33d2fa88",
"@mui/monorepo": "github:mui/material-ui#e1b3bfa687e75d62db6f9a545f1f865f0a7e9273",
"@mui/utils": "^5.16.8",
"@next/eslint-plugin-next": "15.0.3",
"@octokit/plugin-retry": "^7.1.2",
Expand All @@ -109,7 +109,7 @@
"@types/karma": "^6.3.9",
"@types/lodash": "^4.17.13",
"@types/mocha": "^10.0.10",
"@types/node": "^20.17.7",
"@types/node": "^20.17.9",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/react-test-renderer": "^18.3.0",
Expand Down Expand Up @@ -144,13 +144,13 @@
"eslint-import-resolver-webpack": "^0.13.9",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsdoc": "^50.5.0",
"eslint-plugin-jsdoc": "^50.6.0",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-material-ui": "workspace:^",
"eslint-plugin-mocha": "^10.5.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-compiler": "19.0.0-beta-a7bf2bd-20241110",
"eslint-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-testing-library": "^7.0.0",
"fast-glob": "^3.3.2",
Expand Down Expand Up @@ -199,11 +199,11 @@
},
"resolutions": {
"react-is": "^18.3.1",
"@types/node": "^20.17.7"
"@types/node": "^20.17.9"
},
"packageManager": "[email protected].2",
"packageManager": "[email protected].4",
"engines": {
"pnpm": "9.14.2"
"pnpm": "9.14.4"
},
"pnpm": {
"patchedDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/rsc-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
},
"devDependencies": {
"@types/mocha": "^10.0.10",
"@types/node": "^20.17.7"
"@types/node": "^20.17.9"
}
}
2 changes: 1 addition & 1 deletion packages/x-charts-vendor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@types/d3-interpolate": "^3.0.4",
"@types/d3-scale": "^4.0.8",
"@types/d3-shape": "^3.1.6",
"@types/d3-time": "^3.0.3",
"@types/d3-time": "^3.0.4",
"d3-color": "^3.1.0",
"d3-delaunay": "^6.0.4",
"d3-interpolate": "^3.0.1",
Expand Down
Loading

0 comments on commit 4e2cb5f

Please sign in to comment.