Merge branch 'develop' into feat/cy-prompt

Author: ryanthemanuel

cli/CHANGELOG.md

@@ -1,7 +1,7 @@
 <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
 ## 14.5.0
 
-_Released 6/17/2025 (PENDING)_
+_Released 6/17/2025_
 
 **Features:**
 

cli/lib/util.js

@@ -2,7 +2,7 @@ const _ = require('lodash')
 const arch = require('arch')
 const os = require('os')
 const ospath = require('ospath')
-const crypto = require('crypto')
+const hasha = require('hasha')
 const la = require('lazy-ass')
 const is = require('check-more-types')
 const tty = require('tty')
@@ -30,31 +30,11 @@ const getosAsync = Promise.promisify(getos)
 
 /**
  * Returns SHA512 of a file
- *
- * Implementation lifted from https://github.com/sindresorhus/hasha
- * but without bringing that dependency (since hasha is Node v8+)
  */
 const getFileChecksum = (filename) => {
   la(is.unemptyString(filename), 'expected filename', filename)
 
-  const hashStream = () => {
-    const s = crypto.createHash('sha512')
-
-    s.setEncoding('hex')
-
-    return s
-  }
-
-  return new Promise((resolve, reject) => {
-    const stream = fs.createReadStream(filename)
-
-    stream.on('error', reject)
-    .pipe(hashStream())
-    .on('error', reject)
-    .on('finish', function () {
-      resolve(this.read())
-    })
-  })
+  return hasha.fromFile(filename, { algorithm: 'sha512' })
 }
 
 const getFileSize = (filename) => {

cli/package.json

@@ -46,6 +46,7 @@
     "figures": "^3.2.0",
     "fs-extra": "^9.1.0",
     "getos": "^3.2.1",
+    "hasha": "5.2.2",
     "is-installed-globally": "~0.4.0",
     "lazy-ass": "^1.6.0",
     "listr2": "^3.8.3",
@@ -91,7 +92,6 @@
     "dependency-check": "4.1.0",
     "dtslint": "4.2.1",
     "execa-wrap": "1.4.0",
-    "hasha": "5.2.2",
     "mocha": "6.2.2",
     "mock-fs": "5.4.0",
     "mocked-env": "1.3.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "14.4.1",
+  "version": "14.5.0",
   "description": "Cypress is a next generation front end testing tool built for the modern web",
   "private": true,
   "scripts": {
@@ -165,7 +165,7 @@
     "gulp-awspublish": "8.0.0",
     "gulp-debug": "4.0.0",
     "gulp-rename": "1.4.0",
-    "hasha": "5.0.0",
+    "hasha": "5.2.2",
     "human-interval": "1.0.0",
     "husky": "7.0.2",
     "inquirer": "8.2.4",

tooling/v8-snapshot/cache/darwin/snapshot-meta.json

@@ -4201,5 +4201,5 @@
     "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "79fe5ed644343541c25503b45862f78da16b6bdd776b9bf5182a0b92d55c8004"
+  "deferredHash": "ebcc6b5c316232d90e9ba366afdbe6cef609deb194faeb6ad1e2b54303a81eb9"
 }

tooling/v8-snapshot/cache/linux/snapshot-meta.json

@@ -4193,5 +4193,5 @@
     "./tooling/v8-snapshot/cache/linux/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "79fe5ed644343541c25503b45862f78da16b6bdd776b9bf5182a0b92d55c8004"
+  "deferredHash": "ebcc6b5c316232d90e9ba366afdbe6cef609deb194faeb6ad1e2b54303a81eb9"
 }

tooling/v8-snapshot/cache/win32/snapshot-meta.json

@@ -4193,5 +4193,5 @@
     "./tooling/v8-snapshot/cache/win32/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "9206742c395ab4600c848f79c2d3f36a573c6a10735727e2bfea45447be7dcc9"
+  "deferredHash": "44f0bfcf5cb0ec1a744ddd58474f78929b3716fc893b5ec10ab7ffd3d4e7fc08"
 }

yarn.lock

@@ -18521,14 +18521,6 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-[email protected]:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.0.0.tgz#fdc3785caea03df29535fc8adb512c3d3a709004"
-  integrity sha512-PqWdhnQhq6tqD32hZv+l1e5mJHNSudjnaAzgAHfkGiU0ABN6lmbZF8abJIulQHbZ7oiHhP8yL6O910ICMc+5pw==
-  dependencies:
-    is-stream "^1.1.0"
-    type-fest "^0.3.0"
-
 [email protected]:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"
@@ -30870,11 +30862,6 @@ type-fest@^0.21.3:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
-type-fest@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
-  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
-
 type-fest@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"