chore: resolve merge conflicts

.all-contributorsrc

@@ -1652,7 +1652,16 @@
       "contributions": [
         "code"
       ]
-    }
+    },
+    {
+      "login": "ziyadzulfikar",
+      "name": "ziyadzulfikar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/56788667?v=4",
+      "profile": "https://github.com/ziyadzulfikar",
+      "contributions": [
+        "code"
+      ]
+    },
   ],
   "commitConvention": "none"
 }

config/eslint-config-carbon/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-config-carbon",
   "description": "ESLint configuration for Carbon",
-  "version": "3.17.0",
+  "version": "3.18.0-rc.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

config/stylelint-config-carbon/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stylelint-config-carbon",
   "description": "Stylelint configuration for Carbon",
-  "version": "1.19.0",
+  "version": "1.20.0-rc.0",
   "license": "Apache-2.0",
   "type": "module",
   "main": "index.js",

examples/class-prefix/package.json

@@ -1,15 +1,15 @@
 {
   "name": "class-prefix",
   "private": true,
-  "version": "0.65.0",
+  "version": "0.66.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.68.0",
+    "@carbon/react": "^1.69.0-rc.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

examples/codesandbox-styles/package.json

@@ -1,7 +1,7 @@
 {
   "name": "codesandbox-styles",
   "private": true,
-  "version": "0.70.0",
+  "version": "0.71.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite"
@@ -11,6 +11,6 @@
     "vite": "^4.3.8"
   },
   "dependencies": {
-    "@carbon/styles": "^1.67.0"
+    "@carbon/styles": "^1.68.0-rc.0"
   }
 }

examples/custom-theme/package.json

@@ -1,15 +1,15 @@
 {
   "name": "custom-theme",
   "private": true,
-  "version": "0.66.0",
+  "version": "0.67.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.68.0",
+    "@carbon/react": "^1.69.0-rc.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

examples/id-prefix/package.json

@@ -1,15 +1,15 @@
 {
   "name": "id-prefix",
   "private": true,
-  "version": "0.65.0",
+  "version": "0.66.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.68.0",
+    "@carbon/react": "^1.69.0-rc.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

examples/light-dark-mode/package.json

@@ -1,15 +1,15 @@
 {
   "name": "examples-light-dark",
   "private": true,
-  "version": "0.66.0",
+  "version": "0.67.0-rc.0",
   "scripts": {
     "build": "next build",
     "dev": "next dev",
     "lint": "next lint",
     "start": "next start"
   },
   "dependencies": {
-    "@carbon/react": "^1.68.0",
+    "@carbon/react": "^1.69.0-rc.0",
     "next": "14.1.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"

examples/nextjs/package.json

@@ -1,15 +1,15 @@
 {
   "name": "examples-nextjs",
   "private": true,
-  "version": "0.68.0",
+  "version": "0.69.0-rc.0",
   "scripts": {
     "build": "next build",
     "dev": "next dev",
     "lint": "next lint",
     "start": "next start"
   },
   "dependencies": {
-    "@carbon/react": "^1.68.0",
+    "@carbon/react": "^1.69.0-rc.0",
     "next": "14.1.1",
     "react": "18.2.0",
     "react-dom": "18.2.0"

examples/v10-token-compat-in-v11/package.json

@@ -1,15 +1,15 @@
 {
   "name": "v10-token-compat-in-v11",
   "private": true,
-  "version": "0.66.0",
+  "version": "0.67.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.68.0",
+    "@carbon/react": "^1.69.0-rc.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

examples/vite/package.json

@@ -1,15 +1,15 @@
 {
   "name": "vite",
   "private": true,
-  "version": "0.66.0",
+  "version": "0.67.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.68.0",
+    "@carbon/react": "^1.69.0-rc.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

packages/carbon-components-react/package.json

@@ -2,7 +2,7 @@
   "name": "carbon-components-react",
   "private": true,
   "description": "The Carbon Design System is IBM’s open-source design system for products and experiences. This package reached end of support on September 30, 2024 and will not receive any more updates.",
-  "version": "8.68.0",
+  "version": "8.69.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -43,8 +43,8 @@
     "sass": "^1.33.0"
   },
   "dependencies": {
-    "@carbon/react": "^1.68.0",
-    "@carbon/styles": "^1.67.0",
+    "@carbon/react": "^1.69.0-rc.0",
+    "@carbon/styles": "^1.68.0-rc.0",
     "@ibm/telemetry-js": "^1.5.0",
     "chalk": "1.1.3"
   },

packages/carbon-components/package.json

@@ -2,7 +2,7 @@
   "name": "carbon-components",
   "private": true,
   "description": "The Carbon Design System is IBM’s open-source design system for products and experiences. This package reached end of support on September 30, 2024 and will not receive any more updates.",
-  "version": "11.67.0",
+  "version": "11.68.0-rc.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -44,7 +44,7 @@
     "sass": "^1.33.0"
   },
   "dependencies": {
-    "@carbon/styles": "^1.67.0",
+    "@carbon/styles": "^1.68.0-rc.0",
     "@ibm/telemetry-js": "^1.5.0",
     "chalk": "1.1.3"
   },

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/cli",
   "description": "Task automation for working with the Carbon Design System",
-  "version": "11.22.0",
+  "version": "11.23.0-rc.0",
   "license": "Apache-2.0",
   "bin": {
     "carbon-cli": "./bin/carbon-cli.js"

packages/colors/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/colors",
   "description": "Colors for digital and software products using the Carbon Design System",
-  "version": "11.27.0",
+  "version": "11.28.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -39,7 +39,7 @@
     "postinstall": "ibmtelemetry --config=telemetry.yml"
   },
   "devDependencies": {
-    "@carbon/cli": "^11.22.0",
+    "@carbon/cli": "^11.23.0-rc.0",
     "@carbon/cli-reporter": "^10.7.0",
     "@carbon/scss-generator": "^10.18.0",
     "@carbon/test-utils": "^10.33.0",

packages/elements/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/elements",
   "description": "A collection of design elements in code for the IBM Design Language",
-  "version": "11.55.0",
+  "version": "11.56.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -38,17 +38,17 @@
     "postinstall": "ibmtelemetry --config=telemetry.yml"
   },
   "dependencies": {
-    "@carbon/colors": "^11.27.0",
-    "@carbon/grid": "^11.28.0",
-    "@carbon/icons": "^11.51.0",
-    "@carbon/layout": "^11.27.0",
-    "@carbon/motion": "^11.23.0",
-    "@carbon/themes": "^11.42.0",
-    "@carbon/type": "^11.32.0",
+    "@carbon/colors": "^11.28.0-rc.0",
+    "@carbon/grid": "^11.29.0-rc.0",
+    "@carbon/icons": "^11.52.0-rc.0",
+    "@carbon/layout": "^11.28.0-rc.0",
+    "@carbon/motion": "^11.24.0-rc.0",
+    "@carbon/themes": "^11.43.0-rc.0",
+    "@carbon/type": "^11.33.0-rc.0",
     "@ibm/telemetry-js": "^1.5.0"
   },
   "devDependencies": {
-    "@carbon/cli": "^11.22.0",
+    "@carbon/cli": "^11.23.0-rc.0",
     "fs-extra": "^11.0.0",
     "klaw-sync": "^6.0.0",
     "replace-in-file": "^7.0.0",

packages/feature-flags/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/feature-flags",
   "description": "Build with feature flags in Carbon",
-  "version": "0.23.0",
+  "version": "0.24.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

packages/grid/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/grid",
   "description": "Grid for digital and software products using the Carbon Design System",
-  "version": "11.28.0",
+  "version": "11.29.0-rc.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -35,11 +35,11 @@
     "postinstall": "ibmtelemetry --config=telemetry.yml"
   },
   "dependencies": {
-    "@carbon/layout": "^11.27.0",
+    "@carbon/layout": "^11.28.0-rc.0",
     "@ibm/telemetry-js": "^1.5.0"
   },
   "devDependencies": {
-    "@carbon/cli": "^11.22.0",
+    "@carbon/cli": "^11.23.0-rc.0",
     "rimraf": "^6.0.0"
   },
   "eyeglass": {

packages/icon-build-helpers/package.json

@@ -2,7 +2,7 @@
   "name": "@carbon/icon-build-helpers",
   "private": true,
   "description": "Build helpers for the Carbon Design System icon library",
-  "version": "1.31.0",
+  "version": "1.32.0-rc.0",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "repository": {
@@ -30,7 +30,7 @@
     "@babel/template": "^7.24.7",
     "@babel/types": "^7.24.7",
     "@carbon/cli-reporter": "^10.7.0",
-    "@carbon/icon-helpers": "^10.53.0",
+    "@carbon/icon-helpers": "^10.54.0-rc.0",
     "@hapi/joi": "^17.1.1",
     "@rollup/plugin-babel": "^6.0.0",
     "@rollup/plugin-replace": "^5.0.0",

packages/icon-helpers/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/icon-helpers",
   "description": "Helpers used alongside icons for digital and software products using the Carbon Design System",
-  "version": "10.53.0",
+  "version": "10.54.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -36,7 +36,7 @@
     "postinstall": "ibmtelemetry --config=telemetry.yml"
   },
   "devDependencies": {
-    "@carbon/cli": "^11.22.0",
+    "@carbon/cli": "^11.23.0-rc.0",
     "rimraf": "^6.0.0",
     "typescript-config-carbon": "^0.3.0"
   },

packages/icons-react/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/icons-react",
   "description": "React components for icons in digital and software products using the Carbon Design System",
-  "version": "11.51.0",
+  "version": "11.52.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -38,13 +38,13 @@
     "react": ">=16"
   },
   "dependencies": {
-    "@carbon/icon-helpers": "^10.53.0",
+    "@carbon/icon-helpers": "^10.54.0-rc.0",
     "@ibm/telemetry-js": "^1.5.0",
     "prop-types": "^15.7.2"
   },
   "devDependencies": {
-    "@carbon/icon-build-helpers": "^1.31.0",
-    "@carbon/icons": "^11.51.0",
+    "@carbon/icon-build-helpers": "^1.32.0-rc.0",
+    "@carbon/icons": "^11.52.0-rc.0",
     "rimraf": "^6.0.0"
   },
   "sideEffects": false

packages/icons-vue/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/icons-vue",
   "description": "Vue components for icons in digital and software products using the Carbon Design System",
-  "version": "10.100.0",
+  "version": "10.101.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -30,12 +30,12 @@
     "postinstall": "ibmtelemetry --config=telemetry.yml"
   },
   "dependencies": {
-    "@carbon/icon-helpers": "^10.53.0",
+    "@carbon/icon-helpers": "^10.54.0-rc.0",
     "@ibm/telemetry-js": "^1.5.0"
   },
   "devDependencies": {
     "@carbon/cli-reporter": "^10.7.0",
-    "@carbon/icons": "^11.51.0",
+    "@carbon/icons": "^11.52.0-rc.0",
     "fs-extra": "^11.0.0",
     "prettier": "^2.8.8",
     "rimraf": "^6.0.0",