Merge pull request #20769 from cypress-io/10.0-release-merge-3-24

cypress-io · Mar 24, 2022 · a5a9d2e · a5a9d2e · cypress-bot · Mar 24, 2022
2 parents efc00a1 + 7aafae1
commit a5a9d2e
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 24 deletions.
diff --git a/browser-versions.json b/browser-versions.json
@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "100.0.4896.30",
-  "chrome:stable": "99.0.4844.74"
+  "chrome:beta": "100.0.4896.46",
+  "chrome:stable": "99.0.4844.82"
 }
diff --git a/cli/package.json b/cli/package.json
@@ -51,7 +51,7 @@
     "listr2": "^3.8.3",
     "lodash": "^4.17.21",
     "log-symbols": "^4.0.0",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.6",
     "ospath": "^1.2.2",
     "pretty-bytes": "^5.6.0",
     "proxy-from-env": "1.0.0",

diff --git a/cli/types/cypress-eventemitter.d.ts b/cli/types/cypress-eventemitter.d.ts
@@ -30,4 +30,4 @@ interface NodeEventEmitter {
 
 // We use the Buffer class for dealing with binary data, especially around the
 // selectFile interface.
-type BufferType = import("buffer/").Buffer
+type BufferType = typeof import("buffer/").Buffer
diff --git a/cli/types/tests/kitchen-sink.ts b/cli/types/tests/kitchen-sink.ts
@@ -173,6 +173,12 @@ namespace BlobTests {
   })
 }
 
+namespace BufferTests {
+  const buffer = Cypress.Buffer.from('sometext')
+  Cypress.Buffer.isBuffer(buffer)
+  buffer.length
+}
+
 cy.window().then(window => {
   window // $ExpectType AUTWindow
 

diff --git a/package.json b/package.json
@@ -188,7 +188,7 @@
     "lint-staged": "11.1.2",
     "listr2": "3.8.3",
     "lodash": "^4.17.21",
-    "minimist": "1.2.5",
+    "minimist": "1.2.6",
     "mocha": "3.5.3",
     "mocha-banner": "1.1.2",
     "mocha-junit-reporter": "2.0.0",

diff --git a/packages/driver/package.json b/packages/driver/package.json
@@ -64,7 +64,7 @@
     "methods": "1.1.2",
     "mime-types": "2.1.27",
     "minimatch": "3.0.4",
-    "minimist": "1.2.5",
+    "minimist": "1.2.6",
     "mocha": "7.0.1",
     "morgan": "1.9.1",
     "multer": "1.4.2",

diff --git a/packages/electron/package.json b/packages/electron/package.json
@@ -20,7 +20,7 @@
     "debug": "^4.3.2",
     "fs-extra": "9.1.0",
     "lodash": "^4.17.21",
-    "minimist": "1.2.5"
+    "minimist": "1.2.6"
   },
   "devDependencies": {
     "electron": "15.3.4",

diff --git a/packages/https-proxy/package.json b/packages/https-proxy/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "main": "index.js",
   "scripts": {
-    "clean-deps": "rimraf node_modules",
+    "clean-deps": "rm -rf node_modules",
     "https": "node https.js",
     "regenerate:certs": "cd ./test/helpers/certs && ./regenerate-certs.sh",
     "start": "node index.js",
@@ -18,8 +18,7 @@
     "debug": "^4.3.2",
     "fs-extra": "9.1.0",
     "lodash": "^4.17.21",
-    "node-forge": "1.0.0",
-    "rimraf": "3.0.2",
+    "node-forge": "1.3.0",
     "semaphore": "1.1.0"
   },
   "devDependencies": {

diff --git a/packages/network/package.json b/packages/network/package.json
@@ -19,7 +19,7 @@
     "debug": "^4.3.2",
     "fs-extra": "9.1.0",
     "lodash": "^4.17.21",
-    "node-forge": "1.0.0",
+    "node-forge": "1.3.0",
     "proxy-from-env": "1.0.0"
   },
   "devDependencies": {

diff --git a/packages/runner-ct/package.json b/packages/runner-ct/package.json
@@ -44,7 +44,7 @@
     "mobx": "5.15.4",
     "mobx-react": "6.1.8",
     "mocha": "^8.1.3",
-    "nanoid": "3.1.20",
+    "nanoid": "3.1.31",
     "react": "16.8.6",
     "react-devtools-inline": "^4.10.1",
     "react-dom": "16.8.6",

diff --git a/packages/runner-shared/package.json b/packages/runner-shared/package.json
@@ -25,7 +25,7 @@
     "mobx": "5.15.4",
     "mobx-react": "6.1.8",
     "mocha": "7.0.1",
-    "nanoid": "3.1.20",
+    "nanoid": "3.1.31",
     "react": "16.8.6",
     "react-dom": "16.8.6",
     "react-popper": "2.2.5",

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -89,7 +89,7 @@
     "mime": "2.4.4",
     "mime-db": "1.45.0",
     "minimatch": "3.0.4",
-    "minimist": "1.2.5",
+    "minimist": "1.2.6",
     "mocha-7.0.1": "npm:[email protected]",
     "mocha-junit-reporter": "2.0.0",
     "mocha-teamcity-reporter": "3.0.0",

diff --git a/yarn.lock b/yarn.lock
@@ -30382,11 +30382,16 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz#3db5c0765545ab8637be71f333a104a965a9ca3f"
   integrity sha512-+bMdgqjMN/Z77a6NlY/I3U5LlRDbnmaAk6lDveAPKwSpcPM4tKAuYsvYF8xjhOPXhOYGe/73vVLVez5PW+jqhw==
 
-[email protected], minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
+[email protected]:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
+[email protected], minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+
 minimist@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455"
@@ -31207,6 +31212,11 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
   integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==
 
+[email protected]:
+  version "3.1.31"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.31.tgz#f5b58a1ce1b7604da5f0605757840598d8974dc6"
+  integrity sha512-ZivnJm0o9bb13p2Ot5CpgC2rQdzB9Uxm/mFZweqm5eMViqOJe3PV6LU2E30SiLgheesmcPrjquqraoolONSA0A==
+
 [email protected]:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
@@ -31579,21 +31589,16 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-forge@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.0.0.tgz#a025e3beeeb90d9cee37dae34d25b968ec3e6f15"
-  integrity sha512-ShkiiAlzSsgH1IwGlA0jybk9vQTIOLyJ9nBd0JTuP+nzADJFLY0NoDijM2zvD/JaezooGu3G2p2FNxOAK6459g==
+node-forge@1.3.0, node-forge@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2"
+  integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==
 
 node-forge@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
-node-forge@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c"
-  integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==
-
 node-gyp-build@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"