Bazel: use internal codeql module

redsun82 · redsun82 · commit 53539226a8ef · 2024-02-12T14:27:55.000+01:00
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -3,10 +3,17 @@ module(
     version = "0.0",
 )
 
+bazel_dep(name = "codeql_internal", version = "0.0")
+local_path_override(
+    module_name = "codeql_internal",
+    path = "..",
+)
+
 # see https://registry.bazel.build/ for a list of available packages
 
 bazel_dep(name = "platforms", version = "0.0.8")
 bazel_dep(name = "rules_pkg", version = "0.9.1")
+bazel_dep(name = "rules_nodejs", version = "6.0.3")
 bazel_dep(name = "rules_python", version = "0.29.0")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
 bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "absl")
@@ -31,3 +38,14 @@ use_repo(
     "swift_toolchain_linux",
     "swift_toolchain_macos",
 )
+
+node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
+node.toolchain(
+    name = "nodejs",
+    node_version = "18.15.0",
+)
+use_repo(node, "nodejs", "nodejs_toolchains")
+
+register_toolchains(
+    "@nodejs_toolchains//:all",
+)
diff --git a/javascript/BUILD.bazel b/javascript/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@//:dist.bzl", "dist")
+load("@codeql_internal//:dist.bzl", "dist")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
-load("@//buildutils-internal:zipmerge.bzl", "zipmerge")
+load("@codeql_internal//buildutils-internal:zipmerge.bzl", "zipmerge")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -30,7 +30,7 @@ dist(
         "//javascript/downgrades",
         "//javascript/externs",
         "//javascript/extractor:tools-extractor",
-        "@//language-packs/javascript:resources",
+        "@codeql_internal//language-packs/javascript:resources",
     ],
     prefix = "javascript",
 )
diff --git a/javascript/downgrades/BUILD.bazel b/javascript/downgrades/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@//:dist.bzl", "pack_zip")
+load("@codeql_internal//:dist.bzl", "pack_zip")
 
 pack_zip(
     name = "downgrades",
diff --git a/javascript/externs/BUILD.bazel b/javascript/externs/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@//:dist.bzl", "pack_zip")
+load("@codeql_internal//:dist.bzl", "pack_zip")
 
 pack_zip(
     name = "externs",
diff --git a/javascript/extractor/BUILD.bazel b/javascript/extractor/BUILD.bazel
@@ -1,21 +1,21 @@
-load("@//:common.bzl", "codeql_fat_jar", "codeql_java_project")
+load("@codeql_internal//:common.bzl", "codeql_fat_jar", "codeql_java_project")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 
 java_library(
     name = "deps",
     visibility = [":__subpackages__"],
     exports = [
-        "@//extractor:html",
-        "@//extractor:yaml",
-        "@//resources/lib/java:commons-compress",
-        "@//resources/lib/java:gson",
-        "@//resources/lib/java:jericho-html",
-        "@//resources/lib/java:slf4j-api",
-        "@//resources/lib/java:snakeyaml",
-        "@//third_party:jackson",
-        "@//third_party:logback",
-        "@//util-java7",
-        "@//util-java8",
+        "@codeql_internal//extractor:html",
+        "@codeql_internal//extractor:yaml",
+        "@codeql_internal//resources/lib/java:commons-compress",
+        "@codeql_internal//resources/lib/java:gson",
+        "@codeql_internal//resources/lib/java:jericho-html",
+        "@codeql_internal//resources/lib/java:slf4j-api",
+        "@codeql_internal//resources/lib/java:snakeyaml",
+        "@codeql_internal//third_party:jackson",
+        "@codeql_internal//third_party:logback",
+        "@codeql_internal//util-java7",
+        "@codeql_internal//util-java8",
     ],
 )
 
@@ -36,18 +36,18 @@ codeql_fat_jar(
     name = "extractor-javascript",
     srcs = [
         ":extractor",
-        "@//extractor:html",
-        "@//extractor:xml-trap-writer",
-        "@//extractor:yaml",
-        "@//resources/lib/java:commons-compress",
-        "@//resources/lib/java:gson",
-        "@//resources/lib/java:jericho-html",
-        "@//resources/lib/java:slf4j-api",
-        "@//resources/lib/java:snakeyaml",
-        "@//third_party:jackson",
-        "@//third_party:logback",
-        "@//util-java7",
-        "@//util-java8",
+        "@codeql_internal//extractor:html",
+        "@codeql_internal//extractor:xml-trap-writer",
+        "@codeql_internal//extractor:yaml",
+        "@codeql_internal//resources/lib/java:commons-compress",
+        "@codeql_internal//resources/lib/java:gson",
+        "@codeql_internal//resources/lib/java:jericho-html",
+        "@codeql_internal//resources/lib/java:slf4j-api",
+        "@codeql_internal//resources/lib/java:snakeyaml",
+        "@codeql_internal//third_party:jackson",
+        "@codeql_internal//third_party:logback",
+        "@codeql_internal//util-java7",
+        "@codeql_internal//util-java8",
     ],
     files = [":javascript-extractor-resources"],
     main_class = "com.semmle.js.extractor.Main",
diff --git a/javascript/extractor/lib/typescript/BUILD.bazel b/javascript/extractor/lib/typescript/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@//:common.bzl", "on_windows")
+load("@codeql_internal//:common.bzl", "on_windows")
 
 # Builds a zip file of the compiled typscript-parser-wrapper and its dependencies.
 genrule(
diff --git a/javascript/extractor/test/com/semmle/js/extractor/test/BUILD.bazel b/javascript/extractor/test/com/semmle/js/extractor/test/BUILD.bazel
@@ -5,7 +5,7 @@ java_test(
     deps = [
         "//javascript/extractor",
         "//javascript/extractor:deps",
-        "@//resources/lib/java/DO_NOT_DISTRIBUTE:junit",
+        "@codeql_internal//resources/lib/java/DO_NOT_DISTRIBUTE:junit",
     ],
 )
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load("@//:dist.bzl", "pack_zip")`
	`1`	`+load("@codeql_internal//:dist.bzl", "pack_zip")`
`2`	`2`
`3`	`3`	`pack_zip(`
`4`	`4`	`name = "downgrades",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load("@//:common.bzl", "on_windows")`
	`1`	`+load("@codeql_internal//:common.bzl", "on_windows")`
`2`	`2`
`3`	`3`	`# Builds a zip file of the compiled typscript-parser-wrapper and its dependencies.`
`4`	`4`	`genrule(`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ java_test(`
`5`	`5`	`deps = [`
`6`	`6`	`"//javascript/extractor",`
`7`	`7`	`"//javascript/extractor:deps",`
`8`		`- "@//resources/lib/java/DO_NOT_DISTRIBUTE:junit",`
	`8`	`+ "@codeql_internal//resources/lib/java/DO_NOT_DISTRIBUTE:junit",`
`9`	`9`	`],`
`10`	`10`	`)`
`11`	`11`