Skip to content

Commit

Permalink
Merge branch 'main' into interstitialscreen_v2_4041
Browse files Browse the repository at this point in the history
  • Loading branch information
jlongshore authored Jan 31, 2024
2 parents f51879b + 53994e2 commit 64293e5
Show file tree
Hide file tree
Showing 191 changed files with 46,204 additions and 39,531 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,15 @@
"infra",
"review"
]
},
{
"login": "makafsal",
"name": "Afsal K",
"avatar_url": "https://avatars.githubusercontent.com/u/9197089?v=4",
"profile": "http://iamafsal.in/",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 5,
Expand Down
38 changes: 23 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ other users.
This project consists of a number of component library packages published on
npm:

| Package name | Description |
| ----------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
| [`@carbon/ibm-products`](./packages/ibm-products) | A curated set of components and patterns, built on top of Carbon and designed by the Carbon for IBM Products team |
| [`@carbon/ibm-cloud-cognitive-cdai`](https://github.com/carbon-design-system/ibm-products/tree/main_v1/packages/cdai) | (**v1 only**) Legacy and non-curated design implementations used in application integration |
| [`@carbon/ibm-security`](https://github.com/carbon-design-system/ibm-products/tree/main_v1/packages/security) | (**v1 only**) Legacy and non-curated design implementations used in security |
| Package name | Description |
| --------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
| [`@carbon/ibm-products`](./packages/ibm-products) | A curated set of components and patterns, built on top of Carbon and designed by the Carbon for IBM Products team |
| [`@carbon/ibm-cloud-cognitive-cdai`](https://github.com/carbon-design-system/ibm-products/tree/main_v1/packages/cdai) | (**v1 only**) Legacy and non-curated design implementations used in application integration |
| [`@carbon/ibm-security`](https://github.com/carbon-design-system/ibm-products/tree/main_v1/packages/security) | (**v1 only**) Legacy and non-curated design implementations used in security |

Also the following additional utility packages are published on npm:

Expand All @@ -52,20 +52,27 @@ published on npm.

### Version support

Carbon 11 support is introduced in Carbon for IBM Products <https://github.com/carbon-design-system/ibm-products/labels/v2>
Carbon 11 support is introduced in Carbon for IBM Products
<https://github.com/carbon-design-system/ibm-products/labels/v2>

| Package name | Carbon package | React version |
| --------------------------------- | ------------------------------ | --------------- |
| `@carbon/ibm-products` | **`@carbon/react`** | 18, 17, 16
| Package name | Carbon package | React version |
| ---------------------- | ------------------- | ------------- |
| `@carbon/ibm-products` | **`@carbon/react`** | 18, 17, 16 |

The following packages support Carbon 10 and are considered <https://github.com/carbon-design-system/ibm-products/labels/v1> packages.
The following packages support Carbon 10 and are considered
<https://github.com/carbon-design-system/ibm-products/labels/v1> packages.

| Package name | Carbon package | React version |
| ------------------------------------- | --------------------------- | --------------- |
| `@carbon/ibm-products`<br/> `@carbon/ibm-cloud-cognitive-cdai`<br/> `@carbon/ibm-security` <br/> | **`carbon-components-react`**<br/> `carbon-components`<br/> `@carbon/icons-react`<br/> `@carbon/icons` <br/> `@carbon/colors` <br/> `@carbon/elements` <br/> etc | 17, 16 |

If you’d like to learn more about migrating from Carbon 10 to Carbon 11, please see the Carbon [v11 migration guide](https://github.com/carbon-design-system/carbon/blob/main/docs/migration/v11.md) (which includes codemods via [`@carbon/upgrade`](https://github.com/carbon-design-system/carbon/blob/main/packages/upgrade/README.md)) and the Carbon for IBM Products [v2 migration guide](https://github.com/carbon-design-system/ibm-products/blob/main/docs/guides/v2.md).
| Package name | Carbon package | React version |
| ------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
| `@carbon/ibm-products`<br/> `@carbon/ibm-cloud-cognitive-cdai`<br/> `@carbon/ibm-security` <br/> | **`carbon-components-react`**<br/> `carbon-components`<br/> `@carbon/icons-react`<br/> `@carbon/icons` <br/> `@carbon/colors` <br/> `@carbon/elements` <br/> etc | 17, 16 |

If you’d like to learn more about migrating from Carbon 10 to Carbon 11, please
see the Carbon
[v11 migration guide](https://github.com/carbon-design-system/carbon/blob/main/docs/migration/v11.md)
(which includes codemods via
[`@carbon/upgrade`](https://github.com/carbon-design-system/carbon/blob/main/packages/upgrade/README.md))
and the Carbon for IBM Products
[v2 migration guide](https://github.com/carbon-design-system/ibm-products/blob/main/docs/guides/v2.md).

## 🙌 Contributing

Expand Down Expand Up @@ -138,6 +145,7 @@ Thanks goes to these wonderful people
<td align="center" valign="top" width="20%"><a href="https://github.com/punnoosewilson"><img src="https://avatars.githubusercontent.com/u/40118548?v=4?s=100" width="100px;" alt="PUNNOOSE WILSON"/><br /><sub><b>PUNNOOSE WILSON</b></sub></a><br /><a href="https://github.com/carbon-design-system/ibm-products/commits?author=punnoosewilson" title="Code">💻</a></td>
<td align="center" valign="top" width="20%"><a href="https://github.com/SeonyuK"><img src="https://avatars.githubusercontent.com/u/144151347?v=4?s=100" width="100px;" alt="SeonyuK"/><br /><sub><b>SeonyuK</b></sub></a><br /><a href="#a11y-SeonyuK" title="Accessibility">️️️️♿️</a></td>
<td align="center" valign="top" width="20%"><a href="https://github.com/elycheea"><img src="https://avatars.githubusercontent.com/u/1717398?v=4?s=100" width="100px;" alt="Elysia"/><br /><sub><b>Elysia</b></sub></a><br /><a href="https://github.com/carbon-design-system/ibm-products/commits?author=elycheea" title="Code">💻</a> <a href="#infra-elycheea" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/carbon-design-system/ibm-products/pulls?q=is%3Apr+reviewed-by%3Aelycheea" title="Reviewed Pull Requests">👀</a></td>
<td align="center" valign="top" width="20%"><a href="http://iamafsal.in/"><img src="https://avatars.githubusercontent.com/u/9197089?v=4?s=100" width="100px;" alt="Afsal K"/><br /><sub><b>Afsal K</b></sub></a><br /><a href="https://github.com/carbon-design-system/ibm-products/commits?author=makafsal" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
11 changes: 11 additions & 0 deletions config/stylelint-config-ibm-products/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.0.44](https://github.com/carbon-design-system/ibm-products/compare/stylelint-config-ibm-products@[email protected]) (2024-01-30)


### Bug Fixes

* update Carbon 11 compatible versions to latest ([#4167](https://github.com/carbon-design-system/ibm-products/issues/4167)) ([828a8ac](https://github.com/carbon-design-system/ibm-products/commit/828a8acf917fcc58882935be3144f546244be176))





## [0.0.43](https://github.com/carbon-design-system/ibm-products/compare/stylelint-config-ibm-products@[email protected]) (2023-10-27)


Expand Down
4 changes: 2 additions & 2 deletions config/stylelint-config-ibm-products/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "stylelint-config-ibm-products",
"private": true,
"version": "0.0.43",
"version": "0.0.44",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand All @@ -18,7 +18,7 @@
"stylelint": "^15.10.2"
},
"devDependencies": {
"stylelint-config-carbon": "^1.16.0",
"stylelint-config-carbon": "^1.17.1",
"stylelint-config-idiomatic-order": "^9.0.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-config-standard-scss": "^10.0.0",
Expand Down
5 changes: 5 additions & 0 deletions cspell.contributors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,8 @@ punnoosewilson
SeonyuK

tay1orjones

Elysia
elycheea

Afsal
2 changes: 2 additions & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,11 @@
"automerge",
"buildhome",
"checkmark",
"codemods",
"codesandbox",
"colindex",
"columnheader",
"combobox",
"csstools",
"dasharray",
"data-testid",
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion examples/carbon-for-ibm-products/APIKeyModal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"vite": "^4.4.12"
"vite": "^4.5.2"
},
"browserslist": {
"production": [
Expand Down
Loading

0 comments on commit 64293e5

Please sign in to comment.