Skip to content

Commit

Permalink
Merge branch 'main' into allowEmpty_testCoverage_numberInput
Browse files Browse the repository at this point in the history
  • Loading branch information
2nikhiltom authored Apr 29, 2024
2 parents 5d99851 + 9c1dc9c commit 1acf751
Show file tree
Hide file tree
Showing 75 changed files with 365 additions and 174 deletions.
22 changes: 20 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1476,11 +1476,11 @@
"name": "jesnajoseijk",
"avatar_url": "https://avatars.githubusercontent.com/u/38346258?v=4",
"profile": "https://github.com/jesnajoseijk",
"contributions": [
"contributions": [
"code"
]
},
{
{
"login": "Jawahars",
"name": "Jawahar S",
"avatar_url": "https://avatars.githubusercontent.com/u/4353146?v=4",
Expand All @@ -1497,6 +1497,24 @@
"contributions": [
"code"
]
},
{
"login": "2nikhiltom",
"name": "Nikhil Tomar",
"avatar_url": "https://avatars.githubusercontent.com/2nikhiltom?v=4",
"profile": "https://github.com/2nikhiltom",
"contributions": [
"code"
]
},
{
"login": "aninaantony",
"name": "Anina Antony",
"avatar_url": "https://avatars.githubusercontent.com/u/164350784?v=4",
"profile": "https://github.com/aninaantony",
"contributions": [
"code"
]
}
],
"commitConvention": "none"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Create Pull Request
uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83 # v6.0.4
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
with:
branch: 'release/update-carbon-deps'
commit-message: 'chore(release): update carbon deps'
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Create Pull Request
uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83 # v6.0.4
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
with:
branch: 'release/update-carbon-deps'
commit-message: 'chore(release): update carbon deps'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Create Pull Request
uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83 # v6.0.4
uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
with:
branch: 'release/${{ github.event.inputs.tag }}'
commit-message: 'chore(release): ${{ github.event.inputs.tag }}'
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,12 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://cuppajoey.com/"><img src="https://avatars.githubusercontent.com/u/14837881?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joseph Schultz</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=cuppajoey" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/anjaly0606"><img src="https://avatars.githubusercontent.com/u/99959496?v=4?s=100" width="100px;" alt=""/><br /><sub><b>anjaly0606</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=anjaly0606" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/jesnajoseijk"><img src="https://avatars.githubusercontent.com/u/38346258?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jesnajoseijk</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=jesnajoseijk" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/Jawahars"><img src="https://avatars.githubusercontent.com/u/4353146?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jawahar S</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Jawahars" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/Jawahars"><img src="https://avatars.githubusercontent.com/u/4353146?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jawahar S</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Jawahars" title="Code">💻</a></td>
<td align="center"><a href="https://hollyos.com/"><img src="https://avatars.githubusercontent.com/u/4097509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Holly Springsteen</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=hollyos" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/2nikhiltom"><img src="https://avatars.githubusercontent.com/2nikhiltom?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikhil Tomar</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=2nikhiltom" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/aninaantony"><img src="https://avatars.githubusercontent.com/u/164350784?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Anina Antony</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=aninaantony" title="Code">💻</a></td>
</tr>
</table>

Expand Down
6 changes: 3 additions & 3 deletions docs/release-schedule.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ major versions of the Carbon Design System.
| `main` | unstable | unstable | unstable | unstable | unstable |
| v9 | End of life | 2018-06-04 | 2018-06-04 | 2019-03-29 | 2022-03-31 |
| v10 | Maintenance | 2019-03-29 | 2019-03-29 | 2022-03-31 | 2024-09-30 |
| v11 | Active | 2021-08-06 | 2022-03-31 | 2025-03-31 | 2027-03-31 |
| v12 | Unreleased | 2024-08-01 | 2025-03-31 | 2027-03-31 | 2029-03-31 |
| v11 | Active | 2021-08-06 | 2022-03-31 | 2026-03-31 | 2028-03-31 |
| v12 | Unreleased | 2025-08-01 | 2026-03-31 | 2028-03-31 | 2029-03-31 |

> Dates are subject to change
![schedule](https://github.com/carbon-design-system/carbon-website/assets/3360588/02d05990-200c-4380-8acd-82dfbc27483d)
![schedule](https://github.com/carbon-design-system/carbon/assets/3360588/b8014b83-a743-4ace-83a3-ff1c96eef194)

## Release phases

Expand Down
5 changes: 2 additions & 3 deletions e2e/components/FluidTextInput/FluidTextInput-test.avt.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,14 @@ test.describe('@avt FluidTextInput', () => {
},
});
const input = page.getByRole('textbox');
const span = page.locator('span.cds--assistive-text');

await page.keyboard.press('Tab');
await input.fill('Text');

// Checking toggle interaction
await page.keyboard.press('Tab');
await expect(span).toHaveText('Show password');
await expect(page.getByLabel('Show password')).toBeVisible();
await page.keyboard.press('Enter');
await expect(span).toHaveText('Hide password');
await expect(page.getByLabel('Hide password')).toBeVisible();
});
});
5 changes: 2 additions & 3 deletions e2e/components/TextInput/TextInput-test.avt.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,14 @@ test.describe('@avt TextInput', () => {
},
});
const input = page.getByRole('textbox');
const span = page.locator('span.cds--assistive-text');

await page.keyboard.press('Tab');
await input.fill('Text');

// Checking toggle interaction
await page.keyboard.press('Tab');
await expect(span).toHaveText('Show password');
await expect(page.getByLabel('Show password')).toBeVisible();
await page.keyboard.press('Enter');
await expect(span).toHaveText('Hide password');
await expect(page.getByLabel('Hide password')).toBeVisible();
});
});
4 changes: 2 additions & 2 deletions examples/class-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "class-prefix",
"private": true,
"version": "0.53.0-rc.0",
"version": "0.53.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.56.0-rc.0",
"@carbon/react": "^1.56.0",
"react": "^18.2.0",
"react-dom": "^18.2.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,7 +1,7 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.58.0",
"version": "0.59.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.55.0"
"@carbon/styles": "^1.56.0"
}
}
4 changes: 2 additions & 2 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "custom-theme",
"private": true,
"version": "0.54.0-rc.0",
"version": "0.54.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.56.0-rc.0",
"@carbon/react": "^1.56.0",
"react": "^18.2.0",
"react-dom": "^18.2.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,15 +1,15 @@
{
"name": "id-prefix",
"private": true,
"version": "0.53.0-rc.0",
"version": "0.53.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.56.0-rc.0",
"@carbon/react": "^1.56.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/incremental-migration-vite/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "incremental-migration-vite",
"private": true,
"version": "0.21.0-rc.0",
"version": "0.21.0",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -12,7 +12,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.56.0-rc.0",
"@carbon/react": "^1.56.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.54.0-rc.0",
"version": "0.54.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.56.0-rc.0",
"@carbon/react": "^1.56.0",
"next": "13.5.1",
"react": "18.2.0",
"react-dom": "18.2.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.56.0-rc.0",
"version": "0.56.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.56.0-rc.0",
"@carbon/react": "^1.56.0",
"next": "13.5.6",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/v10-token-compat-in-v11/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "v10-token-compat-in-v11",
"private": true,
"version": "0.54.0-rc.0",
"version": "0.54.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.56.0-rc.0",
"@carbon/react": "^1.56.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "vite",
"private": true,
"version": "0.54.0-rc.0",
"version": "0.54.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.56.0-rc.0",
"@carbon/react": "^1.56.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
8 changes: 4 additions & 4 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.56.0-rc.0",
"version": "8.56.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -42,9 +42,9 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.56.0-rc.0",
"@carbon/styles": "^1.55.0",
"@ibm/telemetry-js": "^1.2.1",
"@carbon/react": "^1.56.0",
"@carbon/styles": "^1.56.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
"devDependencies": {
Expand Down
5 changes: 4 additions & 1 deletion packages/carbon-components-react/telemetry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -813,4 +813,7 @@ collect:
- 'normal'
# unstable__Slug - dotType
- 'default'
- 'hollow'
- 'hollow'
js:
functions: {}
tokens: null
6 changes: 3 additions & 3 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.55.0",
"version": "11.56.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -43,8 +43,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.55.0",
"@ibm/telemetry-js": "^1.2.1",
"@carbon/styles": "^1.56.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
"devDependencies": {
Expand Down
5 changes: 4 additions & 1 deletion packages/carbon-components/telemetry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ projectId: fbc5603c-90ba-4d2f-b054-55108c9e06c0
endpoint: https://collector-prod.1am6wm210aow.us-south.codeengine.appdomain.cloud/v1/metrics
collect:
npm:
dependencies: null
dependencies: null
js:
tokens:
functions: {}
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dependencies": {
"@babel/core": "^7.18.2",
"@carbon/cli-reporter": "^10.7.0",
"@ibm/telemetry-js": "^1.2.1",
"@ibm/telemetry-js": "^1.5.0",
"@octokit/plugin-retry": "^3.0.7",
"@octokit/plugin-throttling": "^4.0.0",
"@octokit/rest": "^19.0.0",
Expand Down
3 changes: 3 additions & 0 deletions packages/cli/telemetry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ endpoint: https://collector-prod.1am6wm210aow.us-south.codeengine.appdomain.clou
collect:
npm:
dependencies: null
js:
functions: {}
tokens: null
2 changes: 1 addition & 1 deletion packages/colors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@
"needs": "^1.3.0"
},
"dependencies": {
"@ibm/telemetry-js": "^1.2.1"
"@ibm/telemetry-js": "^1.5.0"
}
}
3 changes: 3 additions & 0 deletions packages/colors/telemetry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ endpoint: https://collector-prod.1am6wm210aow.us-south.codeengine.appdomain.clou
collect:
npm:
dependencies: null
js:
functions: {}
tokens: null
Loading

0 comments on commit 1acf751

Please sign in to comment.