Merge branch 'develop' of https://github.com/cypress-io/cypress into …

…develop
cypress-io · Aug 14, 2024 · 085a50f · 085a50f
2 parents 2f54717 + 2b5b2f6
commit 085a50f
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 141 deletions.
diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt
@@ -1,3 +1,3 @@
 # Bump this version to force CI to re-create the cache from scratch.
 
-07-30-24
+08-13-24
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -1,7 +1,7 @@
 <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
 ## 13.13.3
 
-_Released 8/13/2024 (PENDING)_
+_Released 8/13/2024_
 
 **Bugfixes:**
 
@@ -12,6 +12,10 @@ _Released 8/13/2024 (PENDING)_
 
 - Updated `cypress open` hints displayed after Cypress binary install. Addresses [#29935](https://github.com/cypress-io/cypress/issues/29935).
 
+**Dependency Updates:**
+
+- Updated `image-size` from `0.8.3` to `1.1.1`. Addressed in [#30023](https://github.com/cypress-io/cypress/pull/30023).
+
 ## 13.13.2
 
 _Released 7/31/2024_

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "13.13.2",
+  "version": "13.13.3",
   "description": "Cypress is a next generation front end testing tool built for the modern web",
   "private": true,
   "scripts": {

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -77,7 +77,7 @@
     "graceful-fs": "4.2.9",
     "http-proxy": "1.18.1",
     "human-interval": "1.0.0",
-    "image-size": "0.8.3",
+    "image-size": "1.1.1",
     "is-ci": "^3.0.1",
     "is-fork-pr": "2.5.0",
     "is-html": "2.0.0",

diff --git a/system-tests/package.json b/system-tests/package.json
@@ -66,7 +66,7 @@
     "glob": "7.2.0",
     "https-proxy-agent": "3.0.1",
     "human-interval": "1.0.0",
-    "image-size": "0.8.3",
+    "image-size": "1.1.1",
     "lazy-ass": "1.6.0",
     "lodash": "^4.17.21",
     "mocha": "7.1.0",

diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json
@@ -227,7 +227,6 @@
     "./node_modules/body-parser/index.js",
     "./node_modules/body-parser/node_modules/debug/src/browser.js",
     "./node_modules/body-parser/node_modules/debug/src/index.js",
-    "./node_modules/body-parser/node_modules/http-errors/index.js",
     "./node_modules/buffer-from/index.js",
     "./node_modules/chalk/index.js",
     "./node_modules/chrome-remote-interface/index.js",
@@ -276,7 +275,6 @@
     "./node_modules/express/lib/response.js",
     "./node_modules/express/lib/router/index.js",
     "./node_modules/express/lib/router/route.js",
-    "./node_modules/express/node_modules/body-parser/index.js",
     "./node_modules/express/node_modules/debug/src/browser.js",
     "./node_modules/express/node_modules/debug/src/index.js",
     "./node_modules/fast-glob/out/settings.js",
@@ -324,8 +322,8 @@
     "./node_modules/iconv-lite/lib/streams.js",
     "./node_modules/ignore/index.js",
     "./node_modules/image-q/dist/cjs/image-q.cjs",
-    "./node_modules/image-size/dist/fs.promises.js",
     "./node_modules/image-size/dist/index.js",
+    "./node_modules/image-size/dist/types/utils.js",
     "./node_modules/isexe/index.js",
     "./node_modules/isomorphic-fetch/fetch-npm-node.js",
     "./node_modules/istextorbinary/edition-es2019/index.js",
@@ -1549,19 +1547,14 @@
     "./node_modules/body-parser/lib/types/raw.js",
     "./node_modules/body-parser/lib/types/text.js",
     "./node_modules/body-parser/lib/types/urlencoded.js",
-    "./node_modules/body-parser/node_modules/bytes/index.js",
     "./node_modules/body-parser/node_modules/debug/src/debug.js",
-    "./node_modules/body-parser/node_modules/inherits/inherits.js",
-    "./node_modules/body-parser/node_modules/inherits/inherits_browser.js",
+    "./node_modules/body-parser/node_modules/depd/index.js",
     "./node_modules/body-parser/node_modules/ms/index.js",
-    "./node_modules/body-parser/node_modules/on-finished/index.js",
     "./node_modules/body-parser/node_modules/qs/lib/formats.js",
     "./node_modules/body-parser/node_modules/qs/lib/index.js",
     "./node_modules/body-parser/node_modules/qs/lib/parse.js",
     "./node_modules/body-parser/node_modules/qs/lib/stringify.js",
     "./node_modules/body-parser/node_modules/qs/lib/utils.js",
-    "./node_modules/body-parser/node_modules/raw-body/index.js",
-    "./node_modules/body-parser/node_modules/setprototypeof/index.js",
     "./node_modules/braces/index.js",
     "./node_modules/braces/lib/compile.js",
     "./node_modules/braces/lib/constants.js",
@@ -1829,11 +1822,6 @@
     "./node_modules/express/lib/router/layer.js",
     "./node_modules/express/lib/utils.js",
     "./node_modules/express/lib/view.js",
-    "./node_modules/express/node_modules/body-parser/lib/read.js",
-    "./node_modules/express/node_modules/body-parser/lib/types/json.js",
-    "./node_modules/express/node_modules/body-parser/lib/types/raw.js",
-    "./node_modules/express/node_modules/body-parser/lib/types/text.js",
-    "./node_modules/express/node_modules/body-parser/lib/types/urlencoded.js",
     "./node_modules/express/node_modules/cookie/index.js",
     "./node_modules/express/node_modules/debug/src/debug.js",
     "./node_modules/express/node_modules/depd/index.js",
@@ -2184,14 +2172,14 @@
     "./node_modules/iconv-lite/lib/extend-node.js",
     "./node_modules/ieee754/index.js",
     "./node_modules/image-size/dist/detector.js",
-    "./node_modules/image-size/dist/readUInt.js",
-    "./node_modules/image-size/dist/types.js",
     "./node_modules/image-size/dist/types/bmp.js",
     "./node_modules/image-size/dist/types/cur.js",
     "./node_modules/image-size/dist/types/dds.js",
     "./node_modules/image-size/dist/types/gif.js",
+    "./node_modules/image-size/dist/types/heif.js",
     "./node_modules/image-size/dist/types/icns.js",
     "./node_modules/image-size/dist/types/ico.js",
+    "./node_modules/image-size/dist/types/index.js",
     "./node_modules/image-size/dist/types/j2c.js",
     "./node_modules/image-size/dist/types/jp2.js",
     "./node_modules/image-size/dist/types/jpg.js",
@@ -2200,6 +2188,7 @@
     "./node_modules/image-size/dist/types/pnm.js",
     "./node_modules/image-size/dist/types/psd.js",
     "./node_modules/image-size/dist/types/svg.js",
+    "./node_modules/image-size/dist/types/tga.js",
     "./node_modules/image-size/dist/types/tiff.js",
     "./node_modules/image-size/dist/types/webp.js",
     "./node_modules/inflight/inflight.js",
@@ -2482,6 +2471,13 @@
     "./node_modules/min-indent/index.js",
     "./node_modules/minimatch/node_modules/brace-expansion/index.js",
     "./node_modules/minimist/index.js",
+    "./node_modules/mkdirp/index.js",
+    "./node_modules/mkdirp/lib/find-made.js",
+    "./node_modules/mkdirp/lib/mkdirp-manual.js",
+    "./node_modules/mkdirp/lib/mkdirp-native.js",
+    "./node_modules/mkdirp/lib/opts-arg.js",
+    "./node_modules/mkdirp/lib/path-arg.js",
+    "./node_modules/mkdirp/lib/use-native.js",
     "./node_modules/mocha-7.0.1/lib/browser/progress.js",
     "./node_modules/mocha-7.0.1/lib/context.js",
     "./node_modules/mocha-7.0.1/lib/errors.js",
@@ -2513,13 +2509,6 @@
     "./node_modules/mocha-7.0.1/node_modules/object.assign/polyfill.js",
     "./node_modules/mocha-7.0.1/node_modules/object.assign/shim.js",
     "./node_modules/mocha-7.0.1/package.json",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/index.js",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/lib/find-made.js",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/lib/mkdirp-manual.js",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/lib/mkdirp-native.js",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/lib/opts-arg.js",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/lib/path-arg.js",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/lib/use-native.js",
     "./node_modules/mocha/lib/browser/progress.js",
     "./node_modules/mocha/lib/context.js",
     "./node_modules/mocha/lib/interfaces/bdd.js",
@@ -4344,5 +4333,5 @@
     "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "4d60da842d33c82242dab58d02cab3790b0f3ed061754a8d55c37da3e4a4ebb1"
+  "deferredHash": "cd281068a7ed2d6e30c6a07a07fa1a2233cde51ab4b98f2e7ef1fda9925d6ac7"
 }
diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json
@@ -227,7 +227,6 @@
     "./node_modules/body-parser/index.js",
     "./node_modules/body-parser/node_modules/debug/src/browser.js",
     "./node_modules/body-parser/node_modules/debug/src/index.js",
-    "./node_modules/body-parser/node_modules/http-errors/index.js",
     "./node_modules/buffer-from/index.js",
     "./node_modules/chalk/index.js",
     "./node_modules/chrome-remote-interface/index.js",
@@ -276,7 +275,6 @@
     "./node_modules/express/lib/response.js",
     "./node_modules/express/lib/router/index.js",
     "./node_modules/express/lib/router/route.js",
-    "./node_modules/express/node_modules/body-parser/index.js",
     "./node_modules/express/node_modules/debug/src/browser.js",
     "./node_modules/express/node_modules/debug/src/index.js",
     "./node_modules/fast-glob/out/settings.js",
@@ -323,8 +321,8 @@
     "./node_modules/iconv-lite/lib/streams.js",
     "./node_modules/ignore/index.js",
     "./node_modules/image-q/dist/cjs/image-q.cjs",
-    "./node_modules/image-size/dist/fs.promises.js",
     "./node_modules/image-size/dist/index.js",
+    "./node_modules/image-size/dist/types/utils.js",
     "./node_modules/isexe/index.js",
     "./node_modules/isomorphic-fetch/fetch-npm-node.js",
     "./node_modules/istextorbinary/edition-es2019/index.js",
@@ -1550,19 +1548,14 @@
     "./node_modules/body-parser/lib/types/raw.js",
     "./node_modules/body-parser/lib/types/text.js",
     "./node_modules/body-parser/lib/types/urlencoded.js",
-    "./node_modules/body-parser/node_modules/bytes/index.js",
     "./node_modules/body-parser/node_modules/debug/src/debug.js",
-    "./node_modules/body-parser/node_modules/inherits/inherits.js",
-    "./node_modules/body-parser/node_modules/inherits/inherits_browser.js",
+    "./node_modules/body-parser/node_modules/depd/index.js",
     "./node_modules/body-parser/node_modules/ms/index.js",
-    "./node_modules/body-parser/node_modules/on-finished/index.js",
     "./node_modules/body-parser/node_modules/qs/lib/formats.js",
     "./node_modules/body-parser/node_modules/qs/lib/index.js",
     "./node_modules/body-parser/node_modules/qs/lib/parse.js",
     "./node_modules/body-parser/node_modules/qs/lib/stringify.js",
     "./node_modules/body-parser/node_modules/qs/lib/utils.js",
-    "./node_modules/body-parser/node_modules/raw-body/index.js",
-    "./node_modules/body-parser/node_modules/setprototypeof/index.js",
     "./node_modules/braces/index.js",
     "./node_modules/braces/lib/compile.js",
     "./node_modules/braces/lib/constants.js",
@@ -1830,11 +1823,6 @@
     "./node_modules/express/lib/router/layer.js",
     "./node_modules/express/lib/utils.js",
     "./node_modules/express/lib/view.js",
-    "./node_modules/express/node_modules/body-parser/lib/read.js",
-    "./node_modules/express/node_modules/body-parser/lib/types/json.js",
-    "./node_modules/express/node_modules/body-parser/lib/types/raw.js",
-    "./node_modules/express/node_modules/body-parser/lib/types/text.js",
-    "./node_modules/express/node_modules/body-parser/lib/types/urlencoded.js",
     "./node_modules/express/node_modules/cookie/index.js",
     "./node_modules/express/node_modules/debug/src/debug.js",
     "./node_modules/express/node_modules/depd/index.js",
@@ -2185,14 +2173,14 @@
     "./node_modules/iconv-lite/lib/extend-node.js",
     "./node_modules/ieee754/index.js",
     "./node_modules/image-size/dist/detector.js",
-    "./node_modules/image-size/dist/readUInt.js",
-    "./node_modules/image-size/dist/types.js",
     "./node_modules/image-size/dist/types/bmp.js",
     "./node_modules/image-size/dist/types/cur.js",
     "./node_modules/image-size/dist/types/dds.js",
     "./node_modules/image-size/dist/types/gif.js",
+    "./node_modules/image-size/dist/types/heif.js",
     "./node_modules/image-size/dist/types/icns.js",
     "./node_modules/image-size/dist/types/ico.js",
+    "./node_modules/image-size/dist/types/index.js",
     "./node_modules/image-size/dist/types/j2c.js",
     "./node_modules/image-size/dist/types/jp2.js",
     "./node_modules/image-size/dist/types/jpg.js",
@@ -2201,6 +2189,7 @@
     "./node_modules/image-size/dist/types/pnm.js",
     "./node_modules/image-size/dist/types/psd.js",
     "./node_modules/image-size/dist/types/svg.js",
+    "./node_modules/image-size/dist/types/tga.js",
     "./node_modules/image-size/dist/types/tiff.js",
     "./node_modules/image-size/dist/types/webp.js",
     "./node_modules/inflight/inflight.js",
@@ -2483,6 +2472,13 @@
     "./node_modules/min-indent/index.js",
     "./node_modules/minimatch/node_modules/brace-expansion/index.js",
     "./node_modules/minimist/index.js",
+    "./node_modules/mkdirp/index.js",
+    "./node_modules/mkdirp/lib/find-made.js",
+    "./node_modules/mkdirp/lib/mkdirp-manual.js",
+    "./node_modules/mkdirp/lib/mkdirp-native.js",
+    "./node_modules/mkdirp/lib/opts-arg.js",
+    "./node_modules/mkdirp/lib/path-arg.js",
+    "./node_modules/mkdirp/lib/use-native.js",
     "./node_modules/mocha-7.0.1/lib/browser/progress.js",
     "./node_modules/mocha-7.0.1/lib/context.js",
     "./node_modules/mocha-7.0.1/lib/errors.js",
@@ -2514,13 +2510,6 @@
     "./node_modules/mocha-7.0.1/node_modules/object.assign/polyfill.js",
     "./node_modules/mocha-7.0.1/node_modules/object.assign/shim.js",
     "./node_modules/mocha-7.0.1/package.json",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/index.js",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/lib/find-made.js",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/lib/mkdirp-manual.js",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/lib/mkdirp-native.js",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/lib/opts-arg.js",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/lib/path-arg.js",
-    "./node_modules/mocha-junit-reporter/node_modules/mkdirp/lib/use-native.js",
     "./node_modules/mocha/lib/browser/progress.js",
     "./node_modules/mocha/lib/context.js",
     "./node_modules/mocha/lib/interfaces/bdd.js",
@@ -4347,5 +4336,5 @@
     "./tooling/v8-snapshot/cache/linux/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "4d60da842d33c82242dab58d02cab3790b0f3ed061754a8d55c37da3e4a4ebb1"
+  "deferredHash": "cd281068a7ed2d6e30c6a07a07fa1a2233cde51ab4b98f2e7ef1fda9925d6ac7"
 }