Merge branch 'main' into fix/incorrect-readonly-styles

carbon-design-system · Jan 18, 2024 · 2bbcb3c · 2bbcb3c
2 parents 4746978 + 78d78be
commit 2bbcb3c
Show file tree

Hide file tree

Showing 44 changed files with 327 additions and 247 deletions.
diff --git a/.github/workflows/e2e-tests-parallel.yml b/.github/workflows/e2e-tests-parallel.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'yarn'
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Download any existing cache
         id: yarn-cache
         with:
@@ -95,7 +95,7 @@ jobs:
           name: storybook-build
           path: packages/web-components/storybook-static
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Retrieve yarn cache
         id: yarn-cache
         with:

diff --git a/...act-npm-10.49.2-5ba53838d4-9b591d2f5c.zip → ...ons-npm-11.32.0-ad4e2a2d6c-d0d1776877.zip b/...act-npm-10.49.2-5ba53838d4-9b591d2f5c.zip → ...ons-npm-11.32.0-ad4e2a2d6c-d0d1776877.zip
diff --git a/.yarn/cache/@carbon-styles-npm-1.45.0-67fc1de473-8372874f57.zip b/.yarn/cache/@carbon-styles-npm-1.45.0-67fc1de473-8372874f57.zip
diff --git a/.yarn/cache/@carbon-web-components-npm-2.0.2-rc.1-9586370cb1-3875b649a4.zip b/.yarn/cache/@carbon-web-components-npm-2.0.2-rc.1-9586370cb1-3875b649a4.zip
diff --git a/.yarn/cache/carbon-components-npm-10.58.3-57a9dc3544-6b3a2f8b18.zip b/.yarn/cache/carbon-components-npm-10.58.3-57a9dc3544-6b3a2f8b18.zip
diff --git a/packages/carbon-web-components/package.json b/packages/carbon-web-components/package.json
@@ -1,7 +1,6 @@
 {
   "name": "@carbon/web-components",
-  "private": true,
-  "version": "2.1.1",
+  "version": "2.1.2",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/carbon-web-components/src/components/data-table/_table-core.scss b/packages/carbon-web-components/src/components/data-table/_table-core.scss
@@ -1,5 +1,5 @@
 //
-// Copyright IBM Corp. 2019, 2023
+// Copyright IBM Corp. 2019, 2024
 //
 // This source code is licensed under the Apache-2.0 license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/packages/carbon-web-components/src/components/data-table/_table-selection.scss b/packages/carbon-web-components/src/components/data-table/_table-selection.scss
@@ -1,5 +1,5 @@
 //
-// Copyright IBM Corp. 2019, 2023
+// Copyright IBM Corp. 2019, 2024
 //
 // This source code is licensed under the Apache-2.0 license found in the
 // LICENSE file in the root directory of this source tree.
@@ -73,9 +73,9 @@
 }
 
 :host(#{$prefix}-table-row[selected][slug]) {
-  .#{$prefix}--table-column-checkbox,
   ::slotted(#{$prefix}-table-cell),
-  .#{$prefix}--table-expand {
+  .#{$prefix}--table-expand,
+  .#{$prefix}--table-column-checkbox {
     background-color: transparent;
   }
 }

diff --git a/packages/carbon-web-components/src/components/date-picker/range-plugin.ts b/packages/carbon-web-components/src/components/date-picker/range-plugin.ts
@@ -1,7 +1,7 @@
 /**
  * @license
  *
- * Copyright IBM Corp. 2019, 2023
+ * Copyright IBM Corp. 2019, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -11,7 +11,7 @@
 import rangePlugin, { Config } from 'flatpickr/dist/plugins/rangePlugin';
 import { Instance as FlatpickrInstance } from 'flatpickr/dist/types/instance';
 import { Plugin } from 'flatpickr/dist/types/options';
-import on from 'carbon-components/es/globals/js/misc/on';
+import on from '../../globals/mixins/on';
 import Handle from '../../globals/internal/handle';
 
 /**

diff --git a/packages/carbon-web-components/src/components/slider/slider.scss b/packages/carbon-web-components/src/components/slider/slider.scss
@@ -1,5 +1,5 @@
 //
-// Copyright IBM Corp. 2019, 2023
+// Copyright IBM Corp. 2019, 2024
 //
 // This source code is licensed under the Apache-2.0 license found in the
 // LICENSE file in the root directory of this source tree.

diff --git a/packages/carbon-web-components/src/components/slug/slug-story.scss b/packages/carbon-web-components/src/components/slug/slug-story.scss
@@ -1,7 +1,7 @@
 /**
  * @license
  *
- * Copyright IBM Corp. 2019, 2023
+ * Copyright IBM Corp. 2019, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/packages/carbon-web-components/tests/snapshots/cds-checkbox.md b/packages/carbon-web-components/tests/snapshots/cds-checkbox.md
@@ -61,4 +61,3 @@
 </div>
 
 ```
-
diff --git a/packages/services-store/package.json b/packages/services-store/package.json
@@ -32,7 +32,6 @@
   "dependencies": {
     "@carbon/ibmdotcom-services": "1.53.0",
     "@carbon/ibmdotcom-utilities": "1.53.0",
-    "carbon-components": "10.58.3",
     "redux": "^4.0.0",
     "redux-logger": "^3.0.0",
     "redux-thunk": "^2.3.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.
 
+# [2.1.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-01-17)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-services
+
+
+
+
+
 # [2.1.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-01-09)
 
 

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": "2.1.0-rc.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@carbon/ibmdotcom-utilities": "2.1.0-rc.0",
+    "@carbon/ibmdotcom-utilities": "2.1.0",
     "@carbon/telemetry": "0.1.0",
     "axios": "^1.6.0",
     "marked": "^4.0.10",

diff --git a/packages/styles/CHANGELOG.md b/packages/styles/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.
 
+# [2.1.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-01-17)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-styles
+
+
+
+
+
 # [2.1.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-01-09)
 
 

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": "2.1.0-rc.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "main": "dist/ibm-dotcom-styles.min.css",
   "module": "src/scss",

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.
 
+# [2.1.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-01-17)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-utilities
+
+
+
+
+
 # [2.1.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-01-09)
 
 

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": "2.1.0-rc.0",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

diff --git a/packages/web-components/CHANGELOG.md b/packages/web-components/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.
 
+# [2.1.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-01-17)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-web-components
+
+
+
+
+
 # [2.1.0-rc.0](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-01-09)
 
 

diff --git a/packages/web-components/package.json b/packages/web-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carbon/ibmdotcom-web-components",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "description": "Carbon for IBM.com Web Components",
   "license": "Apache-2.0",
   "exports": {
@@ -90,14 +90,14 @@
     "wca": "web-component-analyzer analyze src --outFile custom-elements.json"
   },
   "dependencies": {
-    "@carbon/ibmdotcom-services": "2.1.0-rc.0",
-    "@carbon/ibmdotcom-styles": "2.1.0-rc.0",
-    "@carbon/ibmdotcom-utilities": "2.1.0-rc.0",
+    "@carbon/ibmdotcom-services": "2.1.0",
+    "@carbon/ibmdotcom-styles": "2.1.0",
+    "@carbon/ibmdotcom-utilities": "2.1.0",
     "@carbon/layout": "11.20.1",
     "@carbon/motion": "11.16.1",
     "@carbon/styles": "1.47.0",
     "@carbon/telemetry": "0.1.0",
-    "@carbon/web-components": "2.0.2-rc.1",
+    "@carbon/web-components": "2.1.2",
     "lit": "^2.7.6",
     "lodash-es": "^4.17.21",
     "redux": "^4.0.0",
@@ -107,7 +107,7 @@
     "window-or-global": "^1.0.1"
   },
   "optionalDependencies": {
-    "@carbon/icons-react": "10.49.2",
+    "@carbon/icons-react": "^11.33.0",
     "lodash.pickby": "^4.6.0",
     "prop-types": "^15.7.0",
     "react": "^16.10.0 || ^17.0.0",
@@ -132,8 +132,8 @@
     "@babel/traverse": "~7.23.0",
     "@carbon/ibmdotcom-services-store": "1.53.0",
     "@carbon/icon-helpers": "10.45.1",
-    "@carbon/icons": "11.31.0",
-    "@carbon/icons-react": "10.49.2",
+    "@carbon/icons": "^11.31.0",
+    "@carbon/icons-react": "^11.33.0",
     "@carbon/pictograms-react": "11.55.0",
     "@carbon/react": "1.47.0",
     "@carbon/type": "11.25.1",

diff --git a/packages/web-components/src/components/back-to-top/__stories__/back-to-top.stories.react.tsx b/packages/web-components/src/components/back-to-top/__stories__/back-to-top.stories.react.tsx
@@ -1,14 +1,14 @@
 /**
  * @license
  *
- * Copyright IBM Corp. 2021
+ * Copyright IBM Corp. 2021, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
 // @ts-nocheck
-import ArrowDown20 from '@carbon/icons-react/es/arrow--down/20.js';
+import { ArrowDown, ArrowRight } from '@carbon/icons-react';
 // Below path will be there when an application installs `@carbon/ibmdotcom-web-components` package.
 // In our dev env, we auto-generate the file and re-map below path to to point to the generated file.
 import C4DBackToTop from '@carbon/ibmdotcom-web-components/es/components-react/back-to-top/back-to-top';
@@ -26,7 +26,6 @@ import C4DLinkListItem from '@carbon/ibmdotcom-web-components/es/components-reac
 /* eslint-disable max-len */
 import C4DContentBlockSimple from '@carbon/ibmdotcom-web-components/es/components-react/content-block-simple/content-block-simple';
 import C4DTextCTA from '@carbon/ibmdotcom-web-components/es/components-react/cta/text-cta';
-import ArrowRight20 from '@carbon/icons-react/es/arrow--right/20.js';
 import React from 'react';
 import readme from './README.stories.react.mdx';
 import styles from './back-to-top.stories.scss';
@@ -116,6 +115,11 @@ natoque penatibus et magnis dis parturient. Nec dubitamus multa iter quae et nos
 bona sunt, inclinet, amari petere vellent. Phasellus laoreet lorem vel dolor tempus vehicula.
 `;
 
+const iconProps = {
+  size: 20,
+  slot: 'icon',
+};
+
 export const Default = () => {
   return (
     <>
@@ -129,7 +133,7 @@ export const Default = () => {
             data-target="#section-1"
             href="#section-1">
             Scroll down
-            <ArrowDown20 slot="icon" />
+            <ArrowDown {...iconProps} />
           </C4DButtonGroupItem>
         </C4DButtonGroup>
       </C4DLeadspace>
@@ -162,43 +166,43 @@ export const Default = () => {
           <C4DButtonGroup slot="action">
             <C4DButtonGroupItem href="#">
               Try it on premises
-              <ArrowRight20 slot="icon" />
+              <ArrowRight {...iconProps} />
             </C4DButtonGroupItem>
             <C4DButtonGroupItem href="#">
               Try it on cloud
-              <ArrowRight20 slot="icon" />
+              <ArrowRight {...iconProps} />
             </C4DButtonGroupItem>
           </C4DButtonGroup>
           <C4DLinkList slot="link-list" type="end">
             <C4DLinkListHeading>
               More ways to explore Linux servers
             </C4DLinkListHeading>
             <C4DLinkListItem href="https://example.com">
-              Products <ArrowRight20 slot="icon" />
+              Products <ArrowRight {...iconProps} />
             </C4DLinkListItem>
             <C4DLinkListItem href="https://example.com">
-              Key concepts <ArrowRight20 slot="icon" />
+              Key concepts <ArrowRight {...iconProps} />
             </C4DLinkListItem>
             <C4DLinkListItem href="https://example.com">
-              Analyst insights <ArrowRight20 slot="icon" />
+              Analyst insights <ArrowRight {...iconProps} />
             </C4DLinkListItem>
             <C4DLinkListItem href="https://example.com">
-              Blogs <ArrowRight20 slot="icon" />
+              Blogs <ArrowRight {...iconProps} />
             </C4DLinkListItem>
             <C4DLinkListItem href="https://example.com">
-              Client stories <ArrowRight20 slot="icon" />
+              Client stories <ArrowRight {...iconProps} />
             </C4DLinkListItem>
             <C4DLinkListItem href="https://example.com">
-              Events <ArrowRight20 slot="icon" />
+              Events <ArrowRight {...iconProps} />
             </C4DLinkListItem>
             <C4DLinkListItem href="https://example.com">
-              Latest Research <ArrowRight20 slot="icon" />
+              Latest Research <ArrowRight {...iconProps} />
             </C4DLinkListItem>
             <C4DLinkListItem href="https://example.com">
-              Training <ArrowRight20 slot="icon" />
+              Training <ArrowRight {...iconProps} />
             </C4DLinkListItem>
             <C4DLinkListItem href="https://example.com">
-              Partners <ArrowRight20 slot="icon" />
+              Partners <ArrowRight {...iconProps} />
             </C4DLinkListItem>
           </C4DLinkList>
         </C4DCTABlock>

diff --git a/.../src/components/card-section-carousel/__stories__/card-section-carousel.stories.react.tsx b/.../src/components/card-section-carousel/__stories__/card-section-carousel.stories.react.tsx
@@ -1,14 +1,14 @@
 /**
  * @license
  *
- * Copyright IBM Corp. 2020, 2023
+ * Copyright IBM Corp. 2020, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
 import React from 'react';
-import ArrowRight20 from '@carbon/icons-react/es/arrow--right/20.js';
+import { ArrowRight } from '@carbon/icons-react';
 // Below path will be there when an application installs `@carbon/ibmdotcom-web-components` package.
 // In our dev env, we auto-generate the file and re-map below path to to point to the generated file.
 // @ts-ignore
@@ -40,6 +40,10 @@ const copyOdd = `
   ${copyDefault}
   Mauris iaculis eget dolor nec hendrerit. Phasellus at elit sollicitudin, sodales nulla quis, consequat libero.
 `;
+const iconProps = {
+  size: 20,
+  slot: 'icon',
+};
 
 const Card = ({
   copy = copyDefault,
@@ -50,7 +54,7 @@ const Card = ({
     <C4DCardHeading>{heading}</C4DCardHeading>
     <p>{copy}</p>
     <C4DCardFooter>
-      <ArrowRight20 slot="icon" />
+      <ArrowRight {...iconProps} />
     </C4DCardFooter>
   </C4DCard>
 );
@@ -67,7 +71,7 @@ export const Default = () => {
       </C4DContentSectionCopy>
       <C4DLinkWithIcon slot="footer" href={hrefDefault}>
         Link text
-        <ArrowRight20 slot="icon" />
+        <ArrowRight {...iconProps} />
       </C4DLinkWithIcon>
       <C4DCarousel>
         <Card />