Skip to content

Commit

Permalink
Merge branch 'main' into remove-test-datatable
Browse files Browse the repository at this point in the history
  • Loading branch information
tay1orjones committed Apr 30, 2024
2 parents 136fec1 + 77aaafa commit 498ab7e
Show file tree
Hide file tree
Showing 92 changed files with 573 additions and 240 deletions.
36 changes: 36 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1471,6 +1471,15 @@
"code"
]
},
{
"login": "jesnajoseijk",
"name": "jesnajoseijk",
"avatar_url": "https://avatars.githubusercontent.com/u/38346258?v=4",
"profile": "https://github.com/jesnajoseijk",
"contributions": [
"code"
]
},
{
"login": "Jawahars",
"name": "Jawahar S",
Expand All @@ -1479,6 +1488,33 @@
"contributions": [
"code"
]
},
{
"login": "hollyos",
"name": "Holly Springsteen",
"avatar_url": "https://avatars.githubusercontent.com/u/4097509?v=4",
"profile": "https://hollyos.com/",
"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
6 changes: 3 additions & 3 deletions .github/workflows/add-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: Add issue with enhancement label to the Proposals project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@2e5cc851ca7162e9eb510e6da6a5c64022e606a7 #v1.0.0
- uses: actions/add-to-project@9bfe908f2eaa7ba10340b31e314148fcfe6a2458 # v1.0.1
with:
labeled: ${{ env.LABEL_ENHANCEMENT }}
project-url: ${{ env.PROPOSALS_PROJECT_URL }}
Expand All @@ -29,7 +29,7 @@ jobs:
name: Add issue with typescript label to the TypeScript Adoption project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@2e5cc851ca7162e9eb510e6da6a5c64022e606a7 #v1.0.0
- uses: actions/add-to-project@9bfe908f2eaa7ba10340b31e314148fcfe6a2458 # v1.0.1
with:
labeled: ${{ env.LABEL_TYPESCRIPT }}
project-url: ${{ env.TYPESCRIPT_PROJECT_URL }}
Expand All @@ -39,7 +39,7 @@ jobs:
name: Add issue to the Design System project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@2e5cc851ca7162e9eb510e6da6a5c64022e606a7 #v1.0.0
- uses: actions/add-to-project@9bfe908f2eaa7ba10340b31e314148fcfe6a2458 # v1.0.1
with:
labeled: ${{ env.LABEL_ENHANCEMENT }}, ${{ env.LABEL_TYPESCRIPT }}
label-operator: NOT
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
uses: github/codeql-action/init@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1
with:
languages: javascript

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
uses: github/codeql-action/analyze@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1
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@c55203cfde3e5c11a452d352b4393e68b85b4533 # v6.0.3
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@c55203cfde3e5c11a452d352b4393e68b85b4533 # v6.0.3
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@c55203cfde3e5c11a452d352b4393e68b85b4533 # v6.0.3
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.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,13 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://github.com/mranjana"><img src="https://avatars.githubusercontent.com/u/91003483?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Anjana M R</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=mranjana" title="Code">💻</a></td>
<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>
</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
2 changes: 1 addition & 1 deletion docs/guides/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ flowchart TD

### Definitions

Guiding principless -
Guiding principles -
https://carbondesignsystem.com/all-about-carbon/what-is-carbon/#our-guiding-principles

DSAG - The Design System Adoption Guild is an expansive group of designers and
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();
});
});
4 changes: 2 additions & 2 deletions e2e/components/NumberInput/NumberInput-test.avt.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ test.describe('@avt NumberInput', () => {
await expect(input).toHaveAttribute('data-invalid', 'true');

// Allow setting value under `min`, but should cause input to be invalid
await input.fill('-1');
await expect(input).toHaveValue('-1');
await input.fill('-101');
await expect(input).toHaveValue('-101');
await expect(input).toHaveAttribute('data-invalid', 'true');
});
});
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
Loading

0 comments on commit 498ab7e

Please sign in to comment.