From 593665c7349f89f6a0b8e2cb1321b69d049620c2 Mon Sep 17 00:00:00 2001
From: "elastic-renovate-prod[bot]"
<174716857+elastic-renovate-prod[bot]@users.noreply.github.com>
Date: Tue, 1 Oct 2024 13:54:00 -0700
Subject: [PATCH 1/3] Update ftr (main) (#194509)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This PR contains the following updates:
| Package | Type | Update | Change | Pending |
|---|---|---|---|---|
| [chromedriver](https://togithub.com/giggio/node-chromedriver) |
devDependencies | major | [`^128.0.3` ->
`^129.0.0`](https://renovatebot.com/diffs/npm/chromedriver/128.0.3/129.0.0)
| `129.0.1` |
|
[selenium-webdriver](https://togithub.com/SeleniumHQ/selenium/tree/trunk/javascript/node/selenium-webdriver#readme)
([source](https://togithub.com/SeleniumHQ/selenium)) | devDependencies |
patch | [`^4.24.1` ->
`^4.25.0`](https://renovatebot.com/diffs/npm/selenium-webdriver/4.25.0/4.25.0)
| |
---
### Release Notes
giggio/node-chromedriver (chromedriver)
###
[`v129.0.0`](https://togithub.com/giggio/node-chromedriver/compare/128.0.3...129.0.0)
[Compare
Source](https://togithub.com/giggio/node-chromedriver/compare/128.0.3...129.0.0)
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.
â™» **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.
👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.
---
- [ ] If you want to rebase/retry this PR, check
this box
---
This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).
Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>
(cherry picked from commit 4a2ae7aa5129d0f83c2da3c34d39aa42dc1c4f8e)
# Conflicts:
# package.json
# yarn.lock
---
package.json | 4 ++--
yarn.lock | 14 ++++++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 028690c59761c..58469705fb620 100644
--- a/package.json
+++ b/package.json
@@ -1606,7 +1606,7 @@
"buildkite-test-collector": "^1.7.0",
"callsites": "^3.1.0",
"chance": "1.0.18",
- "chromedriver": "^128.0.1",
+ "chromedriver": "^129.0.0",
"clean-webpack-plugin": "^3.0.0",
"cli-progress": "^3.12.0",
"cli-table3": "^0.6.1",
@@ -1729,7 +1729,7 @@
"rxjs-marbles": "^7.0.1",
"sass-embedded": "^1.78.0",
"sass-loader": "^10.5.1",
- "selenium-webdriver": "^4.23.0",
+ "selenium-webdriver": "^4.25.0",
"sharp": "0.32.6",
"simple-git": "^3.16.0",
"sinon": "^7.4.2",
diff --git a/yarn.lock b/yarn.lock
index 4ae3fdeeec549..b88eada2543fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14008,10 +14008,17 @@ chrome-trace-event@^1.0.2:
dependencies:
tslib "^1.9.0"
+<<<<<<< HEAD
chromedriver@^128.0.1:
version "128.0.1"
resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-128.0.1.tgz#971fb267cc6893a712808cea6c977473ba167145"
integrity sha512-UmWqZXXAyuRa37pE+lnU46vJcCM/y0ddF015LHxycEOYfuqsK7k9ZxJuXCQNWbws9e7FAMQj/GJZT92WPgis0g==
+=======
+chromedriver@^129.0.0:
+ version "129.0.1"
+ resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-129.0.1.tgz#4a7215f57c419e87468f04f3b011db51e6bc80fc"
+ integrity sha512-thJqK3c7p9rIhmjBvs/cgaK0Hk30g7LbnmMXQ2aLnn75ZOiEl/2GBcgc6fw+4GIw1SmOYhnNmaEI1iTP3qob0w==
+>>>>>>> 4a2ae7aa5129d0f83c2da3c34d39aa42dc1c4f8e (Update ftr (main) (#194509))
dependencies:
"@testim/chrome-version" "^1.1.4"
axios "^1.7.4"
@@ -28147,10 +28154,17 @@ select-hose@^2.0.0:
resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
+<<<<<<< HEAD
selenium-webdriver@^4.23.0:
version "4.23.0"
resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.23.0.tgz#6d9d219a560dffff1fbbc0f2c8a115d81d279a21"
integrity sha512-DdvtInpnMt95Td8VApvmAw7oSydBD9twIRXqoMyRoGMvL1dAnMFxdrwnW6L0d/pF/uoNTjbVUarwGZ9wIGNStA==
+=======
+selenium-webdriver@^4.25.0:
+ version "4.25.0"
+ resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.25.0.tgz#3562b49668817974bb1d13d25a50e8bc0264fcf3"
+ integrity sha512-zl9IX93caOT8wbcCpZzAkEtYa+hNgJ4C5GUN8uhpzggqRLvsg1asfKi0p1uNZC8buYVvsBZbx8S+9MjVAjs4oA==
+>>>>>>> 4a2ae7aa5129d0f83c2da3c34d39aa42dc1c4f8e (Update ftr (main) (#194509))
dependencies:
"@bazel/runfiles" "^5.8.1"
jszip "^3.10.1"
From e7b44fc35006484740f3539db491e99b4e28a42b Mon Sep 17 00:00:00 2001
From: Brad White
Date: Tue, 1 Oct 2024 16:04:24 -0600
Subject: [PATCH 2/3] fix merge conflict
---
yarn.lock | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/yarn.lock b/yarn.lock
index b88eada2543fa..94bf0bd40b48d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14008,17 +14008,10 @@ chrome-trace-event@^1.0.2:
dependencies:
tslib "^1.9.0"
-<<<<<<< HEAD
-chromedriver@^128.0.1:
- version "128.0.1"
- resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-128.0.1.tgz#971fb267cc6893a712808cea6c977473ba167145"
- integrity sha512-UmWqZXXAyuRa37pE+lnU46vJcCM/y0ddF015LHxycEOYfuqsK7k9ZxJuXCQNWbws9e7FAMQj/GJZT92WPgis0g==
-=======
chromedriver@^129.0.0:
version "129.0.1"
resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-129.0.1.tgz#4a7215f57c419e87468f04f3b011db51e6bc80fc"
integrity sha512-thJqK3c7p9rIhmjBvs/cgaK0Hk30g7LbnmMXQ2aLnn75ZOiEl/2GBcgc6fw+4GIw1SmOYhnNmaEI1iTP3qob0w==
->>>>>>> 4a2ae7aa5129d0f83c2da3c34d39aa42dc1c4f8e (Update ftr (main) (#194509))
dependencies:
"@testim/chrome-version" "^1.1.4"
axios "^1.7.4"
@@ -28154,22 +28147,15 @@ select-hose@^2.0.0:
resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
-<<<<<<< HEAD
-selenium-webdriver@^4.23.0:
- version "4.23.0"
- resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.23.0.tgz#6d9d219a560dffff1fbbc0f2c8a115d81d279a21"
- integrity sha512-DdvtInpnMt95Td8VApvmAw7oSydBD9twIRXqoMyRoGMvL1dAnMFxdrwnW6L0d/pF/uoNTjbVUarwGZ9wIGNStA==
-=======
selenium-webdriver@^4.25.0:
version "4.25.0"
resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.25.0.tgz#3562b49668817974bb1d13d25a50e8bc0264fcf3"
integrity sha512-zl9IX93caOT8wbcCpZzAkEtYa+hNgJ4C5GUN8uhpzggqRLvsg1asfKi0p1uNZC8buYVvsBZbx8S+9MjVAjs4oA==
->>>>>>> 4a2ae7aa5129d0f83c2da3c34d39aa42dc1c4f8e (Update ftr (main) (#194509))
dependencies:
"@bazel/runfiles" "^5.8.1"
jszip "^3.10.1"
tmp "^0.2.3"
- ws "^8.17.1"
+ ws "^8.18.0"
self-signed-cert@^1.0.1:
version "1.0.1"
From e0e71a542f742fb9a9e16b3d9d8a6d5759cec2b2 Mon Sep 17 00:00:00 2001
From: Brad White
Date: Tue, 1 Oct 2024 16:24:15 -0600
Subject: [PATCH 3/3] fix yarn lock
---
yarn.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yarn.lock b/yarn.lock
index 94bf0bd40b48d..f5f556ce28fd2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -32373,7 +32373,7 @@ ws@^7.3.1, ws@^7.4.2:
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
-ws@^8.17.1, ws@^8.18.0, ws@^8.2.3, ws@^8.4.2, ws@^8.9.0:
+ws@^8.18.0, ws@^8.2.3, ws@^8.4.2, ws@^8.9.0:
version "8.18.0"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==