Skip to content

Commit

Permalink
Merge commit 'df770817ffa43892a2bfeb911bb1adf9044a3219' into fix-line…
Browse files Browse the repository at this point in the history
…chart-client-side-render-issue
  • Loading branch information
JCQuintas committed Aug 26, 2024
2 parents 857a19b + df77081 commit 6b8a457
Show file tree
Hide file tree
Showing 8 changed files with 526 additions and 278 deletions.
6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
"fg-loadcss": "^3.1.0",
"jscodeshift": "0.16.1",
"lodash": "^4.17.21",
"luxon": "^3.4.4",
"luxon": "^3.5.0",
"lz-string": "^1.5.0",
"markdown-to-jsx": "^7.4.7",
"markdown-to-jsx": "^7.5.0",
"moment": "^2.30.1",
"moment-hijri": "^2.30.0",
"moment-jalaali": "^0.10.1",
Expand All @@ -84,7 +84,7 @@
"react": "^18.3.1",
"react-docgen": "^5.4.3",
"react-dom": "^18.3.1",
"react-hook-form": "^7.52.2",
"react-hook-form": "^7.53.0",
"react-is": "^18.3.1",
"react-router": "^6.26.1",
"react-router-dom": "^6.26.1",
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
"@types/karma": "^6.3.8",
"@types/lodash": "^4.17.7",
"@types/mocha": "^10.0.7",
"@types/node": "^18.19.45",
"@types/react": "^18.3.3",
"@types/node": "^18.19.46",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3.0",
"@types/react-test-renderer": "^18.3.0",
"@types/requestidlecallback": "^0.3.7",
Expand Down Expand Up @@ -156,7 +156,7 @@
"glob-gitignore": "^1.0.14",
"globby": "^14.0.2",
"html-webpack-plugin": "^5.6.0",
"jsdom": "24.1.1",
"jsdom": "24.1.3",
"jss": "^10.10.0",
"jss-plugin-template": "^10.10.0",
"jss-rtl": "^0.3.0",
Expand Down Expand Up @@ -185,7 +185,7 @@
"stream-browserify": "^3.0.0",
"string-replace-loader": "^3.1.0",
"terser-webpack-plugin": "^5.3.10",
"tsx": "^4.16.2",
"tsx": "^4.18.0",
"typescript": "^5.5.4",
"unist-util-visit": "^2.0.3",
"util": "^0.12.5",
Expand All @@ -196,7 +196,7 @@
},
"resolutions": {
"react-is": "^18.3.1",
"@types/node": "^18.19.45"
"@types/node": "^18.19.46"
},
"packageManager": "[email protected]",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-material-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Custom eslint rules for MUI X.",
"main": "src/index.js",
"devDependencies": {
"@types/eslint": "^8.56.11",
"@types/eslint": "^8.56.12",
"@typescript-eslint/utils": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/x-date-pickers-pro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"date-fns": "^2.30.0",
"date-fns-jalali": "^2.30.0-0",
"dayjs": "^1.11.11",
"luxon": "^3.4.4",
"luxon": "^3.5.0",
"moment": "^2.30.1",
"rimraf": "^5.0.10"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/x-date-pickers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"date-fns": "^2.30.0",
"date-fns-jalali": "^2.30.0-0",
"dayjs": "^1.11.11",
"luxon": "^3.4.4",
"luxon": "^3.5.0",
"moment": "^2.30.1",
"moment-hijri": "^2.30.0",
"moment-jalaali": "^0.10.1",
Expand Down
778 changes: 513 additions & 265 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@types/karma": "^6.3.8",
"@types/moment-jalaali": "^0.7.9",
"@types/prop-types": "^15.7.12",
"@types/react": "^18.3.3",
"@types/react": "^18.3.4",
"chai": "^4.5.0",
"dayjs": "^1.11.11",
"moment": "^2.30.1",
Expand Down
2 changes: 1 addition & 1 deletion test/performance-charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@vitejs/plugin-react": "^4.3.1",
"@vitejs/plugin-react-swc": "^3.7.0",
"@vitest/ui": "2.0.5",
"jsdom": "^24.1.1",
"jsdom": "^24.1.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vitest": "2.0.5"
Expand Down

0 comments on commit 6b8a457

Please sign in to comment.