diff --git a/assets/assets.go b/assets/assets.go new file mode 100644 index 0000000..f8715d0 --- /dev/null +++ b/assets/assets.go @@ -0,0 +1,2 @@ +//go:generate go-bindata -pkg assets simplemde/dist/... simplemde/debug/... +package assets diff --git a/bindata.go b/assets/bindata.go similarity index 99% rename from bindata.go rename to assets/bindata.go index 73d518c..3277217 100644 --- a/bindata.go +++ b/assets/bindata.go @@ -8,7 +8,7 @@ // require.js // DO NOT EDIT! -package caddyhugo +package assets import ( "bytes" @@ -245,12 +245,12 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ - "simplemde/dist/simplemde.min.css": simplemdeDistSimplemdeMinCss, - "simplemde/dist/simplemde.min.js": simplemdeDistSimplemdeMinJs, - "simplemde/debug/simplemde.css": simplemdeDebugSimplemdeCss, + "simplemde/dist/simplemde.min.css": simplemdeDistSimplemdeMinCss, + "simplemde/dist/simplemde.min.js": simplemdeDistSimplemdeMinJs, + "simplemde/debug/simplemde.css": simplemdeDebugSimplemdeCss, "simplemde/debug/simplemde.debug.js": simplemdeDebugSimplemdeDebugJs, - "simplemde/debug/simplemde.js": simplemdeDebugSimplemdeJs, - "require.js": requireJs, + "simplemde/debug/simplemde.js": simplemdeDebugSimplemdeJs, + "require.js": requireJs, } // AssetDir returns the file names below a certain @@ -292,17 +292,18 @@ type bintree struct { Func func() (*asset, error) Children map[string]*bintree } + var _bintree = &bintree{nil, map[string]*bintree{ "require.js": &bintree{requireJs, map[string]*bintree{}}, "simplemde": &bintree{nil, map[string]*bintree{ "debug": &bintree{nil, map[string]*bintree{ - "simplemde.css": &bintree{simplemdeDebugSimplemdeCss, map[string]*bintree{}}, + "simplemde.css": &bintree{simplemdeDebugSimplemdeCss, map[string]*bintree{}}, "simplemde.debug.js": &bintree{simplemdeDebugSimplemdeDebugJs, map[string]*bintree{}}, - "simplemde.js": &bintree{simplemdeDebugSimplemdeJs, map[string]*bintree{}}, + "simplemde.js": &bintree{simplemdeDebugSimplemdeJs, map[string]*bintree{}}, }}, "dist": &bintree{nil, map[string]*bintree{ "simplemde.min.css": &bintree{simplemdeDistSimplemdeMinCss, map[string]*bintree{}}, - "simplemde.min.js": &bintree{simplemdeDistSimplemdeMinJs, map[string]*bintree{}}, + "simplemde.min.js": &bintree{simplemdeDistSimplemdeMinJs, map[string]*bintree{}}, }}, }}, }} @@ -353,4 +354,3 @@ func _filePath(dir, name string) string { cannonicalName := strings.Replace(name, "\\", "/", -1) return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) } - diff --git a/simplemde/.eslintrc b/assets/simplemde/.eslintrc similarity index 100% rename from simplemde/.eslintrc rename to assets/simplemde/.eslintrc diff --git a/simplemde/.gitignore b/assets/simplemde/.gitignore similarity index 100% rename from simplemde/.gitignore rename to assets/simplemde/.gitignore diff --git a/simplemde/.travis.yml b/assets/simplemde/.travis.yml similarity index 100% rename from simplemde/.travis.yml rename to assets/simplemde/.travis.yml diff --git a/simplemde/CONTRIBUTING.md b/assets/simplemde/CONTRIBUTING.md similarity index 100% rename from simplemde/CONTRIBUTING.md rename to assets/simplemde/CONTRIBUTING.md diff --git a/simplemde/LICENSE b/assets/simplemde/LICENSE similarity index 100% rename from simplemde/LICENSE rename to assets/simplemde/LICENSE diff --git a/simplemde/README.md b/assets/simplemde/README.md similarity index 100% rename from simplemde/README.md rename to assets/simplemde/README.md diff --git a/simplemde/bower.json b/assets/simplemde/bower.json similarity index 100% rename from simplemde/bower.json rename to assets/simplemde/bower.json diff --git a/simplemde/debug/simplemde.css b/assets/simplemde/debug/simplemde.css similarity index 100% rename from simplemde/debug/simplemde.css rename to assets/simplemde/debug/simplemde.css diff --git a/simplemde/debug/simplemde.debug.js b/assets/simplemde/debug/simplemde.debug.js similarity index 100% rename from simplemde/debug/simplemde.debug.js rename to assets/simplemde/debug/simplemde.debug.js diff --git a/simplemde/debug/simplemde.js b/assets/simplemde/debug/simplemde.js similarity index 100% rename from simplemde/debug/simplemde.js rename to assets/simplemde/debug/simplemde.js diff --git a/simplemde/dist/simplemde.min.css b/assets/simplemde/dist/simplemde.min.css similarity index 100% rename from simplemde/dist/simplemde.min.css rename to assets/simplemde/dist/simplemde.min.css diff --git a/simplemde/dist/simplemde.min.js b/assets/simplemde/dist/simplemde.min.js similarity index 100% rename from simplemde/dist/simplemde.min.js rename to assets/simplemde/dist/simplemde.min.js diff --git a/simplemde/gulpfile.js b/assets/simplemde/gulpfile.js similarity index 100% rename from simplemde/gulpfile.js rename to assets/simplemde/gulpfile.js diff --git a/simplemde/package.json b/assets/simplemde/package.json similarity index 100% rename from simplemde/package.json rename to assets/simplemde/package.json diff --git a/simplemde/src/css/simplemde.css b/assets/simplemde/src/css/simplemde.css similarity index 100% rename from simplemde/src/css/simplemde.css rename to assets/simplemde/src/css/simplemde.css diff --git a/simplemde/src/js/codemirror/tablist.js b/assets/simplemde/src/js/codemirror/tablist.js similarity index 100% rename from simplemde/src/js/codemirror/tablist.js rename to assets/simplemde/src/js/codemirror/tablist.js diff --git a/simplemde/src/js/simplemde.js b/assets/simplemde/src/js/simplemde.js similarity index 100% rename from simplemde/src/js/simplemde.js rename to assets/simplemde/src/js/simplemde.js diff --git a/caddyhugo.go b/caddyhugo.go index 086decb..f56bbfc 100644 --- a/caddyhugo.go +++ b/caddyhugo.go @@ -1,4 +1,3 @@ -//go:generate go-bindata -pkg caddyhugo simplemde/dist/... simplemde/debug/... package caddyhugo import ( @@ -18,6 +17,7 @@ import ( "time" "git.stephensearles.com/stephen/acedoc" + "git.stephensearles.com/stephen/caddy-hugo2/assets" "github.com/gorilla/websocket" "github.com/mholt/caddy" @@ -146,11 +146,11 @@ func (ch *CaddyHugo) ServeHTTPWithNext(next httpserver.Handler, c *caddy.Control return http.StatusFound, nil } if strings.HasPrefix(r.URL.Path, "/hugo/simplemde.css") { - w.Write(MustAsset("simplemde/dist/simplemde.min.css")) + w.Write(assets.MustAsset("simplemde/dist/simplemde.min.css")) return http.StatusOK, nil } if strings.HasPrefix(r.URL.Path, "/hugo/simplemde.js") { - w.Write(MustAsset("simplemde/debug/simplemde.js")) + w.Write(assets.MustAsset("simplemde/debug/simplemde.js")) return http.StatusOK, nil } if strings.HasPrefix(r.URL.Path, "/hugo/admin") {