release v1.3.0 - mrt v1 lock mantine v6 stuff

KevinVandy · Sep 18, 2023 · b7212b8 · b7212b8 · vercel · Sep 18, 2023
1 parent 0d7df5b
commit b7212b8
Show file tree

Hide file tree

Showing 10 changed files with 1,025 additions and 1,142 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: Upgrade Example Versions
 on:
   push:
     branches:
-      - 'main'
+      - 'v1'
     paths:
       - 'packages/mantine-react-table/package.json'
 

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -3,7 +3,7 @@ name: Clean PR
 on:
   pull_request:
     branches:
-      - main
+      - v1
 
 jobs:
   clean-pr:

diff --git a/apps/mantine-react-table-docs/components/mdx/InstallCommand.tsx b/apps/mantine-react-table-docs/components/mdx/InstallCommand.tsx
@@ -3,7 +3,7 @@ import { Tabs } from '@mantine/core';
 import { SampleCodeSnippet } from './SampleCodeSnippet';
 
 const defaultPackagesString =
-  'mantine-react-table @mantine/core @mantine/hooks @mantine/dates @emotion/react @tabler/icons-react dayjs';
+  'mantine-react-table @mantine/core@6.0.21 @mantine/hooks@6.0.21 @mantine/dates@6.0.21 @emotion/react @tabler/icons-react dayjs';
 
 export const InstallCommand = ({
   packagesString = defaultPackagesString,

diff --git a/apps/mantine-react-table-docs/pages/changelog.mdx b/apps/mantine-react-table-docs/pages/changelog.mdx
@@ -12,6 +12,13 @@ import Head from 'next/head';
 
 ### V1
 
+#### V1.3.0 - 2023-09-18
+
+- Updated the mrt `package.json` `@mantine/` peerDependencies to `^6.0.0` to indicate that MRT v1 is now compatible with Mantine v6
+- Upgraded to `@tanstack/react-table v8.10.0`
+  - Better accessorKey deep key inference
+  - New row pinning apis (MRT does not implement row pinning features yet)
+
 #### V1.2.1 - 2023-09-10
 
 - Upgraded to `@tanstack/react-table v8.9.8` and `@tanstack/react-virtual v3.0.0-beta.60` for better performance and bug fixes

diff --git a/apps/mantine-react-table-docs/pages/docs/getting-started/install.mdx b/apps/mantine-react-table-docs/pages/docs/getting-started/install.mdx
@@ -7,6 +7,8 @@ import { FAQs } from '../../../components/mdx/FAQs';
   <meta name="description" content="How to install Mantine React Table" />
 </Head>
 
+> This is the install guide for `mantine-react-table` **V1** and `@mantine/` packages **V6**. MRT V1 will not work with Mantine V7. MRT V2 will be released by the end of 2023 and will work with Mantine V7.
+
 ## Installation
 
 > `mantine-react-table` V1 requires **Mantine V6.0+** packages as dependencies in your project.
@@ -15,9 +17,9 @@ import { FAQs } from '../../../components/mdx/FAQs';
 >
 > Just double-check that you have the following in your package.json, or use the [full install commands](<#install-with-required-peer-dependencies-(recommended)>) below.
 >
-> 1.  `@mantine/core` (v6.0+)
-> 2.  `@mantine/hooks` (v6.0+)
-> 3.  `@mantine/dates` (v6.0+)
+> 1.  `@mantine/core` (^v6.0)
+> 2.  `@mantine/hooks` (^v6.0)
+> 3.  `@mantine/dates` (^v6.0)
 > 4.  `@tabler/icons-react` (2.23.0+)
 > 5.  `@emotion/react` (v11)
 > 6.  `dayjs` (v1.11+)
@@ -37,6 +39,8 @@ import { FAQs } from '../../../components/mdx/FAQs';
 
 ### Common Errors
 
+If you don't see any styles applied to the mantine table components, you may have mismatching versions of `mantine-react-table` and `@mantine/core`. MRT v1 requires Mantine v6 and will not work with Mantine v7. MRT v2 will be released by the end of 2023 and will work with Mantine v7.
+
 If you get an error like this:
 
 ```bsh

diff --git a/apps/mantine-react-table-docs/public/sitemap-0.xml b/apps/mantine-react-table-docs/public/sitemap-0.xml
diff --git a/packages/mantine-react-table/package.json b/packages/mantine-react-table/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.1",
+  "version": "1.3.0",
   "license": "MIT",
   "name": "mantine-react-table",
   "description": "A fully featured Mantine implementation of TanStack React Table V8, written from the ground up in TypeScript.",
@@ -111,9 +111,9 @@
   },
   "peerDependencies": {
     "@emotion/react": ">=11",
-    "@mantine/core": ">=6",
-    "@mantine/dates": ">=6",
-    "@mantine/hooks": ">=6",
+    "@mantine/core": "^6.0",
+    "@mantine/dates": "^6.0",
+    "@mantine/hooks": "^6.0",
     "@tabler/icons-react": ">=2.23.0",
     "react": ">=18.0",
     "react-dom": ">=18.0"

diff --git a/packages/mantine-react-table/src/types.ts b/packages/mantine-react-table/src/types.ts
@@ -395,7 +395,7 @@ export type MRT_ColumnDef<TData extends Record<string, any> = {}> = Omit<
    * @example accessorKey: 'username' //simple
    * @example accessorKey: 'name.firstName' //deep key dot notation
    */
-  accessorKey?: DeepKeys<TData>;
+  accessorKey?: (string & {}) | DeepKeys<TData>;
   aggregationFn?: MRT_AggregationFn<TData> | Array<MRT_AggregationFn<TData>>;
   /**
    * Specify what type of column this is. Either `data`, `display`, or `group`. Defaults to `data`.