Skip to content

Commit 5353922

Browse files
committed
Bazel: use internal codeql module
1 parent 19bb8fe commit 5353922

File tree

7 files changed

+49
-31
lines changed

7 files changed

+49
-31
lines changed

MODULE.bazel

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@ module(
33
version = "0.0",
44
)
55

6+
bazel_dep(name = "codeql_internal", version = "0.0")
7+
local_path_override(
8+
module_name = "codeql_internal",
9+
path = "..",
10+
)
11+
612
# see https://registry.bazel.build/ for a list of available packages
713

814
bazel_dep(name = "platforms", version = "0.0.8")
915
bazel_dep(name = "rules_pkg", version = "0.9.1")
16+
bazel_dep(name = "rules_nodejs", version = "6.0.3")
1017
bazel_dep(name = "rules_python", version = "0.29.0")
1118
bazel_dep(name = "bazel_skylib", version = "1.5.0")
1219
bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "absl")
@@ -31,3 +38,14 @@ use_repo(
3138
"swift_toolchain_linux",
3239
"swift_toolchain_macos",
3340
)
41+
42+
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
43+
node.toolchain(
44+
name = "nodejs",
45+
node_version = "18.15.0",
46+
)
47+
use_repo(node, "nodejs", "nodejs_toolchains")
48+
49+
register_toolchains(
50+
"@nodejs_toolchains//:all",
51+
)

javascript/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
load("@//:dist.bzl", "dist")
1+
load("@codeql_internal//:dist.bzl", "dist")
22
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
3-
load("@//buildutils-internal:zipmerge.bzl", "zipmerge")
3+
load("@codeql_internal//buildutils-internal:zipmerge.bzl", "zipmerge")
44

55
package(default_visibility = ["//visibility:public"])
66

@@ -30,7 +30,7 @@ dist(
3030
"//javascript/downgrades",
3131
"//javascript/externs",
3232
"//javascript/extractor:tools-extractor",
33-
"@//language-packs/javascript:resources",
33+
"@codeql_internal//language-packs/javascript:resources",
3434
],
3535
prefix = "javascript",
3636
)

javascript/downgrades/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@//:dist.bzl", "pack_zip")
1+
load("@codeql_internal//:dist.bzl", "pack_zip")
22

33
pack_zip(
44
name = "downgrades",

javascript/externs/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@//:dist.bzl", "pack_zip")
1+
load("@codeql_internal//:dist.bzl", "pack_zip")
22

33
pack_zip(
44
name = "externs",

javascript/extractor/BUILD.bazel

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
load("@//:common.bzl", "codeql_fat_jar", "codeql_java_project")
1+
load("@codeql_internal//:common.bzl", "codeql_fat_jar", "codeql_java_project")
22
load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
33

44
java_library(
55
name = "deps",
66
visibility = [":__subpackages__"],
77
exports = [
8-
"@//extractor:html",
9-
"@//extractor:yaml",
10-
"@//resources/lib/java:commons-compress",
11-
"@//resources/lib/java:gson",
12-
"@//resources/lib/java:jericho-html",
13-
"@//resources/lib/java:slf4j-api",
14-
"@//resources/lib/java:snakeyaml",
15-
"@//third_party:jackson",
16-
"@//third_party:logback",
17-
"@//util-java7",
18-
"@//util-java8",
8+
"@codeql_internal//extractor:html",
9+
"@codeql_internal//extractor:yaml",
10+
"@codeql_internal//resources/lib/java:commons-compress",
11+
"@codeql_internal//resources/lib/java:gson",
12+
"@codeql_internal//resources/lib/java:jericho-html",
13+
"@codeql_internal//resources/lib/java:slf4j-api",
14+
"@codeql_internal//resources/lib/java:snakeyaml",
15+
"@codeql_internal//third_party:jackson",
16+
"@codeql_internal//third_party:logback",
17+
"@codeql_internal//util-java7",
18+
"@codeql_internal//util-java8",
1919
],
2020
)
2121

@@ -36,18 +36,18 @@ codeql_fat_jar(
3636
name = "extractor-javascript",
3737
srcs = [
3838
":extractor",
39-
"@//extractor:html",
40-
"@//extractor:xml-trap-writer",
41-
"@//extractor:yaml",
42-
"@//resources/lib/java:commons-compress",
43-
"@//resources/lib/java:gson",
44-
"@//resources/lib/java:jericho-html",
45-
"@//resources/lib/java:slf4j-api",
46-
"@//resources/lib/java:snakeyaml",
47-
"@//third_party:jackson",
48-
"@//third_party:logback",
49-
"@//util-java7",
50-
"@//util-java8",
39+
"@codeql_internal//extractor:html",
40+
"@codeql_internal//extractor:xml-trap-writer",
41+
"@codeql_internal//extractor:yaml",
42+
"@codeql_internal//resources/lib/java:commons-compress",
43+
"@codeql_internal//resources/lib/java:gson",
44+
"@codeql_internal//resources/lib/java:jericho-html",
45+
"@codeql_internal//resources/lib/java:slf4j-api",
46+
"@codeql_internal//resources/lib/java:snakeyaml",
47+
"@codeql_internal//third_party:jackson",
48+
"@codeql_internal//third_party:logback",
49+
"@codeql_internal//util-java7",
50+
"@codeql_internal//util-java8",
5151
],
5252
files = [":javascript-extractor-resources"],
5353
main_class = "com.semmle.js.extractor.Main",

javascript/extractor/lib/typescript/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@//:common.bzl", "on_windows")
1+
load("@codeql_internal//:common.bzl", "on_windows")
22

33
# Builds a zip file of the compiled typscript-parser-wrapper and its dependencies.
44
genrule(

javascript/extractor/test/com/semmle/js/extractor/test/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ java_test(
55
deps = [
66
"//javascript/extractor",
77
"//javascript/extractor:deps",
8-
"@//resources/lib/java/DO_NOT_DISTRIBUTE:junit",
8+
"@codeql_internal//resources/lib/java/DO_NOT_DISTRIBUTE:junit",
99
],
1010
)
1111

0 commit comments

Comments
 (0)