Merge branch 'develop' into cacie/fix/ws-disconnected-trampoline

cypress-io · Jul 15, 2024 · 4c5d899 · 4c5d899
2 parents bf06572 + 034c3f2
commit 4c5d899
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 14 deletions.
diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json
@@ -2315,7 +2315,6 @@
     "./node_modules/json5/lib/stringify.js",
     "./node_modules/json5/lib/unicode.js",
     "./node_modules/json5/lib/util.js",
-    "./node_modules/jsonlint/lib/jsonlint.js",
     "./node_modules/jsprim/lib/jsprim.js",
     "./node_modules/launch-editor/editor-info/linux.js",
     "./node_modules/launch-editor/editor-info/macos.js",
@@ -4239,6 +4238,7 @@
     "./packages/server/node_modules/http-proxy/lib/http-proxy/passes/web-outgoing.js",
     "./packages/server/node_modules/http-proxy/lib/http-proxy/passes/ws-incoming.js",
     "./packages/server/node_modules/is-fullwidth-code-point/index.js",
+    "./packages/server/node_modules/json-parse-even-better-errors/lib/index.js",
     "./packages/server/node_modules/mime-db/db.json",
     "./packages/server/node_modules/mime-db/index.js",
     "./packages/server/node_modules/mime/Mime.js",
@@ -4346,5 +4346,5 @@
     "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "8761f5ef513e3eb56db5c26ff6eb649cbf668cda25c910efbbc42ac27af745d0"
+  "deferredHash": "c11df6600a1f3e67f3153adc488af6469cddc95152f39b7d4f076b45bd786172"
 }
diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json
@@ -2316,7 +2316,6 @@
     "./node_modules/json5/lib/stringify.js",
     "./node_modules/json5/lib/unicode.js",
     "./node_modules/json5/lib/util.js",
-    "./node_modules/jsonlint/lib/jsonlint.js",
     "./node_modules/jsprim/lib/jsprim.js",
     "./node_modules/launch-editor/editor-info/linux.js",
     "./node_modules/launch-editor/editor-info/macos.js",
@@ -4242,6 +4241,7 @@
     "./packages/server/node_modules/http-proxy/lib/http-proxy/passes/web-outgoing.js",
     "./packages/server/node_modules/http-proxy/lib/http-proxy/passes/ws-incoming.js",
     "./packages/server/node_modules/is-fullwidth-code-point/index.js",
+    "./packages/server/node_modules/json-parse-even-better-errors/lib/index.js",
     "./packages/server/node_modules/mime-db/db.json",
     "./packages/server/node_modules/mime-db/index.js",
     "./packages/server/node_modules/mime/Mime.js",
@@ -4349,5 +4349,5 @@
     "./tooling/v8-snapshot/cache/linux/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "8761f5ef513e3eb56db5c26ff6eb649cbf668cda25c910efbbc42ac27af745d0"
+  "deferredHash": "c11df6600a1f3e67f3153adc488af6469cddc95152f39b7d4f076b45bd786172"
 }
diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json
@@ -2318,7 +2318,6 @@
     "./node_modules/json5/lib/stringify.js",
     "./node_modules/json5/lib/unicode.js",
     "./node_modules/json5/lib/util.js",
-    "./node_modules/jsonlint/lib/jsonlint.js",
     "./node_modules/jsprim/lib/jsprim.js",
     "./node_modules/launch-editor/editor-info/linux.js",
     "./node_modules/launch-editor/editor-info/macos.js",
@@ -4242,6 +4241,7 @@
     "./packages/server/node_modules/http-proxy/lib/http-proxy/passes/web-outgoing.js",
     "./packages/server/node_modules/http-proxy/lib/http-proxy/passes/ws-incoming.js",
     "./packages/server/node_modules/is-fullwidth-code-point/index.js",
+    "./packages/server/node_modules/json-parse-even-better-errors/lib/index.js",
     "./packages/server/node_modules/mime-db/db.json",
     "./packages/server/node_modules/mime-db/index.js",
     "./packages/server/node_modules/mime/Mime.js",
@@ -4349,5 +4349,5 @@
     "./tooling/v8-snapshot/cache/win32/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "9f78119b70e364ed8204e7961f29bc20bb1fc305f0f463da7373c7f0311753c0"
+  "deferredHash": "63fbf7b9a6e7dd08addc2438a788cf6e806a748f6493549fc61407790bcb05e8"
 }
diff --git a/yarn.lock b/yarn.lock
@@ -22098,7 +22098,7 @@ mobx@5.15.4:
   resolved "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz#9da1a84e97ba624622f4e55a0bf3300fb931c2ab"
   integrity sha512-xRFJxSU2Im3nrGCdjSuOTFmxVDGeqOHL+TyADCGbT0k4HHqGmx5u2yaHNryvoORpI4DfbzjJ5jPmuv+d7sioFw==
 
-"mocha-7.0.1@npm:mocha@7.0.1", mocha@7.0.1:
+"mocha-7.0.1@npm:mocha@7.0.1":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce"
   integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==
@@ -22215,6 +22215,36 @@ mocha@6.2.2:
     yargs-parser "13.1.1"
     yargs-unparser "1.6.0"
 
+mocha@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce"
+  integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==
+  dependencies:
+    ansi-colors "3.2.3"
+    browser-stdout "1.3.1"
+    chokidar "3.3.0"
+    debug "3.2.6"
+    diff "3.5.0"
+    escape-string-regexp "1.0.5"
+    find-up "3.0.0"
+    glob "7.1.3"
+    growl "1.10.5"
+    he "1.2.0"
+    js-yaml "3.13.1"
+    log-symbols "2.2.0"
+    minimatch "3.0.4"
+    mkdirp "0.5.1"
+    ms "2.1.1"
+    node-environment-flags "1.0.6"
+    object.assign "4.1.0"
+    strip-json-comments "2.0.1"
+    supports-color "6.0.0"
+    which "1.3.1"
+    wide-align "1.1.3"
+    yargs "13.3.0"
+    yargs-parser "13.1.1"
+    yargs-unparser "1.6.0"
+
 mocha@7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.0.tgz#c784f579ad0904d29229ad6cb1e2514e4db7d249"
@@ -28817,7 +28847,7 @@ string-template@~0.2.1:
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
   integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -28843,6 +28873,15 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -28944,7 +28983,7 @@ stringify-object@^3.0.0, stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -28986,10 +29025,12 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
-  integrity sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
 
 strip-bom@^2.0.0:
   version "2.0.0"
@@ -31831,7 +31872,7 @@ workerpool@6.2.0:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
   integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -31874,6 +31915,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"