Merge branch 'v2' into chore/change-type-to-interface

KevinVandy · Jul 28, 2024 · 3555d82 · 3555d82
2 parents ba3246a + bc32898
commit 3555d82
Show file tree

Hide file tree

Showing 246 changed files with 22,046 additions and 22,881 deletions.
diff --git a/apps/material-react-table-docs/components/prop-tables/tableOptions.ts b/apps/material-react-table-docs/components/prop-tables/tableOptions.ts
@@ -1071,7 +1071,7 @@ export const tableOptions: TableOption[] = [
     linkText: 'Memoize Components Guide',
     required: false,
     source: 'MRT',
-    type: `'cell' | 'row' | 'table-body'`,
+    type: `'cells' | 'rows' | 'table-body'`,
   },
   {
     tableOption: 'mergeOptions',

diff --git a/apps/material-react-table-docs/examples/advanced/sandbox/package-lock.json b/apps/material-react-table-docs/examples/advanced/sandbox/package-lock.json
diff --git a/apps/material-react-table-docs/examples/advanced/sandbox/package.json b/apps/material-react-table-docs/examples/advanced/sandbox/package.json
@@ -12,9 +12,9 @@
   "dependencies": {
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
-    "@mui/icons-material": "^5.15.19",
-    "@mui/material": "^5.15.19",
-    "@mui/x-date-pickers": "^7.6.1",
+    "@mui/icons-material": "^5.16.4",
+    "@mui/material": "^5.16.4",
+    "@mui/x-date-pickers": "^7.10.0",
     "dayjs": "^1.11.11",
     "material-react-table": "^2.13.0",
     "react": "^18.3.1",
@@ -23,8 +23,8 @@
   "devDependencies": {
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "@vitejs/plugin-react": "^4.3.0",
-    "typescript": "^5.4.5",
-    "vite": "^5.2.12"
+    "@vitejs/plugin-react": "^4.3.1",
+    "typescript": "^5.5.3",
+    "vite": "^5.3.4"
   }
 }
diff --git a/apps/material-react-table-docs/examples/aggregation-and-grouping/sandbox/package-lock.json b/apps/material-react-table-docs/examples/aggregation-and-grouping/sandbox/package-lock.json
diff --git a/apps/material-react-table-docs/examples/aggregation-and-grouping/sandbox/package.json b/apps/material-react-table-docs/examples/aggregation-and-grouping/sandbox/package.json
@@ -12,9 +12,9 @@
   "dependencies": {
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
-    "@mui/icons-material": "^5.15.19",
-    "@mui/material": "^5.15.19",
-    "@mui/x-date-pickers": "^7.6.1",
+    "@mui/icons-material": "^5.16.4",
+    "@mui/material": "^5.16.4",
+    "@mui/x-date-pickers": "^7.10.0",
     "dayjs": "^1.11.11",
     "material-react-table": "^2.13.0",
     "react": "^18.3.1",
@@ -23,8 +23,8 @@
   "devDependencies": {
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "@vitejs/plugin-react": "^4.3.0",
-    "typescript": "^5.4.5",
-    "vite": "^5.2.12"
+    "@vitejs/plugin-react": "^4.3.1",
+    "typescript": "^5.5.3",
+    "vite": "^5.3.4"
   }
 }