Skip to content

Commit d0764c6

Browse files
authored
Merge branch 'master' into no-columns-overlay
2 parents 37b8a0d + 6f095be commit d0764c6

File tree

15 files changed

+623
-557
lines changed

15 files changed

+623
-557
lines changed

docs/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@emotion/react": "^11.14.0",
2828
"@emotion/server": "^11.11.0",
2929
"@emotion/styled": "^11.14.0",
30-
"@mui/docs": "6.4.1",
30+
"@mui/docs": "7.0.0-alpha.1",
3131
"@mui/icons-material": "^5.16.14",
3232
"@mui/joy": "^5.0.0-beta.51",
3333
"@mui/lab": "^5.0.0-alpha.175",
@@ -75,7 +75,7 @@
7575
"moment": "^2.30.1",
7676
"moment-hijri": "^3.0.0",
7777
"moment-jalaali": "^0.10.4",
78-
"moment-timezone": "^0.5.46",
78+
"moment-timezone": "^0.5.47",
7979
"next": "^15.1.6",
8080
"nprogress": "^0.2.0",
8181
"postcss": "^8.5.1",
@@ -101,8 +101,8 @@
101101
"devDependencies": {
102102
"@babel/plugin-transform-react-constant-elements": "^7.25.9",
103103
"@babel/preset-typescript": "^7.26.0",
104-
"@mui/internal-docs-utils": "^1.0.16",
105-
"@mui/internal-scripts": "^1.0.33",
104+
"@mui/internal-docs-utils": "^2.0.0",
105+
"@mui/internal-scripts": "^2.0.1",
106106
"@types/chance": "^1.1.6",
107107
"@types/d3-scale": "^4.0.8",
108108
"@types/d3-scale-chromatic": "^3.1.0",

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
"@emotion/styled": "^11.14.0",
9292
"@mui/icons-material": "^5.16.14",
9393
"@mui/internal-babel-plugin-resolve-imports": "1.0.20",
94-
"@mui/internal-markdown": "^1.0.25",
95-
"@mui/internal-test-utils": "^1.0.26",
94+
"@mui/internal-markdown": "^2.0.0",
95+
"@mui/internal-test-utils": "^2.0.1",
9696
"@mui/material": "^5.16.14",
9797
"@mui/monorepo": "github:mui/material-ui#40a4e6b3e684fff41c68f2d01d5a0e45aded980e",
9898
"@mui/utils": "^5.16.14",
@@ -157,7 +157,7 @@
157157
"glob-gitignore": "^1.0.15",
158158
"globby": "^14.0.2",
159159
"html-webpack-plugin": "^5.6.3",
160-
"jsdom": "25.0.1",
160+
"jsdom": "26.0.0",
161161
"jss": "^10.10.0",
162162
"jss-plugin-template": "^10.10.0",
163163
"jss-rtl": "^0.3.0",
@@ -172,7 +172,7 @@
172172
"markdownlint-cli2": "^0.17.2",
173173
"mocha": "^11.1.0",
174174
"moment": "^2.30.1",
175-
"moment-timezone": "^0.5.46",
175+
"moment-timezone": "^0.5.47",
176176
"nyc": "^17.1.0",
177177
"prettier": "^3.4.2",
178178
"pretty-quick": "^4.0.0",

packages/x-charts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
}
6969
},
7070
"devDependencies": {
71-
"@mui/internal-test-utils": "^1.0.26",
71+
"@mui/internal-test-utils": "^2.0.1",
7272
"@mui/material": "^5.16.14",
7373
"@mui/system": "^5.16.14",
7474
"@react-spring/core": "^9.7.5",

packages/x-codemod/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"devDependencies": {
4343
"@types/jscodeshift": "^0.12.0",
4444
"dayjs": "^1.11.13",
45-
"moment-timezone": "^0.5.46",
45+
"moment-timezone": "^0.5.47",
4646
"rimraf": "^6.0.1"
4747
},
4848
"sideEffects": false,

packages/x-data-grid-premium/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
}
7373
},
7474
"devDependencies": {
75-
"@mui/internal-test-utils": "^1.0.26",
75+
"@mui/internal-test-utils": "^2.0.1",
7676
"@mui/material": "^5.16.14",
7777
"@mui/system": "^5.16.14",
7878
"@types/prop-types": "^15.7.14",

packages/x-data-grid-pro/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
}
7171
},
7272
"devDependencies": {
73-
"@mui/internal-test-utils": "^1.0.26",
73+
"@mui/internal-test-utils": "^2.0.1",
7474
"@mui/material": "^5.16.14",
7575
"@mui/system": "^5.16.14",
7676
"@types/prop-types": "^15.7.14",

packages/x-data-grid/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
}
7373
},
7474
"devDependencies": {
75-
"@mui/internal-test-utils": "^1.0.26",
75+
"@mui/internal-test-utils": "^2.0.1",
7676
"@mui/material": "^5.16.14",
7777
"@mui/system": "^5.16.14",
7878
"@mui/types": "^7.2.20",

packages/x-date-pickers-pro/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
}
9797
},
9898
"devDependencies": {
99-
"@mui/internal-test-utils": "^1.0.26",
99+
"@mui/internal-test-utils": "^2.0.1",
100100
"@mui/material": "^5.16.14",
101101
"@mui/system": "^5.16.14",
102102
"@types/luxon": "^3.4.2",

packages/x-date-pickers/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
}
9999
},
100100
"devDependencies": {
101-
"@mui/internal-test-utils": "^1.0.26",
101+
"@mui/internal-test-utils": "^2.0.1",
102102
"@mui/material": "^5.16.14",
103103
"@mui/system": "^5.16.14",
104104
"@types/luxon": "^3.4.2",
@@ -112,7 +112,7 @@
112112
"moment": "^2.30.1",
113113
"moment-hijri": "^3.0.0",
114114
"moment-jalaali": "^0.10.4",
115-
"moment-timezone": "^0.5.46",
115+
"moment-timezone": "^0.5.47",
116116
"react": "^19.0.0",
117117
"react-dom": "^19.0.0",
118118
"rimraf": "^6.0.1"

packages/x-internals/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"react": "^17.0.0 || ^18.0.0 || ^19.0.0"
4949
},
5050
"devDependencies": {
51-
"@mui/internal-test-utils": "^1.0.26",
51+
"@mui/internal-test-utils": "^2.0.1",
5252
"react": "^19.0.0",
5353
"react-dom": "^19.0.0",
5454
"rimraf": "^6.0.1"

packages/x-license/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"react": "^17.0.0 || ^18.0.0 || ^19.0.0"
4343
},
4444
"devDependencies": {
45-
"@mui/internal-test-utils": "^1.0.26",
45+
"@mui/internal-test-utils": "^2.0.1",
4646
"react": "^19.0.0",
4747
"react-dom": "^19.0.0",
4848
"rimraf": "^6.0.1"

packages/x-tree-view-pro/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
}
7373
},
7474
"devDependencies": {
75-
"@mui/internal-test-utils": "^1.0.26",
75+
"@mui/internal-test-utils": "^2.0.1",
7676
"@mui/material": "^5.16.14",
7777
"@mui/system": "^5.16.14",
7878
"@types/prop-types": "^15.7.14",

packages/x-tree-view/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
}
7171
},
7272
"devDependencies": {
73-
"@mui/internal-test-utils": "^1.0.26",
73+
"@mui/internal-test-utils": "^2.0.1",
7474
"@mui/material": "^5.16.14",
7575
"@mui/system": "^5.16.14",
7676
"@types/prop-types": "^15.7.14",

0 commit comments

Comments
 (0)