mirror of
https://github.com/prymitive/karma
synced 2026-09-04 11:27:19 +00:00
Merge pull request #336 from prymitive/static-tweaks
chore(build): store file metadata when generating binary assets
This commit is contained in:
@@ -49,7 +49,7 @@ endif
|
||||
touch $@
|
||||
|
||||
bindata_assetfs.go: .build/deps-build-go.ok .build/artifacts-bindata_assetfs.$(GO_BINDATA_MODE) .build/artifacts-ui.ok
|
||||
go-bindata-assetfs -o bindata_assetfs.go -nometadata ui/build/... ui/src/...
|
||||
go-bindata-assetfs -o bindata_assetfs.go ui/build/... ui/src/...
|
||||
|
||||
$(NAME): .build/deps-build-go.ok go.mod bindata_assetfs.go $(SOURCES)
|
||||
GO111MODULE=on go build -ldflags "-X main.version=$(VERSION)"
|
||||
|
||||
@@ -2,6 +2,7 @@ package main
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"html/template"
|
||||
"net/http"
|
||||
"os"
|
||||
@@ -81,7 +82,7 @@ func serverFileOrEmpty(path string, contentType string, c *gin.Context) {
|
||||
return
|
||||
}
|
||||
if _, err := os.Stat(path); os.IsNotExist(err) {
|
||||
c.Data(200, contentType, nil)
|
||||
c.Data(404, contentType, []byte(fmt.Sprintf("%s not found", path)))
|
||||
return
|
||||
}
|
||||
c.File(path)
|
||||
|
||||
+4
-4
@@ -33,15 +33,15 @@ func TestCustomizationAssets(t *testing.T) {
|
||||
{
|
||||
customJS: "foo/bar/custom.js",
|
||||
path: "/custom.js",
|
||||
code: 200,
|
||||
body: "",
|
||||
code: 404,
|
||||
body: "foo/bar/custom.js not found",
|
||||
mime: "application/javascript",
|
||||
},
|
||||
{
|
||||
customCSS: "foo/bar/custom.css",
|
||||
path: "/custom.css",
|
||||
code: 200,
|
||||
body: "",
|
||||
code: 404,
|
||||
body: "foo/bar/custom.css not found",
|
||||
mime: "text/css",
|
||||
},
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user