migrate to aspect-build rules_js/rules_ts

Author: pcj

.bazelignore

@@ -1,4 +1,4 @@
 docs/
 node_modules
 plugin/stephenh/ts-proto/node_modules
-rules/ts/node_modules
+rules/ts/node_modules

.bazelrc

@@ -13,3 +13,7 @@ build:bazelci --deleted_packages=docs
 
 # workaround for scala
 build --incompatible_java_common_parameters=false
+
+# HOME appears to be required by //pkg/plugin/grpc/grpc:grpc_test
+# (for github.com/bazelbuild/rules_go/go/tools/bazel_testing)
+test --action_env=HOME

.npmrc

@@ -0,0 +1 @@
+hoist=false

Makefile

@@ -31,3 +31,7 @@ get:
 	$(BAZEL) run @go_sdk//:bin/go -- get github.com/bazelbuild/[email protected]
 	$(BAZEL) run @go_sdk//:bin/go -- mod download github.com/bazelbuild/buildtools
 	$(BAZEL) run @go_sdk//:bin/go -- mod vendor
+
+update_pnpm_lock:
+	# nvm use 18
+	pnpm install --lockfile-only

WORKSPACE

@@ -114,21 +114,23 @@ load(
     "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS",
     "grpc_java_repositories",
 )
+load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
+
+protobuf_deps()
 
 maven_install(
-    artifacts = IO_GRPC_GRPC_JAVA_ARTIFACTS,
+    name = "maven",
+    artifacts = IO_GRPC_GRPC_JAVA_ARTIFACTS + PROTOBUF_MAVEN_ARTIFACTS,
     generate_compat_repositories = True,
-    maven_install_json = "//:maven_install.json",
+    # TODO(pcj): why does pinning of this repository cause such problems?
+    # example: no such package '@com_google_errorprone_error_prone_annotations_2_18_0//file': The repository '@com_google_errorprone_error_prone_annotations_2_18_0' could not be resolved: Repository '@com_google_errorprone_error_prone_annotations_2_18_0' is not defined and referenced by '@maven//:com_google_errorprone_error_prone_annotations_2_18_0_extension'
+    # maven_install_json = "//:maven_install.json",
     override_targets = IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS,
-    repositories = [
-        "https://repo.maven.apache.org/maven2/",
-    ],
+    repositories = ["https://repo.maven.apache.org/maven2/"],
+    strict_visibility = True,
 )
 
-load(
-    "@maven//:compat.bzl",
-    "compat_repositories",
-)
+load("@maven//:compat.bzl", "compat_repositories")
 
 compat_repositories()
 
@@ -219,6 +221,10 @@ rules_closure_dependencies()
 # NodeJS
 # ----------------------------------------------------
 
+load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies")
+
+build_bazel_rules_nodejs_dependencies()
+
 load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories")
 
 node_repositories()
@@ -232,7 +238,7 @@ load("//:proto_repositories.bzl", "proto_repositories")
 proto_repositories()
 
 # ----------------------------------------------------
-# Typescript
+# @aspect_rules_ts
 # ----------------------------------------------------
 load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
 
@@ -241,7 +247,10 @@ rules_ts_dependencies(
     ts_version_from = "//:package.json",
 )
 
-# Fetch and register node, if you haven't already
+# ----------------------------------------------------
+# @rules_nodejs
+# ----------------------------------------------------
+
 load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
 
 nodejs_register_toolchains(
@@ -259,7 +268,6 @@ npm_translate_lock(
     verify_node_modules_ignored = "//:.bazelignore",
 )
 
-load("@npm_ts_proto//:repositories.bzl", "npm_repositories")
+load("@npm_ts_proto//:repositories.bzl", npm_ts_proto_repositories = "npm_repositories")
 
-# Declares npm_import rules from the pnpm-lock.yaml file
-npm_repositories()
+npm_ts_proto_repositories()

deps/BUILD.bazel

@@ -46,9 +46,7 @@ depsgen(
 
 depsgen(
     name = "ts_proto",
-    deps = [
-        ":aspect_rules_ts",
-    ],
+    deps = [":aspect_rules_ts"],
 )
 
 depsgen(
@@ -277,32 +275,33 @@ proto_dependency(
     urls = ["https://github.com/bazelbuild/rules_swift/archive/dadd12190182530cf6f91ca7f9e70391644ce502.tar.gz"],
 )
 
-# Release: v1.35.0
-# Commit: master
-# Date: 2021-01-12 23:05:49 +0000 UTC
-# URL: https://github.com/grpc/grpc-java/releases/tag/v1.35.0
-# Branch: master
-# Commit: 7f7821c616598ce4e33d2045c5641b2348728cb8
-# Date: 2021-02-10 00:56:26 +0000 UTC
-# URL: https://github.com/grpc/grpc-java/commit/7f7821c616598ce4e33d2045c5641b2348728cb8
-#
-# interop-testing: add fake altsHandshakerService for test (#7847)
-# Size: 2337953 (2.3 MB)
+# Release: v1.57.1
+# TargetCommitish: master
+# Date: 2023-08-01 17:05:26 +0000 UTC
+# URL: https://github.com/grpc/grpc-java/releases/tag/v1.57.1
+# Size: 2962849 (3.0 MB)
 proto_dependency(
     name = "io_grpc_grpc_java",
     repository_rule = "http_archive",
-    sha256 = "82b3cf09f98a5932e1b55175aaec91b2a3f424eec811e47b2a3be533044d9afb",
-    strip_prefix = "grpc-java-7f7821c616598ce4e33d2045c5641b2348728cb8",
-    urls = ["https://github.com/grpc/grpc-java/archive/7f7821c616598ce4e33d2045c5641b2348728cb8.tar.gz"],
+    sha256 = "4a021ea9ebb96f5841a135c168209cf2413587a0f8ce71a2bf37b3aad847b0d0",
+    strip_prefix = "grpc-java-1.57.1",
+    urls = ["https://github.com/grpc/grpc-java/archive/v1.57.1.tar.gz"],
     deps = [":rules_jvm_external"],
 )
 
+# Branch: 5.3
+# Commit: e6c1ff21e002bf97a7b1c07d63edd508a8dc9659
+# Date: 2023-06-23 14:48:11 +0000 UTC
+# URL: https://github.com/bazelbuild/rules_jvm_external/commit/e6c1ff21e002bf97a7b1c07d63edd508a8dc9659
+#
+# Prepare for 5.3 release (#922)
+# Size: 6964597 (7.0 MB)
 proto_dependency(
     name = "rules_jvm_external",
     repository_rule = "http_archive",
-    sha256 = "31701ad93dbfe544d597dbe62c9a1fdd76d81d8a9150c2bf1ecf928ecdf97169",
-    strip_prefix = "rules_jvm_external-4.0",
-    urls = ["https://github.com/bazelbuild/rules_jvm_external/archive/4.0.zip"],
+    sha256 = "1ce86ffee65725300dc1f0017b7df89715c832de550137432dc1985d60a13155",
+    strip_prefix = "rules_jvm_external-e6c1ff21e002bf97a7b1c07d63edd508a8dc9659",
+    urls = ["https://github.com/bazelbuild/rules_jvm_external/archive/e6c1ff21e002bf97a7b1c07d63edd508a8dc9659.tar.gz"],
 )
 
 proto_dependency(
@@ -435,9 +434,8 @@ proto_dependency(
 proto_dependency(
     name = "rules_nodejs",
     repository_rule = "http_archive",
-    sha256 = "a833b08fc846e27a73ac2b7062e4f48cace0e72a072c6c3fa756847dc44246dd",
-    strip_prefix = "rules_nodejs-6.0.0",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/v6.0.0/rules_nodejs-v6.0.0.tar.gz"],
+    sha256 = "08337d4fffc78f7fe648a93be12ea2fc4e8eb9795a4e6aa48595b66b34555626",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.0/rules_nodejs-core-5.8.0.tar.gz"],
 )
 
 proto_dependency(

deps/example_routeguide_nodejs_deps.bzl

@@ -0,0 +1,35 @@
+"""
+GENERATED FILE - DO NOT EDIT (created via @build_stack_rules_proto//cmd/depsgen)
+"""
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
+
+def _maybe(repo_rule, name, **kwargs):
+    if name not in native.existing_rules():
+        repo_rule(name = name, **kwargs)
+
+def example_routeguide_nodejs_deps():
+    """example_routeguide_nodejs dependency macro
+    """
+    build_bazel_rules_nodejs()  # via npm_example_routeguide_nodejs
+    npm_example_routeguide_nodejs()  # via <TOP>
+
+def build_bazel_rules_nodejs():
+    _maybe(
+        http_archive,
+        name = "build_bazel_rules_nodejs",
+        sha256 = "4501158976b9da216295ac65d872b1be51e3eeb805273e68c516d2eb36ae1fbb",
+        urls = [
+            "https://github.com/bazelbuild/rules_nodejs/releases/download/4.4.1/rules_nodejs-4.4.1.tar.gz",
+        ],
+    )
+
+def npm_example_routeguide_nodejs():
+    _maybe(
+        npm_install,
+        name = "npm_example_routeguide_nodejs",
+        package_json = "//example/routeguide/nodejs:package.json",
+        package_lock_json = "//example/routeguide/nodejs:package-lock.json",
+        symlink_node_modules = False,
+    )

deps/grpc_core_deps.bzl

@@ -111,10 +111,10 @@ def rules_jvm_external():
     _maybe(
         http_archive,
         name = "rules_jvm_external",
-        sha256 = "31701ad93dbfe544d597dbe62c9a1fdd76d81d8a9150c2bf1ecf928ecdf97169",
-        strip_prefix = "rules_jvm_external-4.0",
+        sha256 = "1ce86ffee65725300dc1f0017b7df89715c832de550137432dc1985d60a13155",
+        strip_prefix = "rules_jvm_external-e6c1ff21e002bf97a7b1c07d63edd508a8dc9659",
         urls = [
-            "https://github.com/bazelbuild/rules_jvm_external/archive/4.0.zip",
+            "https://github.com/bazelbuild/rules_jvm_external/archive/e6c1ff21e002bf97a7b1c07d63edd508a8dc9659.tar.gz",
         ],
     )
 

deps/grpc_java_deps.bzl

@@ -18,20 +18,20 @@ def rules_jvm_external():
     _maybe(
         http_archive,
         name = "rules_jvm_external",
-        sha256 = "31701ad93dbfe544d597dbe62c9a1fdd76d81d8a9150c2bf1ecf928ecdf97169",
-        strip_prefix = "rules_jvm_external-4.0",
+        sha256 = "1ce86ffee65725300dc1f0017b7df89715c832de550137432dc1985d60a13155",
+        strip_prefix = "rules_jvm_external-e6c1ff21e002bf97a7b1c07d63edd508a8dc9659",
         urls = [
-            "https://github.com/bazelbuild/rules_jvm_external/archive/4.0.zip",
+            "https://github.com/bazelbuild/rules_jvm_external/archive/e6c1ff21e002bf97a7b1c07d63edd508a8dc9659.tar.gz",
         ],
     )
 
 def io_grpc_grpc_java():
     _maybe(
         http_archive,
         name = "io_grpc_grpc_java",
-        sha256 = "82b3cf09f98a5932e1b55175aaec91b2a3f424eec811e47b2a3be533044d9afb",
-        strip_prefix = "grpc-java-7f7821c616598ce4e33d2045c5641b2348728cb8",
+        sha256 = "4a021ea9ebb96f5841a135c168209cf2413587a0f8ce71a2bf37b3aad847b0d0",
+        strip_prefix = "grpc-java-1.57.1",
         urls = [
-            "https://github.com/grpc/grpc-java/archive/7f7821c616598ce4e33d2045c5641b2348728cb8.tar.gz",
+            "https://github.com/grpc/grpc-java/archive/v1.57.1.tar.gz",
         ],
     )

deps/grpc_node_deps.bzl

@@ -112,10 +112,10 @@ def rules_jvm_external():
     _maybe(
         http_archive,
         name = "rules_jvm_external",
-        sha256 = "31701ad93dbfe544d597dbe62c9a1fdd76d81d8a9150c2bf1ecf928ecdf97169",
-        strip_prefix = "rules_jvm_external-4.0",
+        sha256 = "1ce86ffee65725300dc1f0017b7df89715c832de550137432dc1985d60a13155",
+        strip_prefix = "rules_jvm_external-e6c1ff21e002bf97a7b1c07d63edd508a8dc9659",
         urls = [
-            "https://github.com/bazelbuild/rules_jvm_external/archive/4.0.zip",
+            "https://github.com/bazelbuild/rules_jvm_external/archive/e6c1ff21e002bf97a7b1c07d63edd508a8dc9659.tar.gz",
         ],
     )
 

deps/nodejs_deps.bzl

@@ -11,14 +11,25 @@ def _maybe(repo_rule, name, **kwargs):
 def nodejs_deps():
     """nodejs dependency macro
     """
+    rules_nodejs()  # via build_bazel_rules_nodejs
     build_bazel_rules_nodejs()  # via <TOP>
 
+def rules_nodejs():
+    _maybe(
+        http_archive,
+        name = "rules_nodejs",
+        sha256 = "08337d4fffc78f7fe648a93be12ea2fc4e8eb9795a4e6aa48595b66b34555626",
+        urls = [
+            "https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.0/rules_nodejs-core-5.8.0.tar.gz",
+        ],
+    )
+
 def build_bazel_rules_nodejs():
     _maybe(
         http_archive,
         name = "build_bazel_rules_nodejs",
-        sha256 = "4501158976b9da216295ac65d872b1be51e3eeb805273e68c516d2eb36ae1fbb",
+        sha256 = "dcc55f810142b6cf46a44d0180a5a7fb923c04a5061e2e8d8eb05ccccc60864b",
         urls = [
-            "https://github.com/bazelbuild/rules_nodejs/releases/download/4.4.1/rules_nodejs-4.4.1.tar.gz",
+            "https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.0/rules_nodejs-5.8.0.tar.gz",
         ],
     )

deps/scala_deps.bzl

@@ -19,10 +19,10 @@ def rules_jvm_external():
     _maybe(
         http_archive,
         name = "rules_jvm_external",
-        sha256 = "31701ad93dbfe544d597dbe62c9a1fdd76d81d8a9150c2bf1ecf928ecdf97169",
-        strip_prefix = "rules_jvm_external-4.0",
+        sha256 = "1ce86ffee65725300dc1f0017b7df89715c832de550137432dc1985d60a13155",
+        strip_prefix = "rules_jvm_external-e6c1ff21e002bf97a7b1c07d63edd508a8dc9659",
         urls = [
-            "https://github.com/bazelbuild/rules_jvm_external/archive/4.0.zip",
+            "https://github.com/bazelbuild/rules_jvm_external/archive/e6c1ff21e002bf97a7b1c07d63edd508a8dc9659.tar.gz",
         ],
     )
 

deps/ts_proto_deps.bzl

@@ -42,10 +42,9 @@ def rules_nodejs():
     _maybe(
         http_archive,
         name = "rules_nodejs",
-        sha256 = "a833b08fc846e27a73ac2b7062e4f48cace0e72a072c6c3fa756847dc44246dd",
-        strip_prefix = "rules_nodejs-6.0.0",
+        sha256 = "08337d4fffc78f7fe648a93be12ea2fc4e8eb9795a4e6aa48595b66b34555626",
         urls = [
-            "https://github.com/bazelbuild/rules_nodejs/releases/download/v6.0.0/rules_nodejs-v6.0.0.tar.gz",
+            "https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.0/rules_nodejs-core-5.8.0.tar.gz",
         ],
     )
 

docs/builtins.md

@@ -46,17 +46,17 @@ proto_compile(
     options = {
         "@build_stack_rules_proto//plugin/builtin:closurejs": [
             "import_style=closure",
-            "library=test",
+            "library=test_closure",
         ],
         "@build_stack_rules_proto//plugin/builtin:commonjs": ["import_style=commonjs"],
     },
     outputs = [
         "Test.pbobjc.h",
         "Test.pbobjc.m",
-        "test.js",
         "test.pb.cc",
         "test.pb.h",
         "test.srcjar",
+        "test_closure.js",
         "test_pb.js",
         "test_pb.rb",
         "test_pb2.py",

example/BUILD.bazel

@@ -35,7 +35,12 @@
 # gazelle:proto_rule proto_java_library deps @com_google_protobuf//:protobuf_java
 # gazelle:proto_rule proto_java_library visibility //visibility:public
 # gazelle:proto_rule grpc_java_library implementation stackb:rules_proto:grpc_java_library
-# gazelle:proto_rule grpc_java_library deps @build_stack_rules_proto//plugin/grpc/grpc-java:grpc_java
+# gazelle:proto_rule grpc_java_library deps @io_grpc_grpc_java//stub
+# gazelle:proto_rule grpc_java_library deps @io_grpc_grpc_java//stub:javax_annotation
+# gazelle:proto_rule grpc_java_library deps @io_grpc_grpc_java//context
+# gazelle:proto_rule grpc_java_library deps @io_grpc_grpc_java//protobuf
+# gazelle:proto_rule grpc_java_library deps @com_google_guava_guava//jar
+
 # gazelle:proto_rule grpc_java_library visibility //visibility:public
 # gazelle:proto_language java plugin java
 # gazelle:proto_language java plugin protoc-gen-grpc-java
@@ -102,8 +107,12 @@
 # gazelle:proto_plugin ts_proto option esModuleInterop=true
 # gazelle:proto_rule proto_ts_library implementation stackb:rules_proto:proto_ts_library
 # gazelle:proto_rule proto_ts_library visibility //visibility:public
-# gazelle:proto_rule proto_ts_library deps //:node_modules/protobufjs
+# gazelle:proto_rule proto_ts_library deps //:node_modules/@nestjs/microservices
+# gazelle:proto_rule proto_ts_library deps //:node_modules/@types/node
 # gazelle:proto_rule proto_ts_library deps //:node_modules/long
+# gazelle:proto_rule proto_ts_library deps //:node_modules/protobufjs
+# gazelle:proto_rule proto_ts_library deps //:node_modules/rxjs
+
 # Set an out_dir so that we don't conflict with the closurejs output
 # gazelle:proto_rule proto_ts_library attr out_dir ts
 

example/golden/testdata/builtins/BUILD.out

@@ -32,17 +32,17 @@ proto_compile(
     options = {
         "@build_stack_rules_proto//plugin/builtin:closurejs": [
             "import_style=closure",
-            "library=test",
+            "library=test_closure",
         ],
         "@build_stack_rules_proto//plugin/builtin:commonjs": ["import_style=commonjs"],
     },
     outputs = [
         "Test.pbobjc.h",
         "Test.pbobjc.m",
-        "test.js",
         "test.pb.cc",
         "test.pb.h",
         "test.srcjar",
+        "test_closure.js",
         "test_pb.js",
         "test_pb.rb",
         "test_pb2.py",

example/golden/testdata/closurejs/BUILD.out

@@ -21,9 +21,9 @@ proto_compile(
     name = "example_closurejs_compile",
     options = {"@build_stack_rules_proto//plugin/builtin:closurejs": [
         "import_style=closure",
-        "library=example",
+        "library=example_closure",
     ]},
-    outputs = ["example.js"],
+    outputs = ["example_closure.js"],
     plugins = ["@build_stack_rules_proto//plugin/builtin:closurejs"],
     proto = "example_proto",
 )