Skip to content

Commit

Permalink
chore(deps): dependency rollup (#5391)
Browse files Browse the repository at this point in the history
* chore(deps): update dependency rollup to ^4.28.1

* fix(deps): update rollup

* chore(deps): update dependency rollup to ^4.29.1

* chore(deps): update dependency playwright to ^1.49.1

* chore(deps): update dependency playwright to ^1.49.1

* chore(deps): update dependency postcss-preset-env to ^10.1.3

* chore(deps): update dependency react-intl to ^7.1.0

* update esnlint deps and fix docs test runner type errors

* chore(deps): update dependency typescript to ^5.7.3 (#5386)

* chore(deps): update react monorepo

* chore(deps): update dependency rollup to ^4.29.1

* chore(deps): update dependency typescript to ^5.7.2

* fix MenuItem and Tab children types errors

---------

Co-authored-by: Michael Winter <[email protected]>
Co-authored-by: cultureamp-renovate[bot] <89962466+cultureamp-renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency @testing-library/react to ^16.1.0

* chore(deps): update dependency stylelint to ^16.12.0

* chore(deps): update dependency highlight.js to ^11.11.1

* chore(deps): update dependency globals to ^15.14.0

* chore(deps): update dependency @changesets/cli to ^2.27.11

* chore(deps): update dependency tailwindcss to ^3.4.17

* fix(deps): update prosemirror (#5384)

Co-authored-by: cultureamp-renovate[bot] <89962466+cultureamp-renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency tailwindcss to ^3.4.17 (#5388)

Co-authored-by: Michael Winter <[email protected]>

* chore(deps): update dependency @cultureamp/frontend-apis to v12 (#5414)

Co-authored-by: cultureamp-renovate[bot] <89962466+cultureamp-renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency react-focus-lock to ^2.13.5 (#5417)

Co-authored-by: cultureamp-renovate[bot] <89962466+cultureamp-renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency typescript-transform-paths to ^3.5.3 (#5434)

Co-authored-by: cultureamp-renovate[bot] <89962466+cultureamp-renovate[bot]@users.noreply.github.com>

* update changeset

* fix(Badge): remove duplicate declaration of defaul color

---------

Co-authored-by: cultureamp-renovate[bot] <89962466+cultureamp-renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Winter <[email protected]>
Co-authored-by: Michael Winter <[email protected]>
  • Loading branch information
3 people authored Jan 15, 2025
1 parent 3aff7de commit d180512
Show file tree
Hide file tree
Showing 12 changed files with 2,051 additions and 586 deletions.
14 changes: 14 additions & 0 deletions .changeset/selfish-shoes-drum.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
'@kaizen/package-bundler': patch
'@kaizen/design-tokens': patch
'@kaizen/components': patch
'@kaizen/tailwind': patch
'@docs/storybook': patch
---

Deps updates and type component fixes for RC MenuItem and Tab

- Update deps
- Update RC MenuItem and Tab child render to fix types issues after upgrade to typescript 5.7.3 upgrade
- Update test-runner to use imported Page type from Playwright to reflect updated dep
- Update Badge duplicate color declaration
6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
"@vitejs/plugin-react": "^4.3.4",
"axe-playwright": "^2.0.3",
"classnames": "^2.5.1",
"globals": "^15.13.0",
"highlight.js": "^11.10.0",
"globals": "^15.14.0",
"highlight.js": "^11.10.1",
"jest-axe": "^9.0.0",
"react-highlight": "^0.15.0",
"sass": "1.79.6",
"storybook": "8.4.7",
"tailwindcss": "^3.4.16",
"tailwindcss": "^3.4.17",
"vite-plugin-node-polyfills": "^0.22.0"
},
"devDependenciesComments": {
Expand Down
7 changes: 4 additions & 3 deletions docs/test-runner.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { getStoryContext, type TestRunnerConfig } from '@storybook/test-runner'
import { configureAxe, getAxeResults, injectAxe } from 'axe-playwright'
import { toHaveNoViolations } from 'jest-axe'
import { type Page } from 'playwright'
import { globalA11yRules } from './utils/global-a11y-rules'

const config = {
setup: () => {
expect.extend(toHaveNoViolations)
},
preVisit: async (page) => {
await injectAxe(page)
await injectAxe(page as Page)
},
postVisit: async (page, context) => {
const { parameters } = await getStoryContext(page, context)
Expand All @@ -21,14 +22,14 @@ const config = {
const storyRules = parameters?.a11y?.config?.rules || []
const rules = [...globalA11yRules, ...storyRules]

await configureAxe(page, { ...parameters.a11y?.config, rules })
await configureAxe(page as Page, { ...parameters.a11y?.config, rules })

if (parameters?.a11y?.timeout) {
await page.waitForTimeout(parameters.a11y.timeout)
}

const a11yResults = await getAxeResults(
page,
page as Page,
parameters?.a11y?.element ?? '#storybook-root',
parameters?.a11y?.options,
)
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"react-dom": "^18.3.1"
},
"devDependencies": {
"@changesets/cli": "^2.27.10",
"@changesets/cli": "^2.27.11",
"@cultureamp/changelog-github": "^0.1.1",
"@eslint/js": "^9.16.0",
"@storybook/addon-a11y": "8.4.6",
Expand All @@ -57,35 +57,35 @@
"@storybook/test": "8.4.7",
"@storybook/theming": "8.4.6",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"@testing-library/react": "^16.1.0",
"@testing-library/user-event": "^14.5.2",
"@types/node": "^20.17.9",
"@types/react": "^18.3.13",
"@types/react-dom": "^18.3.1",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"@vitest/eslint-plugin": "^1.1.24",
"chromatic": "^11.20.0",
"eslint": "^9.16.0",
"eslint": "^9.18.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.7.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-mdx": "^3.1.5",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-storybook": "^0.11.1",
"globals": "^15.13.0",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-storybook": "^0.11.2",
"globals": "^15.14.0",
"node-fetch": "^3.3.2",
"playwright": "^1.49.0",
"playwright": "^1.49.1",
"plop": "^4.0.1",
"prettier": "^3.4.2",
"rimraf": "^6.0.1",
"storybook-addon-pseudo-states": "^4.0.2",
"stylelint": "^16.11.0",
"stylelint": "^16.12.0",
"stylelint-config-standard": "^36.0.1",
"stylelint-config-standard-scss": "^14.0.0",
"turbo": "^2.3.3",
"typescript": "^5.6.3",
"typescript": "^5.7.2",
"typescript-eslint": "^8.17.0",
"vite": "^6.0.7",
"vitest": "^2.1.8",
Expand Down
16 changes: 8 additions & 8 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,22 @@
"prosemirror-history": "^1.4.1",
"prosemirror-inputrules": "^1.4.0",
"prosemirror-keymap": "^1.2.2",
"prosemirror-model": "^1.24.0",
"prosemirror-model": "^1.24.1",
"prosemirror-schema-basic": "^1.2.3",
"prosemirror-schema-list": "^1.5.0",
"prosemirror-state": "^1.4.3",
"prosemirror-transform": "^1.10.2",
"prosemirror-utils": "^1.2.2",
"prosemirror-view": "^1.37.0",
"prosemirror-view": "^1.37.1",
"react-animate-height": "^3.2.3",
"react-aria": "^3.36.0",
"react-aria-components": "^1.5.0",
"react-day-picker": "8.10.1",
"react-focus-lock": "^2.13.2",
"react-focus-lock": "^2.13.5",
"react-focus-on": "^3.9.4",
"react-media": "^1.10.0",
"react-popper": "^2.3.0",
"react-select": "^5.8.3",
"react-select": "^5.9.0",
"react-textfit": "^1.1.1",
"resize-observer-polyfill": "^1.5.1",
"use-debounce": "^10.0.4",
Expand All @@ -99,7 +99,7 @@
"react-day-picker": "Version locked until a11y gets fixed (https://github.com/gpbl/react-day-picker/pull/1708)"
},
"devDependencies": {
"@cultureamp/frontend-apis": "^11.1.0",
"@cultureamp/frontend-apis": "^12.0.1",
"@cultureamp/i18n-react-intl": "^2.7.1",
"@kaizen/design-tokens": "workspace:*",
"@kaizen/package-bundler": "workspace:*",
Expand All @@ -118,14 +118,14 @@
"postcss": "^8.4.49",
"postcss-cli": "^11.0.0",
"postcss-import": "^16.1.0",
"postcss-preset-env": "^10.1.1",
"postcss-preset-env": "^10.1.3",
"postcss-scss": "^4.0.9",
"query-string": "^9.1.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-highlight": "^0.15.0",
"react-intl": "^7.0.1",
"rollup": "^4.28.0",
"react-intl": "^7.1.0",
"rollup": "^4.30.1",
"sass": "1.79.6",
"serialize-query-params": "^2.0.2",
"svgo": "^3.3.2",
Expand Down
4 changes: 0 additions & 4 deletions packages/components/src/Badge/Badge.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@
width: 24px;
}

.default {
color: var(--color-purple-800);
}

.active {
--badge-background-color: var(--color-blue-500);

Expand Down
18 changes: 8 additions & 10 deletions packages/components/src/__rc__/Menu/MenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,14 @@ export const MenuItem = forwardRef<HTMLDivElement, MenuItemProps>(
textValue={determinedTextValue}
{...props}
>
<>
{typeof children === 'string' && icon ? (
<div className={styles.flexWrapper}>
<span className={styles.iconWrapper}>{icon}</span>
{children}
</div>
) : (
<>{children}</>
)}
</>
{typeof children === 'string' && icon ? (
<div className={styles.flexWrapper}>
<span className={styles.iconWrapper}>{icon}</span>
{children}
</div>
) : (
children
)}
</RACMenuItem>
)
},
Expand Down
14 changes: 11 additions & 3 deletions packages/components/src/__rc__/Tabs/subcomponents/Tab/Tab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,20 @@ export const Tab = (props: TabProps): JSX.Element => {

return (
<RACTab data-kz-tab {...tabProps}>
{({ isSelected, isFocusVisible, isHovered }) => (
{(TabRenderProps) => (
<>
{children}
{typeof children === 'function' ? children(TabRenderProps) : children}
{badge && (
<span className={styles.badge}>
<Badge variant={isSelected || isFocusVisible || isHovered ? 'active' : 'default'}>
<Badge
variant={
TabRenderProps.isSelected ||
TabRenderProps.isFocusVisible ||
TabRenderProps.isHovered
? 'active'
: 'default'
}
>
{badge}
</Badge>
</span>
Expand Down
2 changes: 1 addition & 1 deletion packages/design-tokens/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"react": "^18.3.1",
"react-highlight": "^0.15.0",
"react-map-interaction": "^2.1.0",
"rollup": "^4.28.0",
"rollup": "^4.30.1",
"tslib": "^2.8.1",
"tsx": "^4.19.2"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/package-bundler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@
"@babel/plugin-transform-react-pure-annotations": "^7.25.9",
"@rollup/plugin-alias": "^5.1.1",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^28.0.1",
"@rollup/plugin-node-resolve": "^15.3.0",
"@rollup/plugin-typescript": "^12.1.1",
"@rollup/plugin-commonjs": "^28.0.2",
"@rollup/plugin-node-resolve": "^15.3.1",
"@rollup/plugin-typescript": "^12.1.2",
"babel-plugin-pure-static-props": "^0.2.0",
"concat-cli": "^4.0.0",
"rollup-plugin-ignore": "^1.0.10",
"rollup-plugin-node-externals": "^7.1.3",
"rollup-plugin-postcss": "^4.0.2",
"ts-patch": "^3.3.0",
"typescript-transform-paths": "^3.5.2"
"typescript-transform-paths": "^3.5.3"
},
"dependenciesComments": {
"ts-patch": "Required for typescript-transform-paths"
},
"devDependencies": {
"rollup": "^4.28.0"
"rollup": "^4.30.1"
},
"devDependenciesComments": {
"typescript": "Installed in root"
Expand Down
4 changes: 2 additions & 2 deletions packages/tailwind/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"devDependencies": {
"@kaizen/package-bundler": "workspace:*",
"classnames": "^2.5.1",
"rollup": "^4.28.0",
"tailwindcss": "^3.4.16",
"rollup": "^4.30.1",
"tailwindcss": "^3.4.17",
"tslib": "^2.8.1"
},
"peerDependencies": {
Expand Down
Loading

0 comments on commit d180512

Please sign in to comment.