Merge branch 'trunk' into local-distributor

Author: diemol

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/142.0b8/linux-x86_64/en-US/firefox-142.0b8.tar.xz",
-        sha256 = "52c7c24dcc1258c9cd43c7b070def0a93bae58d2f5d077d11a7979307857e5c2",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/142.0b9/linux-x86_64/en-US/firefox-142.0b9.tar.xz",
+        sha256 = "0e230f54a1d933df55e0d730c7d774437e60b5fdcbd74401f5da69bce184c30b",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
 
     dmg_archive(
         name = "mac_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/142.0b8/mac/en-US/Firefox%20142.0b8.dmg",
-        sha256 = "74c20a61fcc05fd69427f370a6a97ab660615299ef254d4cfaa617ec095dba98",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/142.0b9/mac/en-US/Firefox%20142.0b9.dmg",
+        sha256 = "529509a53278d8cbd482fa8ef95ac243b33c6cc4acc7924c15f6ce3f59c64bbf",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
 
     http_archive(
         name = "linux_edgedriver",
-        url = "https://msedgedriver.microsoft.com/138.0.3351.121/edgedriver_linux64.zip",
-        sha256 = "1a0bed812b1b84f1093fa1e759cae2a210481620cd9ea3cb91dc2a60e0b21e4d",
+        url = "https://msedgedriver.microsoft.com/139.0.3405.86/edgedriver_linux64.zip",
+        sha256 = "49ce29de50f9ac418a3a2416708a5563215b8412b27d3e505f3c859fc6ffba12",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
 
     http_archive(
         name = "mac_edgedriver",
-        url = "https://msedgedriver.microsoft.com/138.0.3351.121/edgedriver_mac64.zip",
-        sha256 = "96b648865de254ae5db7008676340b16476e39b0b90c2da71964c14cb53a0195",
+        url = "https://msedgedriver.microsoft.com/139.0.3405.86/edgedriver_mac64.zip",
+        sha256 = "b6c8244dfb7b8a223d3ac8fd569533f0a307eadaca2b8cbc884ce7f69294682e",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

py/BUILD.bazel

@@ -327,7 +327,7 @@ py_wheel(
     python_requires = ">=3.9",
     python_tag = "py3",
     requires = [
-        "urllib3[socks]~=2.5.0",
+        "urllib3[socks]>=2.5.0,<3.0",
         "trio~=0.30.0",
         "trio-websocket~=0.12.2",
         "certifi>=2025.6.15",

py/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
     ]
 dependencies = [
-    "urllib3[socks]~=2.5.0",
+    "urllib3[socks]>=2.5.0,<3.0",
     "trio~=0.30.0",
     "trio-websocket~=0.12.2",
     "certifi>=2025.6.15",

py/selenium/webdriver/common/bidi/session.py

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import Dict, Optional
+from typing import Optional
 
 from selenium.webdriver.common.bidi.common import command_builder
 
@@ -77,7 +77,7 @@ def __init__(
         self.file = file
         self.prompt = prompt
 
-    def to_dict(self) -> Dict[str, str]:
+    def to_dict(self) -> dict[str, str]:
         """Convert the UserPromptHandler to a dictionary for BiDi protocol.
 
         Returns:

rb/Gemfile.lock

@@ -7,7 +7,7 @@ PATH
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
+      rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
 
 GEM
@@ -147,7 +147,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
-    rubyzip (2.4.1)
+    rubyzip (3.0.0)
     securerandom (0.4.1)
     steep (1.5.3)
       activesupport (>= 5.1)

rb/lib/selenium/webdriver/common/driver_extensions/has_file_downloads.rb

@@ -39,7 +39,13 @@ def download_file(file_name, target_directory)
 
           begin
             Zip::File.open("#{file_name}.zip") do |zip|
-              zip.each { |entry| zip.extract(entry, "#{target_directory}#{file_name}") }
+              zip.each do |entry|
+                if Zipper::RUBYZIP_V3
+                  zip.extract(entry, file_name, destination_directory: target_directory)
+                else
+                  zip.extract(entry, "#{target_directory}#{file_name}")
+                end
+              end
             end
           ensure
             FileUtils.rm_f("#{file_name}.zip")

rb/lib/selenium/webdriver/common/zipper.rb

@@ -18,6 +18,7 @@
 # under the License.
 
 require 'zip'
+require 'zip/version' # Not required automatically
 require 'tempfile'
 require 'find'
 require 'base64'
@@ -30,6 +31,7 @@ module WebDriver
 
     module Zipper
       EXTENSIONS = %w[.zip .xpi].freeze
+      RUBYZIP_V3 = Zip::VERSION >= '3.0.0'
 
       class << self
         def unzip(path)
@@ -42,7 +44,11 @@ def unzip(path)
               dirname = File.dirname(to)
 
               FileUtils.mkdir_p dirname
-              zip.extract(entry, to)
+              if RUBYZIP_V3
+                zip.extract(entry, entry.name, destination_directory: destination)
+              else
+                zip.extract(entry, to)
+              end
             end
           end
 
@@ -75,7 +81,11 @@ def with_tmp_zip(&blk)
           # Don't use Tempfile since it lacks rb_file_s_rename permission on Windows.
           Dir.mktmpdir do |tmp_dir|
             zip_path = File.join(tmp_dir, 'webdriver-zip')
-            Zip::File.open(zip_path, Zip::File::CREATE, &blk)
+            if RUBYZIP_V3
+              Zip::File.open(zip_path, create: true, &blk)
+            else
+              Zip::File.open(zip_path, Zip::File::CREATE, &blk)
+            end
           end
         end
 

rb/selenium-webdriver.gemspec

@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'base64', ['~> 0.2']
   s.add_dependency 'logger', ['~> 1.4']
   s.add_dependency 'rexml', ['~> 3.2', '>= 3.2.5']
-  s.add_dependency 'rubyzip', ['>= 1.2.2', '< 3.0']
+  s.add_dependency 'rubyzip', ['>= 1.2.2', '< 4.0']
   s.add_dependency 'websocket', ['~> 1.0']
 
   s.add_development_dependency 'git', ['~> 1.19']