[v3] Fix Assets options in templates

v3/examples/binding/main.go

@@ -16,12 +16,12 @@ func main() {
 		Bind: []interface{}{
 			&GreetService{},
 		},
-		Mac: application.MacOptions{
-			ApplicationShouldTerminateAfterLastWindowClosed: true,
-		},
 		Assets: application.AssetOptions{
 			FS: assets,
 		},
+		Mac: application.MacOptions{
+			ApplicationShouldTerminateAfterLastWindowClosed: true,
+		},
 	})
 
 	app.NewWebviewWindowWithOptions(application.WebviewWindowOptions{

v3/examples/contextmenus/main.go

@@ -17,12 +17,12 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "Context Menu Demo",
 		Description: "A demo of the Context Menu API",
-		Mac: application.MacOptions{
-			ApplicationShouldTerminateAfterLastWindowClosed: true,
-		},
 		Assets: application.AssetOptions{
 			FS: assets,
 		},
+		Mac: application.MacOptions{
+			ApplicationShouldTerminateAfterLastWindowClosed: true,
+		},
 	})
 
 	mainWindow := app.NewWebviewWindowWithOptions(application.WebviewWindowOptions{

v3/examples/dialogs/main.go

@@ -2,12 +2,13 @@ package main
 
 import (
 	_ "embed"
-	"github.com/wailsapp/wails/v3/pkg/icons"
 	"log"
 	"os"
 	"runtime"
 	"strings"
 
+	"github.com/wailsapp/wails/v3/pkg/icons"
+
 	"github.com/wailsapp/wails/v3/pkg/application"
 )
 

v3/examples/drag-n-drop/main.go

@@ -17,12 +17,12 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "Drag-n-drop Demo",
 		Description: "A demo of the Drag-n-drop API",
-		Mac: application.MacOptions{
-			ApplicationShouldTerminateAfterLastWindowClosed: true,
-		},
 		Assets: application.AssetOptions{
 			FS: assets,
 		},
+		Mac: application.MacOptions{
+			ApplicationShouldTerminateAfterLastWindowClosed: true,
+		},
 	})
 
 	window := app.NewWebviewWindowWithOptions(application.WebviewWindowOptions{

v3/examples/events/main.go

@@ -18,12 +18,12 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "Events Demo",
 		Description: "A demo of the Events API",
-		Mac: application.MacOptions{
-			ApplicationShouldTerminateAfterLastWindowClosed: true,
-		},
 		Assets: application.AssetOptions{
 			FS: assets,
 		},
+		Mac: application.MacOptions{
+			ApplicationShouldTerminateAfterLastWindowClosed: true,
+		},
 	})
 
 	// Custom event handling

v3/examples/frameless/main.go

@@ -16,12 +16,12 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "Frameless Demo",
 		Description: "A demo of frameless windows",
-		Mac: application.MacOptions{
-			ApplicationShouldTerminateAfterLastWindowClosed: true,
-		},
 		Assets: application.AssetOptions{
 			FS: assets,
 		},
+		Mac: application.MacOptions{
+			ApplicationShouldTerminateAfterLastWindowClosed: true,
+		},
 	})
 
 	app.NewWebviewWindowWithOptions(application.WebviewWindowOptions{

v3/examples/kitchensink/main.go

@@ -2,12 +2,13 @@ package main
 
 import (
 	_ "embed"
-	"github.com/wailsapp/wails/v3/pkg/icons"
 	"log"
 	"runtime"
 	"sync"
 	"time"
 
+	"github.com/wailsapp/wails/v3/pkg/icons"
+
 	"github.com/wailsapp/wails/v3/pkg/application"
 )
 

v3/examples/plugins/main.go

@@ -2,6 +2,9 @@ package main
 
 import (
 	"embed"
+	"os"
+	"plugin_demo/plugins/hashes"
+
 	"github.com/wailsapp/wails/v3/pkg/application"
 	"github.com/wailsapp/wails/v3/plugins/browser"
 	"github.com/wailsapp/wails/v3/plugins/kvstore"
@@ -9,8 +12,6 @@ import (
 	"github.com/wailsapp/wails/v3/plugins/single_instance"
 	"github.com/wailsapp/wails/v3/plugins/sqlite"
 	"github.com/wailsapp/wails/v3/plugins/start_at_login"
-	"os"
-	"plugin_demo/plugins/hashes"
 )
 
 //go:embed assets/*

v3/examples/systray/main.go

@@ -2,10 +2,11 @@ package main
 
 import (
 	_ "embed"
-	"github.com/wailsapp/wails/v3/pkg/application"
-	"github.com/wailsapp/wails/v3/pkg/icons"
 	"log"
 	"runtime"
+
+	"github.com/wailsapp/wails/v3/pkg/application"
+	"github.com/wailsapp/wails/v3/pkg/icons"
 )
 
 func main() {

v3/examples/window/main.go

@@ -3,14 +3,15 @@ package main
 import (
 	_ "embed"
 	"fmt"
-	"github.com/samber/lo"
-	"github.com/wailsapp/wails/v3/pkg/events"
 	"log"
 	"math/rand"
 	"runtime"
 	"strconv"
 	"time"
 
+	"github.com/samber/lo"
+	"github.com/wailsapp/wails/v3/pkg/events"
+
 	"github.com/wailsapp/wails/v3/pkg/application"
 )
 

v3/internal/templates/_base/default/main.go.tmpl

@@ -15,6 +15,9 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "{{.ProjectName}}",
 		Description: "A demo of using raw HTML & CSS",
+        Assets: application.AssetOptions{
+			FS: assets,
+		},
 		Mac: application.MacOptions{
 			ApplicationShouldTerminateAfterLastWindowClosed: true,
 		},
@@ -28,11 +31,7 @@ func main() {
 			Backdrop:                application.MacBackdropTranslucent,
 			TitleBar:                application.MacTitleBarHiddenInset,
 		},
-
 		URL: "/",
-		Assets: application.AssetOptions{
-			FS: assets,
-		},
 	})
 
 	err := app.Run()

v3/internal/templates/lit-ts/main.go.tmpl

@@ -15,6 +15,9 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "{{.ProjectName}}",
 		Description: "A demo of using raw HTML & CSS",
+		Assets: application.AssetOptions{
+			FS: assets,
+		},
 		Mac: application.MacOptions{
 			ApplicationShouldTerminateAfterLastWindowClosed: true,
 		},
@@ -30,9 +33,6 @@ func main() {
 		},
 
 		URL: "/",
-		Assets: application.AssetOptions{
-			FS: assets,
-		},
 	})
 
 	err := app.Run()

v3/internal/templates/lit/main.go.tmpl

@@ -15,6 +15,9 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "{{.ProjectName}}",
 		Description: "A demo of using raw HTML & CSS",
+		Assets: application.AssetOptions{
+			FS: assets,
+		},
 		Mac: application.MacOptions{
 			ApplicationShouldTerminateAfterLastWindowClosed: true,
 		},
@@ -30,9 +33,6 @@ func main() {
 		},
 
 		URL: "/",
-		Assets: application.AssetOptions{
-			FS: assets,
-		},
 	})
 
 	err := app.Run()

v3/internal/templates/preact-ts/main.go.tmpl

@@ -15,6 +15,9 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "{{.ProjectName}}",
 		Description: "A demo of using raw HTML & CSS",
+        Assets: application.AssetOptions{
+			FS: assets,
+		},
 		Mac: application.MacOptions{
 			ApplicationShouldTerminateAfterLastWindowClosed: true,
 		},
@@ -30,9 +33,6 @@ func main() {
 		},
 
 		URL: "/",
-		Assets: application.AssetOptions{
-			FS: assets,
-		},
 	})
 
 	err := app.Run()

v3/internal/templates/preact/main.go.tmpl

@@ -15,6 +15,9 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "{{.ProjectName}}",
 		Description: "A demo of using raw HTML & CSS",
+        Assets: application.AssetOptions{
+			FS: assets,
+		},
 		Mac: application.MacOptions{
 			ApplicationShouldTerminateAfterLastWindowClosed: true,
 		},
@@ -30,9 +33,6 @@ func main() {
 		},
 
 		URL: "/",
-		Assets: application.AssetOptions{
-			FS: assets,
-		},
 	})
 
 	err := app.Run()

v3/internal/templates/react-swc-ts/main.go.tmpl

@@ -15,6 +15,9 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "{{.ProjectName}}",
 		Description: "A demo of using raw HTML & CSS",
+        Assets: application.AssetOptions{
+			FS: assets,
+		},
 		Mac: application.MacOptions{
 			ApplicationShouldTerminateAfterLastWindowClosed: true,
 		},
@@ -30,9 +33,6 @@ func main() {
 		},
 
 		URL: "/",
-		Assets: application.AssetOptions{
-			FS: assets,
-		},
 	})
 
 	err := app.Run()

v3/internal/templates/react-swc/main.go.tmpl

@@ -15,6 +15,9 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "{{.ProjectName}}",
 		Description: "A demo of using raw HTML & CSS",
+        Assets: application.AssetOptions{
+			FS: assets,
+		},
 		Mac: application.MacOptions{
 			ApplicationShouldTerminateAfterLastWindowClosed: true,
 		},
@@ -30,9 +33,6 @@ func main() {
 		},
 
 		URL: "/",
-		Assets: application.AssetOptions{
-			FS: assets,
-		},
 	})
 
 	err := app.Run()

v3/internal/templates/react-ts/main.go.tmpl

@@ -15,6 +15,9 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "{{.ProjectName}}",
 		Description: "A demo of using raw HTML & CSS",
+        Assets: application.AssetOptions{
+			FS: assets,
+		},
 		Mac: application.MacOptions{
 			ApplicationShouldTerminateAfterLastWindowClosed: true,
 		},
@@ -30,9 +33,6 @@ func main() {
 		},
 
 		URL: "/",
-		Assets: application.AssetOptions{
-			FS: assets,
-		},
 	})
 
 	err := app.Run()

v3/internal/templates/react/main.go.tmpl

@@ -15,6 +15,9 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "{{.ProjectName}}",
 		Description: "A demo of using raw HTML & CSS",
+        Assets: application.AssetOptions{
+			FS: assets,
+		},
 		Mac: application.MacOptions{
 			ApplicationShouldTerminateAfterLastWindowClosed: true,
 		},
@@ -30,9 +33,6 @@ func main() {
 		},
 
 		URL: "/",
-		Assets: application.AssetOptions{
-			FS: assets,
-		},
 	})
 
 	err := app.Run()

v3/internal/templates/svelte-ts/main.go.tmpl

@@ -15,6 +15,9 @@ func main() {
 	app := application.New(application.Options{
 		Name:        "{{.ProjectName}}",
 		Description: "A demo of using raw HTML & CSS",
+        Assets: application.AssetOptions{
+			FS: assets,
+		},
 		Mac: application.MacOptions{
 			ApplicationShouldTerminateAfterLastWindowClosed: true,
 		},
@@ -30,9 +33,6 @@ func main() {
 		},
 
 		URL: "/",
-		Assets: application.AssetOptions{
-			FS: assets,
-		},
 	})
 
 	err := app.Run()