Try migrating to modules again (#911)

Author: johanbrandhorst

.circleci/config.yml

@@ -25,12 +25,9 @@ jobs:
       - run: sudo apt-get install unzip
       - run: . ./install-prototool.sh
       - run: echo 'export GOBIN=/go/bin' >> $BASH_ENV
-      - run: go get -u golang.org/x/tools/cmd/goimports
-      - run: go get -u github.com/robertkrimen/godocdown/godocdown
-      - run: curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-      - run: dep ensure
-      - run: go install ./vendor/github.com/golang/protobuf/protoc-gen-go
-      - run: export PATH=/go/src/github.com/improbable-eng/grpc-web/protobuf/bin:$PATH
+      - run: go get golang.org/x/tools/cmd/goimports
+      - run: go get github.com/robertkrimen/godocdown/godocdown
+      - run: go install github.com/golang/protobuf/protoc-gen-go
       - run:
           command: |
             set +e
@@ -114,4 +111,4 @@ workflows:
                 - BROWSER=ie11_win DISABLE_WEBSOCKET_TESTS=true
                 - BROWSER=nodejs
           requires:
-            - initial-unit-test-lint-prebuild
+            - initial-unit-test-lint-prebuild

CONTRIBUTING.md

@@ -8,15 +8,11 @@ The following steps guide you through a fresh checkout
 
 ```
 # Create a workspace
-cd ~/Projects/grpc-web  # or wherever you want your checkout to live
-export GOPATH=$(pwd)
+cd ~/Projects/  # or wherever you want your checkout to live
 
-# Checkout project sources into your new go workspace
-go get -u github.com/improbable-eng/grpc-web/go
-cd $GOPATH/src/github.com/improbable-eng/grpc-web 
-
-# Install go dependencies
-dep ensure
+# Checkout project sources
+git clone [email protected]:improbable-eng/grpc-web.git
+cd grpc-web
 
 # Install NodeJS dependencies
 nvm use
@@ -25,7 +21,7 @@ npm install
 
 Note you will also need to [install prototool](https://github.com/uber/prototool/blob/dev/docs/install.md) and add it to your `PATH` environment variable if you wish to re-generate the integration test proto files.
 
-## Testing Prerequisites 
+## Testing Prerequisites
 Before you run the tests for the first time, please follow these steps:
 
 ### Installing the Local Certificate
@@ -38,7 +34,7 @@ In order to run the Karma (Integration) tests, you will need to add the certific
 4. Select `misc/localhost.crt`
 5. Double click on the new `GRPC Web example dev server` certificate
 6. Expand the `Trust' section
-7. Change the `When using this certificate` option to `Always Trust` 
+7. Change the `When using this certificate` option to `Always Trust`
 8. Close the certificate details pop-up.
 
 Repeat the above process for `misc/localhostCA.pem`.
@@ -75,4 +71,4 @@ This is your prompt to open a web browser on https://localhost:9876 at which poi
 2. Update `CHANGELOG.md` by comparing commits to master since the last Github Release
 3. Raise a pull request for your changes, have it reviewed and landed into master.
 4. Switch your local checkout back to the master branch, pull your merged changes and run `./publish-release.sh`.
-5. Create the ARM binaries and attach them to the Github release.
+5. Create the ARM binaries and attach them to the Github release.

client/grpc-web-react-example/README.md

@@ -3,7 +3,6 @@
 ### Get started (with HTTP 1.1)
 
 * `npm install`
-  * The postinstall will run `npm run get_go_deps` to install Golang dependencies. [dep](https://github.com/golang/dep) is used for go dependency management.
 * `npm start` to start the Golang server and Webpack dev server
 * Go to `http://localhost:8081`
 

client/grpc-web-react-example/get_go_deps.sh

@@ -14,7 +14,7 @@ import (
 
 	"strings"
 
-	library "github.com/improbable-eng/grpc-web/example/go/_proto/examplecom/library"
+	library "github.com/improbable-eng/grpc-web/client/grpc-web-react-example/go/_proto/examplecom/library"
 	"github.com/improbable-eng/grpc-web/go/grpcweb"
 	"golang.org/x/net/context"
 )

client/grpc-web-react-example/go/Gopkg.lock

@@ -5,8 +5,6 @@
   "scripts": {
     "generate_cert": "cd ../misc ./gen_cert.sh",
     "build:proto": "./protogen.sh",
-    "get_go_deps": "./get_go_deps.sh",
-    "postinstall": "npm run get_go_deps",
     "webpack-dev:tls": "cd ts && export USE_TLS=true && webpack serve --watch --hot --inline --port 8082 --host 0.0.0.0 --output-public-path=https://localhost:8082/build/ --https --cert=../../../misc/localhost.crt --key=../../../misc/localhost.key",
     "webpack-dev": "cd ts && webpack serve --watch --hot --inline --port 8081 --host 0.0.0.0 --output-public-path=http://localhost:8081/build/",
     "start:tls": "npm run build:proto && concurrently --kill-others \"go run go/exampleserver/exampleserver.go --enable_tls=true\" \"npm run webpack-dev:tls\"",

client/grpc-web-react-example/go/Gopkg.toml

@@ -0,0 +1,28 @@
+module github.com/improbable-eng/grpc-web
+
+go 1.16
+
+require (
+	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f
+	github.com/golang/protobuf v1.4.3
+	github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
+	github.com/klauspost/compress v1.11.7 // indirect
+	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
+	github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76
+	github.com/prometheus/client_golang v1.7.1
+	github.com/prometheus/common v0.15.0 // indirect
+	github.com/prometheus/procfs v0.3.0 // indirect
+	github.com/rs/cors v1.7.0
+	github.com/sirupsen/logrus v1.7.0
+	github.com/spf13/pflag v1.0.5
+	github.com/stretchr/testify v1.7.0
+	golang.org/x/net v0.0.0-20210119194325-5f4716e94777
+	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
+	golang.org/x/text v0.3.5 // indirect
+	google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506 // indirect
+	google.golang.org/grpc v1.32.0
+	google.golang.org/protobuf v1.25.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	nhooyr.io/websocket v1.8.6
+)