fix(input): fix dev merge conflicts

.github/workflows/chromatic.yml

@@ -17,8 +17,10 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: package.json
-      - run: npm install
-      - run: npm --workspace="packages/calcite-design-tokens" run build
+      - run: |
+          npm install
+          npm --workspace="packages/calcite-design-tokens" run build
+          npm --workspace="packages/calcite-ui-icons" run build
       - name: Publish to Chromatic
         uses: chromaui/action@v11
         with:

.release-please-manifest.json

@@ -1,8 +1,8 @@
 {
-  "packages/calcite-components": "2.10.1",
-  "packages/calcite-components-react": "2.10.1",
+  "packages/calcite-components": "2.11.1",
+  "packages/calcite-components-react": "2.11.1",
   "packages/calcite-design-tokens": "2.2.0",
-  "packages/calcite-ui-icons": "3.29.0",
+  "packages/calcite-ui-icons": "3.30.0",
   "packages/eslint-plugin-calcite-components": "1.2.0",
-  "packages/calcite-components-angular/projects/component-library": "2.10.1"
+  "packages/calcite-components-angular/projects/component-library": "2.11.1"
 }

CONTRIBUTING.md

@@ -132,7 +132,7 @@ npm install
 Next, start the local Stencil development server on localhost:
 
 ```sh
-npm start
+npm run start:components
 ```
 
 The demos will open in the browser after building. Edit the pages in [`packages/calcite-components/src/demos`](.packages/calcite-components/src/demos) to modify the component demos, such as changing attributes or adding content to slots. When adding a new demo page, make sure to add a link in [`packages/calcite-components/src/index.html`](./packages/calcite-components/src/index.html) so others can find it. You can also edit the component code in [`packages/calcite-components/src/components`](packages/calcite-components/src/components`./src/components), and the changes will be reflected in the demos.

lerna.json

@@ -5,7 +5,8 @@
   "command": {
     "version": {
       "conventionalCommits": true,
-      "allowBranch": ["main", "rc", "dev"]
+      "allowBranch": ["main", "rc", "dev"],
+      "exact": true
     }
   }
 }