Use vfsgen instead of go-bindata (#7080)
* use vfsgen instead of go-bindata * fix templates * fix fmt * vendor vsfgen
This commit is contained in:
parent
8eba27c792
commit
83b90e4199
36 changed files with 1224 additions and 612 deletions
23
modules/public/main.go
Normal file
23
modules/public/main.go
Normal file
|
@ -0,0 +1,23 @@
|
|||
// +build ignore
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"log"
|
||||
"net/http"
|
||||
|
||||
"github.com/shurcooL/vfsgen"
|
||||
)
|
||||
|
||||
func main() {
|
||||
var fsPublic http.FileSystem = http.Dir("../../public")
|
||||
err := vfsgen.Generate(fsPublic, vfsgen.Options{
|
||||
PackageName: "public",
|
||||
BuildTags: "bindata",
|
||||
VariableName: "Assets",
|
||||
Filename: "bindata.go",
|
||||
})
|
||||
if err != nil {
|
||||
log.Fatal("%v", err)
|
||||
}
|
||||
}
|
|
@ -17,10 +17,8 @@ import (
|
|||
"gopkg.in/macaron.v1"
|
||||
)
|
||||
|
||||
//go:generate go-bindata -tags "bindata" -ignore "\\.go|\\.less" -pkg "public" -o "bindata.go" ../../public/...
|
||||
//go:generate go run -mod=vendor main.go
|
||||
//go:generate go fmt bindata.go
|
||||
//go:generate sed -i.bak s/..\/..\/public\/// bindata.go
|
||||
//go:generate rm -f bindata.go.bak
|
||||
|
||||
// Options represents the available options to configure the macaron handler.
|
||||
type Options struct {
|
||||
|
|
|
@ -7,19 +7,12 @@
|
|||
package public
|
||||
|
||||
import (
|
||||
"github.com/go-macaron/bindata"
|
||||
"gopkg.in/macaron.v1"
|
||||
)
|
||||
|
||||
// Static implements the macaron static handler for serving assets.
|
||||
func Static(opts *Options) macaron.Handler {
|
||||
opts.FileSystem = bindata.Static(bindata.Options{
|
||||
Asset: Asset,
|
||||
AssetDir: AssetDir,
|
||||
AssetInfo: AssetInfo,
|
||||
AssetNames: AssetNames,
|
||||
Prefix: "",
|
||||
})
|
||||
opts.FileSystem = Assets
|
||||
// we don't need to pass the directory, because the directory var is only
|
||||
// used when in the options there is no FileSystem.
|
||||
return opts.staticHandler("")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue