Merge main into renovate/rollup

cultureamp · Jan 3, 2025 · bac1d38 · bac1d38
2 parents f6d1a4c + 55c1532
commit bac1d38
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.70.4
+
+### Patch Changes
+
+- [#5435](https://github.com/cultureamp/kaizen-design-system/pull/5435) [`4bfcd3e`](https://github.com/cultureamp/kaizen-design-system/commit/4bfcd3eb617e144293efad2b845c1434c95c38ff) - update LinkButton's import of the Button stylesheet to a relative path to resolve file resolution error
+
 ## 1.70.3
 
 ### Patch Changes

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kaizen/components",
-  "version": "1.70.3",
+  "version": "1.70.4",
   "description": "Kaizen component library",
   "author": "Geoffrey Chong <[email protected]>",
   "homepage": "https://cultureamp.design",

diff --git a/packages/components/src/LinkButton/LinkButton.tsx b/packages/components/src/LinkButton/LinkButton.tsx
@@ -1,10 +1,10 @@
 import React, { forwardRef } from 'react'
 import { Link as RACLink, type LinkProps as RACLinkProps } from 'react-aria-components'
 import { type ButtonUIProps } from '~components/__rc__/Button'
-import buttonStyles from '~components/__rc__/Button/Button.module.css'
 import { ButtonContent } from '~components/__rc__/Button/subcomponents'
 import { useReversedColors } from '~components/__utilities__/v3'
 import { mergeClassNames } from '~components/utils/mergeClassNames'
+import buttonStyles from '../__rc__/Button/Button.module.css'
 import styles from './LinkButton.module.css'
 
 export type LinkButtonProps = ButtonUIProps &