Update Debian (11), Node (20), Webpack, etc.

grpc · May 14, 2023 · 4e44fed · 4e44fed
1 parent c5c1e29
commit 4e44fed
Show file tree

Hide file tree

Showing 48 changed files with 25 additions and 2,931 deletions.
diff --git a/README.md b/README.md
@@ -311,6 +311,8 @@ Multiple proxies support the gRPC-web protocol.
 
 3. Apache [APISIX](https://apisix.apache.org/) has also added grpc-web support, and more details can be found [here](https://apisix.apache.org/blog/2022/01/25/apisix-grpc-web-integration/).
 
+4. [Nginx](https://www.nginx.com/) has a grpc-web module ([doc](https://nginx.org/en/docs/http/ngx_http_grpc_module.html), [announcement](https://www.nginx.com/blog/nginx-1-13-10-grpc/))), and seems to work with simple configs, according to user [feedback](https://github.com/grpc/grpc-web/discussions/1322).
+
 ### Web Frameworks with gRPC-Web support
 - [Armeria (JVM)](https://armeria.dev/docs/server-grpc/#grpc-web)
 - [Tonic (Rust)](https://docs.rs/tonic-web/latest/tonic_web/)

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -93,11 +93,6 @@ services:
     image: grpcweb/interop-client
     ports:
       - "8081:8081"
-  java-interop-server:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/java_interop_server/Dockerfile
-    image: grpcweb/java-interop-server
   protoc-plugin:
     build:
       context: ./

diff --git a/net/grpc/gateway/docker/java_interop_server/Dockerfile b/net/grpc/gateway/docker/java_interop_server/Dockerfile
diff --git a/net/grpc/gateway/docker/node_interop_server/Dockerfile b/net/grpc/gateway/docker/node_interop_server/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM node:12.22.6-stretch
+FROM node:20.0.0-bullseye
 
 WORKDIR /github/grpc-node
 

diff --git a/net/grpc/gateway/docker/prereqs/Dockerfile b/net/grpc/gateway/docker/prereqs/Dockerfile
@@ -18,8 +18,8 @@
 ######################################
 # Stage 1: Fetch binaries
 ######################################
-# node:... Docker image is based on buildpack-deps:stretch
-FROM buildpack-deps:stretch AS prepare
+# node:... Docker image is based on buildpack-deps:bullseye (11)
+FROM buildpack-deps:bullseye AS prepare
 
 ARG BUILDIFIER_VERSION=1.0.0
 ARG PROTOBUF_VERSION=3.19.4
@@ -49,7 +49,7 @@ RUN ./scripts/init_submodules.sh
 ######################################
 # Stage 2: Copy source files and build
 ######################################
-FROM node:12.22.6-stretch AS copy-and-build
+FROM node:20.0.0-bullseye AS copy-and-build
 
 ARG MAKEFLAGS=-j8
 ARG BAZEL_VERSION=4.1.0

diff --git a/net/grpc/gateway/examples/echo/commonjs-example/package.json b/net/grpc/gateway/examples/echo/commonjs-example/package.json
@@ -8,7 +8,7 @@
     "grpc-web": "~1.4.2"
   },
   "devDependencies": {
-    "webpack": "~4.43.0",
-    "webpack-cli": "~3.3.11"
+    "webpack": "~5.82.1",
+    "webpack-cli": "~5.1.1"
   }
 }
diff --git a/net/grpc/gateway/examples/echo/ts-example/package.json b/net/grpc/gateway/examples/echo/ts-example/package.json
@@ -8,7 +8,7 @@
     "jquery": "~3.5.1",
     "mock-xmlhttprequest": "~2.0.0",
     "typescript": "latest",
-    "webpack": "~4.43.0",
-    "webpack-cli": "~3.3.11"
+    "webpack": "~5.82.1",
+    "webpack-cli": "~5.1.1"
   }
 }
diff --git a/net/grpc/gateway/examples/echo/tutorial.md b/net/grpc/gateway/examples/echo/tutorial.md
@@ -172,8 +172,8 @@ You will need a `package.json` file
     "grpc-web": "~1.4.2"
   },
   "devDependencies": {
-    "webpack": "~4.43.0",
-    "webpack-cli": "~3.3.11"
+    "webpack": "~5.82.1",
+    "webpack-cli": "~5.1.1"
   }
 }
 ```

diff --git a/net/grpc/gateway/examples/grpc-web-java/greeter-service/README.md b/net/grpc/gateway/examples/grpc-web-java/greeter-service/README.md
diff --git a/net/grpc/gateway/examples/grpc-web-java/greeter-service/pom.xml b/net/grpc/gateway/examples/grpc-web-java/greeter-service/pom.xml
diff --git a/.../grpc-web-java/greeter-service/src/main/java/grpcweb/examples/greeter/GreeterService.java b/.../grpc-web-java/greeter-service/src/main/java/grpcweb/examples/greeter/GreeterService.java
diff --git a/...a/greeter-service/src/main/java/grpcweb/examples/greeter/StartServiceAndGrpcwebProxy.java b/...a/greeter-service/src/main/java/grpcweb/examples/greeter/StartServiceAndGrpcwebProxy.java
diff --git a/...y/examples/grpc-web-java/greeter-service/src/main/java/grpcweb/examples/greeter/Util.java b/...y/examples/grpc-web-java/greeter-service/src/main/java/grpcweb/examples/greeter/Util.java