From bf8e071efdb026248bb9cf5a8ce25c2c10db1a86 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Fri, 12 Jul 2024 13:43:33 -0700
Subject: [PATCH 1/2] grpc-js: Bump packages to 1.11.0, and update
 documentation

---
 packages/grpc-js-xds/README.md    | 1 +
 packages/grpc-js-xds/package.json | 4 ++--
 packages/grpc-js/README.md        | 1 +
 packages/grpc-js/package.json     | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/grpc-js-xds/README.md b/packages/grpc-js-xds/README.md
index 5b7a5400..48a4db10 100644
--- a/packages/grpc-js-xds/README.md
+++ b/packages/grpc-js-xds/README.md
@@ -35,3 +35,4 @@ const client = new MyServiceClient('xds:///example.com:123');
  - [xDS Custom Load Balancer Configuration](https://github.com/grpc/proposal/blob/master/A52-xds-custom-lb-policies.md) (Custom load balancer registration not currently supported)
  - [xDS Ring Hash LB Policy](https://github.com/grpc/proposal/blob/master/A42-xds-ring-hash-lb-policy.md)
  - [`pick_first` via xDS](https://github.com/grpc/proposal/blob/master/A62-pick-first.md#pick_first-via-xds-1) (Currently experimental, enabled by environment variable `GRPC_EXPERIMENTAL_PICKFIRST_LB_CONFIG`)
+ - [xDS-Enabled Servers](https://github.com/grpc/proposal/blob/master/A36-xds-for-servers.md)
diff --git a/packages/grpc-js-xds/package.json b/packages/grpc-js-xds/package.json
index c2b421ce..3bd247b0 100644
--- a/packages/grpc-js-xds/package.json
+++ b/packages/grpc-js-xds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js-xds",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "description": "Plugin for @grpc/grpc-js. Adds the xds:// URL scheme and associated features.",
   "main": "build/src/index.js",
   "scripts": {
@@ -52,7 +52,7 @@
     "xxhash-wasm": "^1.0.2"
   },
   "peerDependencies": {
-    "@grpc/grpc-js": "~1.10.0"
+    "@grpc/grpc-js": "~1.11.0"
   },
   "engines": {
     "node": ">=10.10.0"
diff --git a/packages/grpc-js/README.md b/packages/grpc-js/README.md
index f3b682f3..dfe80502 100644
--- a/packages/grpc-js/README.md
+++ b/packages/grpc-js/README.md
@@ -69,6 +69,7 @@ Many channel arguments supported in `grpc` are not supported in `@grpc/grpc-js`.
   - `grpc.client_idle_timeout_ms`
   - `grpc-node.max_session_memory`
   - `grpc-node.tls_enable_trace`
+  - `grpc-node.retry_max_attempts_limit`
   - `channelOverride`
   - `channelFactoryOverride`
 
diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
index f0c5da78..353cbe25 100644
--- a/packages/grpc-js/package.json
+++ b/packages/grpc-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.10.11",
+  "version": "1.11.0",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
   "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",

From 996a6375c6499146e8fe2c962803b915adec5952 Mon Sep 17 00:00:00 2001
From: xqin <xqin@xqin.net>
Date: Tue, 16 Jul 2024 16:06:59 +0800
Subject: [PATCH 2/2] support node v14 again

---
 packages/grpc-js/src/resolver-dns.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/grpc-js/src/resolver-dns.ts b/packages/grpc-js/src/resolver-dns.ts
index 56f3dc1e..9e7b8bbf 100644
--- a/packages/grpc-js/src/resolver-dns.ts
+++ b/packages/grpc-js/src/resolver-dns.ts
@@ -20,7 +20,7 @@ import {
   registerResolver,
   registerDefaultScheme,
 } from './resolver';
-import { promises as dns } from 'node:dns';
+import { promises as dns } from 'dns';
 import { extractAndSelectServiceConfig, ServiceConfig } from './service-config';
 import { Status } from './constants';
 import { StatusObject } from './call-interface';