chore: fix conflicts

carbon-design-system · Sep 25, 2024 · 7854beb · 7854beb
2 parents 127824b + 0b69c52
commit 7854beb
Show file tree

Hide file tree

Showing 11 changed files with 128 additions and 85 deletions.
diff --git a/config/jest-config-ibm-cloud-cognitive/CHANGELOG.md b/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.9.0](https://github.com/carbon-design-system/ibm-products/compare/jest-config-ibm-cloud-cognitive@[email protected]) (2024-09-25)
+
+**Note:** Version bump only for package jest-config-ibm-cloud-cognitive
+
+
+
+
+
 # [1.9.0-rc.0](https://github.com/carbon-design-system/ibm-products/compare/jest-config-ibm-cloud-cognitive@[email protected]) (2024-09-16)
 
 

diff --git a/config/jest-config-ibm-cloud-cognitive/package.json b/config/jest-config-ibm-cloud-cognitive/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jest-config-ibm-cloud-cognitive",
   "private": true,
-  "version": "1.9.0-rc.0",
+  "version": "1.9.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

diff --git a/packages/core/CHANGELOG.md b/packages/core/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.26.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-09-25)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive-core
+
+
+
+
+
 # [2.26.0-rc.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-09-16)
 
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-cloud-cognitive-core",
   "private": true,
-  "version": "2.26.0-rc.0",
+  "version": "2.25.0",
   "license": "Apache-2.0",
   "main": "scripts/build.js",
   "repository": {
@@ -28,13 +28,13 @@
     "upgrade-dependencies": "npm-check-updates -u --dep dev,peer,prod --color --reject '/(carbon|^react$|^react-dom$)/'"
   },
   "devDependencies": {
-    "@carbon/grid": "^11.27.0",
-    "@carbon/ibm-products-styles": "^2.46.0-rc.0",
-    "@carbon/layout": "^11.26.0",
-    "@carbon/motion": "^11.22.0",
-    "@carbon/react": "^1.66.0",
-    "@carbon/themes": "^11.40.0",
-    "@carbon/type": "^11.31.0",
+    "@carbon/grid": "^11.26.0",
+    "@carbon/ibm-products-styles": "^2.45.0",
+    "@carbon/layout": "^11.25.0",
+    "@carbon/motion": "^11.21.0",
+    "@carbon/react": "^1.65.0",
+    "@carbon/themes": "^11.39.0",
+    "@carbon/type": "^11.30.0",
     "@storybook/addon-a11y": "^8.1.10",
     "@storybook/addon-actions": "^8.0.9",
     "@storybook/addon-controls": "^8.0.9",

diff --git a/packages/ibm-products-community/CHANGELOG.md b/packages/ibm-products-community/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.11.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-09-25)
+
+**Note:** Version bump only for package @carbon/ibm-products-community
+
+
+
+
+
 # [0.11.0-rc.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-09-16)
 
 

diff --git a/packages/ibm-products-community/package.json b/packages/ibm-products-community/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products-community",
   "description": "Carbon for IBM Products Community package",
-  "version": "0.11.0-rc.0",
+  "version": "0.11.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -39,7 +39,7 @@
     "babel-preset-ibm-cloud-cognitive": "^0.14.40",
     "cross-env": "^7.0.3",
     "jest": "^29.6.2",
-    "jest-config-ibm-cloud-cognitive": "^1.9.0-rc.0",
+    "jest-config-ibm-cloud-cognitive": "^1.9.0",
     "jest-environment-jsdom": "^29.6.2",
     "rimraf": "^5.0.1",
     "sass": "^1.77.2"

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

diff --git a/packages/ibm-products-styles/package.json b/packages/ibm-products-styles/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products-styles",
   "description": "Carbon for IBM Products styles",
-  "version": "2.46.0-rc.0",
+  "version": "2.46.0",
   "license": "Apache-2.0",
   "installConfig": {
     "hoistingLimits": "none"
@@ -52,7 +52,7 @@
     "cross-env": "^7.0.3",
     "glob": "^10.3.10",
     "jest": "^29.7.0",
-    "jest-config-ibm-cloud-cognitive": "^1.9.0-rc.0",
+    "jest-config-ibm-cloud-cognitive": "^1.9.0",
     "jest-environment-jsdom": "^29.7.0",
     "npm-check-updates": "^16.14.12",
     "npm-run-all": "^4.1.5",

diff --git a/packages/ibm-products/CHANGELOG.md b/packages/ibm-products/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.50.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-09-25)
+
+**Note:** Version bump only for package @carbon/ibm-products
+
+
+
+
+
 # [2.50.0-rc.1](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-09-20)
 
 
@@ -11,6 +19,9 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **Datagrid:** dynamic nested rows skeleton always showing regardless of dynamic prop being set ([#6076](https://github.com/carbon-design-system/ibm-products/issues/6076)) ([2d7c570](https://github.com/carbon-design-system/ibm-products/commit/2d7c570a9814bb63bf0c49db43c21dc8e3cd47a6))
 
 
+
+
+
 # [2.50.0-rc.0](https://github.com/carbon-design-system/ibm-products/compare/@carbon/[email protected]...@carbon/[email protected]) (2024-09-16)
 
 

diff --git a/packages/ibm-products/package.json b/packages/ibm-products/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.50.0-rc.1",
+  "version": "2.50.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -81,7 +81,7 @@
     "fs-extra": "^11.2.0",
     "glob": "^10.3.10",
     "jest": "^29.7.0",
-    "jest-config-ibm-cloud-cognitive": "^1.9.0-rc.0",
+    "jest-config-ibm-cloud-cognitive": "^1.9.0",
     "jest-environment-jsdom": "^29.7.0",
     "namor": "^1.1.2",
     "npm-check-updates": "^16.14.12",
@@ -96,7 +96,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.9",
     "@carbon/feature-flags": "^0.22.0",
-    "@carbon/ibm-products-styles": "^2.46.0-rc.0",
+    "@carbon/ibm-products-styles": "^2.46.0",
     "@carbon/telemetry": "^0.1.0",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/modifiers": "^7.0.0",