fix(deps): update dependency electron to v13 🌟 (cypress-io#17408)

Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Jennifer Shehane <[email protected]> Co-authored-by: Zach Bloomquist <[email protected]>
marcospoliceno · Aug 9, 2021 · 9df2543 · 9df2543
1 parent 75746fb
commit 9df2543
Show file tree

Hide file tree

Showing 14 changed files with 388 additions and 369 deletions.
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-14.16.0
+14.17.0
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,7 +8,7 @@ branches:
 # https://www.appveyor.com/docs/lang/nodejs-iojs/
 environment:
   # use matching version of Node.js
-  nodejs_version: "14.16.0"
+  nodejs_version: "14.17.0"
   # encode secure variables which will NOT be used
   # in pull requests
   # https://www.appveyor.com/docs/build-configuration/#secure-variables

diff --git a/circle.yml b/circle.yml
@@ -49,7 +49,7 @@ executors:
   # the Docker image with Cypress dependencies and Chrome browser
   cy-doc:
     docker:
-      - image: cypress/browsers:node14.16.0-chrome90-ff88
+      - image: cypress/browsers:node14.17.0-chrome91-ff89
     # by default, we use "small" to save on CI costs. bump on a per-job basis if needed.
     resource_class: small
     environment:
@@ -58,7 +58,7 @@ executors:
   # Docker image with non-root "node" user
   non-root-docker-user:
     docker:
-      - image: cypress/browsers:node14.16.0-chrome90-ff88
+      - image: cypress/browsers:node14.17.0-chrome91-ff89
         user: node
     environment:
       PLATFORM: linux
@@ -1126,6 +1126,7 @@ jobs:
 
   runner-integration-tests-electron:
     <<: *defaults
+    resource_class: medium
     parallelism: 2
     steps:
       - run-runner-integration-tests:

diff --git a/package.json b/package.json
@@ -196,7 +196,7 @@
     "yarn-deduplicate": "3.1.0"
   },
   "engines": {
-    "node": ">=14.16.0",
+    "node": ">=14.17.0",
     "yarn": ">=1.17.3"
   },
   "productName": "Cypress",

diff --git a/packages/electron/package.json b/packages/electron/package.json
@@ -24,7 +24,7 @@
     "minimist": "1.2.5"
   },
   "devDependencies": {
-    "electron": "12.0.0-beta.14",
+    "electron": "13.1.7",
     "execa": "4.1.0",
     "mocha": "3.5.3"
   },

diff --git a/packages/server/lib/browsers/cdp_automation.ts b/packages/server/lib/browsers/cdp_automation.ts
@@ -19,6 +19,11 @@ export type CyCookie = Pick<chrome.cookies.Cookie, 'name' | 'value' | 'expiratio
 // https://developer.chrome.com/extensions/cookies#method-getAll
 type CyCookieFilter = chrome.cookies.GetAllDetails
 
+export const screencastOpts: cdp.Page.StartScreencastRequest = {
+  format: 'jpeg',
+  everyNthFrame: Number(process.env.CYPRESS_EVERY_NTH_FRAME || 5),
+}
+
 function convertSameSiteExtensionToCdp (str: CyCookie['sameSite']): cdp.Network.CookieSameSite | undefined {
   return str ? ({
     'no_restriction': 'None',

diff --git a/packages/server/lib/browsers/chrome.ts b/packages/server/lib/browsers/chrome.ts
@@ -11,7 +11,7 @@ import { launch } from '@packages/launcher'
 
 import appData from '../util/app_data'
 import { fs } from '../util/fs'
-import { CdpAutomation } from './cdp_automation'
+import { CdpAutomation, screencastOpts } from './cdp_automation'
 import * as CriClient from './cri-client'
 import * as protocol from './protocol'
 import utils from './utils'
@@ -273,9 +273,7 @@ const _maybeRecordVideo = async function (client, options) {
     client.send('Page.screencastFrameAck', { sessionId: meta.sessionId })
   })
 
-  await client.send('Page.startScreencast', {
-    format: 'jpeg',
-  })
+  await client.send('Page.startScreencast', screencastOpts)
 
   return client
 }

diff --git a/packages/server/lib/browsers/electron.js b/packages/server/lib/browsers/electron.js
@@ -5,7 +5,7 @@ const Bluebird = require('bluebird')
 const debug = require('debug')('cypress:server:browsers:electron')
 const menu = require('../gui/menu')
 const Windows = require('../gui/windows')
-const { CdpAutomation } = require('./cdp_automation')
+const { CdpAutomation, screencastOpts } = require('./cdp_automation')
 const savedState = require('../saved_state')
 const utils = require('./utils')
 const errors = require('../errors')
@@ -62,7 +62,7 @@ const _getAutomation = function (win, options, parent) {
         return fn(message, data)
       }
 
-      await sendCommand('Page.startScreencast')
+      await sendCommand('Page.startScreencast', screencastOpts)
 
       const ret = await fn(message, data)
 
@@ -104,9 +104,7 @@ const _maybeRecordVideo = function (webContents, options) {
       }
     })
 
-    await webContents.debugger.sendCommand('Page.startScreencast', {
-      format: 'jpeg',
-    })
+    await webContents.debugger.sendCommand('Page.startScreencast', screencastOpts)
   }
 }