Skip to content

Commit a07b9d9

Browse files
authored
Merge branch 'trunk' into renovate/typescript-5.x
2 parents 225d69b + 9cd397c commit a07b9d9

File tree

106 files changed

+3088
-1973
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+3088
-1973
lines changed

MODULE.bazel

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
1212
bazel_dep(name = "platforms", version = "0.0.10")
1313

1414
# Required for the closure rules
15-
bazel_dep(name = "protobuf", version = "29.2", dev_dependency = True, repo_name = "com_google_protobuf")
15+
bazel_dep(name = "protobuf", dev_dependency = True, repo_name = "com_google_protobuf", version = "29.2")
1616

1717
# Required for rules_rust to import the crates properly
18-
bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
19-
18+
bazel_dep(name = "rules_cc", dev_dependency = True, version = "0.0.9")
2019
bazel_dep(name = "rules_dotnet", version = "0.17.5")
2120
bazel_dep(name = "rules_java", version = "7.12.4")
2221
bazel_dep(name = "rules_jvm_external", version = "6.6")
@@ -28,27 +27,33 @@ bazel_dep(name = "rules_proto", version = "6.0.2")
2827
bazel_dep(name = "rules_ruby", version = "0.13.0")
2928

3029
linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
30+
3131
linter.configure(
3232
name = "java-spotbugs",
3333
config = "//java:spotbugs-config",
3434
)
35+
3536
linter.configure(
3637
name = "rust-rustfmt",
3738
config = "//rust:enable-rustfmt",
3839
)
40+
3941
linter.register(name = "rust-rustfmt")
4042

4143
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
44+
4245
node.toolchain(node_version = "20.9.0")
4346

4447
pnpm = use_extension(
4548
"@aspect_rules_js//npm:extensions.bzl",
4649
"pnpm",
4750
dev_dependency = True,
4851
)
52+
4953
use_repo(pnpm, "pnpm")
5054

5155
npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
56+
5257
npm.npm_translate_lock(
5358
name = "npm",
5459
data = [
@@ -63,59 +68,76 @@ npm.npm_translate_lock(
6368
update_pnpm_lock = True,
6469
verify_node_modules_ignored = "//:.bazelignore",
6570
)
71+
6672
use_repo(npm, "npm")
6773

6874
rules_ts_ext = use_extension(
6975
"@aspect_rules_ts//ts:extensions.bzl",
7076
"ext",
7177
dev_dependency = True,
7278
)
79+
7380
rules_ts_ext.deps(
7481
ts_version = "4.9.5",
7582
)
83+
7684
use_repo(rules_ts_ext, "npm_typescript")
7785

7886
esbuild = use_extension("@aspect_rules_esbuild//esbuild:extensions.bzl", "esbuild")
87+
7988
esbuild.toolchain(esbuild_version = "0.23.0")
89+
8090
use_repo(esbuild, "esbuild_toolchains")
8191

8292
register_toolchains("@esbuild_toolchains//:all")
8393

8494
dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
95+
8596
dotnet.toolchain(dotnet_version = "8.0.203")
97+
8698
use_repo(dotnet, "dotnet_toolchains")
8799

88100
selenium_paket = use_extension("//dotnet:paket.nuget_extension.bzl", "nuget_extension")
101+
89102
use_repo(selenium_paket, "paket.nuget")
90103

91104
register_toolchains("@dotnet_toolchains//:all")
92105

93106
oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
107+
94108
oci.pull(
95109
name = "java_image_base",
96110
digest = "sha256:161a1d97d592b3f1919801578c3a47c8e932071168a96267698f4b669c24c76d",
97111
image = "gcr.io/distroless/java17",
98112
)
113+
99114
oci.pull(
100115
name = "firefox_standalone",
101116
digest = "sha256:b6d8279268b3183d0d33e667e82fec1824298902f77718764076de763673124f",
102117
image = "index.docker.io/selenium/standalone-firefox",
103118
)
119+
104120
oci.pull(
105121
name = "chrome_standalone",
106122
digest = "sha256:1b809a961a0a77787a7cccac74ddc5570b7e89747f925b8469ddb9a6624d4ece",
107123
image = "index.docker.io/selenium/standalone-chrome",
108124
)
125+
109126
use_repo(oci, "chrome_standalone", "firefox_standalone", "java_image_base")
110127

111128
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
129+
112130
python.toolchain(
113131
is_default = True,
114132
python_version = "3.9",
115133
)
134+
116135
python.toolchain(python_version = "3.10")
136+
117137
python.toolchain(python_version = "3.11")
138+
118139
python.toolchain(python_version = "3.12")
140+
119141
use_repo(python, "pythons_hub")
120142

121143
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
@@ -140,15 +162,16 @@ register_toolchains("@pythons_hub//:all")
140162

141163
# https://github.com/bazelbuild/rules_jvm_external/pull/1079
142164
archive_override(
143-
module_name = "rules_jvm_external",
144165
integrity = "sha256-yS8Qes1PLbYbe10b1WSgl0Auqn/1Wlxg8O3wSr7a/Sg=",
166+
module_name = "rules_jvm_external",
145167
patch_strip = 1,
146168
patches = ["//java:rules_jvm_external_javadoc.patch"],
147169
strip_prefix = "rules_jvm_external-f572a26116c7ef71d8842dd056c2605782f7be8d",
148170
urls = ["https://github.com/bazelbuild/rules_jvm_external/archive/f572a26116c7ef71d8842dd056c2605782f7be8d.tar.gz"],
149171
)
150172

151173
java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
174+
152175
use_repo(
153176
java_toolchains,
154177
"remote_java_tools",
@@ -165,6 +188,7 @@ use_repo(
165188
)
166189

167190
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
191+
168192
maven.install(
169193
name = "maven",
170194
artifacts = [
@@ -224,9 +248,9 @@ maven.install(
224248
"org.zeromq:jeromq:0.6.0",
225249
],
226250
boms = [
227-
"io.opentelemetry:opentelemetry-bom:1.44.1",
228-
"io.netty:netty-bom:4.1.115.Final",
229-
"org.junit:junit-bom:5.11.3",
251+
"io.opentelemetry:opentelemetry-bom:1.46.0",
252+
"io.netty:netty-bom:4.1.117.Final",
253+
"org.junit:junit-bom:5.11.4",
230254
],
231255
excluded_artifacts = [
232256
"org.hamcrest:hamcrest-all", # Replaced by hamcrest 2
@@ -243,9 +267,11 @@ maven.install(
243267
resolver = "maven",
244268
strict_visibility = True,
245269
)
270+
246271
use_repo(maven, "maven", "unpinned_maven")
247272

248273
ruby = use_extension("@rules_ruby//ruby:extensions.bzl", "ruby")
274+
249275
ruby.toolchain(
250276
name = "ruby",
251277
msys2_packages = [
@@ -254,6 +280,7 @@ ruby.toolchain(
254280
],
255281
version_file = "//:rb/.ruby-version",
256282
)
283+
257284
ruby.bundle_fetch(
258285
name = "bundle",
259286
srcs = [
@@ -344,11 +371,13 @@ ruby.bundle_fetch(
344371
gemfile = "//:rb/Gemfile",
345372
gemfile_lock = "//:rb/Gemfile.lock",
346373
)
374+
347375
use_repo(ruby, "bundle", "ruby", "ruby_toolchains")
348376

349377
register_toolchains("@ruby_toolchains//:all")
350378

351379
selenium_manager_artifacts = use_extension("//common:selenium_manager.bzl", "selenium_manager_artifacts")
380+
352381
use_repo(
353382
selenium_manager_artifacts,
354383
"download_sm_linux",
@@ -357,6 +386,7 @@ use_repo(
357386
)
358387

359388
pin_browsers_extension = use_extension("//common:repositories.bzl", "pin_browsers_extension")
389+
360390
use_repo(
361391
pin_browsers_extension,
362392
"linux_beta_firefox",

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ namespace :java do
891891
task :update do
892892
# Make sure things are in a good state to start with
893893
args = ['--action_env=RULES_JVM_EXTERNAL_REPIN=1']
894-
Bazel.execute('run', args, '@unpinned_maven//:pin')
894+
Bazel.execute('run', args, '@maven//:pin')
895895

896896
file_path = 'MODULE.bazel'
897897
content = File.read(file_path)
@@ -915,7 +915,7 @@ namespace :java do
915915
File.write(file_path, content)
916916

917917
args = ['--action_env=RULES_JVM_EXTERNAL_REPIN=1']
918-
Bazel.execute('run', args, '@unpinned_maven//:pin')
918+
Bazel.execute('run', args, '@maven//:pin')
919919
end
920920

921921
desc 'Update Java changelog'

common/src/web/relative_locators.html

Lines changed: 72 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
<html>
1+
<html lang="en">
32
<head>
43
<title>Relative Locators</title>
54
<style>
@@ -10,57 +9,101 @@
109
td {
1110
border: solid;
1211
}
13-
.small-rectangle {
12+
#center {
13+
width: 100px;
14+
}
15+
#rectangles {
16+
position: relative;
17+
}
18+
#rectangles div {
19+
position: absolute;
20+
border: 1px solid black;
21+
height: 50px;
22+
width: 50px;
23+
}
24+
#a {
25+
left: 25px;
26+
top: 0;
27+
}
28+
#b {
29+
left: 78px;
30+
top: 30px;
31+
}
32+
#c {
33+
left: 131px;
34+
top: 60px;
35+
}
36+
#d {
37+
left: 0;
38+
top: 53px;
39+
}
40+
#e {
41+
left: 53px;
42+
top: 83px;
43+
}
44+
#f {
45+
left: 106px;
46+
top: 113px;
47+
}
48+
#proximity .small {
1449
border: 1px solid black;
1550
width: 100px;
1651
height: 50px;
1752
margin: 5px 25px;
1853
}
19-
.big-rectangle {
54+
#proximity .big {
2055
border: 1px solid black;
2156
width: 150px;
22-
height: 400px;
57+
height: 400px;
58+
}
59+
#rect3 {
60+
margin: 60px 25px;
2361
}
2462
</style>
2563
</head>
2664
<body>
2765
<h1>Relative Locator Tests</h1>
28-
<p id="above">This text is above.
29-
<p id="mid">This is a paragraph of text in the middle.
30-
<p id="below">This text is below.
31-
66+
<section id="paragraphs">
67+
<p id="above">This text is above.</p>
68+
<p id="mid">This is a paragraph of text in the middle.</p>
69+
<p id="below">This text is below.</p>
70+
</section>
3271

3372
<table>
3473
<tr>
35-
<td id="first">1</td>
36-
<td id="second" style="width: 100px">2</td>
37-
<td id="third">3</td>
74+
<td id="topLeft">1</td>
75+
<td id="top">2</td>
76+
<td id="topRight">3</td>
3877
</tr>
3978
<tr>
40-
<td id="fourth">4</td>
79+
<td id="left">4</td>
4180
<td id="center">5</td>
42-
<td id="sixth">6</td>
81+
<td id="right">6</td>
4382
</tr>
4483
<tr>
45-
<td id="seventh">7</td>
46-
<td id="eighth">8</td>
47-
<td id="ninth">9</td>
84+
<td id="bottomLeft">7</td>
85+
<td id="bottom">8</td>
86+
<td id="bottomRight">9</td>
4887
</tr>
4988
</table>
5089

51-
<div class="small-rectangle" id="rect1">
52-
Rectangle 1
53-
</div>
54-
<div class="big-rectangle" id="rect2">
55-
Rectangle 2, which is near Rectangle 1
56-
</div>
90+
<section id="rectangles">
91+
<div id="a">El-A</div>
92+
<div id="b">El-B</div>
93+
<div id="c">El-C</div>
94+
<div id="d">El-D</div>
95+
<div id="e">El-E</div>
96+
<div id="f">El-F</div>
97+
</section>
5798

58-
<div class="small-rectangle" style="margin:60px 25px" id="rect3">
59-
Rectangle 3
60-
</div>
61-
<div class="big-rectangle" id="rect4">
62-
Rectangle 4, which is not near Rectangle 2 because it is more than 50 px away
63-
</div>
99+
<section id="proximity">
100+
<div class="small" id="rect1">Rectangle 1</div>
101+
<div class="big" id="rect2">Rectangle 2, which is near Rectangle 1</div>
102+
<div class="small" id="rect3">Rectangle 3</div>
103+
<div class="big" id="rect4">
104+
Rectangle 4, which is not near Rectangle 2 because it is more than 50 px away
105+
</div>
106+
</section>
64107

65108
</body>
66109
</html>

dotnet/src/support/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ csharp_library(
3535
"UI/*.cs",
3636
]) + [":assembly-info"],
3737
out = "WebDriver.Support",
38+
langversion = "12.0",
39+
nullable = "enable",
3840
target_frameworks = [
3941
"netstandard2.0",
4042
],
@@ -74,6 +76,8 @@ csharp_library(
7476
]) + [":assembly-info"],
7577
out = "WebDriver.Support.StrongNamed",
7678
keyfile = "//dotnet:WebDriver.snk",
79+
langversion = "12.0",
80+
nullable = "enable",
7781
target_frameworks = [
7882
"netstandard2.0",
7983
],

0 commit comments

Comments
 (0)