From f1d863f2dca8b169309d30a78098cd645147769a Mon Sep 17 00:00:00 2001
From: Eryu Xia <eryu@google.com>
Date: Thu, 18 Nov 2021 18:34:01 +0000
Subject: [PATCH] Pin typescript to @4.4.4 to fix CI (#1170)

---
 .dockerignore                                          | 1 +
 net/grpc/gateway/docker/ts_client/Dockerfile           | 4 +---
 net/grpc/gateway/examples/echo/ts-example/package.json | 3 ++-
 packages/grpc-web/package.json                         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index cae43f7..f82f5a3 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,3 @@
+**/dist
 **/node_modules
 packages/grpc-web/generated
diff --git a/net/grpc/gateway/docker/ts_client/Dockerfile b/net/grpc/gateway/docker/ts_client/Dockerfile
index e4f9704..b99bce3 100644
--- a/net/grpc/gateway/docker/ts_client/Dockerfile
+++ b/net/grpc/gateway/docker/ts_client/Dockerfile
@@ -14,8 +14,6 @@
 
 FROM grpcweb/prereqs
 
-RUN npm install -g typescript
-
 WORKDIR /github/grpc-web/net/grpc/gateway/examples/echo
 
 RUN protoc -I=. echo.proto \
@@ -26,7 +24,7 @@ WORKDIR /github/grpc-web/net/grpc/gateway/examples/echo/ts-example
 
 RUN npm install && \
   npm link grpc-web && \
-  tsc && \
+  npx tsc && \
   npx webpack && \
   cp echotest.html /var/www/html && \
   cp dist/main.js /var/www/html/dist
diff --git a/net/grpc/gateway/examples/echo/ts-example/package.json b/net/grpc/gateway/examples/echo/ts-example/package.json
index 286e594..471a5bb 100644
--- a/net/grpc/gateway/examples/echo/ts-example/package.json
+++ b/net/grpc/gateway/examples/echo/ts-example/package.json
@@ -1,5 +1,5 @@
 {
-  "dependencies": {
+  "devDependencies": {
     "@types/google-protobuf": "~3.7.0",
     "@types/jquery": "~3.3.6",
     "@types/node": "~10.17.0",
@@ -7,6 +7,7 @@
     "grpc-web": "~1.3.0",
     "jquery": "~3.5.1",
     "mock-xmlhttprequest": "~2.0.0",
+    "typescript": "~4.4.4",
     "webpack": "~4.43.0",
     "webpack-cli": "~3.3.11"
   }
diff --git a/packages/grpc-web/package.json b/packages/grpc-web/package.json
index a8c7042..b649aaf 100644
--- a/packages/grpc-web/package.json
+++ b/packages/grpc-web/package.json
@@ -37,6 +37,6 @@
     "mocha": "~5.2.0",
     "mock-xmlhttprequest": "~2.0.0",
     "protractor": "~7.0.0",
-    "typescript": "~3.8.0"
+    "typescript": "~4.4.4"
   }
 }