From b292946de7a4d558de4c8156b9680c5b20dd2429 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Tue, 9 Apr 2024 14:45:35 -0700
Subject: [PATCH 1/2] proto-loader: Avoid generating duplicate method
 declarations in some cases

---
 packages/proto-loader/bin/proto-loader-gen-types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/proto-loader/bin/proto-loader-gen-types.ts b/packages/proto-loader/bin/proto-loader-gen-types.ts
index 6db109904..b586983d9 100644
--- a/packages/proto-loader/bin/proto-loader-gen-types.ts
+++ b/packages/proto-loader/bin/proto-loader-gen-types.ts
@@ -555,7 +555,7 @@ function generateServiceClientInterface(formatter: TextFormatter, serviceType: P
   formatter.indent();
   for (const methodName of Object.keys(serviceType.methods).sort()) {
     const method = serviceType.methods[methodName];
-    for (const name of [methodName, camelCase(methodName)]) {
+    for (const name of new Set([methodName, camelCase(methodName)])) {
       if (CLIENT_RESERVED_METHOD_NAMES.has(name)) {
         continue;
       }

From cf9cba61427c90b9be0f37185776fbbf32480cb1 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Tue, 30 Apr 2024 10:35:48 -0700
Subject: [PATCH 2/2] proto-loader: Update dependency on protobufjs

---
 packages/grpc-health-check/package.json | 4 ++--
 packages/grpc-reflection/package.json   | 4 ++--
 packages/proto-loader/package.json      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/grpc-health-check/package.json b/packages/grpc-health-check/package.json
index 745f65282..181057d6d 100644
--- a/packages/grpc-health-check/package.json
+++ b/packages/grpc-health-check/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc-health-check",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "author": "Google Inc.",
   "description": "Health check client and service for use with gRPC-node",
   "repository": {
@@ -21,7 +21,7 @@
     "generate-test-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --includeDirs proto/ -O test/generated --grpcLib=@grpc/grpc-js health/v1/health.proto"
   },
   "dependencies": {
-    "@grpc/proto-loader": "^0.7.10"
+    "@grpc/proto-loader": "^0.7.13"
   },
   "files": [
     "LICENSE",
diff --git a/packages/grpc-reflection/package.json b/packages/grpc-reflection/package.json
index c7f05558e..af96dfd9d 100644
--- a/packages/grpc-reflection/package.json
+++ b/packages/grpc-reflection/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/reflection",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "author": {
     "name": "Google Inc."
   },
@@ -31,7 +31,7 @@
     "generate-types": "proto-loader-gen-types --longs String --enums String --bytes Array --defaults --oneofs --includeComments --includeDirs proto/ -O src/generated grpc/reflection/v1/reflection.proto grpc/reflection/v1alpha/reflection.proto"
   },
   "dependencies": {
-    "@grpc/proto-loader": "^0.7.10",
+    "@grpc/proto-loader": "^0.7.13",
     "protobufjs": "^7.2.5"
   },
   "peerDependencies": {
diff --git a/packages/proto-loader/package.json b/packages/proto-loader/package.json
index 5782aae44..290ed8440 100644
--- a/packages/proto-loader/package.json
+++ b/packages/proto-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/proto-loader",
-  "version": "0.7.12",
+  "version": "0.7.13",
   "author": "Google Inc.",
   "contributors": [
     {
@@ -47,7 +47,7 @@
   "dependencies": {
     "lodash.camelcase": "^4.3.0",
     "long": "^5.0.0",
-    "protobufjs": "^7.2.4",
+    "protobufjs": "^7.2.5",
     "yargs": "^17.7.2"
   },
   "devDependencies": {