chore(merge): resolve merge conflicts

carbon-design-system · Sep 7, 2023 · 5d19efe · 5d19efe
2 parents 082b467 + df0964b
commit 5d19efe
Show file tree

Hide file tree

Showing 33 changed files with 368 additions and 116 deletions.
diff --git a/...act-npm-11.45.2-8ae0dc7f50-71b6e258a1.zip → ...act-npm-11.47.0-7e0f7e5d05-73bba67d61.zip b/...act-npm-11.45.2-8ae0dc7f50-71b6e258a1.zip → ...act-npm-11.47.0-7e0f7e5d05-73bba67d61.zip
diff --git a/...ents-npm-1.31.0-4d222433be-53b512ff78.zip → ...npm-1.32.0-rc.0-963f5190ca-335530915a.zip b/...ents-npm-1.31.0-4d222433be-53b512ff78.zip → ...npm-1.32.0-rc.0-963f5190ca-335530915a.zip
diff --git a/docs/release-schedule.md b/docs/release-schedule.md
@@ -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
 

diff --git a/packages/carbon-web-components/CHANGELOG.md b/packages/carbon-web-components/CHANGELOG.md
@@ -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

diff --git a/packages/eslint-config-ibmdotcom/CHANGELOG.md b/packages/eslint-config-ibmdotcom/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.42.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-09-06)
+
+**Note:** Version bump only for package @carbon/eslint-config-ibmdotcom
+
+
+
+
+
 # [1.41.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/eslint-config-ibmdotcom

diff --git a/packages/eslint-config-ibmdotcom/package.json b/packages/eslint-config-ibmdotcom/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/eslint-config-ibmdotcom",
   "private": true,
-  "version": "1.41.0",
+  "version": "1.42.0-rc.0",
   "description": "ESLint configuration for Carbon for IBM.com",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -18,7 +18,7 @@
     "eslint": "^6.8.0"
   },
   "dependencies": {
-    "@carbon/eslint-plugin-react-prop-type-comments": "1.40.0",
+    "@carbon/eslint-plugin-react-prop-type-comments": "1.41.0-rc.0",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
     "@typescript-eslint/parser": "^5.43.0",
     "babel-eslint": "^10.1.0",

diff --git a/packages/eslint-plugin-ibmdotcom-import-rules/CHANGELOG.md b/packages/eslint-plugin-ibmdotcom-import-rules/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.41.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-09-06)
+
+**Note:** Version bump only for package @carbon/eslint-plugin-ibmdotcom-import-rules
+
+
+
+
+
 # [1.40.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/eslint-plugin-ibmdotcom-import-rules

diff --git a/packages/eslint-plugin-ibmdotcom-import-rules/package.json b/packages/eslint-plugin-ibmdotcom-import-rules/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/eslint-plugin-ibmdotcom-import-rules",
   "private": true,
-  "version": "1.40.0",
+  "version": "1.41.0-rc.0",
   "description": "ESLint plugin for Carbon for IBM.com checking imports",
   "license": "Apache-2.0",
   "main": "lib/index.js",

diff --git a/packages/eslint-plugin-react-prop-type-comments/CHANGELOG.md b/packages/eslint-plugin-react-prop-type-comments/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.41.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-09-06)
+
+**Note:** Version bump only for package @carbon/eslint-plugin-react-prop-type-comments
+
+
+
+
+
 # [1.40.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/eslint-plugin-react-prop-type-comments

diff --git a/packages/eslint-plugin-react-prop-type-comments/package.json b/packages/eslint-plugin-react-prop-type-comments/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/eslint-plugin-react-prop-type-comments",
   "private": true,
-  "version": "1.40.0",
+  "version": "1.41.0-rc.0",
   "description": "ESLint plugin for Carbon for IBM.com checking React prop type comments",
   "license": "Apache-2.0",
   "main": "lib/index.js",

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.51.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-09-06)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-react
+
+
+
+
+
 # [1.50.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/ibmdotcom-react

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-react",
   "description": "Carbon for IBM.com React Components",
-  "version": "1.50.0",
+  "version": "1.51.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -63,9 +63,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@carbon/ibmdotcom-services": "1.50.0",
-    "@carbon/ibmdotcom-styles": "1.50.0",
-    "@carbon/ibmdotcom-utilities": "1.50.0",
+    "@carbon/ibmdotcom-services": "1.51.0-rc.0",
+    "@carbon/ibmdotcom-styles": "1.51.0-rc.0",
+    "@carbon/ibmdotcom-utilities": "1.51.0-rc.0",
     "@carbon/telemetry": "^0.1.0",
     "autosuggest-highlight": "^3.1.1",
     "carbon-components": "10.58.8",
@@ -86,8 +86,8 @@
     "@babel/preset-env": "~7.12.0",
     "@babel/preset-react": "~7.12.1",
     "@carbon/icons-react": "10.49.1",
-    "@carbon/pictograms-react": "11.45.2",
-    "@carbon/storybook-addon-theme": "1.41.0",
+    "@carbon/pictograms-react": "11.47.0",
+    "@carbon/storybook-addon-theme": "1.42.0-rc.0",
     "@percy-io/in-percy": "^0.1.11",
     "@percy/cli": "^1.8.1",
     "@percy/cypress": "^3.1.1",

diff --git a/packages/services-store/CHANGELOG.md b/packages/services-store/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.51.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-09-06)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-services-store
+
+
+
+
+
 # [1.50.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/ibmdotcom-services-store

diff --git a/packages/services-store/package.json b/packages/services-store/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-services-store",
   "private": true,
-  "version": "1.50.0",
+  "version": "1.51.0-rc.0",
   "description": "Redux store for Carbon for IBM.com Services",
   "license": "Apache-2.0",
   "main": "lib/store.js",
@@ -30,8 +30,8 @@
     "test:unit": "yarn jest"
   },
   "dependencies": {
-    "@carbon/ibmdotcom-services": "1.50.0",
-    "@carbon/ibmdotcom-utilities": "1.50.0",
+    "@carbon/ibmdotcom-services": "1.51.0-rc.0",
+    "@carbon/ibmdotcom-utilities": "1.51.0-rc.0",
     "carbon-components": "10.58.3",
     "redux": "^4.0.0",
     "redux-logger": "^3.0.0",

diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.51.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-09-06)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-services
+
+
+
+
+
 # [1.50.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/ibmdotcom-services

diff --git a/packages/services/package.json b/packages/services/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-services",
   "description": "Carbon for IBM.com Services",
-  "version": "1.50.0",
+  "version": "1.51.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@carbon/ibmdotcom-utilities": "1.50.0",
+    "@carbon/ibmdotcom-utilities": "1.51.0-rc.0",
     "@carbon/telemetry": "0.1.0",
     "axios": "^0.27.2",
     "marked": "^4.0.10",

diff --git a/packages/storybook-addon-theme/CHANGELOG.md b/packages/storybook-addon-theme/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.42.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-09-06)
+
+**Note:** Version bump only for package @carbon/storybook-addon-theme
+
+
+
+
+
 # [1.41.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/storybook-addon-theme

diff --git a/packages/storybook-addon-theme/package.json b/packages/storybook-addon-theme/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/storybook-addon-theme",
   "private": true,
-  "version": "1.41.0",
+  "version": "1.42.0-rc.0",
   "description": "Storybook add-on for Carbon theme chooser",
   "license": "Apache-2.0",
   "main": "es/index.js",

diff --git a/packages/stylelint-config-ibmdotcom/CHANGELOG.md b/packages/stylelint-config-ibmdotcom/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.41.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-09-06)
+
+**Note:** Version bump only for package @carbon/stylelint-config-ibmdotcom
+
+
+
+
+
 # [1.40.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/stylelint-config-ibmdotcom

diff --git a/packages/stylelint-config-ibmdotcom/package.json b/packages/stylelint-config-ibmdotcom/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/stylelint-config-ibmdotcom",
   "private": true,
-  "version": "1.40.0",
+  "version": "1.41.0-rc.0",
   "description": "Stylelint configuration for Carbon for IBM.com",
   "license": "Apache-2.0",
   "main": "index.js",

diff --git a/packages/styles/CHANGELOG.md b/packages/styles/CHANGELOG.md
@@ -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.51.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
+
+* **cta-card:** video heading style fix ([#10804](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10804)) ([f2ea944](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/f2ea944fc632c99f1c0283fbc37a2825f9fc18fb))
+* **tabs-extended:** add hyphens auto to handle word breaks ([#10849](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10849)) ([09c9468](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/09c946894bd1a33cb32628379daf031fe91ee11b))
+
+
+
+
+
 # [1.50.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/ibmdotcom-styles

diff --git a/packages/styles/package.json b/packages/styles/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-styles",
   "description": "Carbon for IBM.com Styles",
-  "version": "1.50.0",
+  "version": "1.51.0-rc.0",
   "license": "Apache-2.0",
   "main": "dist/ibm-dotcom-styles.min.css",
   "module": "src/scss",

diff --git a/packages/styles/scss/components/tabs-extended/_tabs-extended.scss b/packages/styles/scss/components/tabs-extended/_tabs-extended.scss
@@ -110,7 +110,7 @@
           overflow: hidden;
           height: 100%;
           line-height: 1.375rem;
-          word-break: break-word;
+          hyphens: auto;
 
           @include type-style('body-short-02');
         }
@@ -276,3 +276,7 @@ button.#{$prefix}--tabs__nav-link {
   color: $text-02;
 }
 /* stylelint-enable selector-pseudo-class-parentheses-space-inside */
+
+.#{$prefix}--accordion__title {
+  hyphens: auto;
+}
diff --git a/packages/utilities/CHANGELOG.md b/packages/utilities/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.51.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-09-06)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-utilities
+
+
+
+
+
 # [1.50.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/ibmdotcom-utilities

diff --git a/packages/utilities/package.json b/packages/utilities/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibmdotcom-utilities",
   "description": "Carbon for IBM.com Utilities",
-  "version": "1.50.0",
+  "version": "1.51.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

diff --git a/packages/utilities/src/utilities/settings/settings.js b/packages/utilities/src/utilities/settings/settings.js
@@ -11,10 +11,10 @@
  * @exports ibmdotcom.settings
  * @type {object} Settings object
  * @property {string} [prefix=dds]
- * Carbon for IBM.com v1.50.0',
+ * Carbon for IBM.com v1.51.0',
  */
 const settings = {
-  version: 'Carbon for IBM.com v1.50.0',
+  version: 'Carbon for IBM.com v1.51.0',
   stablePrefix: 'dds',
 };
 

diff --git a/packages/web-components/CHANGELOG.md b/packages/web-components/CHANGELOG.md
@@ -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.36.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
+
+* **docs:** add documentation regarding the carbonElement decorator ([#10871](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10871)) ([883a7e5](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/883a7e55873b81b1a8c7f73c675f339733f8703c)), closes [#10278](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10278)
+* **lightbox-video-player:** use more reliable reference to video player ([#10878](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/issues/10878)) ([29434ed](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/commit/29434ed90536fefe8473059332f5efa2e573ec0b))
+
+
+
+
+
 # [1.35.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/ibmdotcom-web-components