diff --git a/go.mod b/go.mod index b2be30450..7c14639c8 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,6 @@ require ( github.com/ProtonMail/go-appdir v1.0.0 github.com/PuerkitoBio/goquery v1.5.0 github.com/PuerkitoBio/purell v1.1.1 // indirect - github.com/Smerity/govarint v0.0.0-20150407073650-7265e41f48f1 // indirect - github.com/UnnoTed/fileb0x v1.1.3 // indirect github.com/anacrolix/envpprof v1.0.0 // indirect github.com/anacrolix/ffprobe v0.0.0-20190307025918-9b483c5f7751 github.com/anacrolix/missinggo v1.1.0 // indirect @@ -13,19 +11,18 @@ require ( github.com/antchfx/xmlquery v1.0.0 // indirect github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e // indirect github.com/araddon/dateparse v0.0.0-20190622164848-0fb0a474d195 - github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect - github.com/blevesearch/bleve v0.7.0 + github.com/blevesearch/bleve v0.8.0 github.com/blevesearch/go-porterstemmer v1.0.2 // indirect github.com/blevesearch/segment v0.0.0-20160915185041-762005e7a34f // indirect - github.com/boltdb/bolt v1.3.1 // indirect github.com/couchbase/vellum v0.0.0-20190328134517-462e86d8716b // indirect - github.com/creasty/defaults v1.3.0 github.com/davecgh/go-spew v1.1.1 github.com/djherbis/times v1.2.0 github.com/dsnet/compress v0.0.1 // indirect + github.com/dukex/mixpanel v0.0.0-20180925151559-f8d5594f958e github.com/edsrzf/mmap-go v1.0.0 // indirect github.com/emicklei/go-restful v2.9.6+incompatible github.com/emicklei/go-restful-openapi v1.2.0 + github.com/etcd-io/bbolt v1.3.3 // indirect github.com/gammazero/nexus v2.1.1-0.20190402111811-fce688586772+incompatible github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 // indirect github.com/getlantern/errors v0.0.0-20180829142810-e24b7f4ff7c7 // indirect @@ -33,7 +30,7 @@ require ( github.com/getlantern/hex v0.0.0-20160523043825-083fba3033ad // indirect github.com/getlantern/hidden v0.0.0-20160523043807-d52a649ab33a // indirect github.com/getlantern/ops v0.0.0-20170904182230-37353306c908 // indirect - github.com/getlantern/systray v0.0.0-20190626064521-f2fa635d0474 + github.com/getlantern/systray v0.0.0-20190727060347-6f0e5a3c556c github.com/go-openapi/jsonpointer v0.19.0 // indirect github.com/go-openapi/jsonreference v0.19.0 // indirect github.com/go-openapi/spec v0.19.0 // indirect @@ -41,33 +38,25 @@ require ( github.com/go-test/deep v1.0.1 github.com/gobwas/glob v0.2.3 // indirect github.com/gocolly/colly v1.2.0 - github.com/golang/mock v1.3.0 // indirect github.com/google/go-cmp v0.3.0 // indirect - github.com/google/martian v2.1.0+incompatible - github.com/google/pprof v0.0.0-20190502144155-8358a9778bd1 // indirect - github.com/googleapis/gax-go v2.0.2+incompatible // indirect github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect github.com/gorilla/websocket v1.4.0 // indirect github.com/gowww/log v0.0.0-20170712202755-af3772f4bb12 - github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc - github.com/imdario/mergo v0.3.7 // indirect + github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 github.com/jinzhu/gorm v1.9.10 github.com/json-iterator/go v1.1.6 // indirect - github.com/kamilsk/retry/v4 v4.1.0 // indirect github.com/kennygrant/sanitize v1.2.4 // indirect github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect - github.com/kr/pty v1.1.4 // indirect - github.com/labstack/echo v3.3.10+incompatible + github.com/kr/pty v1.1.3 // indirect github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe // indirect github.com/marcsauter/single v0.0.0-20181104081128-f8bf46f26ec0 github.com/mattn/go-colorable v0.1.1 // indirect github.com/mattn/go-isatty v0.0.7 // indirect - github.com/mattn/go-sqlite3 v1.11.0 - github.com/mattn/go-zglob v0.0.1 // indirect + github.com/mattn/go-runewidth v0.0.4 // indirect + github.com/mattn/go-sqlite3 v1.11.0 // indirect github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect github.com/mholt/archiver v3.1.1+incompatible - github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.1 // indirect github.com/mozillazg/go-slugify v0.2.0 @@ -82,13 +71,12 @@ require ( github.com/rs/cors v1.6.0 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd // indirect github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect - github.com/simplereach/timeutils v1.2.0 // indirect + github.com/satori/go.uuid v0.0.0-20180103174451-36e9d2ebbde5 github.com/sirupsen/logrus v1.4.2 github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect github.com/steveyen/gtreap v0.0.0-20150807155958-0abe01ef9be2 // indirect - github.com/stretchr/objx v0.2.0 // indirect github.com/temoto/robotstxt v0.0.0-20180810133444-97ee4a9ee6ea // indirect github.com/thoas/go-funk v0.4.0 github.com/tidwall/gjson v1.3.2 @@ -96,23 +84,12 @@ require ( github.com/vansante/go-ffprobe v1.0.0 github.com/x-cray/logrus-prefixed-formatter v0.5.2 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect - golang.org/x/exp v0.0.0-20190509005604-ec0fef3eb65a // indirect golang.org/x/image v0.0.0-20190507092727-e4e5bf290fec // indirect - golang.org/x/lint v0.0.0-20190409202823-959b441ac422 // indirect - golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6 // indirect golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c - golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a // indirect golang.org/x/sys v0.0.0-20190508220229-2d0786266e9c golang.org/x/text v0.3.2 // indirect - golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect - golang.org/x/tools v0.0.0-20190509001310-e31d36578abb // indirect - google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8 // indirect - google.golang.org/grpc v1.20.1 // indirect gopkg.in/cheggaaa/pb.v1 v1.0.28 - gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect gopkg.in/resty.v1 v1.12.0 gopkg.in/sourcemap.v1 v1.0.5 // indirect - gopkg.in/urfave/cli.v1 v1.20.0 - honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a // indirect willnorris.com/go/imageproxy v0.9.0 ) diff --git a/modd.conf b/modd.conf new file mode 100644 index 000000000..f91ec260d --- /dev/null +++ b/modd.conf @@ -0,0 +1,12 @@ +**/*.go { + prep: go generate + daemon: DEBUG=1 go run -tags=json1 main.go +} + +ui/package.json { + prep: cd ui && yarn install +} + +ui/*.js { + daemon: cd ui && yarn watch +} diff --git a/ui/package.json b/ui/package.json index f297c2509..fca1c0b7e 100644 --- a/ui/package.json +++ b/ui/package.json @@ -10,7 +10,7 @@ "dependencies": { "@fortawesome/fontawesome-free": "5.3.1", "@mdi/font": "3.8.95", - "buefy": "0.7.10", + "buefy": "0.8.2", "date-fns": "1.30.1", "ky": "0.11.2", "pretty-bytes": "5.3.0", @@ -24,9 +24,9 @@ "wampy": "6.2.2" }, "devDependencies": { - "@vue/cli-plugin-babel": "^3.9.2", - "@vue/cli-plugin-eslint": "^3.9.2", - "@vue/cli-service": "^3.9.3", + "@vue/cli-plugin-babel": "^3.10.0", + "@vue/cli-plugin-eslint": "^3.10.0", + "@vue/cli-service": "^3.10.0", "babel-eslint": "^10.0.2", "eslint": "^5.16.0", "eslint-plugin-vue": "^5.2.3", diff --git a/ui/yarn.lock b/ui/yarn.lock index 006dce54d..0081012c4 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -816,10 +816,10 @@ lodash.kebabcase "^4.1.1" svg-tags "^1.0.0" -"@vue/babel-preset-app@^3.9.2": - version "3.9.2" - resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-3.9.2.tgz#b72a9b06abbe3f8f272783be13951271277be338" - integrity sha512-0suuCbu4jkVcVYBjPmuKxeDbrhwThYZHu3DUmtsVuOzFEGeXmco60VmXveniL/bnDUdZyknSuYP4FxgS34gw9w== +"@vue/babel-preset-app@^3.10.0": + version "3.10.0" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-3.10.0.tgz#3f89d631dd0f174c8a72e769b55f081c533c4677" + integrity sha512-NzJLI4Qe0SYm9gVHQC9RXyP0YcPjI28TmZ0ds2RJa9NO96LXHLES2U1HqiMDN4+CVjOQFrWUNd7wWeaETRPXbg== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/plugin-proposal-class-properties" "^7.0.0" @@ -882,28 +882,28 @@ "@vue/babel-plugin-transform-vue-jsx" "^1.0.0" camelcase "^5.0.0" -"@vue/cli-overlay@^3.9.0": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-3.9.0.tgz#11f513d1fa11b0135fb8ba8b88d228df0dc542e0" - integrity sha512-QfyvpJl2ChehBT2qzb5EvW921JxW94uFL3+lHa6VT42ImH8awrvkTGZmxTQWhHvATa7r0LKy7M7ZRMyo547esg== +"@vue/cli-overlay@^3.10.0": + version "3.10.0" + resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-3.10.0.tgz#9266c96fb2bffd35ca96edd8e1e1284ca8c00c94" + integrity sha512-DQCY6WIl1UN1nOuPirW63CcYWSBdIn6s4zdGfFodCfV+0PAEXGcrfNStygG+IKUsydQaJGTneV7SFxcS+9gyzA== -"@vue/cli-plugin-babel@^3.9.2": - version "3.9.2" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-3.9.2.tgz#8ff962a383aaeafd2b280998428a57ea23e9539c" - integrity sha512-XqfmGjUGnnJ3NA+HC31F6nkBvB9pFDhk4Lxeao8ZNJcEjKNEBYjlmHunJQdIe/jEXXum6U+U/ZE6DjDStHTIMw== +"@vue/cli-plugin-babel@^3.10.0": + version "3.10.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-3.10.0.tgz#3c5300bd6daf30b53292a6c3982e3a681cba2c18" + integrity sha512-NHrg6ZYN2fh5ZiMMzCNRuDlH9mcTOu+GIti1Va/zPnG3qMkX2iZ0zZGFaOCltIFoVSXdyOfa0sMtJGDoP9Q7ZA== dependencies: "@babel/core" "^7.0.0" - "@vue/babel-preset-app" "^3.9.2" - "@vue/cli-shared-utils" "^3.9.0" + "@vue/babel-preset-app" "^3.10.0" + "@vue/cli-shared-utils" "^3.10.0" babel-loader "^8.0.5" webpack ">=4 < 4.29" -"@vue/cli-plugin-eslint@^3.9.2": - version "3.9.2" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.9.2.tgz#747c616b13a11f34ac80554eee899cbfcd1977b8" - integrity sha512-AdvWJN+4Px2r3hbTDM2/rCtTcS6VyI7XuRljbfr2V9nF9cJiH4qsXFrTCRj3OgupbXJ14fUGKrLxmznLZIm1jA== +"@vue/cli-plugin-eslint@^3.10.0": + version "3.10.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.10.0.tgz#44a2abcecadc5b4854ee8fc4a7c5930f660293b0" + integrity sha512-grM3Z4je8XlPomhYqTC4ILB26rTrJKZhEkCwbXdduMrWtpn2Ggotl2nYayplOzDgoZ4Cx3ykJMkRulla2Zi47g== dependencies: - "@vue/cli-shared-utils" "^3.9.0" + "@vue/cli-shared-utils" "^3.10.0" babel-eslint "^10.0.1" eslint-loader "^2.1.2" globby "^9.2.0" @@ -913,15 +913,15 @@ eslint "^4.19.1" eslint-plugin-vue "^4.7.1" -"@vue/cli-service@^3.9.3": - version "3.9.3" - resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-3.9.3.tgz#4bd5786465afb8b608c5c7fc9661390e747ea756" - integrity sha512-CZE9PP4HH9bK4qAaLbTUB3tubggI+aRSbgB/QYSZrVlhtMpuVFZPj2QHbIvJQZTI2cG6LFQtLTZWXKeqo5lbAQ== +"@vue/cli-service@^3.10.0": + version "3.10.0" + resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-3.10.0.tgz#1e61afac9eeed5d902c124715c29719abeb743c5" + integrity sha512-aQaAjtkpSl4XFBM7Di9doh4GvHp1H8/H1QJKRK8bPJ5MVbt8Lt4tBo+YgK9Qs/9x0mrxCAa5UrR9+8ZWIQs2Zw== dependencies: "@intervolga/optimize-cssnano-plugin" "^1.0.5" "@soda/friendly-errors-webpack-plugin" "^1.7.1" - "@vue/cli-overlay" "^3.9.0" - "@vue/cli-shared-utils" "^3.9.0" + "@vue/cli-overlay" "^3.10.0" + "@vue/cli-shared-utils" "^3.10.0" "@vue/component-compiler-utils" "^2.6.0" "@vue/preload-webpack-plugin" "^1.1.0" "@vue/web-component-wrapper" "^1.2.0" @@ -975,10 +975,10 @@ webpack-dev-server "^3.4.1" webpack-merge "^4.2.1" -"@vue/cli-shared-utils@^3.9.0": - version "3.9.0" - resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.9.0.tgz#cb56a443bf763a873849a11d07e9e7638aa16cc2" - integrity sha512-wumeMZTz5aQ+1Y6uxTKegIsgOXEWT3hT8f9sW2mj5SwNDVyQ+AHZTgSynYExTUJg3dH81uKgFDUpPdAvGxzh8g== +"@vue/cli-shared-utils@^3.10.0": + version "3.10.0" + resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.10.0.tgz#9d156f3c0ef675a939319062489e98c8d3d80f7e" + integrity sha512-i96XBUtLdWeKFCC/ot12ngqnVikN/dXpelGdyxvNZczCkX7Je0FUdrZkiw0+uTYTu1RmuYWpLs+vb/YQerjiWg== dependencies: "@hapi/joi" "^15.0.1" chalk "^2.4.1" @@ -1901,10 +1901,10 @@ browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.5.4: electron-to-chromium "^1.3.127" node-releases "^1.1.17" -buefy@0.7.10: - version "0.7.10" - resolved "https://registry.yarnpkg.com/buefy/-/buefy-0.7.10.tgz#c9931114af9a40cb9a5314026309458241532049" - integrity sha512-jU9CTEQR1rozxagwEPB69qObBDwWl+4uCa6TjiPkqcqOb/uxq1uvyvCsVinADzjNjzOTFhUOuuSPQk8gsVEOzA== +buefy@0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/buefy/-/buefy-0.8.2.tgz#26bfc931c8c7fbe5a90d4b814a8205501eee816a" + integrity sha512-fS4sXYE0ge7fN5tP9k67j1fSCS/yxbTrnEhJ5MBt89gcbmVe5x8/SAXdADjx5W4SdERtjKjE9mzoIoRb+ZC29Q== dependencies: bulma "0.7.5"