Skip to content

Commit

Permalink
chore: update wdio dependencies to latest for firefox [run ci] (#31078)
Browse files Browse the repository at this point in the history
  • Loading branch information
AtofStryker authored Feb 12, 2025
1 parent d935dfc commit 760f600
Show file tree
Hide file tree
Showing 14 changed files with 139 additions and 401 deletions.
2 changes: 1 addition & 1 deletion .circleci/cache-version.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Bump this version to force CI to re-create the cache from scratch.

1-17-24
2-10-25
1 change: 1 addition & 0 deletions .circleci/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ mainBuildFilters: &mainBuildFilters
only:
- develop
- /^release\/\d+\.\d+\.\d+$/
- chore/update_wdio_deps
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- 'update-v8-snapshot-cache-on-develop'

Expand Down
4 changes: 4 additions & 0 deletions cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
## 14.0.4

_Released 2/25/2025 (PENDING)_

## 14.0.3

_Released 2/11/2025_
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@
"resolutions": {
"**/@types/cheerio": "0.22.21",
"**/@types/enzyme": "3.10.5",
"**/@wdio/logger": "9.0.0",
"**/jquery": "3.7.1",
"**/pretty-format": "26.4.0",
"**/sharp": "0.29.3",
Expand Down
3 changes: 0 additions & 3 deletions packages/server/lib/browsers/firefox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -635,9 +635,6 @@ export async function open (browser: Browser, url: string, options: BrowserLaunc
},
// @see https://firefox-source-docs.mozilla.org/testing/geckodriver/Capabilities.html#moz-debuggeraddress
// we specify the debugger address option for Webdriver, which will return us the CDP address when the capability is returned.
// NOTE: this typing is fixed in @wdio/types 9.1.0 https://github.com/webdriverio/webdriverio/commit/ed14717ac4269536f9e7906e4d1612f74650b09b
// Once we have a node engine that can support the package (i.e., electron 32+ update) we can update the package
// @ts-expect-error
'moz:debuggerAddress': true,
// @see https://webdriver.io/docs/capabilities/#wdiogeckodriveroptions
// webdriver starts geckodriver with the correct options on behalf of Cypress
Expand Down
6 changes: 3 additions & 3 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"debug": "^4.3.4",
"dirt-simple-file-cache": "^0.4.0",
"duplexify": "4.1.3",
"edgedriver": "5.6.1",
"edgedriver": "6.1.1",
"electron-context-menu": "3.6.1",
"errorhandler": "1.5.1",
"evil-dns": "0.2.0",
Expand All @@ -75,7 +75,7 @@
"firefox-profile": "4.7.0",
"fluent-ffmpeg": "2.1.2",
"fs-extra": "9.1.0",
"geckodriver": "4.5.1",
"geckodriver": "5.0.0",
"get-port": "5.1.1",
"getos": "3.2.1",
"glob": "7.1.3",
Expand Down Expand Up @@ -133,7 +133,7 @@
"url-parse": "1.5.10",
"uuid": "8.3.2",
"wait-port": "1.1.0",
"webdriver": "9.0.0",
"webdriver": "9.7.3",
"webpack-virtual-modules": "0.5.0",
"widest-line": "3.1.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ index eea42bf..0000000
-
-For more information on WebdriverIO see the [homepage](https://webdriver.io).
diff --git a/node_modules/@wdio/protocols/build/index.js b/node_modules/@wdio/protocols/build/index.js
index 05e55cc..9ea546e 100644
index b33b8bd..0f7da3a 100644
--- a/node_modules/@wdio/protocols/build/index.js
+++ b/node_modules/@wdio/protocols/build/index.js
@@ -5165,9 +5165,11 @@ var gecko_default = {
@@ -5166,9 +5166,11 @@ var gecko_default = {
],
parameters: [
{
Expand Down
31 changes: 0 additions & 31 deletions packages/server/patches/@wdio+utils+9.0.0.patch

This file was deleted.

40 changes: 40 additions & 0 deletions packages/server/patches/@wdio+utils+9.7.3.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
diff --git a/node_modules/@wdio/utils/README.md b/node_modules/@wdio/utils/README.md
deleted file mode 100644
index 3e8048a..0000000
--- a/node_modules/@wdio/utils/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-WDIO Repl
-=========
-
-> A WDIO helper utility to provide a repl interface WebdriverIO
diff --git a/node_modules/@wdio/utils/build/node.js b/node_modules/@wdio/utils/build/node.js
index 9c003aa..53cc9d7 100644
--- a/node_modules/@wdio/utils/build/node.js
+++ b/node_modules/@wdio/utils/build/node.js
@@ -5,6 +5,7 @@ import cp2 from "node:child_process";
import getPort from "get-port";
import waitPort from "wait-port";
import logger2 from "@wdio/logger";
+import debugModule from 'debug';
import split2 from "split2";
import { deepmerge } from "deepmerge-ts";
import { start as startSafaridriver } from "safaridriver";
@@ -32,6 +33,8 @@ import { download as downloadGeckodriver } from "geckodriver";
import { download as downloadEdgedriver } from "edgedriver";
import { locateChrome, locateFirefox, locateApp } from "locate-app";
var log = logger("webdriver");
+// wrap in cypress debugger statement to avoid extraneous messages to the console
+log.setLevel(debugModule.enabled('cypress-verbose:server:browsers:webdriver') ? 'info' : 'silent')
var EXCLUDED_PARAMS = ["version", "help"];
var canAccess = (file) => {
if (!file) {
@@ -283,6 +286,8 @@ function isEdge(browserName) {

// src/node/startWebDriver.ts
var log2 = logger2("@wdio/utils");
+// wrap in cypress debugger statement to avoid extraneous messages to the console
+log2.setLevel(debugModule.enabled('cypress-verbose:server:browsers:webdriver') ? 'info' : 'silent')
var DRIVER_WAIT_TIMEOUT = 10 * 1e3;
async function startWebDriver(options) {
if (process.env.WDIO_SKIP_DRIVER_SETUP) {
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
diff --git a/node_modules/edgedriver/README.md b/node_modules/edgedriver/README.md
deleted file mode 100644
index 3b361a7..0000000
index 112cae9..0000000
--- a/node_modules/edgedriver/README.md
+++ /dev/null
@@ -1,218 +0,0 @@
@@ -1,222 +0,0 @@
-EdgeDriver [![CI](https://github.com/webdriverio-community/node-edgedriver/actions/workflows/ci.yml/badge.svg)](https://github.com/webdriverio-community/node-edgedriver/actions/workflows/ci.yml) [![Audit](https://github.com/webdriverio-community/node-edgedriver/actions/workflows/audit.yml/badge.svg)](https://github.com/webdriverio-community/node-edgedriver/actions/workflows/audit.yml)
-==========
-
Expand Down Expand Up @@ -37,6 +37,10 @@ index 3b361a7..0000000
-Microsoft Edge WebDriver 105.0.1343.33 (4122bb4646b33f33bca5d269490b9caadfc452b2)
-```
-
-# Setting a PROXY URL
-
-Use `HTTPS_PROXY` or `HTTP_PROXY` to set your proxy URL.
-
-# Programmatic Interface
-
-You can import this package with Node.js and start the driver as part of your script and use it e.g. with [WebdriverIO](https://webdriver.io).
Expand Down Expand Up @@ -223,10 +227,10 @@ index 3b361a7..0000000
-
-For more information on WebdriverIO see the [homepage](https://webdriver.io).
diff --git a/node_modules/edgedriver/dist/install.js b/node_modules/edgedriver/dist/install.js
index 99730a0..30e63c0 100644
index c02351f..e1c4c71 100644
--- a/node_modules/edgedriver/dist/install.js
+++ b/node_modules/edgedriver/dist/install.js
@@ -205,6 +205,9 @@ function sanitizeVersion(version) {
@@ -215,6 +215,9 @@ function sanitizeVersion(version) {
* download on install
*/
if (process.argv[1] && process.argv[1].endsWith('/dist/install.js') && Boolean(process.env.EDGEDRIVER_AUTO_INSTALL)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
diff --git a/node_modules/geckodriver/AUTHORS b/node_modules/geckodriver/AUTHORS
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/LICENSE b/node_modules/geckodriver/LICENSE
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/README.md b/node_modules/geckodriver/README.md
deleted file mode 100644
index 95e3ef0..0000000
Expand Down Expand Up @@ -249,58 +243,14 @@ index 95e3ef0..0000000
----
-
-For more information on WebdriverIO see the [homepage](https://webdriver.io).
diff --git a/node_modules/geckodriver/dist/cjs/index.d.ts b/node_modules/geckodriver/dist/cjs/index.d.ts
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/cjs/index.d.ts.map b/node_modules/geckodriver/dist/cjs/index.d.ts.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/cjs/index.js b/node_modules/geckodriver/dist/cjs/index.js
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/cjs/index.js.map b/node_modules/geckodriver/dist/cjs/index.js.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/cli.d.ts b/node_modules/geckodriver/dist/cli.d.ts
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/cli.d.ts.map b/node_modules/geckodriver/dist/cli.d.ts.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/cli.js b/node_modules/geckodriver/dist/cli.js
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/cli.js.map b/node_modules/geckodriver/dist/cli.js.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/constants.d.ts b/node_modules/geckodriver/dist/constants.d.ts
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/constants.d.ts.map b/node_modules/geckodriver/dist/constants.d.ts.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/constants.js b/node_modules/geckodriver/dist/constants.js
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/constants.js.map b/node_modules/geckodriver/dist/constants.js.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/index.d.ts b/node_modules/geckodriver/dist/index.d.ts
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/index.d.ts.map b/node_modules/geckodriver/dist/index.d.ts.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/index.js b/node_modules/geckodriver/dist/index.js
old mode 100644
new mode 100755
index 2edc6d2..d0b456e
index 2edc6d2..a24617e 100644
--- a/node_modules/geckodriver/dist/index.js
+++ b/node_modules/geckodriver/dist/index.js
@@ -1,10 +1,14 @@
import cp from 'node:child_process';
import logger from '@wdio/logger';
+import debugModule from 'debug'
+import debugModule from 'debug';
import { download as downloadDriver } from './install.js';
import { hasAccess, parseParams } from './utils.js';
import { DEFAULT_HOSTNAME } from './constants.js';
Expand All @@ -312,19 +262,8 @@ index 2edc6d2..d0b456e
const { cacheDir, customGeckoDriverPath, spawnOpts, ...startArgs } = params;
let geckoDriverPath = (customGeckoDriverPath ||
process.env.GECKODRIVER_PATH ||
diff --git a/node_modules/geckodriver/dist/index.js.map b/node_modules/geckodriver/dist/index.js.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/install.d.ts b/node_modules/geckodriver/dist/install.d.ts
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/install.d.ts.map b/node_modules/geckodriver/dist/install.d.ts.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/install.js b/node_modules/geckodriver/dist/install.js
old mode 100644
new mode 100755
index c27c805..ac53518
index c27c805..ac53518 100644
--- a/node_modules/geckodriver/dist/install.js
+++ b/node_modules/geckodriver/dist/install.js
@@ -70,6 +70,8 @@ async function downloadZip(res, cacheDir) {
Expand All @@ -338,33 +277,3 @@ index c27c805..ac53518
}
//# sourceMappingURL=install.js.map
\ No newline at end of file
diff --git a/node_modules/geckodriver/dist/install.js.map b/node_modules/geckodriver/dist/install.js.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/types.d.ts b/node_modules/geckodriver/dist/types.d.ts
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/types.d.ts.map b/node_modules/geckodriver/dist/types.d.ts.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/types.js b/node_modules/geckodriver/dist/types.js
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/types.js.map b/node_modules/geckodriver/dist/types.js.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/utils.d.ts b/node_modules/geckodriver/dist/utils.d.ts
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/utils.d.ts.map b/node_modules/geckodriver/dist/utils.d.ts.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/utils.js b/node_modules/geckodriver/dist/utils.js
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/dist/utils.js.map b/node_modules/geckodriver/dist/utils.js.map
old mode 100644
new mode 100755
diff --git a/node_modules/geckodriver/tsconfig.tsbuildinfo b/node_modules/geckodriver/tsconfig.tsbuildinfo
old mode 100644
new mode 100755
Loading

5 comments on commit 760f600

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 760f600 Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux x64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/14.0.4/linux-x64/develop-760f60026dbf182d388a0c801919dd4f9313a607/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 760f600 Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux arm64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/14.0.4/linux-arm64/develop-760f60026dbf182d388a0c801919dd4f9313a607/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 760f600 Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the win32 x64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/14.0.4/win32-x64/develop-760f60026dbf182d388a0c801919dd4f9313a607/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 760f600 Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the darwin arm64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/14.0.4/darwin-arm64/develop-760f60026dbf182d388a0c801919dd4f9313a607/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 760f600 Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the darwin x64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/14.0.4/darwin-x64/develop-760f60026dbf182d388a0c801919dd4f9313a607/cypress.tgz

Please sign in to comment.