fix: resolve merge conflicts

.github/ISSUE_TEMPLATE/release-review.md

@@ -86,6 +86,7 @@ about: Review process before release of a new component or pattern from Canary
       and Stackblitz for the components.
 
 [^1]: Any labels, text, or other strings within a component should use a prop.
+
 [^2]:
     See Carbon’s
     [Developer Handbook](https://github.com/carbon-design-system/carbon/blob/main/.github/CONTRIBUTING.md)

.husky/commit-msg

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 yarn commitlint --edit $1

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx lint-staged

.yarnrc.yml

@@ -4,4 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.2.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

config/babel-preset-ibm-cloud-cognitive/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.
 
+# [0.17.0](https://github.com/carbon-design-system/ibm-products/compare/babel-preset-ibm-cloud-cognitive@0.17.0-rc.0...babel-preset-ibm-cloud-cognitive@0.17.0) (2025-02-05)
+
+**Note:** Version bump only for package babel-preset-ibm-cloud-cognitive
+
+
+
+
+
 # [0.17.0-rc.0](https://github.com/carbon-design-system/ibm-products/compare/babel-preset-ibm-cloud-cognitive@0.14.40...babel-preset-ibm-cloud-cognitive@0.17.0-rc.0) (2025-01-27)
 
 **Note:** Version bump only for package babel-preset-ibm-cloud-cognitive

config/babel-preset-ibm-cloud-cognitive/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-preset-ibm-cloud-cognitive",
   "private": true,
-  "version": "0.17.0-rc.0",
+  "version": "0.17.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {
@@ -22,17 +22,17 @@
     "upgrade-dependencies": "npm-check-updates -u --dep dev,peer,prod --color --reject '/(carbon)/'"
   },
   "devDependencies": {
-    "npm-check-updates": "^17.1.11"
+    "npm-check-updates": "^17.1.13"
   },
   "dependencies": {
-    "@babel/core": "^7.23.9",
+    "@babel/core": "^7.26.0",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-export-default-from": "^7.17.12",
-    "@babel/plugin-proposal-export-namespace-from": "^7.17.12",
-    "@babel/plugin-transform-react-constant-elements": "^7.17.12",
-    "@babel/preset-env": "^7.23.9",
-    "@babel/preset-react": "^7.23.3",
-    "@babel/preset-typescript": "^7.21.5",
+    "@babel/plugin-proposal-export-default-from": "^7.25.9",
+    "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+    "@babel/plugin-transform-react-constant-elements": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-react": "^7.26.3",
+    "@babel/preset-typescript": "^7.26.0",
     "babel-plugin-dev-expression": "^0.2.3",
     "browserslist-config-carbon": "^10.6.1"
   }

config/jest-config-ibm-cloud-cognitive/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.18.0](https://github.com/carbon-design-system/ibm-products/compare/jest-config-ibm-cloud-cognitive@1.18.0-rc.0...jest-config-ibm-cloud-cognitive@1.18.0) (2025-02-05)
+
+**Note:** Version bump only for package jest-config-ibm-cloud-cognitive
+
+
+
+
+
 # [1.18.0-rc.0](https://github.com/carbon-design-system/ibm-products/compare/jest-config-ibm-cloud-cognitive@1.13.0-rc.0...jest-config-ibm-cloud-cognitive@1.18.0-rc.0) (2025-01-27)
 
 

config/jest-config-ibm-cloud-cognitive/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jest-config-ibm-cloud-cognitive",
   "private": true,
-  "version": "1.18.0-rc.0",
+  "version": "1.18.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {
@@ -22,28 +22,28 @@
     "upgrade-dependencies": "npm-check-updates -u --dep dev,peer,prod --color --reject '/(carbon|^chalk$)/'"
   },
   "devDependencies": {
-    "npm-check-updates": "^17.1.11"
+    "npm-check-updates": "^17.1.13"
   },
   "peerDependencies": {
     "jest": "^29.7.0"
   },
   "dependencies": {
-    "@babel/core": "^7.23.9",
-    "@babel/plugin-proposal-class-properties": "^7.17.12",
-    "@babel/plugin-proposal-export-default-from": "^7.17.12",
-    "@babel/plugin-proposal-export-namespace-from": "^7.17.12",
-    "@babel/plugin-transform-runtime": "^7.18.2",
-    "@babel/preset-env": "^7.18.2",
-    "@babel/preset-react": "^7.17.12",
-    "@testing-library/jest-dom": "^6.3.0",
-    "accessibility-checker": "^3.1.78",
-    "axe-core": "^4.8.3",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-export-default-from": "^7.25.9",
+    "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+    "@babel/plugin-transform-runtime": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-react": "^7.26.3",
+    "@testing-library/jest-dom": "^6.6.3",
+    "accessibility-checker": "^3.1.79",
+    "axe-core": "^4.10.2",
     "babel-jest": "^29.7.0",
-    "babel-preset-ibm-cloud-cognitive": "^0.17.0-rc.0",
+    "babel-preset-ibm-cloud-cognitive": "^0.17.0",
     "chalk": "^4.1.2",
     "identity-obj-proxy": "^3.0.0",
     "jest-circus": "^29.7.0",
-    "jest-watch-typeahead": "^2.0.0",
-    "sass": "^1.80.6"
+    "jest-watch-typeahead": "^2.2.2",
+    "sass": "^1.83.4"
   }
 }

config/storybook-addon-carbon-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.
 
+# [2.8.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/storybook-addon-theme@2.8.0-rc.0...@carbon/storybook-addon-theme@2.8.0) (2025-02-05)
+
+**Note:** Version bump only for package @carbon/storybook-addon-theme
+
+
+
+
+
 # [2.8.0-rc.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/storybook-addon-theme@2.3.0-rc.0...@carbon/storybook-addon-theme@2.8.0-rc.0) (2025-01-27)
 
 **Note:** Version bump only for package @carbon/storybook-addon-theme

config/storybook-addon-carbon-theme/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/storybook-addon-theme",
   "description": "Carbon theme switcher for Storybook",
-  "version": "2.8.0-rc.0",
+  "version": "2.8.0",
   "license": "Apache-2.0",
   "main": "dist/react.js",
   "repository": {
@@ -45,23 +45,23 @@
     "vue": "*"
   },
   "dependencies": {
-    "@ibm/telemetry-js": "^1.5.0",
+    "@ibm/telemetry-js": "^1.8.0",
     "@storybook/addons": "^7.6.17",
     "@storybook/api": "^7.6.17",
     "@storybook/client-api": "^7.6.17",
-    "@storybook/client-logger": "^8.4.5",
-    "@storybook/components": "^8.4.5",
-    "@storybook/core-events": "^8.4.5",
-    "@storybook/theming": "^8.4.5",
-    "core-js": "^3.35.1",
+    "@storybook/client-logger": "^8.4.7",
+    "@storybook/components": "^8.4.7",
+    "@storybook/core-events": "^8.4.7",
+    "@storybook/theming": "^8.4.7",
+    "core-js": "^3.40.0",
     "global": "^4.4.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.23.9",
-    "@babel/core": "^7.23.9",
-    "@babel/preset-react": "^7.23.3",
-    "npm-check-updates": "^17.1.11",
+    "@babel/cli": "^7.26.4",
+    "@babel/core": "^7.26.0",
+    "@babel/preset-react": "^7.26.3",
+    "npm-check-updates": "^17.1.13",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^5.0.5"
+    "rimraf": "^6.0.1"
   }
 }

docs/reviews/DESIGN_REVIEW_GUIDELINES.md

@@ -50,16 +50,16 @@ maintainer\
 maintainer\
 `- [ ]` The component’s motion matches the specifications set by the pattern
 maintainer(s)\
-`- [ ]` The UI produced is responsive, cross-browser, and responds to the currently
-set Carbon theme.\
+`- [ ]` The UI produced is responsive, cross-browser, and responds to the
+currently set Carbon theme.\
 `- [ ]` Colors, themes, sizes and additional props are true and correct,
 aligning with Carbon set tokens (unless otherwise specified by the pattern)\
-`- [ ]` Paddings/margins/spacings are true and correct, in both desktop and mobile
-views
+`- [ ]` Paddings/margins/spacings are true and correct, in both desktop and
+mobile views
 
 `###` Storybook
 
 `- [ ]` A functioning component renders in Storybook\
-`- [ ]` The Storybook displays multiple scenarios that show how the component can
-be used\
+`- [ ]` The Storybook displays multiple scenarios that show how the component
+can be used\
 `- [ ]` Changing props in the Storybook updates the component

docs/reviews/PR_REVIEW_GUIDELINES.md

@@ -35,9 +35,11 @@ applicable.
 
 `- [ ]` Verify the dependency has previously been
 [pedigree reviewed](https://pedigree-service.wdc1a.cirrus.ibm.com)\
-`- [ ]` Verify the dependency [doesn't contain any vulnerabilities](https://snyk.io/vuln)\
+`- [ ]` Verify the dependency
+[doesn't contain any vulnerabilities](https://snyk.io/vuln)\
 `- [ ]` Verify the dependency [bundle size](https://bundlephobia.com) is
 acceptable\
-`- [ ]` Verify the dependency is [actively maintained](https://www.npmtrends.com)\
+`- [ ]` Verify the dependency is
+[actively maintained](https://www.npmtrends.com)\
 `- [ ]` Verify license conditions are met e.g. forwarding of copyright if
 necessary.

e2e/components/ExpressiveCard/ExpressiveCard-test.avt.e2e.js

@@ -125,9 +125,7 @@ test.describe('ExpressiveCard @avt', () => {
     await expect(page).toHaveNoACViolations(
       'ExpressiveCard @avt-clickable-state'
     );
-    const cardElement = page.locator(
-      `[data-carbon-devtools-id="${pkg.prefix}--ExpressiveCard"]`
-    );
+    const cardElement = page.locator(`.${pkg.prefix}--card__clickable`);
     // Pressing 'Tab' key to focus on the clickable card
     await page.keyboard.press('Tab');
     await expect(cardElement).toBeFocused();

e2e/components/Tearsheet/TearsheetNarrow-test.avt.e2e.js

@@ -129,7 +129,7 @@ test.describe('TearsheetNarrow @avt', () => {
 
     // Selecting the first slug button
     const slugButton1 = page
-      .locator('*[aria-label="AI - Show information"]')
+      .locator('*[aria-label="AI Show information"]')
       .first();
     const closeButton = page.getByLabel('Close the tearsheet');
     const inputField = page.locator('#tss-ft1');