Merge branch 'main' of github.com:Esri/calcite-components into epic/7…

…180-component-tokens

# Conflicts:
#	packages/calcite-components/src/components/block/block.scss

.github/workflows/chromatic-main.yml → .github/workflows/chromatic.yml

@@ -1,9 +1,9 @@
-name: "Chromatic - Main"
+name: Chromatic
 on:
   push:
-    branches: [main]
+    branches: [main, hotfix, rc]
   pull_request:
-    branches: [main]
+    branches: [main, hotfix, rc]
     types: [labeled, synchronize]
 jobs:
   run:
@@ -25,7 +25,7 @@ jobs:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
           zip: true
           exitOnceUploaded: true
-          autoAcceptChanges: main
+          autoAcceptChanges: ${{ github.base_ref || github.ref_name }}
           workingDir: packages/calcite-components
         env:
           STORYBOOK_SCREENSHOT_TEST_BUILD: true

.github/workflows/deploy-latest.yml

@@ -2,7 +2,7 @@ name: Deploy Latest
 on:
   workflow_dispatch:
   push:
-    branches: [main]
+    branches: [main, hotfix]
 permissions:
   contents: write
   pull-requests: write
@@ -15,7 +15,7 @@ jobs:
         with:
           command: manifest
           token: ${{ secrets.ADMIN_TOKEN }}
-          default-branch: main
+          default-branch: ${{ github.ref_name }}
           extra-files: |
             packages/calcite-components/readme.md
       - name: Checkout Repository
@@ -24,7 +24,6 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.ADMIN_TOKEN }}
-          ref: main
       - name: Setup Node
         if: ${{ steps.release.outputs.releases_created }}
         uses: actions/setup-node@v4
@@ -41,9 +40,22 @@ jobs:
           # For more info, see: https://github.com/Esri/calcite-design-system/pull/9011
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git config --global user.name "github-actions[bot]"
-          # the "|| true" prevents failure if there are no changes
-          git add packages/calcite-components/src/components.d.ts || true
-          git commit -m "build: update types" || true
+
+          # The "|| true" prevents failure if there are no changes
+          git add packages/calcite-components/src/components.d.ts package-lock.json || true
+
+          # The release-please PR only updates when there are new deployable
+          # commits, e.g., fixes, features, or breaking changes. This is fine
+          # but it means autogenerated files can become outdated.
+          #
+          # Lerna will only publish when the working tree is clean, so changes
+          # to autogenerated files cause the release to fail.
+          #
+          # The workaround is to commit the files before releasing so everything
+          # will be up to date in the dists. The commit will be discarded once
+          # the container is destroyed, and then the autogenerated files will be
+          # updated in a subsequent PR.
+          git commit -m "build: update types and package-lock" || true
 
           npm run publish:latest
         env:

.github/workflows/pr-bot.yml

@@ -1,7 +1,7 @@
 name: PR Bot
 on:
   pull_request:
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
 permissions:
   pull-requests: write
   issues: write

.github/workflows/pr-e2e.yml

@@ -2,7 +2,7 @@ name: E2E
 on:
   workflow_dispatch:
   pull_request:
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
 jobs:
   e2e:
     runs-on: ubuntu-20.04

.github/workflows/pr-tests_eslint-plugin-calcite-components.yml

@@ -3,10 +3,10 @@ name: Run eslint-plugin-calcite-components tests
 on:
   pull_request:
     paths: ["packages/eslint-plugin-calcite-components/**"]
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
   push:
     paths: ["packages/eslint-plugin-calcite-components/**"]
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
 
 jobs:
   build:

.github/workflows/remove-next-changelog-entries.yml → .github/workflows/remove-prerelease-changelog-entries.yml

@@ -2,6 +2,7 @@ on:
   push:
     branches:
       - release-please--branches--main
+      - release-please--branches--hotfix
 permissions:
   contents: write
   pull-requests: write
@@ -23,7 +24,7 @@ jobs:
         run: |
           git pull
           npm install
-          npm run util:remove-next-changelog-entries
+          npm run util:remove-prerelease-changelog-entries
       - name: Push Changes
         run: |
           git config --global user.email "github-actions[bot]@users.noreply.github.com"

.release-please-manifest.json

@@ -1,7 +1,7 @@
 {
-  "packages/calcite-components": "2.8.0",
-  "packages/calcite-components-react": "2.8.0",
+  "packages/calcite-components": "2.8.1",
+  "packages/calcite-components-react": "2.8.1",
   "packages/calcite-design-tokens": "2.2.0",
   "packages/eslint-plugin-calcite-components": "1.2.0",
-  "packages/calcite-components-angular/projects/component-library": "2.8.0"
+  "packages/calcite-components-angular/projects/component-library": "2.8.1"
 }

documentation/monorepo.md

@@ -162,7 +162,7 @@ A `deploy-latest.yml` GitHub Action runs `release-please`, which creates the rel
 
 After installing the PR, the Action creates [git tags](#git-tags) and [GitHub releases](#github-releases) for each bumped package, and then deploys to NPM.
 
-A `remove-next-changelog-entries.yml` GitHub Action runs the `removeNextChangelogEntries.ts` script every time `release-please` pushes changes to its branch. This ensures all `next` changelog sections created by Lerna are removed before a dev installs the PR.
+A `remove-prerelease-changelog-entries.yml` GitHub Action runs the `removePrereleaseChangelogEntries.ts` script every time `release-please` pushes changes to its branch. This ensures all `next`, `hotfix`, and `rc` changelog sections created by Lerna are removed before a dev installs the PR.
 
 ### Steps to release
 

lerna.json

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

package.json

@@ -14,21 +14,20 @@
     "lint:md": "prettier --write \"**/*.md\" >/dev/null && markdownlint \"{,documentation}/*.md\" --fix --dot --ignore-path .gitignore",
     "lint:yml": "prettier --write \".github/**/*.yml\" >/dev/null",
     "lint:json": "prettier --write \"*.json\" >/dev/null",
-    "publish:next": "lerna publish from-package --dist-tag next --yes",
-    "publish:rc": "lerna publish from-package --dist-tag rc --yes",
-    "publish:latest": "lerna publish from-package --yes",
-    "version:next": "npm run util:is-in-sync-with-origin-main && npm run util:is-working-tree-clean && lerna version --conventional-prerelease --preid next --no-git-tag-version --no-push --yes && npm run util:sync-linked-package-versions -- next",
-    "version:rc": "npm run util:is-in-sync-with-origin-rc && npm run util:is-working-tree-clean && lerna version --conventional-prerelease --preid rc --no-git-tag-version --no-push --yes && npm run util:sync-linked-package-versions -- rc",
-    "version:latest": "npm run util:is-in-sync-with-origin-main && npm run util:is-working-tree-clean && lerna version --conventional-commits --create-release github --no-git-tag-version --no-push --yes && npm run util:sync-linked-package-versions -- latest",
+    "version:latest": "./support/release.sh version",
+    "publish:latest": "./support/release.sh publish",
+    "version:next": "./support/release.sh version next",
+    "publish:next": "./support/release.sh publish next",
+    "version:rc": "./support/release.sh version rc",
+    "publish:rc": "./support/release.sh publish rc",
+    "version:hotfix": "./support/release.sh version hotfix",
+    "publish:hotfix": "./support/release.sh publish hotfix",
     "prepare": "husky install",
     "start": "turbo run start --log-order=stream",
     "test": "turbo run test --log-order=stream",
-    "util:is-in-sync-with-origin-main": "[ \"$(git rev-parse --abbrev-ref HEAD)\" = \"main\" ] && [ \"$(git rev-parse main)\" = \"$(git rev-parse origin/main)\" ]",
-    "util:is-in-sync-with-origin-rc": "[ \"$(git rev-parse --abbrev-ref HEAD)\" = \"rc\" ] && [ \"$(git rev-parse rc)\" = \"$(git rev-parse origin/rc)\" ]",
     "util:is-next-deployable": "tsx support/isNextDeployable.ts",
-    "util:is-working-tree-clean": "[ -z \"$(git status --porcelain=v1)\" ]",
     "util:push-tags": "git push origin main --follow-tags",
-    "util:remove-next-changelog-entries": "tsx support/removeNextChangelogEntries.ts",
+    "util:remove-prerelease-changelog-entries": "tsx support/removePrereleaseChangelogEntries.ts",
     "util:sync-linked-package-versions": "tsx support/syncLinkedPackageVersions.ts"
   },
   "devDependencies": {
@@ -116,7 +115,6 @@
     "ts-jest": "29.1.2",
     "tsx": "4.7.2",
     "turbo": "1.13.2",
-    "type-fest": "4.16.0",
     "typescript": "5.4.4",
     "updtr": "4.0.0",
     "workbox-build": "7.0.0"

packages/calcite-components-angular/projects/component-library/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.9.0-next.10](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-05-14)
+
+**Note:** Version bump only for package @esri/calcite-components-angular
+
+## [2.8.1](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-05-14)
+
+### Miscellaneous Chores
+
+- **@esri/calcite-components-angular:** Synchronize components versions
+
+### Dependencies
+
+- The following workspace dependencies were updated
+  - dependencies
+    - @esri/calcite-components bumped from ^2.8.1-hotfix.0 to ^2.8.1
+
+## [2.9.0-next.9](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-05-14)
+
+**Note:** Version bump only for package @esri/calcite-components-angular
+
+## [2.9.0-next.8](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-05-14)
+
+**Note:** Version bump only for package @esri/calcite-components-angular
+
 ## [2.9.0-next.7](https://github.com/Esri/calcite-design-system/compare/@esri/[email protected]...@esri/[email protected]) (2024-05-14)
 
 **Note:** Version bump only for package @esri/calcite-components-angular

packages/calcite-components-angular/projects/component-library/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esri/calcite-components-angular",
-  "version": "2.9.0-next.7",
+  "version": "2.9.0-next.10",
   "sideEffects": false,
   "homepage": "https://developers.arcgis.com/calcite-design-system/",
   "description": "A set of Angular components that wrap Esri's Calcite Components.",
@@ -20,7 +20,7 @@
     "@angular/core": ">=16.0.0"
   },
   "dependencies": {
-    "@esri/calcite-components": "^2.9.0-next.7",
+    "@esri/calcite-components": "^2.9.0-next.10",
     "tslib": "2.6.2"
   },
   "lerna": {