Skip to content

Commit

Permalink
Merge branch 'main' into feat/vertical-tabs-with-inner-grid
Browse files Browse the repository at this point in the history
  • Loading branch information
ariellalgilmore authored Jun 12, 2024
2 parents c9ce4ff + 47b909e commit 9373bf5
Show file tree
Hide file tree
Showing 293 changed files with 25,090 additions and 20,769 deletions.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/ACCESSIBILITY_ISSUE.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,23 @@ body:
reproduction/example link above?'
validations:
required: true
- type: dropdown
id: severity
attributes:
label: Suggested Severity
description:
'Read more to understand our [severity
levels](https://github.com/carbon-design-system/carbon/blob/main/docs/guides/support.md#severity)'
options:
- 'Severity 1 = Must be fixed ASAP. The response must be swift. Someone
from the team must drop all current work and be immediately reassigned
to address the issue.'
- 'Severity 2 = User cannot complete task, and/or no workaround within
the user experience of a given component.'
- 'Severity 3 = User can complete task, and/or has a workaround within
the user experience of a given component.'
- 'Severity 4 = Unrelated to a user task, has a workaround or does not
need a workaround.'
- type: checkboxes
id: terms
attributes:
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/code-connect.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
on:
push:
paths:
- src/packages/react/code-connect/**/*.figma.tsx
branches:
- main

jobs:
code-connect:
name: Code Connect
runs-on: ubuntu-latest
steps:
- run: npx figma connect publish
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@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
with:
languages: javascript

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@ package-lock.json

# Playwright
.playwright

# Local token
.env
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.13
20.14
4 changes: 4 additions & 0 deletions .whitesource
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"settingsInheritedFrom": "ibm-mend-config/mend-config@main",
"minSeverityLevel": "NONE"
}
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 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.
2 changes: 2 additions & 0 deletions e2e/icons-react/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,8 @@ Array [
"GatewayUserAccess",
"GatewayVpn",
"Gears",
"Gem",
"GemReference",
"GenderFemale",
"GenderMale",
"GeneratePdf",
Expand Down
8 changes: 8 additions & 0 deletions e2e/icons-vue/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3326,6 +3326,14 @@ Array [
"Gears20",
"Gears24",
"Gears32",
"Gem16",
"Gem20",
"Gem24",
"Gem32",
"GemReference16",
"GemReference20",
"GemReference24",
"GemReference32",
"GenderFemale16",
"GenderFemale20",
"GenderFemale24",
Expand Down
8 changes: 8 additions & 0 deletions e2e/icons/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3325,6 +3325,14 @@ Array [
"Gears20",
"Gears24",
"Gears32",
"Gem16",
"Gem20",
"Gem24",
"Gem32",
"GemReference16",
"GemReference20",
"GemReference24",
"GemReference32",
"GenderFemale16",
"GenderFemale20",
"GenderFemale24",
Expand Down
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.55.0",
"version": "0.56.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.58.0",
"@carbon/react": "^1.59.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.61.0",
"version": "0.62.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.58.0"
"@carbon/styles": "^1.59.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.56.0",
"version": "0.57.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.58.0",
"@carbon/react": "^1.59.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.55.0",
"version": "0.56.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.58.0",
"@carbon/react": "^1.59.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.23.0",
"version": "0.24.0",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -12,7 +12,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.58.0",
"@carbon/react": "^1.59.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.56.0",
"version": "0.57.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.58.0",
"@carbon/react": "^1.59.0",
"next": "14.1.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.58.0",
"version": "0.59.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.58.0",
"@carbon/react": "^1.59.0",
"next": "14.1.1",
"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.56.0",
"version": "0.57.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.58.0",
"@carbon/react": "^1.59.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.56.0",
"version": "0.57.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.58.0",
"@carbon/react": "^1.59.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
11 changes: 11 additions & 0 deletions figma.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"codeConnect": {
"include": ["packages/react/code-connect/**"],
"react": {
"importPaths": {
"packages/react/src/*": "@carbon/react"
},
"paths": {}
}
}
}
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
"postinstall": "husky"
},
"resolutions": {
"@types/react": "~18.2.33",
"@types/react": "~18.3.0",
"@types/prop-types": "15.7.12",
"ast-types": "^0.14.0",
"node-sass": "^9.0.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"react-is": "~18.2.0"
"react": "~18.3.0",
"react-dom": "~18.3.0",
"react-is": "~18.3.0"
},
"devDependencies": {
"@babel/core": "^7.18.2",
Expand All @@ -53,7 +53,7 @@
"@percy/playwright": "^1.0.4",
"@playwright/test": "^1.36.2",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^15.0.0",
"@testing-library/react": "^15.0.6",
"@testing-library/user-event": "^14.4.3",
"@types/react-is": "~18.2.0",
"accessibility-checker": "^3.1.48",
Expand All @@ -62,7 +62,7 @@
"cross-spawn": "^7.0.0",
"doctoc": "^2.0.0",
"eslint": "^8.40.0",
"eslint-plugin-playwright": "^0.22.1",
"eslint-plugin-playwright": "^1.0.0",
"fs-extra": "^11.0.0",
"glob": "^10.0.0",
"husky": "^9.0.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.58.0",
"version": "8.59.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -42,8 +42,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.58.0",
"@carbon/styles": "^1.58.0",
"@carbon/react": "^1.59.0",
"@carbon/styles": "^1.59.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
Expand All @@ -57,7 +57,7 @@
"@babel/preset-react": "^7.17.12",
"@carbon/test-utils": "^10.30.0",
"@rollup/plugin-babel": "^6.0.0",
"@rollup/plugin-commonjs": "^25.0.0",
"@rollup/plugin-commonjs": "^26.0.0",
"@rollup/plugin-node-resolve": "^15.0.0",
"babel-plugin-dev-expression": "^0.2.3",
"babel-preset-carbon": "^0.5.0",
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.58.0",
"version": "11.59.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -43,7 +43,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.58.0",
"@carbon/styles": "^1.59.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@octokit/plugin-throttling": "^4.0.0",
"@octokit/rest": "^19.0.0",
"@rollup/plugin-babel": "^6.0.0",
"@rollup/plugin-commonjs": "^25.0.0",
"@rollup/plugin-commonjs": "^26.0.0",
"@rollup/plugin-node-resolve": "^15.0.0",
"chalk": "^4.1.1",
"change-case": "^4.1.2",
Expand Down
4 changes: 2 additions & 2 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.46.0",
"version": "11.47.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -40,7 +40,7 @@
"dependencies": {
"@carbon/colors": "^11.22.0",
"@carbon/grid": "^11.23.0",
"@carbon/icons": "^11.42.0",
"@carbon/icons": "^11.43.0",
"@carbon/layout": "^11.22.0",
"@carbon/motion": "^11.18.0",
"@carbon/themes": "^11.36.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ You can then include the grid by doing the following in your Sass files:
## Usage

_More examples and documentation can be found on this
[live demo website](https://carbon-elements.netlify.com/grid/examples/preview/)._
[live demo website](https://carbon-elements.netlify.app/grid/examples/preview/)._

`@carbon/grid` has three primitive class types to use in order to structure your
application. They include:
Expand Down
Loading

0 comments on commit 9373bf5

Please sign in to comment.