chore(release): Merge prod into main (#918)

* refactor(gh actions): add a step to reset working directory before lerna version * chore(release): publish - @czi-sds/[email protected] - @czi-sds/[email protected] --------- Co-authored-by: Masoud Amjadi <[email protected]> Co-authored-by: masoudmanson <[email protected]>
chanzuckerberg · Dec 18, 2024 · f091e79 · f091e79
1 parent d818901
commit f091e79
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -56,14 +56,18 @@ jobs:
           git config --global user.name "${{ github.actor }}"
           git config --global user.email "${{ github.actor }}@users.noreply.github.com"
 
-      # Step 8: Lerna Version
+      # Step 8: Reset working directory
+      - name: Reset working directory
+        run: git checkout -- .
+
+      # Step 9: Lerna Version
       - name: Lerna Version
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: yarn version:ci
 
-      # Step 9: Commit changes
+      # Step 10: Commit changes
       - name: Commit changes
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -72,13 +76,13 @@ jobs:
           commit_message: "chore(release): Publish"
           branch: ${{ github.head_ref }}
 
-      # Step 10: Publish NPM packages
+      # Step 11: Publish NPM packages
       - name: Lerna Publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
         run: yarn publish:ci
 
-      # Step 11: Post breaking changes to a Slack channel
+      # Step 12: Post breaking changes to a Slack channel
       - name: Post breaking changes to a Slack channel
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SDS_BREAKING_CHANGES_SLACK_WEBHOOK }}
@@ -89,7 +93,7 @@ jobs:
           config: .github/config/slack.yml
         if: contains(toJson(github.event.commits.*.message), 'BREAKING CHANGE')
 
-      # Step 12: Merge prod branch into main
+      # Step 13: Merge prod branch into main
       - name: Create PR to merge prod into main
         id: createpr
         env:

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [22.1.0](https://github.com/chanzuckerberg/sci-components/compare/@czi-sds/[email protected]...@czi-sds/[email protected]) (2024-12-18)
+
+### Bug Fixes
+
+- **panel:** fix circular dependency error ([d818901](https://github.com/chanzuckerberg/sci-components/commit/d8189012762c0e2c32325e29813a25f1faf9e55f))
+
+### Features
+
+- **InputCheckbox:** refactor `InputCheckbox` and `InputRadio` ([#904](https://github.com/chanzuckerberg/sci-components/issues/904)) ([74fec41](https://github.com/chanzuckerberg/sci-components/commit/74fec4189426782661f28e56bd77a3f912a5cdd1))
+
 # [22.0.0](https://github.com/chanzuckerberg/sci-components/compare/@czi-sds/[email protected]...@czi-sds/[email protected]) (2024-12-04)
 
 ### Bug Fixes

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@czi-sds/components",
-  "version": "22.0.0",
+  "version": "22.1.0",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "types": "dist/index.cjs.d.ts",

diff --git a/packages/data-viz/CHANGELOG.md b/packages/data-viz/CHANGELOG.md
@@ -3,6 +3,16 @@
 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/chanzuckerberg/sci-components/compare/@czi-sds/[email protected]...@czi-sds/[email protected]) (2024-12-18)
+
+### Bug Fixes
+
+- **panel:** fix circular dependency error ([d818901](https://github.com/chanzuckerberg/sci-components/commit/d8189012762c0e2c32325e29813a25f1faf9e55f))
+
+### Features
+
+- **InputCheckbox:** refactor `InputCheckbox` and `InputRadio` ([#904](https://github.com/chanzuckerberg/sci-components/issues/904)) ([74fec41](https://github.com/chanzuckerberg/sci-components/commit/74fec4189426782661f28e56bd77a3f912a5cdd1))
+
 ## [0.10.5](https://github.com/chanzuckerberg/sci-components/compare/@czi-sds/[email protected]...@czi-sds/[email protected]) (2024-12-04)
 
 **Note:** Version bump only for package @czi-sds/data-viz

diff --git a/packages/data-viz/package.json b/packages/data-viz/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@czi-sds/data-viz",
-  "version": "0.10.5",
+  "version": "0.11.0",
   "main": "dist/index.cjs.js",
   "types": "dist/index.cjs.d.ts",
   "module": "dist/index.esm.js",
@@ -52,26 +52,26 @@
     "namespace-check": "tsc --p tsconfig-namespace-check.json"
   },
   "peerDependencies": {
-    "echarts": "^5.4.3",
-    "lodash": "^4.17.21",
     "@emotion/css": "^11.11.2",
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
     "@mui/base": "^5.0.0-beta.30",
     "@mui/icons-material": "^5.15.3",
     "@mui/lab": "^5.0.0-alpha.159",
     "@mui/material": "^5.15.3",
+    "echarts": "^5.4.3",
+    "lodash": "^4.17.21",
     "react": ">=17.0.1",
     "react-dom": ">=17.0.1"
   },
   "devDependencies": {
     "@reduxjs/toolkit": "^2.1.0",
+    "@types/react": "^18.2.46",
+    "@types/react-dom": "^18.2.18",
     "d3-scale-chromatic": "^3.0.0",
     "jest-environment-jsdom": "^29.6.2",
     "react-redux": "^9.1.0",
     "simplex-noise": "^4.0.1",
-    "@types/react": "^18.2.46",
-    "@types/react-dom": "^18.2.18",
     "style-dictionary": "^4.1.0"
   },
   "dependencies": {