Skip to content

Commit

Permalink
fix(merge issues): see if separate commit removing unnecessary design…
Browse files Browse the repository at this point in the history
…-system dep from fields and prop-types dep from other components makes rebasing less of a chore in the future
  • Loading branch information
ByronDWall committed Jan 21, 2025
2 parents 2a616c9 + 0ee1c4d commit 4a2ee0d
Show file tree
Hide file tree
Showing 201 changed files with 2,763 additions and 1,493 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/merge-blocking-labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Label Checker

on:
pull_request:
types:
- opened
- synchronize
- reopened
- labeled
- unlabeled
merge_group:
types: [checks_requested]

jobs:
check_labels:
if: github.event_name == 'pull_request'
name: Prevent merge with blocking labels
runs-on: ubuntu-latest
steps:
- uses: docker://agilepathway/pull-request-label-checker:latest
with:
none_of: '👁 👨‍🎨 Status: UI/UX Review,🖐 🖐 Status: On Hold,🛑 Status: blocked,🚧 Status: WIP,🚨 🚨 🚨DO NOT MERGE🚨 🚨 🚨'
repo_token: ${{ secrets.GITHUB_TOKEN }}
7 changes: 7 additions & 0 deletions design-system/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @commercetools-uikit/design-system

## 19.22.1

### Patch Changes

- Updated dependencies []:
- @commercetools-uikit/hooks@19.22.1

## 19.22.0

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions design-system/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@commercetools-uikit/design-system",
"description": "Core package of the commercetools design system.",
"version": "19.22.0",
"version": "19.22.1",
"bugs": "https://github.com/commercetools/ui-kit/issues",
"repository": {
"type": "git",
Expand All @@ -25,7 +25,7 @@
"dependencies": {
"@babel/runtime": "^7.20.13",
"@babel/runtime-corejs3": "^7.20.13",
"@commercetools-uikit/hooks": "19.22.0",
"@commercetools-uikit/hooks": "19.22.1",
"@emotion/react": "^11.10.5",
"lodash": "4.17.21",
"react": "19.0.0"
Expand Down
7 changes: 7 additions & 0 deletions packages/calendar-time-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @commercetools-uikit/calendar-time-utils

## 19.22.1

### Patch Changes

- Updated dependencies []:
- @commercetools-uikit/utils@19.22.1

## 19.22.0

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/calendar-time-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@commercetools-uikit/calendar-time-utils",
"description": "Utilities to work with time values for a calendar.",
"version": "19.22.0",
"version": "19.22.1",
"bugs": "https://github.com/commercetools/ui-kit/issues",
"repository": {
"type": "git",
Expand All @@ -21,7 +21,7 @@
"dependencies": {
"@babel/runtime": "^7.20.13",
"@babel/runtime-corejs3": "^7.20.13",
"@commercetools-uikit/utils": "19.22.0"
"@commercetools-uikit/utils": "19.22.1"
},
"devDependencies": {
"moment-timezone": "0.5.46"
Expand Down
16 changes: 16 additions & 0 deletions packages/calendar-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# @commercetools-uikit/calendar-utils

## 19.22.1

### Patch Changes

- Updated dependencies []:
- @commercetools-uikit/design-system@19.22.1
- @commercetools-uikit/accessible-button@19.22.1
- @commercetools-uikit/secondary-icon-button@19.22.1
- @commercetools-uikit/icons@19.22.1
- @commercetools-uikit/input-utils@19.22.1
- @commercetools-uikit/spacings-inline@19.22.1
- @commercetools-uikit/text@19.22.1
- @commercetools-uikit/tooltip@19.22.1
- @commercetools-uikit/hooks@19.22.1
- @commercetools-uikit/utils@19.22.1

## 19.22.0

### Patch Changes
Expand Down
22 changes: 11 additions & 11 deletions packages/calendar-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@commercetools-uikit/calendar-utils",
"description": "Utilities to work with values for a calendar.",
"version": "19.22.0",
"version": "19.22.1",
"bugs": "https://github.com/commercetools/ui-kit/issues",
"repository": {
"type": "git",
Expand All @@ -21,16 +21,16 @@
"dependencies": {
"@babel/runtime": "^7.20.13",
"@babel/runtime-corejs3": "^7.20.13",
"@commercetools-uikit/accessible-button": "19.22.0",
"@commercetools-uikit/design-system": "19.22.0",
"@commercetools-uikit/hooks": "19.22.0",
"@commercetools-uikit/icons": "19.22.0",
"@commercetools-uikit/input-utils": "19.22.0",
"@commercetools-uikit/secondary-icon-button": "19.22.0",
"@commercetools-uikit/spacings-inline": "19.22.0",
"@commercetools-uikit/text": "19.22.0",
"@commercetools-uikit/tooltip": "19.22.0",
"@commercetools-uikit/utils": "19.22.0",
"@commercetools-uikit/accessible-button": "19.22.1",
"@commercetools-uikit/design-system": "19.22.1",
"@commercetools-uikit/hooks": "19.22.1",
"@commercetools-uikit/icons": "19.22.1",
"@commercetools-uikit/input-utils": "19.22.1",
"@commercetools-uikit/secondary-icon-button": "19.22.1",
"@commercetools-uikit/spacings-inline": "19.22.1",
"@commercetools-uikit/text": "19.22.1",
"@commercetools-uikit/tooltip": "19.22.1",
"@commercetools-uikit/utils": "19.22.1",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"lodash": "4.17.21",
Expand Down
2 changes: 2 additions & 0 deletions packages/components/accessible-hidden/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @commercetools-uikit/accessible-hidden

## 19.22.1

## 19.22.0

## 19.21.0
Expand Down
2 changes: 1 addition & 1 deletion packages/components/accessible-hidden/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@commercetools-uikit/accessible-hidden",
"description": "Component to hide content offscreen while keeping it accessible. This is also helpful for testing purposes.",
"version": "19.22.0",
"version": "19.22.1",
"bugs": "https://github.com/commercetools/ui-kit/issues",
"repository": {
"type": "git",
Expand Down
10 changes: 10 additions & 0 deletions packages/components/avatar/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# @commercetools-uikit/avatar

## 19.22.1

### Patch Changes

- [#3050](https://github.com/commercetools/ui-kit/pull/3050) [`8bd13d4`](https://github.com/commercetools/ui-kit/commit/8bd13d4489dcbe72e5ed7320ffefc7b5f2538885) Thanks [@ByronDWall](https://github.com/ByronDWall)! - Update TAvatarProps.size type to be optional for backward compatibility, update readmes

- Updated dependencies []:
- @commercetools-uikit/design-system@19.22.1
- @commercetools-uikit/utils@19.22.1

## 19.22.0

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/components/avatar/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@commercetools-uikit/avatar",
"description": "A component for rendering profile images",
"version": "19.22.0",
"version": "19.22.1",
"bugs": "https://github.com/commercetools/ui-kit/issues",
"repository": {
"type": "git",
Expand All @@ -21,8 +21,8 @@
"dependencies": {
"@babel/runtime": "^7.20.13",
"@babel/runtime-corejs3": "^7.20.13",
"@commercetools-uikit/design-system": "19.22.0",
"@commercetools-uikit/utils": "19.22.0",
"@commercetools-uikit/design-system": "19.22.1",
"@commercetools-uikit/utils": "19.22.1",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"lodash": "4.17.21"
Expand Down
4 changes: 2 additions & 2 deletions packages/components/avatar/src/avatar.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ export const getFontSize = (
avatarSize: TAvatarProps['size']
) => {
const widthCode = avatarInitials.length > 1 ? 'wide' : 'narrow';
return fontSizeMap[avatarSize][widthCode];
return fontSizeMap[avatarSize!][widthCode];
};

export const getWidthSize = (avatarSize: TAvatarProps['size']) =>
widthSizeMap[avatarSize];
widthSizeMap[avatarSize!];

export const getBackgroundColor = (
avatarColor: TAvatarProps['color'] = 'accent',
Expand Down
2 changes: 1 addition & 1 deletion packages/components/avatar/src/avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export type TAvatarProps = {
/**
* The size of the rendered avatar.
*/
size: 's' | 'm' | 'l';
size?: 's' | 'm' | 'l';
/**
* The color of the avatar.
*/
Expand Down
8 changes: 8 additions & 0 deletions packages/components/buttons/accessible-button/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @commercetools-uikit/accessible-button

## 19.22.1

### Patch Changes

- Updated dependencies []:
- @commercetools-uikit/design-system@19.22.1
- @commercetools-uikit/utils@19.22.1

## 19.22.0

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/components/buttons/accessible-button/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@commercetools-uikit/accessible-button",
"description": "A React component that you can use to wrap your buttons in an accessible <button/> element.",
"version": "19.22.0",
"version": "19.22.1",
"bugs": "https://github.com/commercetools/ui-kit/issues",
"repository": {
"type": "git",
Expand All @@ -21,8 +21,8 @@
"dependencies": {
"@babel/runtime": "^7.20.13",
"@babel/runtime-corejs3": "^7.20.13",
"@commercetools-uikit/design-system": "19.22.0",
"@commercetools-uikit/utils": "19.22.0",
"@commercetools-uikit/design-system": "19.22.1",
"@commercetools-uikit/utils": "19.22.1",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@types/react-is": "^19.0.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/components/buttons/flat-button/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @commercetools-uikit/flat-button

## 19.22.1

### Patch Changes

- Updated dependencies []:
- @commercetools-uikit/design-system@19.22.1
- @commercetools-uikit/accessible-button@19.22.1
- @commercetools-uikit/spacings-inline@19.22.1
- @commercetools-uikit/text@19.22.1
- @commercetools-uikit/utils@19.22.1

## 19.22.0

### Patch Changes
Expand Down
12 changes: 6 additions & 6 deletions packages/components/buttons/flat-button/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@commercetools-uikit/flat-button",
"description": "Flat buttons are minimal and a flat variation of primary and secondary buttons.",
"version": "19.22.0",
"version": "19.22.1",
"bugs": "https://github.com/commercetools/ui-kit/issues",
"repository": {
"type": "git",
Expand All @@ -21,11 +21,11 @@
"dependencies": {
"@babel/runtime": "^7.20.13",
"@babel/runtime-corejs3": "^7.20.13",
"@commercetools-uikit/accessible-button": "19.22.0",
"@commercetools-uikit/design-system": "19.22.0",
"@commercetools-uikit/spacings-inline": "19.22.0",
"@commercetools-uikit/text": "19.22.0",
"@commercetools-uikit/utils": "19.22.0",
"@commercetools-uikit/accessible-button": "19.22.1",
"@commercetools-uikit/design-system": "19.22.1",
"@commercetools-uikit/spacings-inline": "19.22.1",
"@commercetools-uikit/text": "19.22.1",
"@commercetools-uikit/utils": "19.22.1",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"lodash": "4.17.21",
Expand Down
11 changes: 11 additions & 0 deletions packages/components/buttons/icon-button/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @commercetools-uikit/icon-button

## 19.22.1

### Patch Changes

- Updated dependencies []:
- @commercetools-uikit/design-system@19.22.1
- @commercetools-uikit/accessible-button@19.22.1
- @commercetools-uikit/text@19.22.1
- @commercetools-uikit/utils@19.22.1
- @commercetools-uikit/spacings@19.22.1

## 19.22.0

### Patch Changes
Expand Down
12 changes: 6 additions & 6 deletions packages/components/buttons/icon-button/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@commercetools-uikit/icon-button",
"description": "Icon buttons are icon-only buttons. They trigger an action when clicked (`onClick` prop). You must also pass a label for accessibility reasons.",
"version": "19.22.0",
"version": "19.22.1",
"bugs": "https://github.com/commercetools/ui-kit/issues",
"repository": {
"type": "git",
Expand All @@ -21,11 +21,11 @@
"dependencies": {
"@babel/runtime": "^7.20.13",
"@babel/runtime-corejs3": "^7.20.13",
"@commercetools-uikit/accessible-button": "19.22.0",
"@commercetools-uikit/design-system": "19.22.0",
"@commercetools-uikit/spacings": "19.22.0",
"@commercetools-uikit/text": "19.22.0",
"@commercetools-uikit/utils": "19.22.0",
"@commercetools-uikit/accessible-button": "19.22.1",
"@commercetools-uikit/design-system": "19.22.1",
"@commercetools-uikit/spacings": "19.22.1",
"@commercetools-uikit/text": "19.22.1",
"@commercetools-uikit/utils": "19.22.1",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"lodash": "4.17.21",
Expand Down
11 changes: 11 additions & 0 deletions packages/components/buttons/link-button/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @commercetools-uikit/link-button

## 19.22.1

### Patch Changes

- Updated dependencies []:
- @commercetools-uikit/[email protected]
- @commercetools-uikit/[email protected]
- @commercetools-uikit/[email protected]
- @commercetools-uikit/[email protected]
- @commercetools-uikit/[email protected]

## 19.22.0

### Patch Changes
Expand Down
12 changes: 6 additions & 6 deletions packages/components/buttons/link-button/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@commercetools-uikit/link-button",
"description": "Link buttons are similar to Flat buttons but work as link elements.",
"version": "19.22.0",
"version": "19.22.1",
"bugs": "https://github.com/commercetools/ui-kit/issues",
"repository": {
"type": "git",
Expand All @@ -21,11 +21,11 @@
"dependencies": {
"@babel/runtime": "^7.20.13",
"@babel/runtime-corejs3": "^7.20.13",
"@commercetools-uikit/accessible-button": "19.22.0",
"@commercetools-uikit/design-system": "19.22.0",
"@commercetools-uikit/spacings-inline": "19.22.0",
"@commercetools-uikit/text": "19.22.0",
"@commercetools-uikit/utils": "19.22.0",
"@commercetools-uikit/accessible-button": "19.22.1",
"@commercetools-uikit/design-system": "19.22.1",
"@commercetools-uikit/spacings-inline": "19.22.1",
"@commercetools-uikit/text": "19.22.1",
"@commercetools-uikit/utils": "19.22.1",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"lodash": "4.17.21"
Expand Down
11 changes: 11 additions & 0 deletions packages/components/buttons/primary-button/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @commercetools-uikit/primary-button

## 19.22.1

### Patch Changes

- Updated dependencies []:
- @commercetools-uikit/[email protected]
- @commercetools-uikit/[email protected]
- @commercetools-uikit/[email protected]
- @commercetools-uikit/[email protected]
- @commercetools-uikit/[email protected]

## 19.22.0

### Patch Changes
Expand Down
Loading

0 comments on commit 4a2ee0d

Please sign in to comment.