Merge branch 'master' into import_style_es6

README.md

@@ -70,7 +70,7 @@ Make sure they are both executable and are discoverable from your PATH.
 For example, in MacOS, you can do:
 
 ```
-$ sudo mv ~/Downloads/protoc-gen-grpc-web-1.0.7-darwin-x86_64 \
+$ sudo mv ~/Downloads/protoc-gen-grpc-web-1.1.0-darwin-x86_64 \
   /usr/local/bin/protoc-gen-grpc-web
 $ chmod +x /usr/local/bin/protoc-gen-grpc-web
 ```

net/grpc/gateway/docker/common/Dockerfile

@@ -19,13 +19,13 @@ RUN apt-get -qq update && apt-get -qq install -y \
 
 WORKDIR /tmp
 
-RUN curl -sSL https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/\
-protoc-3.11.4-linux-x86_64.zip -o protoc.zip && \
+RUN curl -sSL https://github.com/protocolbuffers/protobuf/releases/download/v3.12.2/\
+protoc-3.12.2-linux-x86_64.zip -o protoc.zip && \
   unzip -qq protoc.zip && \
   cp ./bin/protoc /usr/local/bin/protoc
 
-RUN curl -sSL https://github.com/grpc/grpc-web/releases/download/1.0.7/\
-protoc-gen-grpc-web-1.0.7-linux-x86_64 -o /usr/local/bin/protoc-gen-grpc-web && \
+RUN curl -sSL https://github.com/grpc/grpc-web/releases/download/1.1.0/\
+protoc-gen-grpc-web-1.1.0-linux-x86_64 -o /usr/local/bin/protoc-gen-grpc-web && \
   chmod +x /usr/local/bin/protoc-gen-grpc-web
 
 WORKDIR /var/www/html/dist

net/grpc/gateway/examples/echo/commonjs-example/package.json

@@ -4,12 +4,11 @@
   "description": "gRPC-Web CommonJS client example",
   "license": "Apache-2.0",
   "dependencies": {
-    "google-protobuf": "^3.6.1",
-    "grpc-web": "^1.0.0"
+    "google-protobuf": "~3.12.0",
+    "grpc-web": "~1.1.0"
   },
   "devDependencies": {
-    "browserify": "^16.2.2",
-    "webpack": "^4.16.5",
-    "webpack-cli": "^3.1.0"
+    "webpack": "~4.43.0",
+    "webpack-cli": "~3.3.11"
   }
 }

net/grpc/gateway/examples/echo/node-server/package.json

@@ -3,10 +3,10 @@
   "version": "0.1.0",
   "main": "server.js",
   "dependencies": {
-    "@grpc/proto-loader": "^0.3.0",
-    "async": "^1.5.2",
-    "google-protobuf": "^3.6.0",
-    "grpc": "^1.24.0",
-    "lodash": "^4.6.1"
+    "@grpc/proto-loader": "~0.5.0",
+    "async": "~1.5.2",
+    "google-protobuf": "~3.12.0",
+    "grpc": "~1.24.2",
+    "lodash": "~4.17.0"
   }
 }

net/grpc/gateway/examples/echo/ts-example/package.json

@@ -1,14 +1,13 @@
 {
   "dependencies": {
-    "@types/google-protobuf": "^3.2.7",
-    "@types/jquery": "^3.3.6",
-    "@types/node": "^10.7.1",
-    "browserify": "^16.2.2",
-    "google-protobuf": "^3.6.1",
-    "grpc-web": "^1.0.0",
-    "jquery": "^3.3.1",
-    "mock-xmlhttprequest": "^2.0.0",
-    "webpack": "^4.16.5",
-    "webpack-cli": "^3.1.0"
+    "@types/google-protobuf": "~3.7.0",
+    "@types/jquery": "~3.3.6",
+    "@types/node": "~10.17.0",
+    "google-protobuf": "~3.12.0",
+    "grpc-web": "~1.1.0",
+    "jquery": "~3.5.1",
+    "mock-xmlhttprequest": "~2.0.0",
+    "webpack": "~4.43.0",
+    "webpack-cli": "~3.3.11"
   }
 }

net/grpc/gateway/examples/echo/tutorial.md

@@ -154,13 +154,12 @@ You will need a `package.json` file
 {
   "name": "grpc-web-commonjs-example",
   "dependencies": {
-    "google-protobuf": "^3.6.1",
-    "grpc-web": "^1.0.0"
+    "google-protobuf": "~3.12.0",
+    "grpc-web": "~1.1.0"
   },
   "devDependencies": {
-    "browserify": "^16.2.2",
-    "webpack": "^4.16.5",
-    "webpack-cli": "^3.1.0"
+    "webpack": "~4.43.0",
+    "webpack-cli": "~3.3.11"
   }
 }
 ```

net/grpc/gateway/examples/helloworld/README.md

@@ -195,12 +195,14 @@ the `client.js` files.
   "version": "0.1.0",
   "description": "gRPC-Web simple example",
   "devDependencies": {
-    "@grpc/proto-loader": "^0.3.0",
-    "google-protobuf": "^3.6.1",
-    "grpc": "^1.15.0",
-    "grpc-web": "^1.0.0",
-    "webpack": "^4.16.5",
-    "webpack-cli": "^3.1.0"
+    "@grpc/proto-loader": "~0.5.4",
+    "async": "~1.5.2",
+    "google-protobuf": "~3.12.0",
+    "grpc": "~1.24.2",
+    "grpc-web": "~1.1.0",
+    "lodash": "~4.17.0",
+    "webpack": "~4.43.0",
+    "webpack-cli": "~3.3.11"
   }
 }
 ```
@@ -244,7 +246,7 @@ Make sure they are both executable and are discoverable from your PATH.
 For example, in MacOS, you can do:
 
 ```
-$ sudo mv ~/Downloads/protoc-gen-grpc-web-1.0.7-darwin-x86_64 \
+$ sudo mv ~/Downloads/protoc-gen-grpc-web-1.1.0-darwin-x86_64 \
   /usr/local/bin/protoc-gen-grpc-web
 $ chmod +x /usr/local/bin/protoc-gen-grpc-web
 ```

net/grpc/gateway/examples/helloworld/package.json

@@ -4,13 +4,13 @@
   "description": "gRPC-Web simple example",
   "main": "server.js",
   "devDependencies": {
-    "@grpc/proto-loader": "^0.3.0",
-    "async": "^1.5.2",
-    "google-protobuf": "^3.6.1",
-    "grpc": "^1.15.0",
-    "grpc-web": "^1.0.0",
-    "lodash": "^4.6.1",
-    "webpack": "^4.16.5",
-    "webpack-cli": "^3.1.0"
+    "@grpc/proto-loader": "~0.5.4",
+    "async": "~1.5.2",
+    "google-protobuf": "~3.12.0",
+    "grpc": "~1.24.2",
+    "grpc-web": "~1.1.0",
+    "lodash": "~4.17.0",
+    "webpack": "~4.43.0",
+    "webpack-cli": "~3.3.11"
   }
 }

packages/grpc-web/README.md

@@ -42,7 +42,7 @@ Make sure they are both executable and are discoverable from your PATH.
 For example, in MacOS, you can do:
 
 ```
-$ sudo mv ~/Downloads/protoc-gen-grpc-web-1.0.7-darwin-x86_64 \
+$ sudo mv ~/Downloads/protoc-gen-grpc-web-1.1.0-darwin-x86_64 \
   /usr/local/bin/protoc-gen-grpc-web
 $ chmod +x /usr/local/bin/protoc-gen-grpc-web
 ```

test/interop/package.json

@@ -7,8 +7,8 @@
     "test": "mocha -b --timeout 500 interop_client.js"
   },
   "dependencies": {
-    "google-protobuf": "~3.11.4",
-    "grpc-web": "~1.0.0"
+    "google-protobuf": "~3.12.0",
+    "grpc-web": "~1.1.0"
   },
   "devDependencies": {
     "minimist": "~1.2.5",