Skip to content

Commit

Permalink
Merge pull request #350 from icflorescu/next
Browse files Browse the repository at this point in the history
Relax peerDeps to fix #349 & update deps
  • Loading branch information
icflorescu authored Jun 26, 2023
2 parents 5ef5e16 + a5f9c73 commit 1d8aabb
Show file tree
Hide file tree
Showing 5 changed files with 265 additions and 260 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.6.5 (2023-06-12)

- Relax `peerDependencies` (to Mantine 6.x)

## 2.6.0 (2023-06-12)

- Implement column groups (issue [#207](https://github.com/icflorescu/mantine-datatable/issues/207) / PR [#330](https://github.com/icflorescu/mantine-datatable/pull/330) / thanks to [@MatthijsMud](https://github.com/MatthijsMud))
Expand Down
8 changes: 4 additions & 4 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mantine-datatable-docs",
"version": "2.6.4",
"version": "2.6.5",
"description": "Docs website for mantine-datatable; see ../package/package.json for more info",
"private": true,
"scripts": {
Expand All @@ -21,8 +21,8 @@
"@mantine/next": "^6.0.14",
"@mantine/notifications": "^6.0.14",
"@mantine/prism": "^6.0.14",
"@tabler/icons-react": "^2.22.0",
"@tanstack/react-query": "^4.29.15",
"@tabler/icons-react": "^2.23.0",
"@tanstack/react-query": "^4.29.17",
"dayjs": "^1.11.8",
"lodash": "^4.17.21",
"mantine-datatable": "*",
Expand All @@ -36,7 +36,7 @@
"@types/lodash": "^4.14.195",
"@types/mixpanel-browser": "^2.47.0",
"@types/node": "^20.3.1",
"@types/react": "^18.2.13",
"@types/react": "^18.2.14",
"mixpanel-browser": "^2.47.0",
"typescript": "^5.1.3"
}
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mantine-datatable-turborepo",
"version": "2.6.4",
"version": "2.6.5",
"description": "This is a monorepo; see package/package.json for more info",
"private": true,
"workspaces": [
Expand All @@ -27,16 +27,16 @@
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^29.5.2",
"@typescript-eslint/eslint-plugin": "^5.60.0",
"@typescript-eslint/parser": "^5.60.0",
"@typescript-eslint/eslint-plugin": "^5.60.1",
"@typescript-eslint/parser": "^5.60.1",
"babel-jest": "^29.5.0",
"eslint": "^8.43.0",
"eslint-config-next": "^13.4.7",
"eslint-config-prettier": "^8.8.0",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"prettier": "^2.8.8",
"turbo": "^1.10.5",
"turbo": "^1.10.6",
"typescript": "^5.1.3"
},
"engines": {
Expand Down
14 changes: 7 additions & 7 deletions package/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mantine-datatable",
"version": "2.6.4",
"version": "2.6.5",
"description": "The dependency-free datatable component for Mantine UI, featuring asynchronous data loading support, pagination, multple rows selection, column sorting, custom cell data rendering, row context menu, row expansion and more",
"keywords": [
"mantine",
Expand Down Expand Up @@ -58,16 +58,16 @@
"devDependencies": {
"@mantine/core": "^6.0.14",
"@mantine/hooks": "^6.0.14",
"@tabler/icons-react": "^2.22.0",
"@types/react": "^18.2.13",
"@tabler/icons-react": "^2.23.0",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"esbuild": "^0.18.6",
"esbuild": "^0.18.9",
"react": "^18.2.0",
"typescript": "^5.1.3"
},
"peerDependencies": {
"@mantine/core": "^6.0.14",
"@mantine/hooks": "^6.0.14",
"react": "^18.2.0"
"@mantine/core": ">=6",
"@mantine/hooks": ">=6",
"react": ">=18"
}
}
Loading

0 comments on commit 1d8aabb

Please sign in to comment.