checkpoint

Author: pcj

.bazelrc

@@ -1,11 +1,9 @@
-# Compile/run with Java 21
-build --java_language_version=21
+# Enable Java 21
 build --java_runtime_version=21
+build --java_language_version=21
 build --tool_java_language_version=21
 build --tool_java_runtime_version=21
 
-build --experimental_proto_descriptor_sets_include_source_info
-
 # Don't leak PATH and LD_LIBRARY_PATH into the build.
 build --incompatible_strict_action_env
 

MODULE.bazel

@@ -24,6 +24,24 @@ bazel_dep(name = "rules_tsickle", version = "1.0.0")
 bazel_dep(name = "rules_web_testing_java", version = "0.4.1")
 bazel_dep(name = "rules_webtesting", version = "0.4.1")
 
+# google_bazel_common override is needed for @closure-compiler
+git_override(
+    module_name = "google_bazel_common",
+    # Pin to newer version to fix b/408030907
+    commit = "2cab52929507935aa43d460a3976d3bedc814d3a",
+    remote = "https://github.com/google/bazel-common",
+)
+
+local_path_override(
+    module_name = "rules_tsickle",
+    path = "/Users/pcj/go/src/github.com/stackb/rules_tsickle",
+)
+
+# local_path_override(
+#     module_name = "closure-compiler",
+#     path = "/Users/pcj/go/src/github.com/google/closure-compiler",
+# )
+
 # -------------------------------------------------------------------
 # Overrides
 # -------------------------------------------------------------------
@@ -136,6 +154,14 @@ platform_http_file(
     ],
 )
 
+# -------------------------------------------------------------------
+# java configuration
+# -------------------------------------------------------------------
+
+# Compatibility layer
+compat = use_extension("@rules_java//java:rules_java_deps.bzl", "compatibility_proxy")
+use_repo(compat, "compatibility_proxy")
+
 # -------------------------------------------------------------------
 # maven configuration
 # -------------------------------------------------------------------
@@ -175,7 +201,8 @@ maven.artifact(
     name = "maven_rules_closure",
     artifact = "closure-compiler",
     group = "com.google.javascript",
-    version = "v20250402",  # Using maven.artifact here because the version number vxxxxx cannot parsed correctly.
+    # version = "v20250402",  # Using maven.artifact here because the version number vxxxxx cannot parsed correctly.
+    version = "v20250820",  # Using maven.artifact here because the version number vxxxxx cannot parsed correctly.
 )
 maven.override(
     name = "maven_rules_closure",

README.md

@@ -25,6 +25,7 @@ load(
     "ClosureJsLibraryInfo",
     "JS_FILE_TYPE",
     "JS_LANGUAGE_IN",
+    "JS_OR_ZIP_FILE_TYPE",
     "collect_js",
     "collect_runfiles",
     "convert_path_to_es6_module_name",
@@ -72,6 +73,9 @@ def create_closure_js_library(
         but also propagate up to closure_js_binary.
       lenient: makes the library lenient which suppresses handful of checkings in
         one shot.
+      convention: naming convention for the library (default: "CLOSURE")
+      internal_descriptors: depset of protobuf descriptor files
+      artifact_suffix: suffix to append to generated artifact names
 
     Returns:
       A closure_js_library metadata struct with exports and closure_js_library attribute
@@ -202,10 +206,6 @@ def _closure_js_library_impl(
     args.add("--output_ijs_file", ijs_file)
     args.add("--convention", convention)
 
-    # Because JsChecker is an edge in the build graph, we need to declare all of
-    # its input vertices.
-    inputs = []
-
     # We want to test the failure conditions of this rule from within Bazel,
     # rather than from a meta-system like shell scripts. In order to do that, we
     # need a way to toggle the return status of the process.
@@ -375,12 +375,14 @@ def _closure_js_library(ctx):
     if not ctx.files.srcs and (ctx.attr.suppress or ctx.attr.lenient):
         fail("'srcs' must be set when using 'suppress' or 'lenient'")
     if ctx.attr.language:
+        # buildifier: disable=print
         print("The closure_js_library 'language' attribute is now removed and " +
               "is always set to " + JS_LANGUAGE_IN)
 
     # Create a list of the sources defined by this specific rule.
     srcs = ctx.files.srcs
     if ctx.files.externs:
+        # buildifier: disable=print
         print("closure_js_library 'externs' is deprecated; just use 'srcs'")
         srcs = ctx.files.externs + srcs
 
@@ -438,7 +440,7 @@ closure_js_library = rule(
         ),
         "includes": attr.string_list(),
         "no_closure_library": attr.bool(),
-        "srcs": attr.label_list(allow_files = JS_FILE_TYPE),
+        "srcs": attr.label_list(allow_files = JS_OR_ZIP_FILE_TYPE),
         "suppress": attr.string_list(),
         "lenient": attr.bool(),
 

closure/compiler/closure_js_library.bzl

@@ -8,7 +8,7 @@ load(
     "closure_js_template_library",
     "web_library",
 )
-load("@io_bazel_rules_closure//closure/protobuf:defs.bzl", "closure_jspb_library")
+load("//closure/protobuf:defs.bzl", "closure_jspb_library")
 
 package(default_testonly = True)
 

closure/compiler/test/app/BUILD.bazel

@@ -2,7 +2,7 @@
 # They are too different to attempt a copybara transform between them.
 # This file is used in the closure-library repo by external Bazel users (via io_bazel_rules_closure)
 
-load("@io_bazel_rules_closure//closure/compiler:closure_base_js_library.bzl", "closure_base_js_library")
+load("//closure/compiler:closure_base_js_library.bzl", "closure_base_js_library")
 
 package(default_visibility = ["//visibility:public"])
 

closure/goog/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
+load("//closure:defs.bzl", "closure_js_library")
 
 package(default_visibility = ["//visibility:public"])
 

closure/goog/a11y/aria/BUILD

@@ -1,4 +1,4 @@
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
+load("//closure:defs.bzl", "closure_js_library")
 
 package(default_visibility = ["//visibility:public"])
 

closure/goog/array/BUILD

@@ -1,4 +1,4 @@
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
+load("//closure:defs.bzl", "closure_js_library")
 
 package(default_visibility = ["//visibility:public"])
 

closure/goog/asserts/BUILD

@@ -1,4 +1,4 @@
-load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")
+load("//closure:defs.bzl", "closure_js_library")
 
 package(default_visibility = ["//visibility:public"])