Skip to content

Commit

Permalink
Merge branch 'main' into ai-skeleton-states
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan authored Feb 13, 2024
2 parents 6ba31c0 + 77df181 commit 0ca3170
Show file tree
Hide file tree
Showing 60 changed files with 517 additions and 191 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1415,6 +1415,15 @@
"contributions": [
"code"
]
},
{
"login": "ggdawson",
"name": "Garrett Dawson",
"avatar_url": "https://avatars.githubusercontent.com/u/37080130?v=4",
"profile": "https://github.com/ggdawson",
"contributions": [
"code"
]
}
],
"commitConvention": "none"
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@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 #v3.23.2
uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 #v3.24.0
with:
languages: javascript

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 #v3.23.2
uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 #v3.24.0
4 changes: 2 additions & 2 deletions .github/workflows/deploy-react-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
echo "::warning title=Invalid file permissions automatically fixed::$line"
done
- name: Upload artifact
uses: actions/upload-pages-artifact@0252fc4ba7626f0298f0cf00902a25c6afc77fa8 #v3.0.0
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa #v3.0.1
with:
path: 'packages/react/storybook-static'

Expand All @@ -63,4 +63,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@87c3283f01cd6fe19a0ab93a23b2f6fcba5a8e42 #v4.0.3
uses: actions/deploy-pages@decdde0ac072f6dcbe43649d82d9c635fff5b4e4 #v4.0.4
2 changes: 1 addition & 1 deletion .github/workflows/slack-announcement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
steps:
- name: Send slack announcement
id: slack
uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 #v1.24.0
uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 #v1.25.0
with:
payload: |
{
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/slack-build-notifications.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
steps:
- name: Send custom JSON data to Slack
id: slack-success
uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 #v1.24.0
uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 #v1.25.0
with:
payload: |
{
Expand All @@ -42,7 +42,7 @@ jobs:
steps:
- name: Send custom JSON data to Slack
id: slack-failure
uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 #v1.24.0
uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 #v1.25.0
with:
payload: |
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/slack-office-hours-design.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- name: Send custom JSON data to Slack workflow
id: slack
uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 #v1.24.0
uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 #v1.25.0
with:
payload: |
{
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/slack-office-hours-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- name: Send custom JSON data to Slack workflow
id: slack
uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 #v1.24.0
uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 #v1.25.0
with:
payload: |
{
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
steps:
- name: Send custom JSON data to Slack workflow
id: slack
uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 #v1.24.0
uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 #v1.25.0
with:
payload: |
{
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,9 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://github.com/amercury"><img src="https://avatars.githubusercontent.com/u/17834588?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alexandr Ovchinnikov</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=amercury" title="Code">💻</a></td>
<td align="center"><a href="https://jt-helsinki.github.io/blog/"><img src="https://avatars.githubusercontent.com/u/20871336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>J Thomas</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=jt-helsinki" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/ggdawson"><img src="https://avatars.githubusercontent.com/u/37080130?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Garrett Dawson</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ggdawson" title="Code">💻</a></td>
</tr>
</table>

<!-- markdownlint-restore -->
Expand Down
32 changes: 32 additions & 0 deletions e2e/components/Slug/Slug-test.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,45 @@ test.describe('Slug', () => {
});
});

test('slug callout @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Slug',
id: 'experimental-unstable-slug--callout',
theme,
});
});

test('slug inside form @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Slug',
id: 'experimental-unstable-slug-form--form-example',
theme,
});
});

test('slug inside DataTable column @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Slug',
id: 'experimental-unstable-slug-datatable--column-slug-sort',
theme,
});
});

test('slug inside DataTable row @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Slug',
id: 'experimental-unstable-slug-datatable--slug-with-selection-and-expansion',
theme,
});
});

test('slug inside Tile @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Slug',
id: 'experimental-unstable-slug-examples--tile',
theme,
});
});
});
});
});
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.47.0-rc.0",
"version": "0.47.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.50.0-rc.0",
"@carbon/react": "^1.50.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.53.0-rc.0",
"version": "0.53.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.50.0-rc.0"
"@carbon/styles": "^1.50.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.48.0-rc.0",
"version": "0.48.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.50.0-rc.0",
"@carbon/react": "^1.50.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.47.0-rc.0",
"version": "0.47.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.50.0-rc.0",
"@carbon/react": "^1.50.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.15.0-rc.0",
"version": "0.15.0",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -12,7 +12,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.50.0-rc.0",
"@carbon/react": "^1.50.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.48.0-rc.0",
"version": "0.48.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.50.0-rc.0",
"@carbon/react": "^1.50.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.50.0-rc.0",
"version": "0.50.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.50.0-rc.0",
"@carbon/react": "^1.50.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.48.0-rc.0",
"version": "0.48.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.50.0-rc.0",
"@carbon/react": "^1.50.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.48.0-rc.0",
"version": "0.48.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.50.0-rc.0",
"@carbon/react": "^1.50.0",
"react": "^18.2.0",
"react-dom": "^18.2.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.50.0-rc.0",
"version": "8.50.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -41,8 +41,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.50.0-rc.0",
"@carbon/styles": "^1.50.0-rc.0",
"@carbon/react": "^1.50.0",
"@carbon/styles": "^1.50.0",
"@carbon/telemetry": "0.1.0",
"chalk": "1.1.3"
},
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.50.0-rc.0",
"version": "11.50.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -42,7 +42,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.50.0-rc.0",
"@carbon/styles": "^1.50.0",
"@carbon/telemetry": "0.1.0",
"chalk": "1.1.3"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/elements/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/elements",
"description": "A collection of design elements in code for the IBM Design Language",
"version": "11.39.0-rc.0",
"version": "11.39.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -38,10 +38,10 @@
"dependencies": {
"@carbon/colors": "^11.20.0",
"@carbon/grid": "^11.21.0",
"@carbon/icons": "^11.36.0-rc.0",
"@carbon/icons": "^11.36.0",
"@carbon/layout": "^11.20.0",
"@carbon/motion": "^11.16.0",
"@carbon/themes": "^11.30.0",
"@carbon/themes": "^11.31.0",
"@carbon/type": "^11.25.0"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Array [
"aiAuraHoverEnd",
"aiAuraHoverStart",
"aiAuraStart",
"aiAuraStartTable",
"aiBorderEnd",
"aiBorderStart",
"aiBorderStrong",
Expand Down
4 changes: 2 additions & 2 deletions packages/icons-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-react",
"description": "React components for icons in digital and software products using the Carbon Design System",
"version": "11.36.0-rc.0",
"version": "11.36.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -43,7 +43,7 @@
},
"devDependencies": {
"@carbon/icon-build-helpers": "^1.22.0",
"@carbon/icons": "^11.36.0-rc.0",
"@carbon/icons": "^11.36.0",
"rimraf": "^5.0.0"
},
"sideEffects": false
Expand Down
Loading

0 comments on commit 0ca3170

Please sign in to comment.