Merge branch 'develop'

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
 
       - name: Install dependencies
         run: |

README.md

@@ -25,6 +25,19 @@ version := ""                    // Asset version
 inertiaManager := inertia.New(url, rootTemplate, version)
 ```
 
+Or create with `embed.FS` for root template:
+
+```go
+import "embed"
+
+//go:embed template
+var templateFS embed.FS
+
+// ...
+
+inertiaManager := inertia.NewWithFS(url, rootTemplate, version, templateFS)
+```
+
 ### 2. Register the middleware
 
 ```go
@@ -119,6 +132,16 @@ r = r.WithContext(ctx)
 </html>
 ```
 
+## Example Apps
+
+### Satellite
+
+https://github.com/petaki/satellite
+
+### Homettp
+
+https://github.com/homettp/homettp
+
 ## Reporting Issues
 
 If you are facing a problem with this package or found any bug, please open an issue on [GitHub](https://github.com/petaki/inertia-go/issues).

go.mod

@@ -1,3 +1,3 @@
 module github.com/petaki/inertia-go
 
-go 1.15
+go 1.16

inertia.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"html/template"
+	"io/fs"
 	"net/http"
 	"path/filepath"
 	"strings"
@@ -16,6 +17,7 @@ type Inertia struct {
 	version       string
 	sharedProps   map[string]interface{}
 	sharedFuncMap template.FuncMap
+	templateFS    fs.FS
 }
 
 // New function.
@@ -30,6 +32,14 @@ func New(url, rootTemplate, version string) *Inertia {
 	return i
 }
 
+// NewWithFS function.
+func NewWithFS(url, rootTemplate, version string, templateFS fs.FS) *Inertia {
+	i := New(url, rootTemplate, version)
+	i.templateFS = templateFS
+
+	return i
+}
+
 // Share function.
 func (i *Inertia) Share(key string, value interface{}) {
 	i.sharedProps[key] = value
@@ -155,7 +165,7 @@ func (i *Inertia) Render(w http.ResponseWriter, r *http.Request, component strin
 
 	viewData["page"] = page
 
-	ts, err := template.New(filepath.Base(i.rootTemplate)).Funcs(i.sharedFuncMap).ParseFiles(i.rootTemplate)
+	ts, err := i.createRootTemplate()
 	if err != nil {
 		return err
 	}
@@ -167,3 +177,13 @@ func (i *Inertia) Render(w http.ResponseWriter, r *http.Request, component strin
 
 	return nil
 }
+
+func (i *Inertia) createRootTemplate() (*template.Template, error) {
+	ts := template.New(filepath.Base(i.rootTemplate)).Funcs(i.sharedFuncMap)
+
+	if i.templateFS != nil {
+		return ts.ParseFS(i.templateFS, i.rootTemplate)
+	}
+
+	return ts.ParseFiles(i.rootTemplate)
+}