Merge branch 'develop' into release/14.0.0

cypress-io · Nov 4, 2024 · 9342e54 · 9342e54 · cypress-bot · Nov 4, 2024
2 parents 196f5f1 + 4ff3b2b
commit 9342e54
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -34,6 +34,10 @@ _Released 12/3/2024 (PENDING)_
 
 _Released 11/5/2024 (PENDING)_
 
+**Misc:**
+
+- Fixed a typo in CLI `global` option help text. Addresses [#30531](https://github.com/cypress-io/cypress/issues/30531).
+
 **Dependency Updates:**
 
 - Updated `@cypress/request` from `3.0.4` to `3.0.6`. Addressed in [#30488](https://github.com/cypress-io/cypress/pull/30488).

diff --git a/cli/__snapshots__/cli_spec.js b/cli/__snapshots__/cli_spec.js
@@ -33,7 +33,7 @@ exports['shows help for open --foo 1'] = `
                                      multiple values with a comma. overrides any
                                      value in cypress.config.{js,ts,mjs,cjs} or
                                      cypress.env.json
-    --global                         force Cypress into global mode as if its
+    --global                         force Cypress into global mode as if it were
                                      globally installed
     -p, --port <port>                runs Cypress on a specific port. overrides
                                      any value in cypress.config.{js,ts,mjs,cjs}.

diff --git a/cli/lib/cli.js b/cli/lib/cli.js
@@ -110,7 +110,7 @@ const descriptions = {
   env: 'sets environment variables. separate multiple values with a comma. overrides any value in cypress.config.{js,ts,mjs,cjs} or cypress.env.json',
   exit: 'keep the browser open after tests finish',
   forceInstall: 'force install the Cypress binary',
-  global: 'force Cypress into global mode as if its globally installed',
+  global: 'force Cypress into global mode as if it were globally installed',
   group: 'a named group for recorded runs in Cypress Cloud',
   headed: 'displays the browser instead of running headlessly',
   headless: 'hide the browser instead of running headed (default for cypress run)',

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -188,7 +188,6 @@
     "mockery": "2.1.0",
     "nock": "13.2.9",
     "proxyquire": "2.1.3",
-    "react": "16.8.6",
     "repl.history": "0.1.4",
     "sinon": "17.0.1",
     "snap-shot-it": "7.9.3",