Skip to content

Commit

Permalink
Merge branch 'main' into add-multiselect-types
Browse files Browse the repository at this point in the history
  • Loading branch information
awarrier99 committed Feb 22, 2023
2 parents 26e55f9 + dadd6b8 commit 767ae13
Show file tree
Hide file tree
Showing 202 changed files with 1,068 additions and 598 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,15 @@
"code"
]
},
{
"login": "remolueoend",
"name": "remolueoend",
"avatar_url": "https://avatars.githubusercontent.com/u/7881606?v=4",
"profile": "https://github.com/remolueoend",
"contributions": [
"code"
]
},
{
"login": "awarrier99",
"name": "Ashvin Warrier",
Expand Down
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/resolve-patch-3b327f0d66-21684b4d99.zip
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.
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.
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
<a href="https://github.com/carbon-design-system/carbon/blob/master/.github/CONTRIBUTING.md">
<img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs welcome" />
</a>
<a href="https://bestpractices.coreinfrastructure.org/projects/7034">
<img src="https://bestpractices.coreinfrastructure.org/projects/7034/badge">
</a>
<a href="https://discord.gg/J7JEUEkTRX">
<img src="https://img.shields.io/discord/689212587170201628?color=5865F2" alt="Chat with us on Discord">
</a>
Expand Down Expand Up @@ -220,6 +223,7 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
</tr>
<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://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>
</tr>
</table>
Expand Down
8 changes: 7 additions & 1 deletion config/eslint-config-carbon/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@
'use strict';

module.exports = {
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
babelOptions: {
presets: ['babel-preset-carbon'],
},
requireConfigFile: false,
},
extends: [
'eslint:recommended',
require.resolve('./rules/best-practices'),
Expand Down
29 changes: 15 additions & 14 deletions config/eslint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eslint-config-carbon",
"description": "ESLint configuration for Carbon",
"version": "2.20.0",
"version": "3.0.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down Expand Up @@ -29,27 +29,28 @@
"access": "public"
},
"peerDependencies": {
"eslint": "^6.0.0 || ^7.0.0"
"eslint": "^8.0.0"
},
"dependencies": {
"@babel/eslint-parser": "^7.19.1",
"@typescript-eslint/eslint-plugin": "^5.38.1",
"@typescript-eslint/parser": "^5.38.1",
"babel-eslint": "^10.1.0",
"eslint-config-airbnb": "^19.0.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-cypress": "^2.11.3",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jest": "^26.0.0",
"eslint-plugin-jsdoc": "^37.0.0",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-storybook": "^0.6.0",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^26.9.0",
"eslint-plugin-jsdoc": "^40.0.0",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-storybook": "^0.6.10",
"eslint-restricted-globals": "^0.2.0"
},
"devDependencies": {
"babel-preset-carbon": "workspace:^",
"prettier": "^2.7.1"
}
}
6 changes: 5 additions & 1 deletion config/eslint-config-carbon/vanilla.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@
'use strict';

module.exports = {
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 6,
sourceType: 'script',
babelOptions: {
presets: ['babel-preset-carbon'],
},
requireConfigFile: false,
},
env: {
browser: true,
Expand Down
3 changes: 3 additions & 0 deletions config/jest-config-carbon/matchers/toHaveNoAxeViolations.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ const defaultOptions = {
region: {
enabled: false,
},
'color-contrast': {
enabled: false,
},
},
};

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.6.0",
"version": "1.6.1",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
30 changes: 30 additions & 0 deletions docs/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,36 @@ git push upstream vX.Y.Z
./packages/cli/bin/carbon-cli.js changelog vA.B.C..vX.Y.Z
```

### Releasing a new major for a single package

In some cases, a single package in the monorepo may need a major version bump.
This can be done without having to do a major version bump across all packages.

For instance:

- `eslint-config-carbon` needs a new major
- All other packages should only be bumped as a new patch
- The tag for the release should remain at the curent major `v11.x`, and not be
bumped to `v12.x`

To do this, packages must be versioned manually.

1. Switch to `main`
1. Pull in latest `git pull upstream main`
1. Make a new branch with the version you're going to release, e.g.
`git checkout -b release/v11.23.1`
1. Run `yarn lerna version --no-git-tag-version --no-push`
1. An interactive prompt will be presented - select the appropriate version bump
for each package
1. After the interactive prompt is complete, run `yarn install` to update
`yarn.lock`
1. Commit `chore(release): v11.23.1`
1. `git push` and then open a pull request
1. Once the changes are merged in, follow the same steps for a
[Stable Release](#stable-release) after the
`🛑 Wait for the Pull Request to be merged` step to tag the release commit
and trigger the automated release workflows.

## Troubleshooting

### The Version workflow succeeded, but the PR was not created
Expand Down
37 changes: 37 additions & 0 deletions e2e/components/Menu/Menu-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('Menu', () => {
themes.forEach((theme) => {
test.describe(theme, () => {
test('menu @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Menu',
id: 'experimental-unstable-menu--playground',
theme,
});
});
});
});

test('accessibility-checker @avt', async ({ page }) => {
await visitStory(page, {
component: 'Menu',
id: 'experimental-unstable-menu--playground',
globals: {
theme: 'white',
},
});
await expect(page).toHaveNoACViolations('Menu');
});
});
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.26.0",
"version": "0.26.1",
"scripts": {
"develop": "vite"
},
"devDependencies": {
"vite": "^2.8.0"
},
"dependencies": {
"@carbon/styles": "^1.23.0",
"@carbon/styles": "^1.23.1",
"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.24.0",
"version": "0.24.1",
"private": true,
"dependencies": {
"@carbon/react": "^1.23.0",
"@carbon/react": "^1.23.1",
"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.24.0",
"version": "0.24.1",
"private": true,
"dependencies": {
"@carbon/react": "^1.23.0",
"@carbon/react": "^1.23.1",
"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.21.0",
"version": "0.21.1",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.23.0",
"@carbon/react": "^1.23.1",
"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.23.0",
"version": "0.23.1",
"scripts": {
"build": "next build",
"dev": "next dev",
Expand All @@ -13,7 +13,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.23.0",
"@carbon/react": "^1.23.1",
"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.21.0",
"version": "0.21.1",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.23.0",
"@carbon/react": "^1.23.1",
"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.23.0",
"version": "0.23.1",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.23.0",
"@carbon/react": "^1.23.1",
"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.21.0",
"version": "0.21.1",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.23.0",
"@carbon/react": "^1.23.1",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"cross-env": "^7.0.0",
"cross-spawn": "^7.0.0",
"doctoc": "^2.0.0",
"eslint": "^7.28.0",
"eslint": "^8.0.0",
"fs-extra": "^10.0.0",
"glob": "^7.1.4",
"husky": "^8.0.0",
Expand Down
6 changes: 3 additions & 3 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.23.0",
"version": "8.23.1",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -39,8 +39,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.23.0",
"@carbon/styles": "^1.23.0",
"@carbon/react": "^1.23.1",
"@carbon/styles": "^1.23.1",
"@carbon/telemetry": "0.1.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/carbon-components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "11.23.0",
"version": "11.23.1",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -40,7 +40,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.23.0",
"@carbon/styles": "^1.23.1",
"@carbon/telemetry": "0.1.0"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit 767ae13

Please sign in to comment.