chore(deps): resolve merge conflicts

carbon-design-system · Feb 25, 2022 · b1580bf · b1580bf
2 parents 3ed1e3f + 1e5dc11
commit b1580bf
Show file tree

Hide file tree

Showing 23 changed files with 266 additions and 171 deletions.
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.22.0-rc.3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2022-02-25)
+
+**Note:** Version bump only for package @carbon/eslint-config-ibmdotcom
+
+
+
+
+
 # [1.22.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2022-02-24)
 
 **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.22.0-rc.2",
+  "version": "1.22.0-rc.3",
   "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.21.0-rc.2",
+    "@carbon/eslint-plugin-react-prop-type-comments": "1.21.0-rc.3",
     "babel-eslint": "^10.1.0",
     "eslint-config-airbnb": "^18.1.0",
     "eslint-config-airbnb-base": "^14.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.21.0-rc.3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/main/packages/eslint-plugin-ibmdotcom-import-rules/compare/@carbon/[email protected]...@carbon/[email protected]) (2022-02-25)
+
+**Note:** Version bump only for package @carbon/eslint-plugin-ibmdotcom-import-rules
+
+
+
+
+
 # [1.21.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/main/packages/eslint-plugin-ibmdotcom-import-rules/compare/@carbon/[email protected]...@carbon/[email protected]) (2022-02-24)
 
 **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.21.0-rc.2",
+  "version": "1.21.0-rc.3",
   "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.21.0-rc.3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/main/packages/eslint-plugin-react-prop-type-comments/compare/@carbon/[email protected]...@carbon/[email protected]) (2022-02-25)
+
+**Note:** Version bump only for package @carbon/eslint-plugin-react-prop-type-comments
+
+
+
+
+
 # [1.21.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/tree/main/packages/eslint-plugin-react-prop-type-comments/compare/@carbon/[email protected]...@carbon/[email protected]) (2022-02-24)
 
 **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.21.0-rc.2",
+  "version": "1.21.0-rc.3",
   "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,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.31.0-rc.3](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2022-02-25)
+
+
+
+# 1.31.0-rc.2 (2022-02-24)
+
+**Note:** Version bump only for package @carbon/ibmdotcom-react
+
+
+
+
+
 # [1.31.0-rc.2](https://github.com/carbon-design-system/carbon-for-ibm-dotcom/compare/@carbon/[email protected]...@carbon/[email protected]) (2022-02-24)
 
 

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.31.0-rc.2",
+  "version": "1.31.0-rc.3",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -61,9 +61,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@carbon/ibmdotcom-services": "1.31.0-rc.2",
-    "@carbon/ibmdotcom-styles": "1.31.0-rc.2",
-    "@carbon/ibmdotcom-utilities": "1.31.0-rc.2",
+    "@carbon/ibmdotcom-services": "1.31.0-rc.3",
+    "@carbon/ibmdotcom-styles": "1.31.0-rc.3",
+    "@carbon/ibmdotcom-utilities": "1.31.0-rc.3",
     "@carbon/telemetry": "^0.0.0-alpha.6",
     "autosuggest-highlight": "^3.1.1",
     "carbon-components": "10.52.0",
@@ -88,8 +88,8 @@
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.10.1",
     "@carbon/icons-react": "10.45.0",
-    "@carbon/pictograms-react": "11.22.0",
-    "@carbon/storybook-addon-theme": "1.22.0-rc.2",
+    "@carbon/pictograms-react": "11.21.0",
+    "@carbon/storybook-addon-theme": "1.22.0-rc.3",
     "@percy-io/in-percy": "^0.1.11",
     "@percy/agent": "^0.28.0",
     "@percy/cli": "^1.0.0-beta.67",