Merge branch 'main' into feat/ibmdotcom-styles-remove-react-class-2

sangeethababu9223 · Jan 19, 2024 · 6dac1f3 · 6dac1f3
2 parents 36e43ce + 3b2149b
commit 6dac1f3
Show file tree

Hide file tree

Showing 44 changed files with 870 additions and 475 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/number-input/number-input.scss b/packages/carbon-web-components/src/components/number-input/number-input.scss
@@ -36,6 +36,14 @@ $css--plex: true !default;
   background-color: $border-subtle;
 }
 
+.#{$prefix}--number--readonly {
+  .#{$prefix}--number__controls {
+    .#{$prefix}--number__control-btn {
+      border-block-end: 0;
+    }
+  }
+}
+
 :host(#{$prefix}-number-input) {
   ::slotted(#{$prefix}-slug) {
     position: absolute;

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",