From 7c1e432a2751eb79bfcc8cd86c642b9f42c0204b Mon Sep 17 00:00:00 2001 From: Nikhil Ranjan Date: Tue, 17 Sep 2019 00:02:14 +0200 Subject: [PATCH] replacing apache.com/thrift with github.com to solve network issue when building; missing dangling comma (#66) --- go.mod | 7 +++++-- go.sum | 1 + webapp/webpack.config.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9d76a0a..27dc427 100644 --- a/go.mod +++ b/go.mod @@ -15,5 +15,8 @@ require ( github.com/stretchr/testify v1.3.0 ) -// Workaround for https://github.com/golang/go/issues/30831 and fallout. -replace github.com/golang/lint => github.com/golang/lint v0.0.0-20190227174305-8f45f776aaf1 +replace ( + git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 + // Workaround for https://github.com/golang/go/issues/30831 and fallout. + github.com/golang/lint => github.com/golang/lint v0.0.0-20190227174305-8f45f776aaf1 +) diff --git a/go.sum b/go.sum index 3693ef2..01f9b4b 100644 --- a/go.sum +++ b/go.sum @@ -18,6 +18,7 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js index ea2bfe8..5b04d30 100644 --- a/webapp/webpack.config.js +++ b/webapp/webpack.config.js @@ -44,7 +44,7 @@ module.exports = { ['@babel/typescript', { allExtensions: true, isTSX: true, - }] + }], ], }, },