From b865fd4c2be0fdcf7c0dec297a82ff50b2ae1091 Mon Sep 17 00:00:00 2001
From: Zach Bloomquist <git@chary.us>
Date: Fri, 17 Jun 2022 11:09:01 -0400
Subject: [PATCH] fix(cli): don't include workspaces.nohoist in public NPM
 package (#22365)

---
 circle.yml           | 5 ++---
 cli/scripts/build.js | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 0241aa54efaf..ede5ccf5b0fc 100644
--- a/circle.yml
+++ b/circle.yml
@@ -27,8 +27,7 @@ mainBuildFilters: &mainBuildFilters
     branches:
       only:
         - develop
-        - 10.0-release
-        - linux-arm64
+        - issue-22147-nohoist
 
 # usually we don't build Mac app - it takes a long time
 # but sometimes we want to really confirm we are doing the right thing
@@ -129,7 +128,7 @@ commands:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "linux-arm64" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "issue-22147-nohoist" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
diff --git a/cli/scripts/build.js b/cli/scripts/build.js
index 7ce6b3d9a8d5..b5fe4fb8c24d 100644
--- a/cli/scripts/build.js
+++ b/cli/scripts/build.js
@@ -31,6 +31,7 @@ function preparePackageForNpmRelease (json) {
   delete json['private']
   // no need to include "nyc" code coverage settings
   delete json.nyc
+  delete json.workspaces
 
   _.extend(json, {
     version,