Skip to content

Commit

Permalink
Merge branch 'main' into 13004
Browse files Browse the repository at this point in the history
  • Loading branch information
tay1orjones authored Feb 7, 2023
2 parents d091616 + 95075da commit ed29d73
Show file tree
Hide file tree
Showing 98 changed files with 3,428 additions and 10,682 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,15 @@
"contributions": [
"code"
]
},
{
"login": "jkap",
"name": "jae kaplan",
"avatar_url": "https://avatars.githubusercontent.com/u/224587?v=4",
"profile": "https://github.com/jkap",
"contributions": [
"infra"
]
}
],
"commitConvention": "none"
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/issue-triage-strategic-adopter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: 'Issue Triage - Strategic Adopter'

on:
issues:
types: [opened]

jobs:
apply-label:
runs-on: ubuntu-latest
if: |
!github.event.issue.pull_request
steps:
- uses: actions/checkout@main
- uses: actions-ecosystem/action-regex-match@v2
id: regex-match
with:
text: ${{ github.event.issue.body }}
regex:
'\b(Instana|QRadar|MaaS360|Environmental Intelligence Suite|Watson
Orchestrate|Watson Assistant|Planning Analytics|ReaQta|API
Connect|Fusion|Flash Storage|Envizi|Maximo|Turbonomic|Fusion
Microsoft 360)\b'
flags: g
- uses: actions/github-script@v6
if: ${{ steps.regex-match.outputs.match != '' }}
with:
script: |
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ['adopter: strategic-product']
})
3 changes: 1 addition & 2 deletions .github/workflows/slack-build-notifications.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ jobs:
# We only want notifications for successful runs for certain workflows
if:
${{ github.event.workflow_run.conclusion == 'success' &&
contains(fromJson('["Version", "Release", "Deploy React storybook to IBM
Cloud", "promote"]'), github.event.workflow.name) }}
contains(fromJson('["Version", "Release", "Deploy React storybook to GitHub Pages", "promote"]'), github.event.workflow.name) }}
steps:
- name: Send custom JSON data to Slack
id: slack-success
Expand Down
3 changes: 2 additions & 1 deletion .kodiak.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
version = 1

[merge]
automerge_label = "status: ready to merge 🎉"
automerge_label = ["status: ready to merge 🎉", "status: enable automerge 🟠"]
notify_on_conflict = "false"
method = "squash"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
823 changes: 0 additions & 823 deletions .yarn/releases/yarn-3.3.1.cjs

This file was deleted.

873 changes: 873 additions & 0 deletions .yarn/releases/yarn-3.4.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1

yarn-path ".yarn/releases/yarn-3.2.4.cjs"
yarn-path ".yarn/releases/yarn-3.4.1.cjs"
2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ supportedArchitectures:
- linux
- win32

yarnPath: .yarn/releases/yarn-3.3.1.cjs
yarnPath: .yarn/releases/yarn-3.4.1.cjs
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://github.com/Shankar-CodeJunkie"><img src="https://avatars.githubusercontent.com/u/56068832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ShankarV-CodeJunkie</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Shankar-CodeJunkie" title="Code">💻</a></td>
<td align="center"><a href="http://darioplatania.github.io/"><img src="https://avatars.githubusercontent.com/u/11682859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dario platania</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=darioplatania" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/matkrzy"><img src="https://avatars.githubusercontent.com/u/14991661?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mateusz Krzyżanowski</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=matkrzy" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/jkap"><img src="https://avatars.githubusercontent.com/u/224587?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jae kaplan</b></sub></a><br /><a href="#infra-jkap" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
</tr>
</table>

Expand Down
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.24.0",
"version": "0.25.0",
"scripts": {
"develop": "vite"
},
"devDependencies": {
"vite": "^2.8.0"
},
"dependencies": {
"@carbon/styles": "^1.21.0",
"@carbon/styles": "^1.22.0",
"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.22.0",
"version": "0.23.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.21.0",
"@carbon/react": "^1.22.0",
"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.22.0",
"version": "0.23.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.21.0",
"@carbon/react": "^1.22.0",
"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.19.0",
"version": "0.20.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.21.0",
"@carbon/react": "^1.22.0",
"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.21.0",
"version": "0.22.0",
"scripts": {
"build": "next build",
"dev": "next dev",
Expand All @@ -13,7 +13,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.21.0",
"@carbon/react": "^1.22.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.19.0",
"version": "0.20.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.21.0",
"@carbon/react": "^1.22.0",
"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.21.0",
"version": "0.22.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.21.0",
"@carbon/react": "^1.22.0",
"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.19.0",
"version": "0.20.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.21.0",
"@carbon/react": "^1.22.0",
"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 @@ -139,5 +139,5 @@
"./config/stylelint-config-carbon"
]
},
"packageManager": "yarn@3.3.1"
"packageManager": "yarn@3.4.1"
}
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.21.0",
"version": "8.22.0",
"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.21.0",
"@carbon/styles": "^1.21.0",
"@carbon/react": "^1.22.0",
"@carbon/styles": "^1.22.0",
"@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.21.0",
"version": "11.22.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -40,7 +40,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.21.0",
"@carbon/styles": "^1.22.0",
"@carbon/telemetry": "0.1.0"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/colors/examples/preview/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3323,9 +3323,9 @@ fsevents@~2.3.2:
linkType: hard

"http-cache-semantics@npm:^4.1.0":
version: 4.1.0
resolution: "http-cache-semantics@npm:4.1.0"
checksum: 974de94a81c5474be07f269f9fd8383e92ebb5a448208223bfb39e172a9dbc26feff250192ecc23b9593b3f92098e010406b0f24bd4d588d631f80214648ed42
version: 4.1.1
resolution: "http-cache-semantics@npm:4.1.1"
checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236
languageName: node
linkType: hard

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.18.0",
"version": "11.19.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -37,7 +37,7 @@
"dependencies": {
"@carbon/colors": "^11.12.0",
"@carbon/grid": "^11.11.0",
"@carbon/icons": "^11.15.0",
"@carbon/icons": "^11.16.0",
"@carbon/layout": "^11.11.0",
"@carbon/motion": "^11.9.0",
"@carbon/themes": "^11.16.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/grid/examples/preview/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3476,9 +3476,9 @@ fsevents@~2.3.2:
linkType: hard

"http-cache-semantics@npm:^4.1.0":
version: 4.1.0
resolution: "http-cache-semantics@npm:4.1.0"
checksum: 974de94a81c5474be07f269f9fd8383e92ebb5a448208223bfb39e172a9dbc26feff250192ecc23b9593b3f92098e010406b0f24bd4d588d631f80214648ed42
version: 4.1.1
resolution: "http-cache-semantics@npm:4.1.1"
checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236
languageName: node
linkType: hard

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.15.0",
"version": "11.16.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -42,7 +42,7 @@
},
"devDependencies": {
"@carbon/icon-build-helpers": "^1.10.0",
"@carbon/icons": "^11.15.0",
"@carbon/icons": "^11.16.0",
"rimraf": "^4.0.0"
},
"sideEffects": false
Expand Down
4 changes: 2 additions & 2 deletions packages/icons-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-vue",
"description": "Vue components for icons in digital and software products using the Carbon Design System",
"version": "10.64.0",
"version": "10.65.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -32,7 +32,7 @@
},
"devDependencies": {
"@carbon/cli-reporter": "^10.5.0",
"@carbon/icons": "^11.15.0",
"@carbon/icons": "^11.16.0",
"fs-extra": "^10.0.0",
"prettier": "^2.7.1",
"rimraf": "^4.0.0",
Expand Down
Binary file modified packages/icons/examples/preview/.yarn/install-state.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/icons/examples/preview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"@carbon/styles": "link:../../../styles",
"change-case": "^4.1.1",
"next": "^10.0.7",
"next": "^12.1.0",
"prismjs": "^1.20.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
Expand Down
Loading

0 comments on commit ed29d73

Please sign in to comment.