From ce8cdc47a902c1b60c8ddd11de49a7d89566f3e1 Mon Sep 17 00:00:00 2001
From: Tim Griesser <tgriesser10@gmail.com>
Date: Fri, 19 Nov 2021 15:29:07 -0500
Subject: [PATCH] fix review

---
 circle.yml                           | 12 +-----------
 cli/package.json                     |  1 +
 packages/launcher/lib/darwin/util.ts |  2 +-
 yarn.lock                            |  2 +-
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/circle.yml b/circle.yml
index f22ed75ac1c7..2b87e6738089 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,7 +9,6 @@ macBuildFilters: &macBuildFilters
       only:
         - develop
         - tgriesser/build/root-yarn-install
-        - 9.0-release
 
 defaults: &defaults
   parallelism: 1
@@ -43,7 +42,6 @@ onlyMainBranches: &onlyMainBranches
     branches:
       only:
         - develop
-        - 9.0-release
   requires:
     - create-build-artifacts
 
@@ -1514,7 +1512,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "9.0-release" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "tgriesser/build/root-yarn-install" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -2156,7 +2154,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - build
     - test-kitchensink:
@@ -2168,7 +2165,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - build
     - create-build-artifacts:
@@ -2218,7 +2214,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - create-build-artifacts
     - test-npm-module-and-verify-binary:
@@ -2226,7 +2221,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - create-build-artifacts
     - test-binary-against-staging:
@@ -2235,7 +2229,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - create-build-artifacts
 
@@ -2260,7 +2253,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - create-build-artifacts
 
@@ -2332,7 +2324,6 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - darwin-create-build-artifacts
 
@@ -2344,7 +2335,6 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - darwin-create-build-artifacts
 
diff --git a/cli/package.json b/cli/package.json
index 5d6813b22784..fce13515ce47 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -71,6 +71,7 @@
     "@types/chai": "4.2.15",
     "@types/chai-jquery": "1.1.40",
     "@types/jquery": "3.3.31",
+    "@types/lodash": "4.14.168",
     "@types/minimatch": "3.0.3",
     "@types/mocha": "8.0.3",
     "@types/sinon": "7.5.1",
diff --git a/packages/launcher/lib/darwin/util.ts b/packages/launcher/lib/darwin/util.ts
index d077490ef23a..9447bcf7bf27 100644
--- a/packages/launcher/lib/darwin/util.ts
+++ b/packages/launcher/lib/darwin/util.ts
@@ -115,7 +115,7 @@ export async function darwinDetectionWorkaround (): Promise<FoundBrowser[]> {
   let args = ['./detection-workaround.js']
 
   if (process.env.CYPRESS_INTERNAL_ENV === 'development') {
-    args = ['-r', '@packages/ts/register.js'].concat(['./detection-workaround.ts'])
+    args = ['-r', '@packages/ts/register.js', './detection-workaround.ts']
   }
 
   const { stdout } = await utils.execa(nodePath, args, { cwd: __dirname })
diff --git a/yarn.lock b/yarn.lock
index 96fe4b5e03b6..2893a9baa982 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8019,7 +8019,7 @@
   resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.0.tgz#c0ca4c253664492dbf47a646f31cfd483a6bbc95"
   integrity sha512-x9OaQQTb1N2hPZ/LWJsqushexDvz7NgzuZxiRmZio44WPuolTZNHDBCrOxCzRVOMwamJRO2dWax5NbygOf1OTQ==
 
-"@types/lodash@^4.14.168":
+"@types/lodash@4.14.168", "@types/lodash@^4.14.168":
   version "4.14.168"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008"
   integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==