Skip to content

Commit

Permalink
Merge branch 'feat/carbon-for-ibm-dotcom-v2' into feat/toc-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
ariellalgilmore authored Sep 21, 2023
2 parents 9d22c85 + 5519067 commit e3a85d7
Show file tree
Hide file tree
Showing 88 changed files with 1,348 additions and 1,273 deletions.
10 changes: 9 additions & 1 deletion docs/dotcom-v2-migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ For Carbon v11 migration guidance, see their
| background-media | No API changes. |
| button | This component is deprecated in v2 in favor for Carbon's core Button |
| button-group | No API changes. |
| callout-with-media | View changes [here](#callout-with-media) |
| callout-quote | View changes [here](#callout-quote) |
| card | View changes [here] (#card) |
| card-group-card-link-item | This component is deprecated in v2 in favor for default card or with content-item |
| card-link | This component is deprecated in v2 in favor for card (link variant) component |
| card-link | This component is deprecated in v2 in favor for [card](#card) (link variant) component |
| card-section-carousel | This component is deprecated in v2 in favor for content-section/block component combined with carousel |
| card-section-simple | This component is deprecated in v2 in facor for content-section/block component combined with card-group |
| content-block-cards | This component is deprecated in v2 in favor for content-section/block & card-group components |
Expand All @@ -37,6 +38,7 @@ For Carbon v11 migration guidance, see their
| cta | View changes [here](#cta) |
| cta-block | This component is deprecated in v2 in favor for content-section/block & content-item components |
| cta-section | This component is deprecated in v2 in favor for content-section/block & content-item components |
| footer | No API changes. |
| hr | View changes [here](#horizontal-rule) |
| image | View changes [here](#image) |
| image-with-caption | Replaced by `image` |
Expand All @@ -53,6 +55,11 @@ For Carbon v11 migration guidance, see their

-

### Callout with media

- New options for `color-scheme` property: `REGULAR = 'regular'`, `INVERSE = 'inverse'` `LAYER = 'layer'`, `CYAN = 'cyan'`, `PURPLE = 'purple'`
- New callout style tokens

### Callout quote

- New options for `color-scheme` property: `REGULAR = 'regular'`, `INVERSE = 'inverse'` `LAYER = 'layer'`, `CYAN = 'cyan'`, `PURPLE = 'purple'`
Expand All @@ -63,6 +70,7 @@ For Carbon v11 migration guidance, see their
- `<dds-card-footer>` has `icon-placement` property has been removed
- Removed `border` property, clickable cards inherit the Carbon v11 experimental tile border style
- New `aspect-ratio` property with '1:1', '2:1', '3:2', '4:3', and '16:9' as options
- New `link` property which takes the place of the deprecated `card-link`

### CTA

Expand Down
2 changes: 1 addition & 1 deletion docs/release-schedule.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ major versions of the Carbon for IBM.com library.

> Dates are subject to change
![schedule](https://www.ibm.com/standards/carbon/static/bcfed95efe679166dbec1cbae7ea33bb/4ea69/dotcom-lts.png)
![schedule](https://www.ibm.com/standards/carbon/static/0ef80acd5f41a795ca27d8add6516414/4ea69/dotcom-lts.png)

## Release phases

Expand Down
12 changes: 12 additions & 0 deletions packages/carbon-web-components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.32.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-09-06)


### Bug Fixes

* **lerna:** build packages & codesandbox updates ([#10876](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10876)) ([fa5bee0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/fa5bee07eb65a0f730c7cb1094a5eb8d122ab593))
* **pagination:** mark selected option in page-sizes-select component ([#10884](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10884)) ([ec3e4cf](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/ec3e4cfaa4f50282c037c789898b7d6a61d6d54c))





# [1.31.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-08-22)

**Note:** Version bump only for package @carbon/web-components
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
const HtmlWebpackPlugin = require('html-webpack-plugin');

module.exports = {
// disable the host check on sandbox
devServer: {
disableHostCheck: true
},
plugins: [
new HtmlWebpackPlugin({
template: 'index.html',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
const HtmlWebpackPlugin = require('html-webpack-plugin');

module.exports = {
// disable the host check on sandbox
devServer: {
disableHostCheck: true
},
module: {
rules: [
{
Expand Down
22 changes: 0 additions & 22 deletions packages/carbon-web-components/examples/codesandbox/ie/.gitignore

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"description": "Sample project for getting started with the Web Components from the Carbon Design System with Next.js.",
"license": "Apache-2",
"scripts": {
"start": "echo 'Running Next in Node 12.16.3+. If you have such Node version in your system just `next` here will work.' && ./node_modules/node/node_modules/.bin/node ./node_modules/.bin/next"
"start": "echo 'Running Next in Node 18.15.0+. If you have such Node version in your system just `next` here will work.' && NODE_OPTIONS=--openssl-legacy-provider ./node_modules/node/node_modules/.bin/node ./node_modules/.bin/next"
},
"dependencies": {
"@carbon/web-components": "latest",
"next": "^10.0.0",
"node": "^12.16.3",
"node": "^18.15.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
*/

module.exports = {
// disable the host check on sandbox
devServer: {
disableHostCheck: true
},
module: {
rules: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
const HtmlWebpackPlugin = require('html-webpack-plugin');

module.exports = {
// disable the host check on sandbox
devServer: {
disableHostCheck: true
},
module: {
rules: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const devServer = {
open: true,
contentBase: path.resolve(__dirname, 'src'),
publicPath: '/dist',
disableHostCheck: true,
setup(app, server) {
app.get('/', (req, res) => {
const { fileSystem, waitUntilValid } = server.middleware;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
const HtmlWebpackPlugin = require('html-webpack-plugin');

module.exports = {
// disable the host check on sandbox
devServer: {
disableHostCheck: true
},
plugins: [
new HtmlWebpackPlugin({
template: 'index.html',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
},
"browserslist": [
"> 1%",
"last 2 versions",
"not ie <= 8"
"last 2 versions"
],
"eslintConfig": {
"parserOptions": {
Expand Down
7 changes: 4 additions & 3 deletions packages/carbon-web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
"main": "es/index.js",
"module": "es/index.js",
"exports": {
"./es/components-react/": {
"node": "./lib/components-react-node/",
"default": "./es/components-react/"
"./es/components-react/*": {
"node": "./lib/components-react-node/*",
"default": "./es/components-react/*"
},
"./es/components/*": {
"node": "./lib/components/*",
"default": "./es/components/*"
},
"./es/globals/": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export const Default = () => {
export const WithLayer = () => {
return html`
<sb-template-layers>
<div style="width:400px">
<div style="width:300px">
<cds-combo-box
title-text="ComboBox label"
helper-text="Combobox helper text"
Expand Down Expand Up @@ -178,7 +178,7 @@ export default {
},
decorators: [
(story, { name }) => {
const width = !name.toLowerCase().includes('layer') ? `width:400px` : ``;
const width = !name.toLowerCase().includes('layer') ? `width:300px` : ``;
return html` <div style="${width}">${story()}</div> `;
},
],
Expand Down
Loading

0 comments on commit e3a85d7

Please sign in to comment.