From d3397b098cd3585afd593c9678f23c202f0843c2 Mon Sep 17 00:00:00 2001 From: cld9x <46501326+cld9x@users.noreply.github.com> Date: Sun, 28 Feb 2021 15:09:27 +0100 Subject: [PATCH] Dropped modd in favour of air --- .gitpod.dockerfile | 2 +- .gitpod.yml | 2 +- Dockerfile | 2 +- README.md | 8 ++++---- go.mod | 15 +++++++-------- modd.conf | 9 --------- 6 files changed, 14 insertions(+), 24 deletions(-) delete mode 100644 modd.conf diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile index fbd8f241f..366c747c7 100644 --- a/.gitpod.dockerfile +++ b/.gitpod.dockerfile @@ -12,7 +12,7 @@ ENV PATH=$GOROOT/bin:$GOPATH/bin:$PATH RUN GO111MODULE=on go get -u -v \ github.com/UnnoTed/fileb0x \ - github.com/cortesi/modd/cmd/modd && \ + github.com/cosmtrek/air && \ sudo rm -rf $GOPATH/src && \ sudo rm -rf $GOPATH/pkg # user Go packages diff --git a/.gitpod.yml b/.gitpod.yml index bc18b9060..a9927a8b1 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,7 +2,7 @@ image: file: .gitpod.dockerfile tasks: - name: Continuous Build - command: cd /workspace/xbvr && modd + command: cd /workspace/xbvr && yarn dev ports: - port: 9999 onOpen: open-preview diff --git a/Dockerfile b/Dockerfile index 76eb5ff54..a2cee4870 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:10.16.3-jessie as build-env +FROM node:12 as build-env ### Install Go ### ENV GO_VERSION=1.13.15 \ diff --git a/README.md b/README.md index f61860cd8..2e2d8f933 100644 --- a/README.md +++ b/README.md @@ -74,18 +74,18 @@ Ask your questions and suggest features on [Discord](https://discord.gg/wdCHXAG) Make sure you have following installed: - Go 1.13 -- Node.js 10.x +- Node.js 12.x - Yarn 1.17.x - fileb0x (run `go get github.com/UnnoTed/fileb0x` outside project directory) -- modd (run `env GO111MODULE=on go get github.com/cortesi/modd/cmd/modd` outside project directory) +- air (run `go get github.com/cosmtrek/air` outside project directory) -Once all of the above is installed, running `modd` from project directory launches file-watchers providing livereload for both Go and JavaScript. +Once all of the above is installed, running `yarn dev` from project directory launches file-watchers providing livereload for both Go and JavaScript. ## Development in Gitpod This project is configured for use in Gitpod. It will provide you with a pre-built development environment with all the tools needed to compile XBVR. -When the workspace loads, modd runs and will build and start XBVR automatically. Every time you make a change to a file, modd will automatically compile the relevant code. +When the workspace loads, `yarn dev` runs and it will build and start XBVR automatically. Every time you make a change to a file, watchers will automatically compile the relevant code. Once XBVR is compiled and starts, a preview panel will open in the IDE. As you modify go files, the preview panel will reload with the latest changes. If you make changes to Vue, you'll need to reload the browser to load the updated JavaScript. diff --git a/go.mod b/go.mod index ca4a4d987..fefb9caea 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e // indirect github.com/araddon/dateparse v0.0.0-20200409225146-d820a6159ab1 github.com/avast/retry-go v3.0.0+incompatible - github.com/blevesearch/bleve v1.0.13 + github.com/blevesearch/bleve v1.0.14 github.com/creasty/defaults v1.5.1 github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d // indirect github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect @@ -58,8 +58,8 @@ require ( github.com/peterbourgon/diskv v2.0.1+incompatible github.com/pkg/errors v0.9.1 github.com/posthog/posthog-go v0.0.0-20200525173953-e46dc8e6b89b + github.com/prometheus/common v0.9.1 github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8 - github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237 // indirect github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac github.com/robfig/cron/v3 v3.0.1 github.com/rs/cors v1.7.0 @@ -67,18 +67,17 @@ require ( github.com/satori/go.uuid v0.0.0-20180103174451-36e9d2ebbde5 github.com/sirupsen/logrus v1.7.0 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 - github.com/tecbot/gorocksdb v0.0.0-20190705090504-162552197222 // indirect github.com/temoto/robotstxt v0.0.0-20180810133444-97ee4a9ee6ea // indirect github.com/thoas/go-funk v0.7.0 - github.com/tidwall/gjson v1.6.3 + github.com/tidwall/gjson v1.6.8 github.com/x-cray/logrus-prefixed-formatter v0.5.2 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect github.com/xo/dburl v0.0.0-20200910011426-652e0d5720a3 github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect - golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c - golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb - golang.org/x/oauth2 v0.0.0-20201203001011-0b49973bad19 - golang.org/x/sys v0.0.0-20201204225414-ed752295db88 + golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 + golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93 + golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46 gopkg.in/cheggaaa/pb.v1 v1.0.28 gopkg.in/gormigrate.v1 v1.6.0 gopkg.in/resty.v1 v1.12.0 diff --git a/modd.conf b/modd.conf deleted file mode 100644 index 1af297d7c..000000000 --- a/modd.conf +++ /dev/null @@ -1,9 +0,0 @@ -{ - prep: yarn install - daemon: yarn dev:ui -} - -**/*.go { - prep: go generate - daemon: DISABLE_ANALYTICS=1 DEBUG=1 go run -tags="json1" main.go -}