Skip to content

Commit 1bcc79f

Browse files
authored
[bazel + js] Allow bazel build //javascript/... to work (#13893)
* [bazel + js] Allow `bazel build //javascript/...` to work * cp: hackity hack * Reorganise the build file
1 parent ac93fab commit 1bcc79f

File tree

3 files changed

+60
-35
lines changed

3 files changed

+60
-35
lines changed

javascript/grid-ui/BUILD.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ SRCS = glob(
3333
exclude = [
3434
"src/simple.ts",
3535
"src/**/*.test.tsx",
36-
# "src/assets/**/*",
3736
],
3837
)
3938

@@ -54,7 +53,9 @@ DEPS = [
5453
ts_project(
5554
name = "transpile_ts",
5655
srcs = SRCS,
56+
allow_js = True,
5757
assets = glob(["src/assets/**/*"]),
58+
resolve_json_module = True,
5859
tsconfig = "tsconfig.json",
5960
deps = DEPS,
6061
)

javascript/grid-ui/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"types": [
2323
"@types/node"
2424
],
25-
"sourceMap": false,
25+
"sourceMap": false
2626
},
2727
"include": [
2828
"src"

javascript/node/selenium-webdriver/BUILD.bazel

Lines changed: 57 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
2+
load("@aspect_rules_js//js:defs.bzl", "js_library")
23
load("@aspect_rules_js//npm:defs.bzl", "npm_package")
34
load("@npm//:defs.bzl", "npm_link_all_packages")
45
load("@npm//javascript/node/selenium-webdriver:eslint/package_json.bzl", eslint_bin = "bin")
@@ -18,31 +19,35 @@ BROWSER_VERSIONS = [
1819
"v124",
1920
]
2021

21-
SRC_FILES = [
22-
"CHANGES.md",
23-
"README.md",
24-
"package.json",
25-
] + glob([
26-
"*.js",
27-
"example/*.js",
28-
"http/*.js",
29-
"io/*.js",
30-
"lib/*.js",
31-
"net/*.js",
32-
"remote/*.js",
33-
"testing/*.js",
34-
"devtools/*.js",
35-
"common/*.js",
36-
"bidi/*.js",
37-
])
22+
js_library(
23+
name = "prod-src-files",
24+
srcs = [
25+
"CHANGES.md",
26+
"README.md",
27+
"package.json",
28+
] + glob([
29+
"*.js",
30+
"example/*.js",
31+
"http/*.js",
32+
"io/*.js",
33+
"lib/*.js",
34+
"net/*.js",
35+
"remote/*.js",
36+
"testing/*.js",
37+
"devtools/*.js",
38+
"common/*.js",
39+
"bidi/*.js",
40+
]),
41+
)
3842

3943
npm_package(
4044
name = "selenium-webdriver",
41-
srcs = SRC_FILES + [
45+
srcs = [
4246
":license",
4347
":manager-linux",
4448
":manager-macos",
4549
":manager-windows",
50+
":prod-src-files",
4651
"//javascript/node/selenium-webdriver/lib/atoms:find-elements",
4752
"//javascript/node/selenium-webdriver/lib/atoms:get_attribute",
4853
"//javascript/node/selenium-webdriver/lib/atoms:is_displayed",
@@ -64,8 +69,6 @@ pkg_tar(
6469
strip_prefix = "selenium-webdriver",
6570
)
6671

67-
#TEST_FILES = glob(["test/**/*_test.js"])
68-
#
6972
SMALL_TESTS = [
7073
"test/io/io_test.js",
7174
"test/io/zip_test.js",
@@ -83,17 +86,30 @@ SMALL_TESTS = [
8386
"test/net/portprober_test.js",
8487
]
8588

86-
LARGE_TESTS = glob(
87-
["test/**/*_test.js"],
88-
exclude = SMALL_TESTS,
89+
js_library(
90+
name = "small-test-srcs",
91+
srcs = SMALL_TESTS,
8992
)
9093

91-
TEST_DATA = SRC_FILES + glob(
92-
[
93-
"lib/test/**",
94-
"test/**",
95-
],
96-
exclude = LARGE_TESTS + SMALL_TESTS,
94+
js_library(
95+
name = "large-test-srcs",
96+
srcs = glob(
97+
["test/**/*_test.js"],
98+
exclude = SMALL_TESTS,
99+
),
100+
)
101+
102+
js_library(
103+
name = "test-data",
104+
srcs = glob(
105+
[
106+
"lib/test/**",
107+
"test/**",
108+
],
109+
exclude = [
110+
"test/**/*_test.js",
111+
],
112+
),
97113
)
98114

99115
mocha_test(
@@ -108,14 +124,16 @@ mocha_test(
108124
":node_modules/sinon",
109125
":node_modules/tmp",
110126
":node_modules/ws",
127+
":small-test-srcs",
128+
":test-data",
111129
"//:node_modules/selenium-webdriver",
112130
"//common/extensions:js-lib",
113131
"//common/src/web:js-lib",
114132
"//javascript/node/selenium-webdriver/lib/atoms:find-elements",
115133
"//javascript/node/selenium-webdriver/lib/atoms:get_attribute",
116134
"//javascript/node/selenium-webdriver/lib/atoms:is_displayed",
117135
"//javascript/node/selenium-webdriver/lib/atoms:mutation-listener",
118-
] + SMALL_TESTS + TEST_DATA,
136+
],
119137
tags = [
120138
"skip-remote",
121139
],
@@ -127,7 +145,9 @@ mocha_test(
127145
size = "large",
128146
args = ["--retries 1"],
129147
chdir = package_name(),
130-
data = LARGE_TESTS + TEST_DATA + [
148+
data = [
149+
"test-data",
150+
":large-test-srcs",
131151
":node_modules/@bazel/runfiles",
132152
":node_modules/express",
133153
":node_modules/jszip",
@@ -198,7 +218,7 @@ copy_to_bin(
198218
eslint_bin.eslint_test(
199219
name = "eslint-test",
200220
chdir = package_name(),
201-
data = SRC_FILES + [
221+
data = [
202222
":eslint-config",
203223
":node_modules/@eslint/js",
204224
":node_modules/eslint-plugin-mocha",
@@ -211,6 +231,7 @@ eslint_bin.eslint_test(
211231
":node_modules/tmp",
212232
":node_modules/ws",
213233
":package-json",
234+
":prod-src-files",
214235
],
215236
tags = [
216237
"lint",
@@ -231,9 +252,12 @@ prettier_bin.prettier_test(
231252
"--config=.prettierrc",
232253
],
233254
chdir = package_name(),
234-
data = SRC_FILES + SMALL_TESTS + LARGE_TESTS + [
255+
data = [
256+
":large-test-srcs",
235257
":prettier-config",
236258
":prettier-ignore",
259+
":prod-src-files",
260+
":small-test-srcs",
237261
],
238262
tags = [
239263
"lint",

0 commit comments

Comments
 (0)