diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt index 7cc7bd0553..dde0da7113 100644 --- 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. -3-7-2024 +3-18-2024:4:25 diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 3364a59c6d..7dc5af95fa 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -38,7 +38,7 @@ mainBuildFilters: &mainBuildFilters - /^release\/\d+\.\d+\.\d+$/ # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - 'update-v8-snapshot-cache-on-develop' - - 'bump-win-version-info' + - 'renovate/webdriverio-monorepo' # usually we don't build Mac app - it takes a long time # but sometimes we want to really confirm we are doing the right thing @@ -49,7 +49,7 @@ macWorkflowFilters: &darwin-workflow-filters - equal: [ develop, << pipeline.git.branch >> ] # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - - equal: [ 'bump-win-version-info', << pipeline.git.branch >> ] + - equal: [ 'renovate/webdriverio-monorepo', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -60,7 +60,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters - equal: [ develop, << pipeline.git.branch >> ] # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - - equal: [ 'bump-win-version-info', << pipeline.git.branch >> ] + - equal: [ 'renovate/webdriverio-monorepo', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -83,7 +83,7 @@ windowsWorkflowFilters: &windows-workflow-filters - equal: [ develop, << pipeline.git.branch >> ] # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - - equal: [ 'bump-win-version-info', << pipeline.git.branch >> ] + - equal: [ 'renovate/webdriverio-monorepo', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 9b7295c832..d26f90c711 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -15,6 +15,7 @@ _Released 4/8/2025 (PENDING)_ **Dependency Updates:** +- Upgraded `webdriver` from `9.7.3` to `9.11.0`. Addressed in [#31315](https://github.com/cypress-io/cypress/pull/31315). - Upgraded `win-version-info` from `5.0.1` to `6.0.1`. Addressed in [#31358](https://github.com/cypress-io/cypress/pull/31358). ## 14.2.1 diff --git a/packages/server/package.json b/packages/server/package.json index 958ba4b936..0dc62877aa 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -135,7 +135,7 @@ "url-parse": "1.5.10", "uuid": "8.3.2", "wait-port": "1.1.0", - "webdriver": "9.7.3", + "webdriver": "9.11.0", "webpack-virtual-modules": "0.5.0", "widest-line": "3.1.0" }, diff --git a/packages/server/patches/@wdio+utils+9.7.3.patch b/packages/server/patches/@wdio+utils+9.11.0.patch similarity index 98% rename from packages/server/patches/@wdio+utils+9.7.3.patch rename to packages/server/patches/@wdio+utils+9.11.0.patch index 49e9db3439..cefe05ffbe 100644 --- a/packages/server/patches/@wdio+utils+9.7.3.patch +++ b/packages/server/patches/@wdio+utils+9.11.0.patch @@ -9,7 +9,7 @@ index 3e8048a..0000000 - -> 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 +index c499226..92050be 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"; diff --git a/scripts/binary/util/testStaticAssets.js b/scripts/binary/util/testStaticAssets.js index 1fd7d94abc..16abc74849 100644 --- a/scripts/binary/util/testStaticAssets.js +++ b/scripts/binary/util/testStaticAssets.js @@ -66,6 +66,43 @@ const testStaticAssets = async (buildResourcePath) => { 'return callback((data instanceof ArrayBuffer || isArrayBuffer(data)) ? data : data.buffer);', ], }), + testPackageStaticAssets({ + assetGlob: `${buildResourcePath}/packages/server/node_modules/geckodriver/dist/install.js`, + badStrings: [ + 'await download()', + ], + goodStrings: [ + 'download()', + ], + }), + testPackageStaticAssets({ + assetGlob: `${buildResourcePath}/packages/server/node_modules/edgedriver/dist/install.js`, + badStrings: [ + 'await download()', + ], + goodStrings: [ + 'download()', + ], + }), + testPackageStaticAssets({ + assetGlob: `${buildResourcePath}/packages/server/node_modules/@wdio/protocols/build/index.js`, + badStrings: [ + 'name: "addon"', + 'description: "base64 string of the add on file"', + ], + goodStrings: [ + 'name: "path"', + 'description: "path to the extension"', + ], + }), + testPackageStaticAssets({ + assetGlob: `${buildResourcePath}/packages/server/node_modules/@wdio/utils/build/node.js`, + badStrings: [], + goodStrings: [ + `log.setLevel(debugModule.enabled('cypress-verbose:server:browsers:webdriver') ? 'info' : 'silent')`, + `log2.setLevel(debugModule.enabled('cypress-verbose:server:browsers:webdriver') ? 'info' : 'silent')`, + ], + }), ]) } diff --git a/yarn.lock b/yarn.lock index 0a6d47dc1d..a75c7e527f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9282,14 +9282,14 @@ dependencies: vue-demi "*" -"@wdio/config@9.7.3": - version "9.7.3" - resolved "https://registry.npmjs.org/@wdio/config/-/config-9.7.3.tgz#fb612cdee5acba250f536f90d25bc4e2910080e8" - integrity sha512-rWiGR0WMcUpGTTMn3XP9OzNW3WH64AcNK93b9kSwq9WzVGVIzMBCZK8LPXpdQ+pFwizq/ExIXTx/Z39kc0LCyw== +"@wdio/config@9.11.0": + version "9.11.0" + resolved "https://registry.yarnpkg.com/@wdio/config/-/config-9.11.0.tgz#d16ba92ad0fdde2573e5861d1bd1642f8fb53d5e" + integrity sha512-lBcmd7r+3nHJwIWDZ/cLIXcIL9rCmQmMvMWQ+Ykcrlc2khePX92VZyd0igptrZATJGD3tQ7VySR5Bozz6uMzyA== dependencies: "@wdio/logger" "9.4.4" - "@wdio/types" "9.6.3" - "@wdio/utils" "9.7.3" + "@wdio/types" "9.10.1" + "@wdio/utils" "9.11.0" deepmerge-ts "^7.0.3" glob "^10.2.2" import-meta-resolve "^4.0.0" @@ -9309,21 +9309,21 @@ resolved "https://registry.npmjs.org/@wdio/protocols/-/protocols-9.7.0.tgz#2f2c0a7e371d65305e0d64980f63caa98ba5a4de" integrity sha512-5DI8cqJqT9K6oQn8UpaSTmcGAl4ufkUWC5FoPT3oXdLjILfxvweZDf/2XNBCbGMk4+VOMKqB2ofOqKhDIB2nAg== -"@wdio/types@9.6.3": - version "9.6.3" - resolved "https://registry.npmjs.org/@wdio/types/-/types-9.6.3.tgz#2fbbb5fcdec32f9d9953ee9d73c659052c0fb6b1" - integrity sha512-K3Lu7K5g5bsUcQV6/95XaS3jMwcGUn2pDdryYibKZafklhHjVt3o/xnw6Vgd/JzoSneCKHdwj941n+yDpTJHAw== +"@wdio/types@9.10.1": + version "9.10.1" + resolved "https://registry.yarnpkg.com/@wdio/types/-/types-9.10.1.tgz#89d3eb936ac2dc5675b01652ee9475e1ff31f325" + integrity sha512-/t1VXPU5Ad1FQjRUP0WlK7IR0dCTX5hSkul8SpCuUpWbeyI4Iol/Wx2b1YU6nS+Ydh78rJCyHxtV0eE5TM1rbw== dependencies: "@types/node" "^20.1.0" -"@wdio/utils@9.7.3": - version "9.7.3" - resolved "https://registry.npmjs.org/@wdio/utils/-/utils-9.7.3.tgz#9b1d59e3cfb8e14cb541d28a0f790fee0e2e32aa" - integrity sha512-gScYudyuq/aOmiPTz7vTvEhWtmiUMdrrzkOSQqGCQk0AMy7WpAzKM19NESPe9iPTN96i11jLJnpLOXwm2j+6LQ== +"@wdio/utils@9.11.0": + version "9.11.0" + resolved "https://registry.yarnpkg.com/@wdio/utils/-/utils-9.11.0.tgz#006234c865579e86b121998c78e47e86013de57d" + integrity sha512-chVbHqrjDlIKCLoAPLdrFK8Qozu/S+fbubqlyazohAKnouCUCa2goYs7faYR0lkmLqm92PllJS+KBRAha9V/tg== dependencies: "@puppeteer/browsers" "^2.2.0" "@wdio/logger" "9.4.4" - "@wdio/types" "9.6.3" + "@wdio/types" "9.10.1" decamelize "^6.0.0" deepmerge-ts "^7.0.3" edgedriver "^6.1.1" @@ -32348,18 +32348,18 @@ web-streams-polyfill@^3.0.3: resolved "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz#2073b91a2fdb1fbfbd401e7de0ac9f8214cecb4b" integrity sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw== -webdriver@9.7.3: - version "9.7.3" - resolved "https://registry.npmjs.org/webdriver/-/webdriver-9.7.3.tgz#faaa212b891a29cf15c2102d8c9daa5c518540d2" - integrity sha512-Mpi277WKw37Yg5xZ0MT2BcG/Q/5Y5reYA0wDXOMldVI1nLxA7eOzAvsBA8NpjPbi/+yZijZhNMrXRAtQ5Eu8NQ== +webdriver@9.11.0: + version "9.11.0" + resolved "https://registry.yarnpkg.com/webdriver/-/webdriver-9.11.0.tgz#12c33e6481ca3ddfbda61ca07fb445615b8f4c45" + integrity sha512-KQdI5sK+YwnUqol8MhvW9y6V+fhaW82KRhqMYnVCOrG4sJFWg7A9OIqR11Buco804HpzxyocRO6MnOQrNvP0vQ== dependencies: "@types/node" "^20.1.0" "@types/ws" "^8.5.3" - "@wdio/config" "9.7.3" + "@wdio/config" "9.11.0" "@wdio/logger" "9.4.4" "@wdio/protocols" "9.7.0" - "@wdio/types" "9.6.3" - "@wdio/utils" "9.7.3" + "@wdio/types" "9.10.1" + "@wdio/utils" "9.11.0" deepmerge-ts "^7.0.3" undici "^6.20.1" ws "^8.8.0"