refactor: from packr2 to statik

.gitignore

@@ -25,9 +25,8 @@ coverage.txt
 /docs/resources
 /docs/public
 
-# Packd
-/packrd
-*-packr.go
+# Statik
+statik
 
 # Web
 /web/build

Makefile

@@ -3,26 +3,23 @@ TAG := $(shell git tag -l --points-at @)
 setup:
 	curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 	go get -u golang.org/x/tools/cmd/cover
-	go get -u github.com/gobuffalo/packr/v2/packr2
+	go get -u github.com/rakyll/statik
 	npm install
 	dep ensure
 
 build:
 	npm run build
+	go generate
 
 clean:
 	rm -rf web/build
 	rm -rf docs/public
 	rm -rf dist
-	packr2 clean
 
 mest:
 	go test -race -coverpkg=./... -coverprofile=coverage.txt -covermode=atomic ./...
 
-prerelease:
-	packr2
-
-release: prerelease
+release:
 ifdef TAG
 	git status
 	curl -sL http://git.io/goreleaser | bash
@@ -40,7 +37,7 @@ docs:
 	git submodule update --recursive --remote
 	cd docs && hugo && cd ..
 
-dist: clean build prerelease
+dist: clean build
 	goreleaser release --skip-publish --skip-validate
 
 ci: build test codecov release

app/app.go

@@ -2,14 +2,18 @@ package app
 
 import (
 	"errors"
+	"log"
 	"net/http"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
 	"time"
 
-	packr "github.com/gobuffalo/packr/v2"
+	"github.com/rakyll/statik/fs"
+
+	_ "github.com/tympanix/supper/statik"
+
 	"github.com/tympanix/supper/api"
 	"github.com/tympanix/supper/app/cfg"
 	"github.com/tympanix/supper/media"
@@ -27,7 +31,6 @@ var filetypes = []string{
 type Application struct {
 	types.Provider
 	*http.ServeMux
-	box      *packr.Box
 	cfg      types.Config
 	scrapers []types.Scraper
 }
@@ -36,7 +39,6 @@ type Application struct {
 func New(cfg types.Config) *Application {
 	app := &Application{
 		Provider: cfg.Providers()[0],
-		box:      packr.New("webfiles", webRoot),
 		cfg:      cfg,
 		ServeMux: http.NewServeMux(),
 		scrapers: cfg.Scrapers(),
@@ -61,12 +63,18 @@ func (a *Application) Config() types.Config {
 }
 
 func (a *Application) webAppHandler() http.Handler {
-	const index = "index.html"
+	webfs, err := fs.New()
+
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	const index = "/index.html"
 
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		f, err := a.box.Open(r.URL.Path)
+		f, err := webfs.Open(r.URL.Path)
 		if len(path.Ext(r.URL.Path)) == 0 || err != nil {
-			if f, err = a.box.Open(index); err != nil {
+			if f, err = webfs.Open(index); err != nil {
 				http.Error(w, "404: not found", http.StatusNotFound)
 				return
 			}

supper.go

@@ -1,3 +1,5 @@
+//go:generate statik -src=web/build
+
 package main
 
 import "github.com/tympanix/supper/app/cli"