Skip to content

Commit

Permalink
Merge branch 'main' into radiobutton-invalid
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Mar 22, 2023
2 parents 0b30868 + 33f683f commit c9b09a8
Show file tree
Hide file tree
Showing 128 changed files with 2,644 additions and 603 deletions.
24 changes: 22 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1045,9 +1045,10 @@
"login": "jsehull",
"name": "Jesse Hull",
"avatar_url": "https://avatars.githubusercontent.com/u/9935383?v=4",
"profile": "https://jsehull.com/",
"profile": "https://github.com/jsehull",
"contributions": [
"code"
"code",
"a11y"
]
},
{
Expand Down Expand Up @@ -1076,6 +1077,25 @@
"contributions": [
"code"
]
},
{
"login": "davesteinberg",
"name": "Dave Steinberg",
"avatar_url": "https://avatars.githubusercontent.com/u/3935584?v=4",
"profile": "https://github.com/davesteinberg",
"contributions": [
"code"
]
},
{
"login": "pratikkarad",
"name": "Pratik Karad",
"avatar_url": "https://avatars.githubusercontent.com/u/32093370?v=4",
"profile": "https://github.com/pratikkarad",
"contributions": [
"code",
"a11y"
]
}
],
"commitConvention": "none"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-react-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v2
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.14
18.15
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
516 changes: 258 additions & 258 deletions .yarn/releases/yarn-3.4.1.cjs → .yarn/releases/yarn-3.5.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1

yarn-path ".yarn/releases/yarn-3.4.1.cjs"
yarn-path ".yarn/releases/yarn-3.5.0.cjs"
2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ supportedArchitectures:
- linux
- win32

yarnPath: .yarn/releases/yarn-3.4.1.cjs
yarnPath: .yarn/releases/yarn-3.5.0.cjs
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,14 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<tr>
<td align="center"><a href="https://github.com/lewandom"><img src="https://avatars.githubusercontent.com/u/8779205?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcin Lewandowski</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=lewandom" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/remolueoend"><img src="https://avatars.githubusercontent.com/u/7881606?v=4?s=100" width="100px;" alt=""/><br /><sub><b>remolueoend</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=remolueoend" title="Code">💻</a></td>
<td align="center"><a href="https://jsehull.com/"><img src="https://avatars.githubusercontent.com/u/9935383?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jesse Hull</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=jsehull" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/jsehull"><img src="https://avatars.githubusercontent.com/u/9935383?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jesse Hull</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=jsehull" title="Code">💻</a><a href="#a11y-jsehull" title="Accessibility">️️️️♿️</a></td>
<td align="center"><a href="https://github.com/awarrier99"><img src="https://avatars.githubusercontent.com/u/17476235?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ashvin Warrier</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=awarrier99" title="Code">💻</a></td>
<td align="center"><a href="https://galvingao.com/"><img src="https://avatars.githubusercontent.com/u/12567059?v=4?s=100" width="100px;" alt=""/><br /><sub><b>GalvinGao</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=GalvinGao" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/bianca-sparxs"><img src="https://avatars.githubusercontent.com/u/33003148?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bianca Sparxs</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=bianca-sparxs" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/davesteinberg"><img src="https://avatars.githubusercontent.com/u/3935584?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dave Steinberg</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=davesteinberg" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/pratikkarad"><img src="https://avatars.githubusercontent.com/u/32093370?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pratik Karad</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=pratikkarad" title="Code">💻</a> <a href="#a11y-pratikkarad" title="Accessibility">️️️️♿️</a></td>
</tr>
</table>

Expand Down
2 changes: 1 addition & 1 deletion config/jest-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "jest-config-carbon",
"private": true,
"description": "Jest configuration and preset for Carbon",
"version": "1.7.0",
"version": "1.8.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion docs/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ following:
to automatically generate the prerelease versions for packages
- [ ] Specify `minor` as the release type
- [ ] Provide the tag for the release. For example, if the previous release
was `v11.1.0-rc.0` this tag would be `v11.2.0`. To find the previous
was `v11.1.0-rc.0` this tag would be `v11.1.0`. To find the previous
release, view the
[tag list](https://github.com/carbon-design-system/carbon/tags).
- [ ] Review and approve the Pull Request generated from this action
Expand Down
37 changes: 37 additions & 0 deletions e2e/components/ComboButton/ComboButton-test.e2e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/**
* Copyright IBM Corp. 2023
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

const { expect, test } = require('@playwright/test');
const { themes } = require('../../test-utils/env');
const { snapshotStory, visitStory } = require('../../test-utils/storybook');

test.describe('ComboButton', () => {
themes.forEach((theme) => {
test.describe(theme, () => {
test('combo-button @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'ComboButton',
id: 'experimental-unstable-combobutton--default',
theme,
});
});
});
});

test('accessibility-checker @avt', async ({ page }) => {
await visitStory(page, {
component: 'ComboButton',
id: 'experimental-unstable-combobutton--default',
globals: {
theme: 'white',
},
});
await expect(page).toHaveNoACViolations('ComboButton');
});
});
37 changes: 37 additions & 0 deletions e2e/components/MenuButton/MenuButton-test.e2e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/**
* Copyright IBM Corp. 2023
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

const { expect, test } = require('@playwright/test');
const { themes } = require('../../test-utils/env');
const { snapshotStory, visitStory } = require('../../test-utils/storybook');

test.describe('MenuButton', () => {
themes.forEach((theme) => {
test.describe(theme, () => {
test('menu-button @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'MenuButton',
id: 'experimental-unstable-menubutton--default',
theme,
});
});
});
});

test('accessibility-checker @avt', async ({ page }) => {
await visitStory(page, {
component: 'MenuButton',
id: 'experimental-unstable-menubutton--default',
globals: {
theme: 'white',
},
});
await expect(page).toHaveNoACViolations('MenuButton');
});
});
4 changes: 2 additions & 2 deletions examples/class-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "class-prefix",
"private": true,
"version": "0.21.0",
"version": "0.22.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.24.0",
"@carbon/react": "^1.25.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.27.0",
"version": "0.28.0",
"scripts": {
"develop": "vite"
},
"devDependencies": {
"vite": "^2.8.0"
},
"dependencies": {
"@carbon/styles": "^1.24.0",
"@carbon/styles": "^1.25.0",
"sass": "^1.51.0"
}
}
4 changes: 2 additions & 2 deletions examples/codesandbox-with-sass-compilation/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codesandbox-with-sass-compilation",
"version": "0.25.0",
"version": "0.26.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.24.0",
"@carbon/react": "^1.25.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codesandbox",
"version": "0.25.0",
"version": "0.26.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.24.0",
"@carbon/react": "^1.25.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "custom-theme",
"private": true,
"version": "0.22.0",
"version": "0.23.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.24.0",
"@carbon/react": "^1.25.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/id-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "id-prefix",
"private": true,
"version": "0.21.0",
"version": "0.22.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.24.0",
"@carbon/react": "^1.25.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/incremental-migration/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "incremental-migration",
"private": true,
"version": "0.24.0",
"version": "0.25.0",
"scripts": {
"build": "next build",
"dev": "next dev",
Expand All @@ -13,7 +13,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.24.0",
"@carbon/react": "^1.25.0",
"carbon-components": "^10.57.0",
"carbon-components-react": "^7.57.0",
"carbon-icons": "^7.0.7",
Expand Down
4 changes: 2 additions & 2 deletions examples/light-dark-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-light-dark",
"private": true,
"version": "0.22.0",
"version": "0.23.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.24.0",
"@carbon/react": "^1.25.0",
"next": "12.1.4",
"react": "18.0.0",
"react-dom": "18.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/nextjs/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-nextjs",
"private": true,
"version": "0.24.0",
"version": "0.25.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.24.0",
"@carbon/react": "^1.25.0",
"next": "12.1.4",
"react": "18.0.0",
"react-dom": "18.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "vite",
"private": true,
"version": "0.22.0",
"version": "0.23.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.24.0",
"@carbon/react": "^1.25.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
12 changes: 2 additions & 10 deletions examples/vite/src/index.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
@use '@carbon/react/scss/compat/themes' as compat;
@use '@carbon/react/scss/themes';
@use '@carbon/react/scss/theme' with (
$fallback: compat.$g100,
$theme: themes.$g100
@use '@carbon/react' with (
$font-path: '@ibm/plex'
);
@use '@carbon/react';

:root {
@include theme.theme();
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,5 @@
"./config/stylelint-config-carbon"
]
},
"packageManager": "yarn@3.4.1"
"packageManager": "yarn@3.5.0"
}
11 changes: 6 additions & 5 deletions packages/carbon-components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components-react",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "8.24.0",
"version": "8.25.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -31,17 +31,18 @@
"scripts": {
"build": "yarn clean && node tasks/build-styles.js && node tasks/build.js",
"clean": "rimraf es lib",
"postinstall": "carbon-telemetry collect --install"
"postinstall": "carbon-telemetry collect --install && node scripts/postinstall.js"
},
"peerDependencies": {
"react": "^16.8.6 || ^17.0.1",
"react-dom": "^16.8.6 || ^17.0.1",
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.24.0",
"@carbon/styles": "^1.24.0",
"@carbon/telemetry": "0.1.0"
"@carbon/react": "^1.25.0",
"@carbon/styles": "^1.25.0",
"@carbon/telemetry": "0.1.0",
"chalk": "1.1.3"
},
"devDependencies": {
"@babel/core": "^7.18.2",
Expand Down
Loading

0 comments on commit c9b09a8

Please sign in to comment.