chore: Replace Bluebird.resolve/reject with native Promise.resolve/reject (#33035)

jennifer-shehane · web-flow · commit d57db8797f86 · 2025-12-04T12:01:15.000-05:00
* chore: Update Bluebird resolve to Promise.resolve

* Fix parallel calls to getHttpsOptions (used in tests)

* revert Promise.resolve and add note

* update columns for stack traces
diff --git a/cli/lib/tasks/download.ts b/cli/lib/tasks/download.ts
@@ -202,7 +202,7 @@ const verifyDownloadedFile = async (filename: string, expectedSize?: number, exp
 // {filename: ..., downloaded: true}
 const downloadFromUrl = ({ url, downloadDestination, progress, ca, version, redirectTTL = defaultMaxRedirects }: any): any => {
   if (redirectTTL <= 0) {
-    return Bluebird.reject(new Error(
+    return Promise.reject(new Error(
       stripIndent`
           Failed downloading the Cypress binary.
           There were too many redirects. The default allowance is ${defaultMaxRedirects}.
diff --git a/cli/lib/util.ts b/cli/lib/util.ts
@@ -409,7 +409,7 @@ const util = {
   },
 
   isExecutableAsync (filePath: string): any {
-    return Bluebird.resolve(executable(filePath))
+    return Promise.resolve(executable(filePath))
   },
 
   isLinux,
diff --git a/packages/app/cypress/e2e/runner/reporter-ct-generator.ts b/packages/app/cypress/e2e/runner/reporter-ct-generator.ts
@@ -631,7 +631,7 @@ export const generateCtUncaughtErrorTests = (server: 'Webpack' | 'Vite', configF
 
     verify('spec Bluebird unhandled rejection', {
       uncaught: true,
-      column: [21, 22],
+      column: [19, 20, 21],
       originalMessage: 'Unhandled promise rejection from the spec',
       message: [
         'The following error originated from your application code',
@@ -642,7 +642,7 @@ export const generateCtUncaughtErrorTests = (server: 'Webpack' | 'Vite', configF
 
     verify('spec Bluebird unhandled rejection with done', {
       uncaught: true,
-      column: [21, 22],
+      column: [19, 20, 21],
       originalMessage: 'Unhandled promise rejection from the spec',
       message: [
         'The following error originated from your application code',
diff --git a/packages/app/cypress/e2e/runner/reporter.errors.cy.ts b/packages/app/cypress/e2e/runner/reporter.errors.cy.ts
@@ -204,7 +204,7 @@ describe('errors ui', {
 
     verify('spec Bluebird unhandled rejection', {
       uncaught: true,
-      column: 21,
+      column: 20,
       originalMessage: 'Unhandled promise rejection from the spec',
       message: [
         'The following error originated from your test code',
@@ -214,7 +214,7 @@ describe('errors ui', {
 
     verify('spec Bluebird unhandled rejection with done', {
       uncaught: true,
-      column: 21,
+      column: 20,
       originalMessage: 'Unhandled promise rejection from the spec',
       message: [
         'The following error originated from your test code',
diff --git a/packages/app/src/runner/event-manager.ts b/packages/app/src/runner/event-manager.ts
@@ -582,6 +582,8 @@ export class EventManager {
 
     Cypress.on('collect:run:state', () => {
       if (Cypress.config('hideCommandLog')) {
+        // TODO: Need more refactoring to use native Promise here since
+        // this goes to events.emitThen = map(Bluebird.map) which expect a Bluebird promise
         return Bluebird.resolve()
       }
 
diff --git a/packages/config/src/project/utils.ts b/packages/config/src/project/utils.ts
@@ -274,7 +274,7 @@ export function relativeToProjectRoot (projectRoot: string, file: string) {
 // async function
 export async function setSupportFileAndFolder (obj: Config, getFilesByGlob: any) {
   if (!obj.supportFile) {
-    return Bluebird.resolve(obj)
+    return Promise.resolve(obj)
   }
 
   obj = _.clone(obj)
diff --git a/packages/launcher/lib/linux/index.ts b/packages/launcher/lib/linux/index.ts
@@ -109,7 +109,7 @@ function getLinuxBrowser (
 export function getVersionString (path: string) {
   debugVerbose('finding version string using command "%s --version"', path)
 
-  return Bluebird.resolve(utils.getOutput(path, ['--version']))
+  return utils.getOutput(path, ['--version'])
   .timeout(30000, `Timed out after 30 seconds getting browser version for ${path}`)
   .then((val) => val.stdout)
   .then((val) => val.trim())
diff --git a/packages/proxy/lib/http/index.ts b/packages/proxy/lib/http/index.ts
@@ -141,7 +141,7 @@ export function _runStage (type: HttpStages, ctx: any, onError: Function) {
     const middlewareName = _.keys(middlewares)[0]
 
     if (!middlewareName) {
-      return Bluebird.resolve()
+      return Promise.resolve()
     }
 
     const middleware = middlewares[middlewareName]
diff --git a/packages/server/lib/browsers/chrome.ts b/packages/server/lib/browsers/chrome.ts
@@ -76,14 +76,14 @@ const _getDefaultChromePreferences = (): ChromePreferences => {
  * Reads all known preference files (CHROME_PREFERENCE_PATHS) from disk and return
  * @param userDir
  */
-const _getChromePreferences = (userDir: string): Bluebird<ChromePreferences> => {
+const _getChromePreferences = (userDir: string): Promise<ChromePreferences> => {
   // skip reading the preferences if requested by the user,
   // typically used when the AUT encrypts the user data dir, causing relaunches of the browser not to work
   // see https://github.com/cypress-io/cypress/issues/29330
   if (process.env.IGNORE_CHROME_PREFERENCES) {
     debug('ignoring chrome preferences: not reading from chrome preference files')
 
-    return Bluebird.resolve(_.mapValues(CHROME_PREFERENCE_PATHS, () => ({})))
+    return Promise.resolve(_.mapValues(CHROME_PREFERENCE_PATHS, () => ({})))
   }
 
   debug('reading chrome preferences... %o', { userDir, CHROME_PREFERENCE_PATHS })
diff --git a/packages/server/lib/cloud/api/index.ts b/packages/server/lib/cloud/api/index.ts
@@ -80,7 +80,7 @@ const rp = request.defaults((params: CypressRequestOptions, callback) => {
   if (params.cacheable && (resp = getCachedResponse(params))) {
     debug('resolving with cached response for %o', { url: params.url })
 
-    return Bluebird.resolve(resp)
+    return Promise.resolve(resp)
   }
 
   _.defaults(params, {
diff --git a/packages/server/lib/gui/windows.ts b/packages/server/lib/gui/windows.ts
@@ -232,7 +232,7 @@ export async function open (projectRoot: string, options: WindowOpenOptions, new
   if (knownWin) {
     knownWin.show()
 
-    return Bluebird.resolve(knownWin)
+    return Promise.resolve(knownWin)
   }
 
   recentlyCreatedWindow = true
diff --git a/packages/server/lib/modes/run.ts b/packages/server/lib/modes/run.ts
@@ -437,7 +437,7 @@ function launchBrowser (options: { browser: Browser, spec: SpecWithRelativeRoot,
 }
 
 async function listenForProjectEnd (project: ProjectBase, exit: boolean): Promise<any> {
-  if (globalThis.CY_TEST_MOCK?.listenForProjectEnd) return Bluebird.resolve(globalThis.CY_TEST_MOCK.listenForProjectEnd)
+  if (globalThis.CY_TEST_MOCK?.listenForProjectEnd) return Promise.resolve(globalThis.CY_TEST_MOCK.listenForProjectEnd)
 
   // if exit is false, we need to intercept the resolution of tests - whether
   // an early exit with intermediate results, or a full run.
diff --git a/packages/server/lib/open_project.ts b/packages/server/lib/open_project.ts
@@ -135,7 +135,7 @@ export class OpenProject {
 
     const afterSpec = () => {
       if (!this.projectBase || cfg.isTextTerminal || !cfg.experimentalInteractiveRunEvents) {
-        return Bluebird.resolve()
+        return Promise.resolve()
       }
 
       return runEvents.execute('after:spec', spec)
diff --git a/packages/server/lib/saved_state.ts b/packages/server/lib/saved_state.ts
@@ -93,11 +93,11 @@ interface SavedStateAPI {
   set: (stateToSet: AllowedState) => Bluebird<void>
 }
 
-export const create = (projectRoot?: string, isTextTerminal: boolean = false): Bluebird<SavedStateAPI> => {
+export const create = (projectRoot?: string, isTextTerminal: boolean = false): Promise<SavedStateAPI> => {
   if (isTextTerminal) {
     debug('noop saved state')
 
-    return Bluebird.resolve(FileUtil.noopFile)
+    return Promise.resolve(FileUtil.noopFile)
   }
 
   // @ts-ignore - this is currently affecting the v8-snapshot type checking job as we are importing the file directly from the server package
diff --git a/packages/server/lib/server-base.ts b/packages/server/lib/server-base.ts
@@ -662,7 +662,7 @@ export class ServerBase<TSocket extends SocketE2E | SocketCt> {
     // bail early we dont have a server or we're not
     // currently listening
     if (!this._server || !this.isListening) {
-      return Bluebird.resolve(true)
+      return Promise.resolve(true)
     }
 
     this.reset()
diff --git a/packages/server/test/unit/cloud/api/utils/fake_proxy_server.ts b/packages/server/test/unit/cloud/api/utils/fake_proxy_server.ts
@@ -27,6 +27,9 @@ app.get('/error', (req, res) => {
 })
 
 let ca: CA
+let caPromise: Promise<CA> | null = null
+// Cache certificate generation promises per hostname to prevent parallel writes
+const certPromises: Map<string, Promise<{ cert: string, key: string }>> = new Map()
 
 interface DestroyableProxyOptions {
   keepRequests?: boolean
@@ -139,10 +142,27 @@ export async function fakeProxy (opts: FakeProxyOptions) {
 }
 
 async function getHttpsOptions () {
-  ca = await CA.create()
-  const [cert, key] = await ca.generateServerCertificateKeys('localhost')
+  // Ensure CA is only created once, even if called in parallel
+  if (!caPromise) {
+    caPromise = CA.create().then((createdCa) => {
+      ca = createdCa
 
-  return { cert, key }
+      return createdCa
+    })
+  }
+
+  const currentCa = await caPromise
+  const hostname = 'localhost'
+
+  // Serialize certificate generation for the same hostname to prevent file corruption
+  // when multiple HTTPS servers are created in parallel
+  if (!certPromises.has(hostname)) {
+    certPromises.set(hostname, currentCa.generateServerCertificateKeys(hostname).then(([cert, key]) => {
+      return { cert, key }
+    }))
+  }
+
+  return certPromises.get(hostname)!
 }
 
 export function getCA () {
diff --git a/packages/server/test/unit/open_project_spec.js b/packages/server/test/unit/open_project_spec.js
@@ -124,7 +124,7 @@ describe('lib/open_project', () => {
       it('executes after:spec on browser close if in interactive mode', function () {
         this.config.experimentalInteractiveRunEvents = true
         this.config.isTextTerminal = false
-        const onBrowserClose = () => Bluebird.resolve()
+        const onBrowserClose = () => Promise.resolve()
 
         return openProject.launch(this.browser, this.spec, { onBrowserClose })
         .then(() => {
@@ -138,7 +138,7 @@ describe('lib/open_project', () => {
       it('does not execute after:spec on browser close if not in interactive mode', function () {
         this.config.experimentalInteractiveRunEvents = true
         this.config.isTextTerminal = true
-        const onBrowserClose = () => Bluebird.resolve()
+        const onBrowserClose = () => Promise.resolve()
 
         return openProject.launch(this.browser, this.spec, { onBrowserClose })
         .then(() => {
@@ -152,7 +152,7 @@ describe('lib/open_project', () => {
       it('does not execute after:spec on browser close if experimental flag is not enabled', function () {
         this.config.experimentalInteractiveRunEvents = false
         this.config.isTextTerminal = false
-        const onBrowserClose = () => Bluebird.resolve()
+        const onBrowserClose = () => Promise.resolve()
 
         return openProject.launch(this.browser, this.spec, { onBrowserClose })
         .then(() => {
@@ -166,7 +166,7 @@ describe('lib/open_project', () => {
       it('does not execute after:spec on browser close if the project is no longer open', function () {
         this.config.experimentalInteractiveRunEvents = true
         this.config.isTextTerminal = false
-        const onBrowserClose = () => Bluebird.resolve()
+        const onBrowserClose = () => Promise.resolve()
 
         return openProject.launch(this.browser, this.spec, { onBrowserClose })
         .then(() => {
diff --git a/packages/server/test/unit/util/editors_spec.ts b/packages/server/test/unit/util/editors_spec.ts
@@ -54,7 +54,7 @@ describe('lib/util/editors', () => {
       sinon.stub(shellUtil, 'commandExists').callsFake((command) => {
         const exists = ['code', 'subl', 'vim'].includes(command)
 
-        return Bluebird.resolve(exists)
+        return Promise.resolve(exists)
       })
 
       platform = process.platform
@@ -70,7 +70,7 @@ describe('lib/util/editors', () => {
       // @ts-ignore
       savedState.create.resolves({
         get () {
-          return Bluebird.resolve({ isOther: true, binary: '/path/to/editor', id: 'other' })
+          return Promise.resolve({ isOther: true, binary: '/path/to/editor', id: 'other' })
         },
       })
     })
@@ -112,7 +112,7 @@ describe('lib/util/editors', () => {
         // @ts-ignore
         savedState.create.resolves({
           get () {
-            return Bluebird.resolve({ preferredOpener })
+            return Promise.resolve({ preferredOpener })
           },
         })
 
@@ -130,7 +130,7 @@ describe('lib/util/editors', () => {
         // @ts-ignore
         savedState.create.resolves({
           get () {
-            return Bluebird.resolve({ preferredOpener })
+            return Promise.resolve({ preferredOpener })
           },
         })
 
diff --git a/system-tests/project-fixtures/runner-specs/cypress/e2e/errors/uncaught-ct.cy.js b/system-tests/project-fixtures/runner-specs/cypress/e2e/errors/uncaught-ct.cy.js
@@ -1,5 +1,4 @@
 import Errors from '../../../src/Errors'
-import Bluebird from 'bluebird'
 import React from 'react'
 
 describe('uncaught errors', { defaultCommandTimeout: 0 }, () => {
@@ -63,13 +62,13 @@ describe('uncaught errors', { defaultCommandTimeout: 0 }, () => {
   })
 
   it('spec Bluebird unhandled rejection', () => {
-    Bluebird.reject(new Error('Unhandled promise rejection from the spec'))
+    Promise.reject(new Error('Unhandled promise rejection from the spec'))
 
     cy.wait(10000)
   })
 
   // eslint-disable-next-line mocha/handle-done-callback
   it('spec Bluebird unhandled rejection with done', (done) => {
-    Bluebird.reject(new Error('Unhandled promise rejection from the spec'))
+    Promise.reject(new Error('Unhandled promise rejection from the spec'))
   })
 })
diff --git a/system-tests/project-fixtures/runner-specs/cypress/e2e/errors/uncaught.cy.js b/system-tests/project-fixtures/runner-specs/cypress/e2e/errors/uncaught.cy.js
@@ -1,5 +1,3 @@
-import Bluebird from 'bluebird'
-
 describe('uncaught errors', { defaultCommandTimeout: 0 }, () => {
   it('sync app visit exception', () => {
     cy.visit('cypress/fixtures/errors.html?error-on-visit')
@@ -73,13 +71,13 @@ describe('uncaught errors', { defaultCommandTimeout: 0 }, () => {
   })
 
   it('spec Bluebird unhandled rejection', () => {
-    Bluebird.reject(new Error('Unhandled promise rejection from the spec'))
+    Promise.reject(new Error('Unhandled promise rejection from the spec'))
 
     cy.wait(10000)
   })
 
   // eslint-disable-next-line mocha/handle-done-callback
   it('spec Bluebird unhandled rejection with done', (done) => {
-    Bluebird.reject(new Error('Unhandled promise rejection from the spec'))
+    Promise.reject(new Error('Unhandled promise rejection from the spec'))
   })
 })

Original file line number	Diff line number	Diff line change
`@@ -582,6 +582,8 @@ export class EventManager {`
`582`	`582`
`583`	`583`	`Cypress.on('collect:run:state', () => {`
`584`	`584`	`if (Cypress.config('hideCommandLog')) {`
	`585`	`+ // TODO: Need more refactoring to use native Promise here since`
	`586`	`+ // this goes to events.emitThen = map(Bluebird.map) which expect a Bluebird promise`
`585`	`587`	`return Bluebird.resolve()`
`586`	`588`	`}`
`587`	`589`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ export function relativeToProjectRoot (projectRoot: string, file: string) {`
`274`	`274`	`// async function`
`275`	`275`	`export async function setSupportFileAndFolder (obj: Config, getFilesByGlob: any) {`
`276`	`276`	`if (!obj.supportFile) {`
`277`		`- return Bluebird.resolve(obj)`
	`277`	`+ return Promise.resolve(obj)`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`obj = _.clone(obj)`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ export function _runStage (type: HttpStages, ctx: any, onError: Function) {`
`141`	`141`	`const middlewareName = _.keys(middlewares)[0]`
`142`	`142`
`143`	`143`	`if (!middlewareName) {`
`144`		`- return Bluebird.resolve()`
	`144`	`+ return Promise.resolve()`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`const middleware = middlewares[middlewareName]`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ const rp = request.defaults((params: CypressRequestOptions, callback) => {`
`80`	`80`	`if (params.cacheable && (resp = getCachedResponse(params))) {`
`81`	`81`	`debug('resolving with cached response for %o', { url: params.url })`
`82`	`82`
`83`		`- return Bluebird.resolve(resp)`
	`83`	`+ return Promise.resolve(resp)`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`_.defaults(params, {`