From a1bccc9a0902d0a83c251ab82aee0de170de09b8 Mon Sep 17 00:00:00 2001 From: Guido Zuidhof Date: Thu, 1 Apr 2021 23:35:15 +0100 Subject: [PATCH] Switch to go:embed, at the cost of 10MB extra binary size.. --- starboard/.goreleaser.yml | 3 - starboard/README.md | 8 +-- .../assets/images/starboard-cli-logo.png | Bin 8206 -> 0 bytes starboard/cmd/serve.go | 2 +- starboard/go.mod | 3 +- starboard/go.sum | 4 -- starboard/internal/nbserver/fs.go | 20 +++---- starboard/main.go | 5 +- starboard/web/assets_generate.go | 30 ---------- starboard/web/static/fs.go | 8 +++ starboard/web/templates/editor.html.tmpl | 54 ++++++------------ starboard/web/templates/fs.go | 8 +++ 12 files changed, 48 insertions(+), 97 deletions(-) delete mode 100644 starboard/assets/images/starboard-cli-logo.png delete mode 100644 starboard/web/assets_generate.go create mode 100644 starboard/web/static/fs.go create mode 100644 starboard/web/templates/fs.go diff --git a/starboard/.goreleaser.yml b/starboard/.goreleaser.yml index b847957..347d9d3 100644 --- a/starboard/.goreleaser.yml +++ b/starboard/.goreleaser.yml @@ -1,6 +1,5 @@ before: hooks: - # you may remove this if you don't need go generate - go generate builds: - binary: starboard @@ -11,7 +10,5 @@ builds: goarch: - amd64 - arm64 - # Custom ldflags templates. - # Default is `-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=goreleaser`. ldflags: - -s -w -X github.com/gzuidhof/starboard-cli/starboard/cmd.version={{.Version}} -X github.com/gzuidhof/starboard-cli/starboard/cmd.commit={{.Commit}} -X github.com/gzuidhof/starboard-cli/starboard/cmd.date={{.CommitDate}} -X github.com/gzuidhof/starboard-cli/starboard/cmd.target={{.Env.GOOS}} \ No newline at end of file diff --git a/starboard/README.md b/starboard/README.md index 9a6719b..edf9e0d 100644 --- a/starboard/README.md +++ b/starboard/README.md @@ -1,11 +1,6 @@ # starboard (cli) -To download a new runtime, specify its version and the target folder in the `go:generate` in main.go: - -```bash -go run scripts/download_runtime/main.go starboard-notebook 0.7.1 web/static/vendor/ -``` - +To download a new runtime, specify its version and the target folder in the `go:generate` in main.go. ## Development To run the serve command with the latest static assets and templates without having to `go generate`, use: @@ -14,6 +9,7 @@ To run the serve command with the latest static assets and templates without hav go run main.go serve --static_folder web/static --templates_folder web/templates ``` +Consider it live-reload as long as you are only changing template files :). ## Releases diff --git a/starboard/assets/images/starboard-cli-logo.png b/starboard/assets/images/starboard-cli-logo.png deleted file mode 100644 index c3c6c4b4036adab1407ed6cb317558456e70a7e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8206 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 diff --git a/starboard/cmd/serve.go b/starboard/cmd/serve.go index 079f825..435df1f 100644 --- a/starboard/cmd/serve.go +++ b/starboard/cmd/serve.go @@ -38,7 +38,7 @@ func init() { // Cobra supports local flags which will only run when this command // is called directly, e.g.: serveCmd.Flags().StringP("port", "p", "8585", "Port to serve files on") - serveCmd.Flags().String("port_secondary", "15742", "Port used as secondary origin (for additional sandboxing)") + serveCmd.Flags().String("port_secondary", "9959", "Port used as secondary origin (for additional sandboxing)") serveCmd.Flags().String("static_folder", "", "Override where static assets are served from, it uses the embedded assets if not set") serveCmd.Flags().String("templates_folder", "", "Override where templates are loaded from, it uses the embedded assets if not set") diff --git a/starboard/go.mod b/starboard/go.mod index c318d63..1678c6a 100644 --- a/starboard/go.mod +++ b/starboard/go.mod @@ -1,12 +1,11 @@ module github.com/gzuidhof/starboard-cli/starboard -go 1.15 +go 1.16 require ( github.com/mitchellh/go-homedir v1.1.0 github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0 - github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 github.com/spf13/afero v1.4.1 github.com/spf13/cobra v1.1.1 github.com/spf13/viper v1.7.1 diff --git a/starboard/go.sum b/starboard/go.sum index 18d8612..e06c4a3 100644 --- a/starboard/go.sum +++ b/starboard/go.sum @@ -159,8 +159,6 @@ github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJ github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0 h1:mj/nMDAwTBiaCqMEs4cYCqF7pO6Np7vhy1D1wcQGz+E= github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 h1:pXY9qYc/MP5zdvqWEUH6SjNiu7VhSjuVFTFiTcphaLU= -github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -168,7 +166,6 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.4.1 h1:asw9sl74539yqavKaglDM5hFpdJVK0Y5Dr/JOgQ89nQ= github.com/spf13/afero v1.4.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= @@ -263,7 +260,6 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 h1:HyfiK1WMnHj5FXFXatD+Qs1A/ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/starboard/internal/nbserver/fs.go b/starboard/internal/nbserver/fs.go index 7a25a2c..54b0a0e 100644 --- a/starboard/internal/nbserver/fs.go +++ b/starboard/internal/nbserver/fs.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "github.com/gzuidhof/starboard-cli/starboard/assets/web_static" - "github.com/gzuidhof/starboard-cli/starboard/assets/web_templates" + "github.com/gzuidhof/starboard-cli/starboard/web/static" + "github.com/gzuidhof/starboard-cli/starboard/web/templates" "github.com/spf13/viper" ) @@ -21,24 +21,24 @@ type serveFS struct { } func getFileSystems() serveFS { - var static http.FileSystem - var templates http.FileSystem + var staticFS http.FileSystem + var templatesFS http.FileSystem if viper.GetString("static_folder") != "" { - static = http.Dir(viper.GetString("static_folder")) + staticFS = http.Dir(viper.GetString("static_folder")) } else { - static = web_static.StaticAssets + staticFS = http.FS(static.FS) } if viper.GetString("templates_folder") != "" { - templates = http.Dir(viper.GetString("templates_folder")) + templatesFS = http.Dir(viper.GetString("templates_folder")) } else { - templates = web_templates.TemplateAssets + templatesFS = http.FS(templates.FS) } return serveFS{ - static: static, - templates: templates, + static: staticFS, + templates: templatesFS, } } diff --git a/starboard/main.go b/starboard/main.go index 72197ca..44fc9aa 100644 --- a/starboard/main.go +++ b/starboard/main.go @@ -4,9 +4,8 @@ package main -//go:generate go run web/assets_generate.go -//go:generate go run scripts/download_runtime/main.go starboard-notebook 0.7.1 web/static/vendor/ -//go:generate go run scripts/download_runtime/main.go iframe-resizer 4.2.11 web/static/vendor/ +//go:generate go run scripts/download_runtime/main.go starboard-notebook 0.8.2 web/static/vendor/ +//go:generate go run scripts/download_runtime/main.go starboard-wrap 0.2.3 web/static/vendor/ import ( "github.com/gzuidhof/starboard-cli/starboard/cmd" diff --git a/starboard/web/assets_generate.go b/starboard/web/assets_generate.go deleted file mode 100644 index f1c1e65..0000000 --- a/starboard/web/assets_generate.go +++ /dev/null @@ -1,30 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -package main - -import ( - "log" - "net/http" - "os" - - "github.com/shurcooL/vfsgen" -) - -func main() { - var fs http.FileSystem = http.Dir("web/static/") - - os.MkdirAll("assets/web_static/", 0755) - err := vfsgen.Generate(fs, vfsgen.Options{Filename: "assets/web_static/vfsdata.go", VariableName: "StaticAssets", PackageName: "web_static"}) - if err != nil { - log.Fatalln(err) - } - - var templateFs http.FileSystem = http.Dir("web/templates/") - os.MkdirAll("assets/web_templates/", 0755) - err = vfsgen.Generate(templateFs, vfsgen.Options{Filename: "assets/web_templates/vfsdata.go", VariableName: "TemplateAssets", PackageName: "web_templates"}) - if err != nil { - log.Fatalln(err) - } -} diff --git a/starboard/web/static/fs.go b/starboard/web/static/fs.go new file mode 100644 index 0000000..f4d5bc8 --- /dev/null +++ b/starboard/web/static/fs.go @@ -0,0 +1,8 @@ +package static + +import ( + "embed" +) + +//go:embed * +var FS embed.FS diff --git a/starboard/web/templates/editor.html.tmpl b/starboard/web/templates/editor.html.tmpl index c1abb6f..c7b38e9 100644 --- a/starboard/web/templates/editor.html.tmpl +++ b/starboard/web/templates/editor.html.tmpl @@ -13,14 +13,7 @@ - +
Current notebook content @@ -30,8 +23,8 @@ {{template "footer"}} - \ No newline at end of file diff --git a/starboard/web/templates/fs.go b/starboard/web/templates/fs.go new file mode 100644 index 0000000..5071c28 --- /dev/null +++ b/starboard/web/templates/fs.go @@ -0,0 +1,8 @@ +package templates + +import ( + "embed" +) + +//go:embed * +var FS embed.FS