hack: enable builds on non-Windows

.gitignore

@@ -27,3 +27,5 @@ v2/pkg/parser/testproject/frontend/wails
 v2/test/kitchensink/frontend/public
 v2/test/kitchensink/build/darwin/desktop/kitchensink
 v2/test/kitchensink/frontend/package.json.md5
+/v2/internal/ffenestri/windows/test/cmake-build-debug/
+.idea/

v2/cmd/wails/internal/commands/build/build.go

@@ -3,8 +3,10 @@ package build
 import (
 	"fmt"
 	"io"
+	"os"
 	"runtime"
 	"strings"
+	"text/tabwriter"
 	"time"
 
 	"github.com/leaanthony/clir"
@@ -22,10 +24,6 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 
 	command := app.NewSubCommand("build", "Builds the application")
 
-	// Setup target type flag
-	description := "Type of application to build. Valid types: " + validTargetTypes.Join(",")
-	command.StringFlag("t", description, &outputType)
-
 	// Setup production flag
 	production := false
 	command.BoolFlag("production", "Build in production mode", &production)
@@ -37,33 +35,41 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	compilerCommand := "go"
 	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
 
+	compress := false
+	command.BoolFlag("compress", "Compress final binary", &compress)
+
 	// Setup Platform flag
 	platform := runtime.GOOS
 	command.StringFlag("platform", "Platform to target", &platform)
 
-	// Quiet Build
-	quiet := false
-	command.BoolFlag("q", "Suppress output to console", &quiet)
+	// Verbosity
+	verbosity := 1
+	command.IntFlag("v", "Verbosity level (0 - silent, 1 - default, 2 - verbose)", &verbosity)
 
 	// ldflags to pass to `go`
 	ldflags := ""
 	command.StringFlag("ldflags", "optional ldflags", &ldflags)
 
-	// Log to file
-	logFile := ""
-	command.StringFlag("l", "Log to file", &logFile)
+	// tags to pass to `go`
+	tags := ""
+	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &tags)
 
 	// Retain assets
 	keepAssets := false
 	command.BoolFlag("k", "Keep generated assets", &keepAssets)
 
-	appleIdentity := ""
-	if runtime.GOOS == "darwin" {
-		command.StringFlag("sign", "Signs your app with the given identity.", &appleIdentity)
-	}
+	// Retain assets
+	outputFilename := ""
+	command.StringFlag("o", "Output filename", &outputFilename)
+
+	// Clean build directory
+	cleanBuildDirectory := false
+	command.BoolFlag("clean", "Clean the build directory before building", &cleanBuildDirectory)
 
 	command.Action(func() error {
 
+		quiet := verbosity == 0
+
 		// Create logger
 		logger := clilogger.New(w)
 		logger.Mute(quiet)
@@ -77,34 +83,93 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			app.PrintBanner()
 		}
 
-		// Ensure package is used with apple identity
-		if appleIdentity != "" && pack == false {
-			return fmt.Errorf("must use `-package` flag when using `-sign`")
-		}
-
-		task := fmt.Sprintf("Building %s Application", strings.Title(outputType))
-		logger.Println(task)
-		logger.Println(strings.Repeat("-", len(task)))
-
 		// Setup mode
 		mode := build.Debug
 		if production {
 			mode = build.Production
 		}
 
+		// Check platform
+		validPlatformArch := slicer.String([]string{
+			"darwin",
+			"darwin/amd64",
+			"darwin/arm64",
+			"darwin/universal",
+			//"linux/amd64",
+			//"linux/arm-7",
+			"windows",
+			"windows/amd64",
+		})
+		if !validPlatformArch.Contains(platform) {
+			return fmt.Errorf("platform %s is not supported", platform)
+		}
+
+		if compress && platform == "darwin/universal" {
+			println("Warning: compress flag unsupported for universal binaries. Ignoring.")
+			compress = false
+		}
+
+		// Tags
+		userTags := []string{}
+		for _, tag := range strings.Split(tags, " ") {
+			thisTag := strings.TrimSpace(tag)
+			if thisTag != "" {
+				userTags = append(userTags, thisTag)
+			}
+		}
+
 		// Create BuildOptions
 		buildOptions := &build.Options{
-			Logger:        logger,
-			OutputType:    outputType,
-			Mode:          mode,
-			Pack:          pack,
-			Platform:      platform,
-			LDFlags:       ldflags,
-			Compiler:      compilerCommand,
-			KeepAssets:    keepAssets,
-			AppleIdentity: appleIdentity,
+			Logger:              logger,
+			OutputType:          outputType,
+			OutputFile:          outputFilename,
+			CleanBuildDirectory: cleanBuildDirectory,
+			Mode:                mode,
+			Pack:                pack,
+			LDFlags:             ldflags,
+			Compiler:            compilerCommand,
+			KeepAssets:          keepAssets,
+			Verbosity:           verbosity,
+			Compress:            compress,
+			UserTags:            userTags,
 		}
 
+		// Calculate platform and arch
+		platformSplit := strings.Split(platform, "/")
+		buildOptions.Platform = platformSplit[0]
+		buildOptions.Arch = runtime.GOARCH
+		if len(platformSplit) == 2 {
+			buildOptions.Arch = platformSplit[1]
+		}
+
+		// Start a new tabwriter
+		w := new(tabwriter.Writer)
+		w.Init(os.Stdout, 8, 8, 0, '\t', 0)
+
+		buildModeText := "debug"
+		if production {
+			buildModeText = "production"
+		}
+
+		// Write out the system information
+		fmt.Fprintf(w, "\n")
+		fmt.Fprintf(w, "App Type: \t%s\n", buildOptions.OutputType)
+		fmt.Fprintf(w, "Platform: \t%s\n", buildOptions.Platform)
+		fmt.Fprintf(w, "Arch: \t%s\n", buildOptions.Arch)
+		fmt.Fprintf(w, "Compiler: \t%s\n", buildOptions.Compiler)
+		fmt.Fprintf(w, "Compress: \t%t\n", buildOptions.Compress)
+		fmt.Fprintf(w, "Build Mode: \t%s\n", buildModeText)
+		fmt.Fprintf(w, "Package: \t%t\n", buildOptions.Pack)
+		fmt.Fprintf(w, "Clean Build Dir: \t%t\n", buildOptions.CleanBuildDirectory)
+		fmt.Fprintf(w, "KeepAssets: \t%t\n", buildOptions.KeepAssets)
+		fmt.Fprintf(w, "LDFlags: \t\"%s\"\n", buildOptions.LDFlags)
+		fmt.Fprintf(w, "Tags: \t[%s]\n", strings.Join(buildOptions.UserTags, ","))
+		if len(buildOptions.OutputFile) > 0 {
+			fmt.Fprintf(w, "Output File: \t%s\n", buildOptions.OutputFile)
+		}
+		fmt.Fprintf(w, "\n")
+		w.Flush()
+
 		return doBuild(buildOptions)
 	})
 }

v2/cmd/wails/internal/commands/doctor/doctor.go

@@ -48,9 +48,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 		// Exit early if PM not found
 		if info.PM == nil {
-			fmt.Fprintf(w, "\n%s\t%s", "Package Manager:", "Not Found")
 			w.Flush()
-			println()
 			return nil
 		}
 		fmt.Fprintf(w, "%s\t%s\n", "Package Manager: ", info.PM.Name())

v2/cmd/wails/internal/commands/generate/generate.go

@@ -9,7 +9,7 @@ import (
 	"github.com/wailsapp/wails/v2/pkg/parser"
 )
 
-// AddSubcommand adds the `dev` command for the Wails application
+// AddSubcommand adds the `generate` command for the Wails application
 func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	command := app.NewSubCommand("generate", "Code Generation Tools")
@@ -19,7 +19,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	// Quiet Init
 	quiet := false
-	backendAPI.BoolFlag("q", "Supress output to console", &quiet)
+	backendAPI.BoolFlag("q", "Suppress output to console", &quiet)
 
 	backendAPI.Action(func() error {
 
@@ -85,7 +85,4 @@ func logPackage(pkg *parser.Package, logger *clilogger.CLILogger) {
 		}
 	}
 	logger.Println("")
-
-	// logger.Println("  Original Go Package Path:", pkg.Gopackage.PkgPath)
-	// logger.Println("  Original Go Package Path:", pkg.Gopackage.PkgPath)
 }

v2/cmd/wails/internal/commands/initialise/initialise.go

@@ -6,9 +6,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/initialise/templates"
+
 	"github.com/leaanthony/clir"
 	"github.com/pkg/errors"
-	"github.com/wailsapp/wails/v2/internal/templates"
 	"github.com/wailsapp/wails/v2/pkg/clilogger"
 	"github.com/wailsapp/wails/v2/pkg/git"
 )

v2/cmd/wails/internal/commands/initialise/templates/templates.go

@@ -1,14 +1,16 @@
 package templates
 
 import (
+	"embed"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	gofs "io/fs"
 	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
 
+	"github.com/leaanthony/debme"
 	"github.com/leaanthony/gosod"
 	"github.com/leaanthony/slicer"
 	"github.com/olekukonko/tablewriter"
@@ -16,6 +18,12 @@ import (
 	"github.com/wailsapp/wails/v2/pkg/clilogger"
 )
 
+//go:embed templates
+var templates embed.FS
+
+//go:embed ides/*
+var ides embed.FS
+
 // Cahce for the templates
 // We use this because we need different views of the same data
 var templateCache []Template = nil
@@ -59,20 +67,21 @@ type Template struct {
 	HelpURL     string `json:"helpurl"`
 
 	// Other data
-	Directory string `json:"-"`
+	FS gofs.FS `json:"-"`
 }
 
-func parseTemplate(directory string) (Template, error) {
-	templateJSON := filepath.Join(directory, "template.json")
+func parseTemplate(template gofs.FS) (Template, error) {
 	var result Template
-	data, err := ioutil.ReadFile(templateJSON)
+	data, err := gofs.ReadFile(template, "template.json")
 	if err != nil {
 		return result, err
 	}
-
-	result.Directory = directory
 	err = json.Unmarshal(data, &result)
-	return result, err
+	if err != nil {
+		return result, err
+	}
+	result.FS = template
+	return result, nil
 }
 
 // TemplateShortNames returns a slicer of short template names
@@ -134,11 +143,13 @@ func getTemplateByShortname(shortname string) (Template, error) {
 // Loads the template cache
 func loadTemplateCache() error {
 
-	// Get local template directory
-	templateDir := fs.RelativePath("templates")
+	templatesFS, err := debme.FS(templates, "templates")
+	if err != nil {
+		return err
+	}
 
 	// Get directories
-	files, err := ioutil.ReadDir(templateDir)
+	files, err := templatesFS.ReadDir(".")
 	if err != nil {
 		return err
 	}
@@ -148,8 +159,11 @@ func loadTemplateCache() error {
 
 	for _, file := range files {
 		if file.IsDir() {
-			templateDir := filepath.Join(templateDir, file.Name())
-			template, err := parseTemplate(templateDir)
+			templateFS, err := templatesFS.FS(file.Name())
+			if err != nil {
+				return err
+			}
+			template, err := parseTemplate(templateFS)
 			if err != nil {
 				// Cannot parse this template, continue
 				continue
@@ -163,7 +177,6 @@ func loadTemplateCache() error {
 
 // Install the given template
 func Install(options *Options) error {
-
 	// Get cwd
 	cwd, err := os.Getwd()
 	if err != nil {
@@ -211,19 +224,16 @@ func Install(options *Options) error {
 	}
 
 	// Use Gosod to install the template
-	installer, err := gosod.TemplateDir(template.Directory)
-	if err != nil {
-		return err
-	}
+	installer := gosod.New(template.FS)
 
 	// Ignore template.json files
-	installer.IgnoreFilename("template.json")
+	installer.IgnoreFile("template.json")
 
 	// Setup the data.
 	// We use the directory name for the binary name, like Go
 	BinaryName := filepath.Base(options.TargetDir)
 	NPMProjectName := strings.ToLower(strings.ReplaceAll(BinaryName, " ", ""))
-	localWailsDirectory := fs.RelativePath("../..")
+	localWailsDirectory := fs.RelativePath("../../../../../..")
 	templateData := &Data{
 		ProjectName:    options.ProjectName,
 		BinaryName:     filepath.Base(options.TargetDir),
@@ -295,14 +305,14 @@ func generateIDEFiles(options *Options) error {
 func generateVSCodeFiles(options *Options) error {
 
 	targetDir := filepath.Join(options.TargetDir, ".vscode")
-	sourceDir := fs.RelativePath(filepath.Join("./ides/vscode"))
-
-	// Use Gosod to install the template
-	installer, err := gosod.TemplateDir(sourceDir)
+	source, err := debme.FS(ides, "ides/vscode")
 	if err != nil {
 		return err
 	}
 
+	// Use gosod to install the template
+	installer := gosod.New(source)
+
 	binaryName := filepath.Base(options.TargetDir)
 	if runtime.GOOS == "windows" {
 		// yay windows

v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/basic.tmpl.go

@@ -11,7 +11,7 @@ type Basic struct {
 	runtime *wails.Runtime
 }
 
-// newBasic creates a new Basic application struct
+// NewBasic creates a new Basic application struct
 func NewBasic() *Basic {
 	return &Basic{}
 }

v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/main.css

@@ -2,6 +2,7 @@
 html {
   text-align: center;
   color: white;
+  background-color: black;
 }
 
 body {
@@ -23,6 +24,7 @@ button {
   border-radius: 3px;
   outline: none;
   height: 20px;
+  -webkit-font-smoothing: antialiased;
 }
 
 #logo {

v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/main.js

@@ -1,12 +1,12 @@
 // Get input + focus
-var nameElement = document.getElementById("name");
+let nameElement = document.getElementById("name");
 nameElement.focus();
 
-// Stup the greet function
+// Setup the greet function
 window.greet = function () {
 
   // Get name
-  var name = nameElement.value;
+  let name = nameElement.value;
 
   // Call Basic.Greet(name)
   window.backend.main.Basic.Greet(name).then((result) => {

v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/go.mod.tmpl

@@ -1,6 +1,6 @@
 module test
 
-go 1.13
+go 1.16
 
 require (
 	github.com/wailsapp/wails/v2 v2.0.0-alpha

v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/wails.tmpl.json

@@ -1,7 +1,7 @@
 {
     "name": "{{.ProjectName}}",
     "outputfilename": "{{.BinaryName}}",
-    "html": "frontend/index.html",
+    "html": "frontend/src/index.html",
     "author": {
         "name": "{{.AuthorName}}",
         "email": "{{.AuthorEmail}}"

v2/cmd/wails/internal/commands/initialise/templates/templates_test.go

@@ -0,0 +1,46 @@
+package templates
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/matryer/is"
+)
+
+func TestList(t *testing.T) {
+
+	is2 := is.New(t)
+	templates, err := List()
+	is2.NoErr(err)
+
+	println("Found these templates:")
+	for _, template := range templates {
+		fmt.Printf("%+v\n", template)
+	}
+}
+
+func TestShortname(t *testing.T) {
+
+	is2 := is.New(t)
+
+	template, err := getTemplateByShortname("vanilla")
+	is2.NoErr(err)
+
+	println("Found this template:")
+	fmt.Printf("%+v\n", template)
+}
+
+func TestInstall(t *testing.T) {
+
+	is2 := is.New(t)
+
+	options := &Options{
+		ProjectName:  "test",
+		TemplateName: "vanilla",
+		AuthorName:   "Lea Anthony",
+		AuthorEmail:  "lea.anthony@gmail.com",
+	}
+
+	err := Install(options)
+	is2.NoErr(err)
+}

v2/cmd/wails/main.go

@@ -67,5 +67,6 @@ func main() {
 	err = app.Run()
 	if err != nil {
 		println("\n\nERROR: " + err.Error())
+		os.Exit(1)
 	}
 }

v2/cmd/wails/version.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "v2.0.0-alpha.55"
+var version = "v2.0.0-alpha.65"

v2/go.mod

@@ -4,14 +4,15 @@ go 1.16
 
 require (
 	github.com/Masterminds/semver v1.5.0
-	github.com/davecgh/go-spew v1.1.1
 	github.com/fatih/structtag v1.2.0
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/gorilla/websocket v1.4.1
 	github.com/imdario/mergo v0.3.11
 	github.com/jackmordaunt/icns v1.0.0
 	github.com/leaanthony/clir v1.0.4
-	github.com/leaanthony/gosod v0.0.4
+	github.com/leaanthony/debme v1.1.2
+	github.com/leaanthony/go-ansi-parser v1.0.1
+	github.com/leaanthony/gosod v1.0.1
 	github.com/leaanthony/slicer v1.5.0
 	github.com/matryer/is v1.4.0
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect

v2/go.sum

@@ -1,7 +1,6 @@
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
@@ -42,8 +41,13 @@ github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eT
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/leaanthony/clir v1.0.4 h1:Dov2y9zWJmZr7CjaCe86lKa4b5CSxskGAt2yBkoDyiU=
 github.com/leaanthony/clir v1.0.4/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0=
-github.com/leaanthony/gosod v0.0.4 h1:v4hepo4IyL8E8c9qzDsvYcA0KGh7Npf8As74K5ibQpI=
-github.com/leaanthony/gosod v0.0.4/go.mod h1:nGMCb1PJfXwBDbOAike78jEYlpqge+xUKFf0iBKjKxU=
+github.com/leaanthony/debme v1.1.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
+github.com/leaanthony/debme v1.1.2 h1:dGeQuj0+xPIlDQzGIjmAU52+yRg85u5pWaaqrdLBjD0=
+github.com/leaanthony/debme v1.1.2/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
+github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQOk2DgKxGG4=
+github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM=
+github.com/leaanthony/gosod v1.0.1 h1:F+4c3DmEBfigi7oAswCV2RpQ+k4DcNbhuCZUGdBHacQ=
+github.com/leaanthony/gosod v1.0.1/go.mod h1:W8RyeSFBXu7RpIxPGEJfW4moSyGGEjlJMLV25wEbAdU=
 github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY=
 github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=

v2/init.go

@@ -0,0 +1,7 @@
+// +build !windows
+
+package wails
+
+func Init() error {
+	return nil
+}

v2/init_windows.go

@@ -0,0 +1,14 @@
+package wails
+
+import (
+	"fmt"
+	"syscall"
+)
+
+func Init() error {
+	status, r, err := syscall.NewLazyDLL("user32.dll").NewProc("SetProcessDPIAware").Call()
+	if status == 0 {
+		return fmt.Errorf("exit status %d: %v %v", status, r, err)
+	}
+	return nil
+}

v2/internal/binding/generate.go

@@ -14,30 +14,6 @@ import (
 	"github.com/leaanthony/slicer"
 )
 
-const _comment = `
-
-const backend = {
-        main: {
-            "xbarApp": {
-                "GetCategories": () => {
-                    window.backend.main.xbarApp.GetCategories.call(arguments);
-                },
-
-                /**
-                 * @param {string} arg1
-                 */
-                "InstallPlugin": (arg1) => {
-                    window.backend.main.xbarApp.InstallPlugin.call(arguments);
-                },
-                "GetPlugins": () => {
-                    window.backend.main.xbarApp.GetPlugins.call(arguments);
-                }
-            }
-        }
-}
-
-export default backend;`
-
 //go:embed assets/package.json
 var packageJSON []byte
 
@@ -100,6 +76,8 @@ const backend = {`)
 					}
 					returnType += ">"
 					returnTypeDetails = " - Go Type: " + methodDetails.Outputs[0].TypeName
+				} else {
+					returnType = "Promise<void>"
 				}
 				output.WriteString("       * @returns {" + returnType + "} " + returnTypeDetails + "\n")
 				output.WriteString("       */\n")
@@ -125,13 +103,14 @@ const backend = {`)
 export default backend;`)
 	output.WriteString("\n")
 
+	// TODO: Make this configurable in wails.json
 	dirname, err := fs.RelativeToCwd("frontend/src/backend")
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	if !fs.DirExists(dirname) {
-		err := fs.Mkdir(dirname)
+		err := fs.MkDirs(dirname)
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -165,6 +144,8 @@ func goTypeToJSDocType(input string) string {
 		return "number"
 	case input == "bool":
 		return "boolean"
+	case input == "[]byte":
+		return "string"
 	case strings.HasPrefix(input, "[]"):
 		arrayType := goTypeToJSDocType(input[2:])
 		return "Array.<" + arrayType + ">"

v2/internal/binding/generate_test.go

@@ -0,0 +1,87 @@
+package binding
+
+import (
+	"testing"
+)
+
+func Test_goTypeToJSDocType(t *testing.T) {
+
+	tests := []struct {
+		name  string
+		input string
+		want  string
+	}{
+		{
+			name:  "string",
+			input: "string",
+			want:  "string",
+		},
+		{
+			name:  "error",
+			input: "error",
+			want:  "Error",
+		},
+		{
+			name:  "int",
+			input: "int",
+			want:  "number",
+		},
+		{
+			name:  "int32",
+			input: "int32",
+			want:  "number",
+		},
+		{
+			name:  "uint",
+			input: "uint",
+			want:  "number",
+		},
+		{
+			name:  "uint32",
+			input: "uint32",
+			want:  "number",
+		},
+		{
+			name:  "float32",
+			input: "float32",
+			want:  "number",
+		},
+		{
+			name:  "float64",
+			input: "float64",
+			want:  "number",
+		},
+		{
+			name:  "bool",
+			input: "bool",
+			want:  "boolean",
+		},
+		{
+			name:  "[]byte",
+			input: "[]byte",
+			want:  "string",
+		},
+		{
+			name:  "[]int",
+			input: "[]int",
+			want:  "Array.<number>",
+		},
+		{
+			name:  "[]bool",
+			input: "[]bool",
+			want:  "Array.<boolean>",
+		},
+		{
+			name:  "anything else",
+			input: "foo",
+			want:  "any",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := goTypeToJSDocType(tt.input); got != tt.want {
+				t.Errorf("goTypeToJSDocType() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

v2/internal/bridge/client.go

@@ -26,9 +26,8 @@ func (b BridgeClient) Quit() {
 }
 
 func (b BridgeClient) NotifyEvent(message string) {
-	//b.session.sendMessage("n" + message)
+	b.session.sendMessage("n" + message)
 	b.session.log.Info("NotifyEvent: %s", message)
-	b.session.log.Info("NotifyEvent unsupported in Bridge mode")
 }
 
 func (b BridgeClient) CallResult(message string) {

v2/internal/ffenestri/LICENCES.md

@@ -1,5 +1,11 @@
 # 3rd Party Licenses
 
+## Webview
+Whilst not using the library directly, there is certainly some code that is inspired by or used from the webview library.
+
+Homepage: https://github.com/webview/webview
+License: https://github.com/webview/webview/blob/master/LICENSE
+
 ## vec
 Homepage: https://github.com/rxi/vec
 License: https://github.com/rxi/vec/blob/master/LICENSE

v2/internal/ffenestri/common.c

@@ -1,3 +1,6 @@
+// +build !windows
+
+
 //
 // Created by Lea Anthony on 6/1/21.
 //

v2/internal/ffenestri/contextmenus_darwin.c

@@ -82,10 +82,10 @@ void ShowContextMenu(ContextMenuStore* store, id mainWindow, const char *context
     FREE_AND_SET(contextMenu->contextMenuData, contextMenuData);
 
 	// Grab the content view and show the menu
-	id contentView = msg(mainWindow, s("contentView"));
+	id contentView = msg_reg(mainWindow, s("contentView"));
 
 	// Get the triggering event
-	id menuEvent = msg(mainWindow, s("currentEvent"));
+	id menuEvent = msg_reg(mainWindow, s("currentEvent"));
 
 	if( contextMenu->nsmenu == NULL ) {
         // GetMenu creates the NSMenu
@@ -93,7 +93,7 @@ void ShowContextMenu(ContextMenuStore* store, id mainWindow, const char *context
 	}
 
 	// Show popup
-	msg(c("NSMenu"), s("popUpContextMenu:withEvent:forView:"), contextMenu->nsmenu, menuEvent, contentView);
+	((id(*)(id, SEL, id, id, id))objc_msgSend)(c("NSMenu"), s("popUpContextMenu:withEvent:forView:"), contextMenu->nsmenu, menuEvent, contentView);
 
 }
 

v2/internal/ffenestri/effectstructs_windows.h

@@ -0,0 +1,64 @@
+// Credit: https://gist.github.com/ysc3839/b08d2bff1c7dacde529bed1d37e85ccf
+#pragma once
+
+typedef enum _WINDOWCOMPOSITIONATTRIB
+{
+	WCA_UNDEFINED = 0,
+	WCA_NCRENDERING_ENABLED = 1,
+	WCA_NCRENDERING_POLICY = 2,
+	WCA_TRANSITIONS_FORCEDISABLED = 3,
+	WCA_ALLOW_NCPAINT = 4,
+	WCA_CAPTION_BUTTON_BOUNDS = 5,
+	WCA_NONCLIENT_RTL_LAYOUT = 6,
+	WCA_FORCE_ICONIC_REPRESENTATION = 7,
+	WCA_EXTENDED_FRAME_BOUNDS = 8,
+	WCA_HAS_ICONIC_BITMAP = 9,
+	WCA_THEME_ATTRIBUTES = 10,
+	WCA_NCRENDERING_EXILED = 11,
+	WCA_NCADORNMENTINFO = 12,
+	WCA_EXCLUDED_FROM_LIVEPREVIEW = 13,
+	WCA_VIDEO_OVERLAY_ACTIVE = 14,
+	WCA_FORCE_ACTIVEWINDOW_APPEARANCE = 15,
+	WCA_DISALLOW_PEEK = 16,
+	WCA_CLOAK = 17,
+	WCA_CLOAKED = 18,
+	WCA_ACCENT_POLICY = 19,
+	WCA_FREEZE_REPRESENTATION = 20,
+	WCA_EVER_UNCLOAKED = 21,
+	WCA_VISUAL_OWNER = 22,
+	WCA_HOLOGRAPHIC = 23,
+	WCA_EXCLUDED_FROM_DDA = 24,
+	WCA_PASSIVEUPDATEMODE = 25,
+	WCA_USEDARKMODECOLORS = 26,
+	WCA_LAST = 27
+} WINDOWCOMPOSITIONATTRIB;
+
+typedef struct _WINDOWCOMPOSITIONATTRIBDATA
+{
+	WINDOWCOMPOSITIONATTRIB Attrib;
+	PVOID pvData;
+	SIZE_T cbData;
+} WINDOWCOMPOSITIONATTRIBDATA;
+
+typedef enum _ACCENT_STATE
+{
+	ACCENT_DISABLED = 0,
+	ACCENT_ENABLE_GRADIENT = 1,
+	ACCENT_ENABLE_TRANSPARENTGRADIENT = 2,
+	ACCENT_ENABLE_BLURBEHIND = 3,
+	ACCENT_ENABLE_ACRYLICBLURBEHIND = 4, // RS4 1803
+	ACCENT_ENABLE_HOSTBACKDROP = 5, // RS5 1809
+ 	ACCENT_INVALID_STATE = 6
+} ACCENT_STATE;
+
+typedef struct _ACCENT_POLICY
+{
+	ACCENT_STATE AccentState;
+	DWORD AccentFlags;
+	DWORD GradientColor;
+	DWORD AnimationId;
+} ACCENT_POLICY;
+
+typedef BOOL (WINAPI *pfnGetWindowCompositionAttribute)(HWND, WINDOWCOMPOSITIONATTRIBDATA*);
+
+typedef BOOL (WINAPI *pfnSetWindowCompositionAttribute)(HWND, WINDOWCOMPOSITIONATTRIBDATA*);

v2/internal/ffenestri/ffenestri.go

@@ -13,17 +13,17 @@ import (
 )
 
 /*
-
 #cgo linux CFLAGS: -DFFENESTRI_LINUX=1
 #cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
 
 #cgo darwin CFLAGS: -DFFENESTRI_DARWIN=1
 #cgo darwin LDFLAGS: -framework WebKit -lobjc
 
+#cgo windows CXXFLAGS: -std=c++11
+#cgo windows,amd64 LDFLAGS: -L./windows/x64 -lwebview -lWebView2Loader -lgdi32 -lole32 -lShlwapi -luser32 -loleaut32
+
 #include <stdlib.h>
 #include "ffenestri.h"
-
-
 */
 import "C"
 
@@ -65,14 +65,6 @@ func NewApplicationWithConfig(config *options.App, logger *logger.Logger, menuMa
 	}
 }
 
-// NewApplication creates a new Application with the default config
-func NewApplication(logger *logger.Logger) *Application {
-	return &Application{
-		config: options.Default,
-		logger: logger.CustomLogger("Ffenestri"),
-	}
-}
-
 func (a *Application) freeMemory() {
 	for _, mem := range a.memory {
 		// fmt.Printf("Freeing memory: %+v\n", mem)
@@ -139,9 +131,9 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug
 	C.SetDebug(app, a.bool2Cint(debug))
 
 	// TODO: Move frameless to Linux options
-	// if a.config.Frameless {
-	// 	C.DisableFrame(a.app)
-	// }
+	if a.config.Frameless {
+		C.DisableFrame(a.app)
+	}
 
 	if a.config.RGBA != 0 {
 		r, g, b, alpha := intToColour(a.config.RGBA)
@@ -173,7 +165,7 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug
 		// Oh no! We couldn't initialise the application
 		a.logger.Fatal("Cannot initialise Application.")
 	}
-
+	//println("\n\n\n\n\n\nhererererer\n\n\n\n")
 	a.freeMemory()
 	return nil
 }

v2/internal/ffenestri/ffenestri.h

@@ -1,6 +1,10 @@
 #ifndef __FFENESTRI_H__
 #define __FFENESTRI_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdio.h>
 struct Application;
 
@@ -41,5 +45,11 @@ extern void DeleteTrayMenuByID(struct Application*, const char *id);
 extern void UpdateTrayMenuLabel(struct Application*, const char* JSON);
 extern void AddContextMenu(struct Application*, char *contextMenuJSON);
 extern void UpdateContextMenu(struct Application*, char *contextMenuJSON);
+extern void WebviewIsTransparent(struct Application*);
+extern void WindowBackgroundIsTranslucent(struct Application*);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif

v2/internal/ffenestri/ffenestri_client.go

@@ -1,13 +1,7 @@
 package ffenestri
 
 /*
-
-#cgo linux CFLAGS: -DFFENESTRI_LINUX=1
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
-
-#include <stdlib.h>
 #include "ffenestri.h"
-
 */
 import "C"
 

v2/internal/ffenestri/ffenestri_darwin.h

@@ -11,9 +11,21 @@
 #include "hashmap.h"
 #include "stdlib.h"
 
+typedef struct {
+    long maj;
+    long min;
+    long patch;
+} OSVersion;
+
 // Macros to make it slightly more sane
 #define msg objc_msgSend
-
+#define msg_reg ((id(*)(id, SEL))objc_msgSend)
+#define msg_id ((id(*)(id, SEL, id))objc_msgSend)
+#define msg_id_id ((id(*)(id, SEL, id, id))objc_msgSend)
+#define msg_bool ((id(*)(id, SEL, BOOL))objc_msgSend)
+#define msg_int ((id(*)(id, SEL, int))objc_msgSend)
+#define msg_uint ((id(*)(id, SEL, unsigned int))objc_msgSend)
+#define msg_float ((id(*)(id, SEL, float))objc_msgSend)
 #define kInternetEventClass 'GURL'
 #define kAEGetURL 'GURL'
 #define keyDirectObject '----'
@@ -21,18 +33,29 @@
 #define c(str) (id)objc_getClass(str)
 #define s(str) sel_registerName(str)
 #define u(str) sel_getUid(str)
-#define str(input) msg(c("NSString"), s("stringWithUTF8String:"), input)
-#define strunicode(input) msg(c("NSString"), s("stringWithFormat:"), str("%C"), (unsigned short)input)
-#define cstr(input) (const char *)msg(input, s("UTF8String"))
-#define url(input) msg(c("NSURL"), s("fileURLWithPath:"), str(input))
-#define ALLOC(classname) msg(c(classname), s("alloc"))
-#define ALLOC_INIT(classname) msg(msg(c(classname), s("alloc")), s("init"))
+#define str(input) ((id(*)(id, SEL, const char *))objc_msgSend)(c("NSString"), s("stringWithUTF8String:"), input)
+#define strunicode(input) ((id(*)(id, SEL, id, unsigned short))objc_msgSend)(c("NSString"), s("stringWithFormat:"), str("%C"), (unsigned short)input)
+#define cstr(input) (const char *)msg_reg(input, s("UTF8String"))
+#define url(input) msg_id(c("NSURL"), s("fileURLWithPath:"), str(input))
+#define ALLOC(classname) msg_reg(c(classname), s("alloc"))
+#define ALLOC_INIT(classname) msg_reg(msg_reg(c(classname), s("alloc")), s("init"))
+
+#if defined (__aarch64__)
+#define GET_FRAME(receiver) ((CGRect(*)(id, SEL))objc_msgSend)(receiver, s("frame"))
+#define GET_BOUNDS(receiver) ((CGRect(*)(id, SEL))objc_msgSend)(receiver, s("bounds"))
+#define GET_OSVERSION(receiver) ((OSVersion(*)(id, SEL))objc_msgSend)(processInfo, s("operatingSystemVersion"));
+#endif
+
+#if defined (__x86_64__)
 #define GET_FRAME(receiver) ((CGRect(*)(id, SEL))objc_msgSend_stret)(receiver, s("frame"))
 #define GET_BOUNDS(receiver) ((CGRect(*)(id, SEL))objc_msgSend_stret)(receiver, s("bounds"))
-#define GET_BACKINGSCALEFACTOR(receiver) ((CGFloat(*)(id, SEL))msg)(receiver, s("backingScaleFactor"))
+#define GET_OSVERSION(receiver) ((OSVersion(*)(id, SEL))objc_msgSend_stret)(processInfo, s("operatingSystemVersion"));
+#endif
+
+#define GET_BACKINGSCALEFACTOR(receiver) ((CGFloat(*)(id, SEL))objc_msgSend)(receiver, s("backingScaleFactor"))
 
 #define ON_MAIN_THREAD(str) dispatch( ^{ str; } )
-#define MAIN_WINDOW_CALL(str) msg(app->mainWindow, s((str)))
+#define MAIN_WINDOW_CALL(str) msg_reg(app->mainWindow, s((str)))
 
 #define NSBackingStoreBuffered 2
 
@@ -102,6 +125,8 @@
 #define NSAlertSecondButtonReturn  1001
 #define NSAlertThirdButtonReturn   1002
 
+#define BrokenImage "iVBORw0KGgoAAAANSUhEUgAAABAAAAASCAMAAABl5a5YAAABj1BMVEWopan///+koqSWk5P9/v3///////////+AgACMiovz8/PB0fG9z+3i4+WysbGBfX1Erh80rACLiYqBxolEsDhHlDEbqQDDx+CNho7W1tj4+/bw+O3P5Mn4/f/W1tbK6sX////b2dn////////////8/Pz6+vro6Ojj4+P////G1PL////EzNydmp2cmZnd3eDF1PHs8v/o8P/Q3vrS3vfE0vCdmpqZkpr19/3N2vXI1vPH1fOgnqDg6frP3PbCytvHx8irqq6HhIZtuGtjnlZetU1Xs0NWskBNsi7w9v/d6P7w9P3S4Pzr8Pvl7PrY5PrU4PjQ3fjD1Ozo6Om30NjGzNi7ubm34K+UxKmbnaWXlJeUjpSPi4tppF1TtjxSsTf2+f7L2PTr7e3H2+3V7+q+0uXg4OPg4eLR1uG7z+Hg4ODGzODV2N7V1trP5dmxzs65vcfFxMWq0cKxxr+/vr+0s7apxbWaxrCv2qao05+dlp2Uuo2Dn4F8vIB6xnyAoHmAym9zqGpctENLryNFsgoblJpnAAAAKnRSTlP+hP7+5ZRmYgL+/f39/f39/f38/Pz8/Pv69+7j083My8GocnBPTTMWEgjxeITOAAABEklEQVQY0y3KZXuCYBiG4ceYuu7u3nyVAaKOMBBQ7O5Yd3f3fvheDnd9u8/jBkGwNxP6sjOWVQvY/ftrzfT6bd3yEhCnYZqiaYoKiwX/gXkFiHySTcUTLJMsZ9v8nQvgssWYOEKedKpcOO6CUXD5IlGEY5hLUbyDAAZ6HRf1bnkoavOsFQibg+Q4nuNYL+ON5PHD5nBaraRVyxnzGf6BJzUi2QQCQgMyk8tleL7dg1owpJ17D5IkvV100EingeOopPyo6vfAuXF+9hbDTknZCIaUoeK4efKwG4iT6xDewd7imGlid7gGwv37b6Oh9jwaTdOf/Tc1qH7UZVmuP6G5qZfBr9cAGNy4KiDd4tXIs7tS+QO9aUKvPAIKuQAAAABJRU5ErkJggg=="
+
 struct Application;
 int releaseNSObject(void *const context, struct hashmap_element_s *const e);
 void TitlebarAppearsTransparent(struct Application* app);
@@ -124,4 +149,6 @@ void* lookupStringConstant(id constantName);
 
 void HasURLHandlers(struct Application* app);
 
+id createImageFromBase64Data(const char *data, bool isTemplateImage);
+
 #endif

v2/internal/ffenestri/ffenestri_windows.c

@@ -1,78 +0,0 @@
-
-typedef struct {
-} Application;
-
-struct Application *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel, int hideWindowOnClose) {
-}
-void SetMinWindowSize(struct Application* app, int minWidth, int minHeight) {
-}
-void SetMaxWindowSize(struct Application* app, int maxWidth, int maxHeight) {
-}
-void Run(struct Application* app, int argc, char **argv) {
-}
-void DestroyApplication(struct Application* app) {
-}
-void SetDebug(struct Application* app, int flag) {
-}
-void SetBindings(struct Application* app, const char *bindings) {
-}
-void ExecJS(struct Application* app, const char *script) {
-}
-void Hide(struct Application* app) {
-}
-void Show(struct Application* app) {
-}
-void Center(struct Application* app) {
-}
-void Maximise(struct Application* app) {
-}
-void Unmaximise(struct Application* app) {
-}
-void ToggleMaximise(struct Application* app) {
-}
-void Minimise(struct Application* app) {
-}
-void Unminimise(struct Application* app) {
-}
-void ToggleMinimise(struct Application* app) {
-}
-void SetColour(struct Application* app, int red, int green, int blue, int alpha) {
-}
-void SetSize(struct Application* app, int width, int height) {
-}
-void SetPosition(struct Application* app, int x, int y) {
-}
-void Quit(struct Application* app) {
-}
-void SetTitle(struct Application* app, const char *title) {
-}
-void Fullscreen(struct Application* app) {
-}
-void UnFullscreen(struct Application* app) {
-}
-void ToggleFullscreen(struct Application* app) {
-}
-void DisableFrame(struct Application* app) {
-}
-void OpenDialog(struct Application* app, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolvesAliases, int treatPackagesAsDirectories) {
-}
-void SaveDialog(struct Application* app, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int showHiddenFiles, int canCreateDirectories, int treatPackagesAsDirectories) {
-}
-void MessageDialog(struct Application* app, char *callbackID, char *type, char *title, char *message, char *icon, char *button1, char *button2, char *button3, char *button4, char *defaultButton, char *cancelButton) {
-}
-void DarkModeEnabled(struct Application* app, char *callbackID) {
-}
-void SetApplicationMenu(struct Application* app, const char *applicationMenuJSON) {
-}
-void AddTrayMenu(struct Application* app, const char *menuTrayJSON) {
-}
-void SetTrayMenu(struct Application* app, const char *menuTrayJSON) {
-}
-void DeleteTrayMenuByID(struct Application* app, const char *id) {
-}
-void UpdateTrayMenuLabel(struct Application* app, const char* JSON) {
-}
-void AddContextMenu(struct Application* app, char *contextMenuJSON) {
-}
-void UpdateContextMenu(struct Application* app, char *contextMenuJSON) {
-}

v2/internal/ffenestri/ffenestri_windows.cpp

@@ -0,0 +1,620 @@
+// Some code may be inspired by or directly used from Webview (c) zserge.
+// License included in README.md
+
+#include "ffenestri_windows.h"
+#include "wv2ComHandler_windows.h"
+#include <functional>
+#include <atomic>
+#include <Shlwapi.h>
+#include <locale>
+#include <codecvt>
+#include "windows/WebView2.h"
+#include "effectstructs_windows.h"
+#include <Shlobj.h>
+
+int debug = 0;
+DWORD mainThread;
+
+// --- Assets
+extern const unsigned char runtime;
+extern const unsigned char *defaultDialogIcons[];
+
+// dispatch will execute the given `func` pointer
+void dispatch(dispatchFunction func) {
+    PostThreadMessage(mainThread, WM_APP, 0, (LPARAM) new dispatchFunction(func));
+}
+
+LPWSTR cstrToLPWSTR(const char *cstr) {
+    int wchars_num = MultiByteToWideChar( CP_UTF8 , 0 , cstr , -1, NULL , 0 );
+    wchar_t* wstr = new wchar_t[wchars_num+1];
+    MultiByteToWideChar( CP_UTF8 , 0 , cstr , -1, wstr , wchars_num );
+    return wstr;
+}
+
+// Credit: https://stackoverflow.com/a/9842450
+char* LPWSTRToCstr(LPWSTR input) {
+    int length = WideCharToMultiByte(CP_UTF8, 0, input, -1, 0, 0, NULL, NULL);
+    char* output = new char[length];
+    WideCharToMultiByte(CP_UTF8, 0, input, -1, output , length, NULL, NULL);
+    return output;
+}
+
+struct Application *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel, int hideWindowOnClose) {
+
+    // Create application
+    struct Application *result = (struct Application*)malloc(sizeof(struct Application));
+
+    result->window = nullptr;
+    result->webview = nullptr;
+    result->webviewController = nullptr;
+
+    result->title = title;
+    result->width = width;
+    result->height = height;
+    result->resizable = resizable;
+    result->devtools = devtools;
+    result->fullscreen = fullscreen;
+    result->startHidden = startHidden;
+    result->logLevel = logLevel;
+    result->hideWindowOnClose = hideWindowOnClose;
+    result->webviewIsTranparent = false;
+    result->windowBackgroundIsTranslucent = false;
+
+    // Min/Max Width/Height
+    result->minWidth = 0;
+    result->minHeight = 0;
+    result->maxWidth = 0;
+    result->maxHeight = 0;
+
+    // Default colour
+    result->backgroundColour.R = 255;
+    result->backgroundColour.G = 255;
+    result->backgroundColour.B = 255;
+    result->backgroundColour.A = 255;
+
+    // Have a frame by default
+    result->frame = 1;
+
+    // Capture Main Thread
+    mainThread = GetCurrentThreadId();
+
+    // Startup url
+    result->startupURL = nullptr;
+
+    return result;
+}
+
+void SetMinWindowSize(struct Application* app, int minWidth, int minHeight) {
+    app->minWidth = (LONG)minWidth;
+    app->minHeight = (LONG)minHeight;
+}
+
+void SetMaxWindowSize(struct Application* app, int maxWidth, int maxHeight) {
+    app->maxWidth = (LONG)maxWidth;
+    app->maxHeight = (LONG)maxHeight;
+}
+
+void SetBindings(struct Application *app, const char *bindings) {
+    std::string temp = std::string("window.wailsbindings = \"") + std::string(bindings) + std::string("\";");
+    app->bindings = new char[temp.length()+1];
+	memcpy(app->bindings, temp.c_str(), temp.length()+1);
+}
+
+void performShutdown(struct Application *app) {
+    if( app->startupURL != nullptr ) {
+        delete[] app->startupURL;
+    }
+    messageFromWindowCallback("WC");
+}
+
+void enableTranslucentBackground(struct Application *app) {
+    HMODULE hUser = GetModuleHandleA("user32.dll");
+    if (hUser)
+    {
+        pfnSetWindowCompositionAttribute setWindowCompositionAttribute = (pfnSetWindowCompositionAttribute)GetProcAddress(hUser, "SetWindowCompositionAttribute");
+        if (setWindowCompositionAttribute)
+        {
+            ACCENT_POLICY accent = { ACCENT_ENABLE_BLURBEHIND, 0, 0, 0 };
+            WINDOWCOMPOSITIONATTRIBDATA data;
+            data.Attrib = WCA_ACCENT_POLICY;
+            data.pvData = &accent;
+            data.cbData = sizeof(accent);
+            setWindowCompositionAttribute(app->window, &data);
+        }
+    }
+}
+
+LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
+
+    struct Application *app = (struct Application *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+
+    switch(msg) {
+
+        case WM_DESTROY: {
+            DestroyApplication(app);
+            break;
+        }
+        case WM_SIZE: {
+            if( app->webviewController != nullptr) {
+                RECT bounds;
+                GetClientRect(app->window, &bounds);
+                app->webviewController->put_Bounds(bounds);
+            }
+            break;
+        }
+        case WM_GETMINMAXINFO: {
+            // Exit early if this is called before the window is created.
+            if ( app == NULL ) {
+                return 0;
+            }
+
+            // get pixel density
+            HDC hDC = GetDC(NULL);
+            double DPIScaleX = GetDeviceCaps(hDC, 88)/96.0;
+            double DPIScaleY = GetDeviceCaps(hDC, 90)/96.0;
+            ReleaseDC(NULL, hDC);
+
+            RECT rcClient, rcWind;
+            POINT ptDiff;
+            GetClientRect(hwnd, &rcClient);
+            GetWindowRect(hwnd, &rcWind);
+
+            int widthExtra = (rcWind.right - rcWind.left) - rcClient.right;
+            int heightExtra = (rcWind.bottom - rcWind.top) - rcClient.bottom;
+
+            LPMINMAXINFO mmi = (LPMINMAXINFO) lParam;
+            if (app->minWidth > 0 && app->minHeight > 0) {
+                mmi->ptMinTrackSize.x = app->minWidth * DPIScaleX + widthExtra;
+                mmi->ptMinTrackSize.y = app->minHeight * DPIScaleY + heightExtra;
+            }
+            if (app->maxWidth > 0 && app->maxHeight > 0) {
+                mmi->ptMaxSize.x = app->maxWidth * DPIScaleX + widthExtra;
+                mmi->ptMaxSize.y = app->maxHeight * DPIScaleY + heightExtra;
+                mmi->ptMaxTrackSize.x = app->maxWidth * DPIScaleX + widthExtra;
+                mmi->ptMaxTrackSize.y = app->maxHeight * DPIScaleY + heightExtra;
+            }
+            return 0;
+        }
+        default:
+            return DefWindowProc(hwnd, msg, wParam, lParam);
+    }
+    return 0;
+}
+
+void init(struct Application *app, const char* js) {
+    LPCWSTR wjs = cstrToLPWSTR(js);
+    app->webview->AddScriptToExecuteOnDocumentCreated(wjs, nullptr);
+    delete[] wjs;
+}
+
+void execJS(struct Application* app, const char *script) {
+    LPWSTR s = cstrToLPWSTR(script);
+    app->webview->ExecuteScript(s, nullptr);
+    delete[] s;
+}
+
+void loadAssets(struct Application* app) {
+
+    // patch window.external.invoke
+    std::string initialCode = std::string("window.external={invoke:s=>window.chrome.webview.postMessage(s)};");
+
+    // Load bindings
+    initialCode += std::string(app->bindings);
+    delete[] app->bindings;
+
+    // Load runtime
+    initialCode += std::string((const char*)&runtime);
+
+    int index = 1;
+    while(1) {
+        // Get next asset pointer
+        const unsigned char *asset = assets[index];
+
+        // If we have no more assets, break
+        if (asset == 0x00) {
+            break;
+        }
+
+        initialCode += std::string((const char*)asset);
+        index++;
+    };
+
+    // Disable context menu if not in debug mode
+    if( debug != 1 ) {
+        initialCode += std::string("wails._.DisableDefaultContextMenu();");
+    }
+
+    initialCode += std::string("window.external.invoke('completed');");
+
+    // Keep a copy of the code
+    app->initialCode = new char[initialCode.length()+1];
+	memcpy(app->initialCode, initialCode.c_str(), initialCode.length()+1);
+
+    execJS(app, app->initialCode);
+
+    // Show app if we need to
+    if( app->startHidden == false ) {
+        Show(app);
+    }
+}
+
+// This is called when all our assets are loaded into the DOM
+void completed(struct Application* app) {
+    delete[] app->initialCode;
+    app->initialCode = nullptr;
+
+    if( app->startupURL == nullptr ) {
+        messageFromWindowCallback("SS");
+        return;
+    }
+    std::string readyMessage = std::string("SS") + std::string(app->startupURL);
+    messageFromWindowCallback(readyMessage.c_str());
+}
+
+
+//
+bool initWebView2(struct Application *app, int debugEnabled, messageCallback cb) {
+
+    debug = debugEnabled;
+
+    CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
+
+    std::atomic_flag flag = ATOMIC_FLAG_INIT;
+    flag.test_and_set();
+
+//    char currentExePath[MAX_PATH];
+//    GetModuleFileNameA(NULL, currentExePath, MAX_PATH);
+//    char *currentExeName = PathFindFileNameA(currentExePath);
+//    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> wideCharConverter;
+//    auto exeName = wideCharConverter.from_bytes(currentExeName);
+//
+//    PWSTR path;
+//    HRESULT appDataResult = SHGetFolderPathAndSubDir(app->window, CSIDL_LOCAL_APPDATA, nullptr, SHGFP_TYPE_CURRENT, exeName.c_str(), path);
+//    if ( appDataResult == false ) {
+//        path = nullptr;
+//    }
+//
+
+    ICoreWebView2Controller *controller;
+    ICoreWebView2* webview;
+
+    HRESULT res = CreateCoreWebView2EnvironmentWithOptions(
+            nullptr, nullptr, nullptr,
+            new wv2ComHandler(app, app->window, cb,
+                                     [&](ICoreWebView2Controller *webviewController) {
+                                         controller = webviewController;
+                                         controller->get_CoreWebView2(&webview);
+                                         webview->AddRef();
+                                         flag.clear();
+                                     }));
+    if (res != S_OK) {
+        CoUninitialize();
+        return false;
+    }
+
+    MSG msg = {};
+    while (flag.test_and_set() && GetMessage(&msg, NULL, 0, 0)) {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+    }
+    app->webviewController = controller;
+    app->webview = webview;
+    // Resize WebView to fit the bounds of the parent window
+    RECT bounds;
+    GetClientRect(app->window, &bounds);
+    app->webviewController->put_Bounds(bounds);
+
+    // Callback hack
+    app->webview->AddScriptToExecuteOnDocumentCreated(L"window.chrome.webview.postMessage('I');", nullptr);
+    // Load the HTML
+    LPCWSTR html = (LPCWSTR) cstrToLPWSTR((char*)assets[0]);
+    app->webview->Navigate(html);
+
+	messageFromWindowCallback("Ej{\"name\":\"wails:launched\",\"data\":[]}");
+    return true;
+}
+
+void initialCallback(std::string message) {
+    printf("MESSAGE=%s\n", message);
+}
+
+void Run(struct Application* app, int argc, char **argv) {
+
+    WNDCLASSEX wc;
+    HINSTANCE hInstance = GetModuleHandle(NULL);
+    ZeroMemory(&wc, sizeof(WNDCLASSEX));
+    wc.cbSize = sizeof(WNDCLASSEX);
+    wc.style = CS_HREDRAW | CS_VREDRAW;
+    wc.hInstance = hInstance;
+    wc.lpszClassName = (LPCWSTR)"ffenestri";
+    wc.lpfnWndProc   = WndProc;
+
+    // TODO: Menu
+//    wc.lpszMenuName = nullptr;
+
+
+    // Process window resizable
+    DWORD windowStyle = WS_OVERLAPPEDWINDOW;
+    if (app->resizable == 0) {
+        windowStyle &= ~WS_MAXIMIZEBOX;
+        windowStyle &= ~WS_THICKFRAME;
+    }
+    if ( app->frame == 0 ) {
+        windowStyle = WS_POPUP;
+    }
+
+    RegisterClassEx(&wc);
+    app->window = CreateWindow((LPCWSTR)"ffenestri", (LPCWSTR)"", windowStyle, CW_USEDEFAULT,
+                                CW_USEDEFAULT, app->width, app->height, NULL, NULL,
+                                hInstance, NULL);
+
+    // Private setTitle as we're on the main thread
+    setTitle(app, app->title);
+
+    // Store application pointer in window handle
+    SetWindowLongPtr(app->window, GWLP_USERDATA, (LONG_PTR)app);
+
+    // Process whether window should show by default
+    int startVisibility = SW_SHOWNORMAL;
+    if ( app->startHidden == 1 ) {
+        startVisibility = SW_HIDE;
+    }
+
+    // TODO: Make configurable
+//    COREWEBVIEW2_COLOR wvColor;
+//    wvColor.A = 255;
+//    std::weak_ptr<ICoreWebView2Controller2> controller2 = app->webviewController->query<ICoreWebView2Controller2>();
+//    controller2->put_DefaultBackgroundColor(wvColor);
+
+    if( app->windowBackgroundIsTranslucent ) {
+        enableTranslucentBackground(app);
+    }
+
+    // private center() as we are on main thread
+    center(app);
+    ShowWindow(app->window, startVisibility);
+    UpdateWindow(app->window);
+    SetFocus(app->window);
+
+    // Add webview2
+    initWebView2(app, 1, initialCallback);
+
+    // Main event loop
+    MSG  msg;
+    BOOL res;
+    while ((res = GetMessage(&msg, NULL, 0, 0)) != -1) {
+      if (msg.hwnd) {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+        continue;
+      }
+      if (msg.message == WM_APP) {
+          dispatchFunction *f = (dispatchFunction*) msg.lParam;
+          (*f)();
+          delete(f);
+      } else if (msg.message == WM_QUIT) {
+        performShutdown(app);
+        return;
+      }
+    }
+}
+
+void DestroyApplication(struct Application* app) {
+    PostQuitMessage(0);
+}
+void SetDebug(struct Application* app, int flag) {
+    debug = flag;
+}
+
+void ExecJS(struct Application* app, const char *script) {
+    ON_MAIN_THREAD(
+        execJS(app, script);
+    );
+}
+
+void hide(struct Application* app) {
+    ShowWindow(app->window, SW_HIDE);
+}
+
+void Hide(struct Application* app) {
+    ON_MAIN_THREAD(
+        hide(app);
+    );
+}
+
+void show(struct Application* app) {
+    ShowWindow(app->window, SW_SHOW);
+}
+
+void Show(struct Application* app) {
+    ON_MAIN_THREAD(
+        show(app);
+    );
+}
+
+void center(struct Application* app) {
+
+    HMONITOR currentMonitor = MonitorFromWindow(app->window, MONITOR_DEFAULTTONEAREST);
+    MONITORINFO info = {0};
+    info.cbSize = sizeof(info);
+    GetMonitorInfoA(currentMonitor, &info);
+    RECT workRect = info.rcWork;
+    LONG screenMiddleW = (workRect.right - workRect.left) / 2;
+    LONG screenMiddleH = (workRect.bottom - workRect.top) / 2;
+    RECT winRect;
+    if (app->frame == 1) {
+        GetWindowRect(app->window, &winRect);
+    } else {
+        GetClientRect(app->window, &winRect);
+    }
+    LONG winWidth = winRect.right - winRect.left;
+    LONG winHeight = winRect.bottom - winRect.top;
+
+    LONG windowX = screenMiddleW - (winWidth / 2);
+    LONG windowY = screenMiddleH - (winHeight / 2);
+
+    SetWindowPos(app->window, HWND_TOP, windowX, windowY, winWidth, winHeight, SWP_NOSIZE);
+}
+
+void Center(struct Application* app) {
+    ON_MAIN_THREAD(
+        center(app);
+    );
+}
+
+UINT getWindowPlacement(struct Application* app) {
+    WINDOWPLACEMENT lpwndpl;
+    lpwndpl.length = sizeof(WINDOWPLACEMENT);
+    BOOL result = GetWindowPlacement(app->window, &lpwndpl);
+    if( result == 0 ) {
+        // TODO: Work out what this call failing means
+        return -1;
+    }
+    return lpwndpl.showCmd;
+}
+
+int isMaximised(struct Application* app) {
+    return getWindowPlacement(app) == SW_SHOWMAXIMIZED;
+}
+
+void maximise(struct Application* app) {
+    ShowWindow(app->window, SW_MAXIMIZE);
+}
+
+void Maximise(struct Application* app) {
+    ON_MAIN_THREAD(
+        maximise(app);
+    );
+}
+
+void unmaximise(struct Application* app) {
+    ShowWindow(app->window, SW_RESTORE);
+}
+
+void Unmaximise(struct Application* app) {
+    ON_MAIN_THREAD(
+        unmaximise(app);
+    );
+}
+
+
+void ToggleMaximise(struct Application* app) {
+    if(isMaximised(app)) {
+        return Unmaximise(app);
+    }
+    return Maximise(app);
+}
+
+int isMinimised(struct Application* app) {
+    return getWindowPlacement(app) == SW_SHOWMINIMIZED;
+}
+
+void minimise(struct Application* app) {
+    ShowWindow(app->window, SW_MINIMIZE);
+}
+
+void Minimise(struct Application* app) {
+    ON_MAIN_THREAD(
+        minimise(app);
+    );
+}
+
+void unminimise(struct Application* app) {
+    ShowWindow(app->window, SW_RESTORE);
+}
+
+void Unminimise(struct Application* app) {
+    ON_MAIN_THREAD(
+        unminimise(app);
+    );
+}
+
+void ToggleMinimise(struct Application* app) {
+    if(isMinimised(app)) {
+        return Unminimise(app);
+    }
+    return Minimise(app);
+}
+
+void SetColour(struct Application* app, int red, int green, int blue, int alpha) {
+// TBD
+}
+
+void SetSize(struct Application* app, int width, int height) {
+    // TBD
+}
+
+void setPosition(struct Application* app, int x, int y) {
+    // TBD
+}
+
+void SetPosition(struct Application* app, int x, int y) {
+//    ON_MAIN_THREAD(
+//        setPosition(app, x, y);
+//    );
+}
+
+void Quit(struct Application* app) {
+    DestroyWindow(app->window);
+}
+
+
+// Credit: https://stackoverflow.com/a/6693107
+void setTitle(struct Application* app, const char *title) {
+    LPCTSTR text = cstrToLPWSTR(title);
+    SetWindowText(app->window, text);
+    delete[] text;
+}
+
+void SetTitle(struct Application* app, const char *title) {
+    ON_MAIN_THREAD(
+        setTitle(app, title);
+    );
+}
+
+void Fullscreen(struct Application* app) {
+}
+
+void UnFullscreen(struct Application* app) {
+}
+
+void ToggleFullscreen(struct Application* app) {
+}
+
+void DisableFrame(struct Application* app) {
+    app->frame = 0;
+}
+
+// WebviewIsTransparent will make the webview transparent
+// revealing the window underneath
+void WebviewIsTransparent(struct Application *app) {
+	app->webviewIsTranparent = true;
+}
+
+void WindowBackgroundIsTranslucent(struct Application *app) {
+	app->windowBackgroundIsTranslucent = true;
+}
+
+
+void OpenDialog(struct Application* app, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolvesAliases, int treatPackagesAsDirectories) {
+}
+void SaveDialog(struct Application* app, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int showHiddenFiles, int canCreateDirectories, int treatPackagesAsDirectories) {
+}
+void MessageDialog(struct Application* app, char *callbackID, char *type, char *title, char *message, char *icon, char *button1, char *button2, char *button3, char *button4, char *defaultButton, char *cancelButton) {
+}
+void DarkModeEnabled(struct Application* app, char *callbackID) {
+}
+void SetApplicationMenu(struct Application* app, const char *applicationMenuJSON) {
+}
+void AddTrayMenu(struct Application* app, const char *menuTrayJSON) {
+}
+void SetTrayMenu(struct Application* app, const char *menuTrayJSON) {
+}
+void DeleteTrayMenuByID(struct Application* app, const char *id) {
+}
+void UpdateTrayMenuLabel(struct Application* app, const char* JSON) {
+}
+void AddContextMenu(struct Application* app, char *contextMenuJSON) {
+}
+void UpdateContextMenu(struct Application* app, char *contextMenuJSON) {
+}

v2/internal/ffenestri/ffenestri_windows.go

@@ -1,14 +1,63 @@
 package ffenestri
 
+import "C"
+
 /*
 
+#cgo windows CXXFLAGS: -std=c++11
+#cgo windows,amd64 LDFLAGS: -L./windows/x64 -lwebview -lWebView2Loader -lgdi32 -lole32 -lShlwapi -luser32 -loleaut32
+
 #include "ffenestri.h"
-#include "ffenestri_windows.h"
 
 */
 import "C"
 
 func (a *Application) processPlatformSettings() error {
 
+	config := a.config.Windows
+
+	// Check if the webview should be transparent
+	if config.WebviewIsTransparent {
+		C.WebviewIsTransparent(a.app)
+	}
+
+	if config.WindowBackgroundIsTranslucent {
+		C.WindowBackgroundIsTranslucent(a.app)
+	}
+
+	//// Process menu
+	////applicationMenu := options.GetApplicationMenu(a.config)
+	//applicationMenu := a.menuManager.GetApplicationMenuJSON()
+	//if applicationMenu != "" {
+	//	C.SetApplicationMenu(a.app, a.string2CString(applicationMenu))
+	//}
+	//
+	//// Process tray
+	//trays, err := a.menuManager.GetTrayMenus()
+	//if err != nil {
+	//	return err
+	//}
+	//if trays != nil {
+	//	for _, tray := range trays {
+	//		C.AddTrayMenu(a.app, a.string2CString(tray))
+	//	}
+	//}
+	//
+	//// Process context menus
+	//contextMenus, err := a.menuManager.GetContextMenus()
+	//if err != nil {
+	//	return err
+	//}
+	//if contextMenus != nil {
+	//	for _, contextMenu := range contextMenus {
+	//		C.AddContextMenu(a.app, a.string2CString(contextMenu))
+	//	}
+	//}
+	//
+	//// Process URL Handlers
+	//if a.config.Mac.URLHandlers != nil {
+	//	C.HasURLHandlers(a.app)
+	//}
+
 	return nil
 }

v2/internal/ffenestri/ffenestri_windows.h

@@ -1,5 +1,75 @@
 
-#ifndef _FFENESTRI_WINDOWS_
-#define _FFENESTRI_WINDOWS_
+#ifndef _FFENESTRI_WINDOWS_H
+#define _FFENESTRI_WINDOWS_H
+
+#define WIN32_LEAN_AND_MEAN
+#define UNICODE 1
+
+#include "ffenestri.h"
+#include <windows.h>
+#include <wingdi.h>
+#include <functional>
+#include <codecvt>
+#include "windows/WebView2.h"
+
+#include "assets.h"
+
+// TODO:
+//#include "userdialogicons.h"
+
+
+struct Application{
+    // Window specific
+    HWND window;
+    ICoreWebView2 *webview;
+    ICoreWebView2Controller* webviewController;
+
+    // Application
+    const char *title;
+    int width;
+    int height;
+    int resizable;
+    int devtools;
+    int fullscreen;
+    int startHidden;
+    int logLevel;
+    int hideWindowOnClose;
+    int minSizeSet;
+    LONG minWidth;
+    LONG minHeight;
+    int maxSizeSet;
+    LONG maxWidth;
+    LONG maxHeight;
+    int frame;
+    char *startupURL;
+    bool webviewIsTranparent;
+    bool windowBackgroundIsTranslucent;
+    COREWEBVIEW2_COLOR backgroundColour;
+
+    // placeholders
+    char* bindings;
+    char* initialCode;
+};
+
+#define ON_MAIN_THREAD(code) dispatch( [=]{ code; } )
+
+typedef std::function<void()> dispatchFunction;
+typedef std::function<void(const std::string)> messageCallback;
+typedef std::function<void(ICoreWebView2Controller *)> comHandlerCallback;
+
+void center(struct Application*);
+void setTitle(struct Application* app, const char *title);
+char* LPWSTRToCstr(LPWSTR input);
+
+// called when the DOM is ready
+void loadAssets(struct Application* app);
+
+// called when the application assets have been loaded into the DOM
+void completed(struct Application* app);
+
+// Callback
+extern "C" {
+    void messageFromWindowCallback(const char *);
+}
 
 #endif

v2/internal/ffenestri/json.c

@@ -1,3 +1,5 @@
+// +build !windows
+
 /*
   Copyright (C) 2011 Joseph A. Adams (joeyadams3.14159@gmail.com)
   All rights reserved.

v2/internal/ffenestri/menu_darwin.c

@@ -90,7 +90,7 @@ void DeleteMenu(Menu *menu) {
 
     // Free nsmenu if we have it
     if ( menu->menu != NULL ) {
-        msg(menu->menu, s("release"));
+        msg_reg(menu->menu, s("release"));
     }
 
     free(menu);
@@ -120,17 +120,17 @@ const char* createMenuClickedMessage(const char *menuItemID, const char *data, e
 
 // Callback for text menu items
 void menuItemCallback(id self, SEL cmd, id sender) {
-    MenuItemCallbackData *callbackData = (MenuItemCallbackData *)msg(msg(sender, s("representedObject")), s("pointerValue"));
+    MenuItemCallbackData *callbackData = (MenuItemCallbackData *)msg_reg(msg_reg(sender, s("representedObject")), s("pointerValue"));
     const char *message;
 
     // Update checkbox / radio item
     if( callbackData->menuItemType == Checkbox) {
         // Toggle state
-        bool state = msg(callbackData->menuItem, s("state"));
-        msg(callbackData->menuItem, s("setState:"), (state? NSControlStateValueOff : NSControlStateValueOn));
+        bool state = msg_reg(callbackData->menuItem, s("state"));
+        msg_int(callbackData->menuItem, s("setState:"), (state? NSControlStateValueOff : NSControlStateValueOn));
     } else if( callbackData->menuItemType == Radio ) {
         // Check the menu items' current state
-        bool selected = msg(callbackData->menuItem, s("state"));
+        bool selected = (bool)msg_reg(callbackData->menuItem, s("state"));
 
         // If it's already selected, exit early
         if (selected) return;
@@ -142,13 +142,13 @@ void menuItemCallback(id self, SEL cmd, id sender) {
         id thisMember = members[0];
         int count = 0;
         while(thisMember != NULL) {
-            msg(thisMember, s("setState:"), NSControlStateValueOff);
+            msg_int(thisMember, s("setState:"), NSControlStateValueOff);
             count = count + 1;
             thisMember = members[count];
         }
 
         // check the selected menu item
-        msg(callbackData->menuItem, s("setState:"), NSControlStateValueOn);
+        msg_int(callbackData->menuItem, s("setState:"), NSControlStateValueOn);
     }
 
     const char *menuID = callbackData->menuID;
@@ -189,6 +189,9 @@ id processAcceleratorKey(const char *key) {
     if( STREQ(key, "return") ) {
         return strunicode(0x000d);
     }
+    if( STREQ(key, "enter") ) {
+        return strunicode(0x000d);
+    }
     if( STREQ(key, "escape") ) {
         return strunicode(0x001b);
     }
@@ -345,61 +348,61 @@ id processAcceleratorKey(const char *key) {
 
 
 void addSeparator(id menu) {
-    id item = msg(c("NSMenuItem"), s("separatorItem"));
-    msg(menu, s("addItem:"), item);
+    id item = msg_reg(c("NSMenuItem"), s("separatorItem"));
+    msg_id(menu, s("addItem:"), item);
 }
 
 id createMenuItemNoAutorelease( id title, const char *action, const char *key) {
     id item = ALLOC("NSMenuItem");
-    msg(item, s("initWithTitle:action:keyEquivalent:"), title, s(action), str(key));
+    ((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), title, s(action), str(key));
     return item;
 }
 
 id createMenuItem(id title, const char *action, const char *key) {
     id item = ALLOC("NSMenuItem");
-    msg(item, s("initWithTitle:action:keyEquivalent:"), title, s(action), str(key));
-    msg(item, s("autorelease"));
+    ((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), title, s(action), str(key));
+    msg_reg(item, s("autorelease"));
     return item;
 }
 
 id addMenuItem(id menu, const char *title, const char *action, const char *key, bool disabled) {
     id item = createMenuItem(str(title), action, key);
-    msg(item, s("setEnabled:"), !disabled);
-    msg(menu, s("addItem:"), item);
+    msg_bool(item, s("setEnabled:"), !disabled);
+    msg_id(menu, s("addItem:"), item);
     return item;
 }
 
 id createMenu(id title) {
     id menu = ALLOC("NSMenu");
-    msg(menu, s("initWithTitle:"), title);
-    msg(menu, s("setAutoenablesItems:"), NO);
+    msg_id(menu, s("initWithTitle:"), title);
+    msg_bool(menu, s("setAutoenablesItems:"), NO);
 //  msg(menu, s("autorelease"));
     return menu;
 }
 
 void createDefaultAppMenu(id parentMenu) {
 // App Menu
-    id appName = msg(msg(c("NSProcessInfo"), s("processInfo")), s("processName"));
+    id appName = msg_reg(msg_reg(c("NSProcessInfo"), s("processInfo")), s("processName"));
     id appMenuItem = createMenuItemNoAutorelease(appName, NULL, "");
     id appMenu = createMenu(appName);
 
-    msg(appMenuItem, s("setSubmenu:"), appMenu);
-    msg(parentMenu, s("addItem:"), appMenuItem);
+    msg_id(appMenuItem, s("setSubmenu:"), appMenu);
+    msg_id(parentMenu, s("addItem:"), appMenuItem);
 
-    id title = msg(str("Hide "), s("stringByAppendingString:"), appName);
+    id title = msg_id(str("Hide "), s("stringByAppendingString:"), appName);
     id item = createMenuItem(title, "hide:", "h");
-    msg(appMenu, s("addItem:"), item);
+    msg_id(appMenu, s("addItem:"), item);
 
     id hideOthers = addMenuItem(appMenu, "Hide Others", "hideOtherApplications:", "h", FALSE);
-    msg(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand));
+    msg_int(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand));
 
     addMenuItem(appMenu, "Show All", "unhideAllApplications:", "", FALSE);
 
     addSeparator(appMenu);
 
-    title = msg(str("Quit "), s("stringByAppendingString:"), appName);
+    title = msg_id(str("Quit "), s("stringByAppendingString:"), appName);
     item = createMenuItem(title, "terminate:", "q");
-    msg(appMenu, s("addItem:"), item);
+    msg_id(appMenu, s("addItem:"), item);
 }
 
 void createDefaultEditMenu(id parentMenu) {
@@ -407,8 +410,8 @@ void createDefaultEditMenu(id parentMenu) {
     id editMenuItem = createMenuItemNoAutorelease(str("Edit"), NULL, "");
     id editMenu = createMenu(str("Edit"));
 
-    msg(editMenuItem, s("setSubmenu:"), editMenu);
-    msg(parentMenu, s("addItem:"), editMenuItem);
+    msg_id(editMenuItem, s("setSubmenu:"), editMenu);
+    msg_id(parentMenu, s("addItem:"), editMenuItem);
 
     addMenuItem(editMenu, "Undo", "undo:", "z", FALSE);
     addMenuItem(editMenu, "Redo", "redo:", "y", FALSE);
@@ -436,7 +439,7 @@ void processMenuRole(Menu *menu, id parentMenu, JsonNode *item) {
     }
     if ( STREQ(roleName, "hideothers")) {
         id hideOthers = addMenuItem(parentMenu, "Hide Others", "hideOtherApplications:", "h", FALSE);
-        msg(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand));
+        msg_int(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand));
         return;
     }
     if ( STREQ(roleName, "unhide")) {
@@ -473,7 +476,7 @@ void processMenuRole(Menu *menu, id parentMenu, JsonNode *item) {
     }
     if( STREQ(roleName, "pasteandmatchstyle")) {
         id pasteandmatchstyle = addMenuItem(parentMenu, "Paste and Match Style", "pasteandmatchstyle:", "v", FALSE);
-        msg(pasteandmatchstyle, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagShift | NSEventModifierFlagCommand));
+        msg_int(pasteandmatchstyle, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagShift | NSEventModifierFlagCommand));
     }
     if ( STREQ(roleName, "selectall")) {
         addMenuItem(parentMenu, "Select All", "selectAll:", "a", FALSE);
@@ -540,18 +543,18 @@ id processRadioMenuItem(Menu *menu, id parentmenu, const char *title, const char
     // Create a MenuItemCallbackData
     MenuItemCallbackData *callback = CreateMenuItemCallbackData(menu, item, menuid, Radio);
 
-    id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), callback);
-    msg(item, s("setRepresentedObject:"), wrappedId);
+    id wrappedId = msg_id(c("NSValue"), s("valueWithPointer:"), (id)callback);
+    msg_id(item, s("setRepresentedObject:"), wrappedId);
 
     id key = processAcceleratorKey(acceleratorkey);
 
-    msg(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), key);
+    ((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), key);
 
-    msg(item, s("setEnabled:"), !disabled);
-    msg(item, s("autorelease"));
-    msg(item, s("setState:"), (checked ? NSControlStateValueOn : NSControlStateValueOff));
+    msg_bool(item, s("setEnabled:"), !disabled);
+    msg_reg(item, s("autorelease"));
+    msg_int(item, s("setState:"), (checked ? NSControlStateValueOn : NSControlStateValueOff));
 
-    msg(parentmenu, s("addItem:"), item);
+    msg_id(parentmenu, s("addItem:"), item);
     return item;
 
 }
@@ -566,42 +569,136 @@ id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const c
     // Create a MenuItemCallbackData
     MenuItemCallbackData *callback = CreateMenuItemCallbackData(menu, item, menuid, Checkbox);
 
-    id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), callback);
-    msg(item, s("setRepresentedObject:"), wrappedId);
-    msg(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), str(key));
-    msg(item, s("setEnabled:"), !disabled);
-    msg(item, s("autorelease"));
-    msg(item, s("setState:"), (checked ? NSControlStateValueOn : NSControlStateValueOff));
-    msg(parentmenu, s("addItem:"), item);
+    id wrappedId = msg_id(c("NSValue"), s("valueWithPointer:"), (id)callback);
+    msg_id(item, s("setRepresentedObject:"), wrappedId);
+    ((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), str(key));
+    msg_bool(item, s("setEnabled:"), !disabled);
+    msg_reg(item, s("autorelease"));
+    msg_int(item, s("setState:"), (checked ? NSControlStateValueOn : NSControlStateValueOff));
+    msg_id(parentmenu, s("addItem:"), item);
     return item;
 }
 
+// getColour returns the colour from a styledLabel based on the key
+const char* getColour(JsonNode *styledLabelEntry, const char* key) {
+    JsonNode* colEntry = getJSONObject(styledLabelEntry, key);
+    if( colEntry == NULL ) {
+        return NULL;
+    }
+    return getJSONString(colEntry, "hex");
+}
+
+id createAttributedStringFromStyledLabel(JsonNode *styledLabel, const char* fontName, int fontSize) {
+
+    // Create result
+    id attributedString = ALLOC_INIT("NSMutableAttributedString");
+    msg_reg(attributedString, s("autorelease"));
+
+    // Create new Dictionary
+    id dictionary = ALLOC_INIT("NSMutableDictionary");
+    msg_reg(dictionary, s("autorelease"));
+
+    // Use default font
+    CGFloat fontSizeFloat = (CGFloat)fontSize;
+    id font = ((id(*)(id, SEL, CGFloat))objc_msgSend)(c("NSFont"), s("menuBarFontOfSize:"), fontSizeFloat);
+
+    // Check user supplied font
+    if( STR_HAS_CHARS(fontName) ) {
+        id fontNameAsNSString = str(fontName);
+        id userFont = ((id(*)(id, SEL, id, CGFloat))objc_msgSend)(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
+        if( userFont != NULL ) {
+            font = userFont;
+        }
+    }
+
+    id fan = lookupStringConstant(str("NSFontAttributeName"));
+    id NSForegroundColorAttributeName = lookupStringConstant(str("NSForegroundColorAttributeName"));
+    id NSBackgroundColorAttributeName = lookupStringConstant(str("NSBackgroundColorAttributeName"));
+
+    // Loop over styled text creating NSAttributedText and appending to result
+    JsonNode *styledLabelEntry;
+    json_foreach(styledLabelEntry, styledLabel) {
+
+        // Clear dictionary
+        msg_reg(dictionary, s("removeAllObjects"));
+
+        // Add font to dictionary
+        msg_id_id(dictionary, s("setObject:forKey:"), font, fan);
+
+        // Get Text
+        const char* thisLabel = mustJSONString(styledLabelEntry, "Label");
+
+        // Get foreground colour
+        const char *hexColour = getColour(styledLabelEntry, "FgCol");
+        if( hexColour != NULL) {
+            unsigned short r, g, b, a;
+
+            // white by default
+            r = g = b = a = 255;
+            int count = sscanf(hexColour, "#%02hx%02hx%02hx%02hx", &r, &g, &b, &a);
+            if (count > 0) {
+                id colour = ((id(*)(id, SEL, CGFloat, CGFloat, CGFloat, CGFloat))objc_msgSend)(c("NSColor"), s("colorWithCalibratedRed:green:blue:alpha:"),
+                                    (CGFloat)r / (CGFloat)255.0,
+                                    (CGFloat)g / (CGFloat)255.0,
+                                    (CGFloat)b / (CGFloat)255.0,
+                                    (CGFloat)a / (CGFloat)255.0);
+                msg_id_id(dictionary, s("setObject:forKey:"), colour, NSForegroundColorAttributeName);
+            }
+        }
+
+        // Get background colour
+        hexColour = getColour(styledLabelEntry, "BgCol");
+        if( hexColour != NULL) {
+            unsigned short r, g, b, a;
+
+            // white by default
+            r = g = b = a = 255;
+            int count = sscanf(hexColour, "#%02hx%02hx%02hx%02hx", &r, &g, &b, &a);
+            if (count > 0) {
+                id colour = ((id(*)(id, SEL, CGFloat, CGFloat, CGFloat, CGFloat))objc_msgSend)(c("NSColor"), s("colorWithCalibratedRed:green:blue:alpha:"),
+                                    (CGFloat)r / (CGFloat)255.0,
+                                    (CGFloat)g / (CGFloat)255.0,
+                                    (CGFloat)b / (CGFloat)255.0,
+                                    (CGFloat)a / (CGFloat)255.0);
+                msg_id_id(dictionary, s("setObject:forKey:"), colour, NSForegroundColorAttributeName);
+            }
+        }
+
+        // Create AttributedText
+        id thisString = ALLOC("NSMutableAttributedString");
+        msg_reg(thisString, s("autorelease"));
+        msg_id_id(thisString, s("initWithString:attributes:"), str(thisLabel), dictionary);
+
+        // Append text to result
+        msg_id(attributedString, s("appendAttributedString:"), thisString);
+    }
+
+    return attributedString;
+
+}
+
+
 id createAttributedString(const char* title, const char* fontName, int fontSize, const char* RGBA) {
 
-    // Process Menu Item attributes
+    // Create new Dictionary
     id dictionary = ALLOC_INIT("NSMutableDictionary");
-
-    // Process font
-    id font;
     CGFloat fontSizeFloat = (CGFloat)fontSize;
 
-    // Check if valid
-    id fontNameAsNSString = str(fontName);
-    font = msg(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
-    if( font == NULL ) {
-        bool supportsMonospacedDigitSystemFont = (bool) msg(c("NSFont"), s("respondsToSelector:"), s("monospacedDigitSystemFontOfSize:weight:"));
-        if( supportsMonospacedDigitSystemFont ) {
-            font = msg(c("NSFont"), s("monospacedDigitSystemFontOfSize:weight:"), fontSizeFloat, NSFontWeightRegular);
-        } else {
-            font = msg(c("NSFont"), s("menuFontOfSize:"), fontSizeFloat);
+    // Use default font
+    id font = ((id(*)(id, SEL, CGFloat))objc_msgSend)(c("NSFont"), s("menuBarFontOfSize:"), fontSizeFloat);
+
+    // Check user supplied font
+    if( STR_HAS_CHARS(fontName) ) {
+        id fontNameAsNSString = str(fontName);
+        id userFont = ((id(*)(id, SEL, id, CGFloat))objc_msgSend)(c("NSFont"), s("fontWithName:size:"), fontNameAsNSString, fontSizeFloat);
+        if( userFont != NULL ) {
+            font = userFont;
         }
     }
 
     // Add font to dictionary
-    msg(dictionary, s("setObject:forKey:"), font, lookupStringConstant(str("NSFontAttributeName")));
-
-    id offset = msg(c("NSNumber"), s("numberWithFloat:"), 0.0);
-    msg(dictionary, s("setObject:forKey:"), offset, lookupStringConstant(str("NSBaselineOffsetAttributeName")));
+    id fan = lookupStringConstant(str("NSFontAttributeName"));
+    msg_id_id(dictionary, s("setObject:forKey:"), font, fan);
 
     // RGBA
     if( RGBA != NULL && strlen(RGBA) > 0) {
@@ -611,74 +708,75 @@ id createAttributedString(const char* title, const char* fontName, int fontSize,
         r = g = b = a = 255;
         int count = sscanf(RGBA, "#%02hx%02hx%02hx%02hx", &r, &g, &b, &a);
         if (count > 0) {
-			id colour = msg(c("NSColor"), s("colorWithCalibratedRed:green:blue:alpha:"),
-								(float)r / 255.0,
-								(float)g / 255.0,
-								(float)b / 255.0,
-								(float)a / 255.0);
-            msg(dictionary, s("setObject:forKey:"), colour, lookupStringConstant(str("NSForegroundColorAttributeName")));
-            msg(colour, s("release"));
+			id colour = ((id(*)(id, SEL, CGFloat, CGFloat, CGFloat, CGFloat))objc_msgSend)(c("NSColor"), s("colorWithCalibratedRed:green:blue:alpha:"),
+								(CGFloat)r / (CGFloat)255.0,
+								(CGFloat)g / (CGFloat)255.0,
+								(CGFloat)b / (CGFloat)255.0,
+								(CGFloat)a / (CGFloat)255.0);
+			id NSForegroundColorAttributeName = lookupStringConstant(str("NSForegroundColorAttributeName"));
+            msg_id_id(dictionary, s("setObject:forKey:"), colour, NSForegroundColorAttributeName);
         }
     }
 
     id attributedString = ALLOC("NSMutableAttributedString");
-    msg(attributedString, s("initWithString:attributes:"), str(title), dictionary);
-    msg(attributedString, s("autorelease"));
-    msg(dictionary, s("release"));
+    msg_id_id(attributedString, s("initWithString:attributes:"), str(title), dictionary);
+    msg_reg(attributedString, s("autorelease"));
+    msg_reg(dictionary, s("autorelease"));
     return attributedString;
 }
 
-id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage, bool alternate) {
+id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage, bool alternate, JsonNode* styledLabel) {
     id item = ALLOC("NSMenuItem");
 
     // Create a MenuItemCallbackData
     MenuItemCallbackData *callback = CreateMenuItemCallbackData(menu, item, menuid, Text);
 
-    id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), callback);
-    msg(item, s("setRepresentedObject:"), wrappedId);
+    id wrappedId = msg_id(c("NSValue"), s("valueWithPointer:"), (id)callback);
+    msg_id(item, s("setRepresentedObject:"), wrappedId);
 
     if( !alternate ) {
         id key = processAcceleratorKey(acceleratorkey);
-        msg(item, s("initWithTitle:action:keyEquivalent:"), str(title),
+        ((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), str(title),
             s("menuItemCallback:"), key);
     } else {
-        msg(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), str(""));
+        ((id(*)(id, SEL, id, SEL, id))objc_msgSend)(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuItemCallback:"), str(""));
     }
 
     if( tooltip != NULL ) {
-        msg(item, s("setToolTip:"), str(tooltip));
+        msg_id(item, s("setToolTip:"), str(tooltip));
     }
 
     // Process image
     if( image != NULL && strlen(image) > 0) {
-        id data = ALLOC("NSData");
-        id imageData = msg(data, s("initWithBase64EncodedString:options:"), str(image), 0);
-        id nsimage = ALLOC("NSImage");
-        msg(nsimage, s("initWithData:"), imageData);
-        if( templateImage ) {
-            msg(nsimage, s("setTemplate:"), YES);
-        }
-        msg(item, s("setImage:"), nsimage);
+        id nsimage = createImageFromBase64Data(image, templateImage);
+        msg_id(item, s("setImage:"), nsimage);
     }
 
-    id attributedString = createAttributedString(title, fontName, fontSize, RGBA);
-    msg(item, s("setAttributedTitle:"), attributedString);
+    id attributedString = NULL;
+    if( styledLabel != NULL) {
+        attributedString = createAttributedStringFromStyledLabel(styledLabel, fontName, fontSize);
+    } else {
+        attributedString = createAttributedString(title, fontName, fontSize, RGBA);
+    }
+    msg_id(item, s("setAttributedTitle:"), attributedString);
 
-    msg(item, s("setEnabled:"), !disabled);
-    msg(item, s("autorelease"));
+//msg_id(item, s("setTitle:"), str(title));
+
+    msg_bool(item, s("setEnabled:"), !disabled);
+    msg_reg(item, s("autorelease"));
 
     // Process modifiers
     if( modifiers != NULL && !alternate) {
         unsigned long modifierFlags = parseModifiers(modifiers);
-        msg(item, s("setKeyEquivalentModifierMask:"), modifierFlags);
+        ((id(*)(id, SEL, unsigned long))objc_msgSend)(item, s("setKeyEquivalentModifierMask:"), modifierFlags);
     }
 
     // alternate
     if( alternate ) {
-        msg(item, s("setAlternate:"), true);
-        msg(item, s("setKeyEquivalentModifierMask:"), NSEventModifierFlagOption);
+        msg_bool(item, s("setAlternate:"), true);
+        msg_int(item, s("setKeyEquivalentModifierMask:"), NSEventModifierFlagOption);
     }
-    msg(parentMenu, s("addItem:"), item);
+    msg_id(parentMenu, s("addItem:"), item);
 
     return item;
 }
@@ -699,38 +797,6 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
         return;
     }
 
-    // Check if this is a submenu
-    JsonNode *submenu = json_find_member(item, "SubMenu");
-    if( submenu != NULL ) {
-        // Get the label
-        JsonNode *menuNameNode = json_find_member(item, "Label");
-        const char *name = "";
-        if ( menuNameNode != NULL) {
-            name = menuNameNode->string_;
-        }
-
-        id thisMenuItem = createMenuItemNoAutorelease(str(name), NULL, "");
-        id thisMenu = createMenu(str(name));
-
-        msg(thisMenuItem, s("setSubmenu:"), thisMenu);
-        msg(parentMenu, s("addItem:"), thisMenuItem);
-
-        JsonNode *submenuItems = json_find_member(submenu, "Items");
-        // If we have no items, just return
-        if ( submenuItems == NULL ) {
-            return;
-        }
-
-        // Loop over submenu items
-        JsonNode *item;
-        json_foreach(item, submenuItems) {
-            // Get item label
-            processMenuItem(menu, thisMenu, item);
-        }
-
-        return;
-    }
-
     // This is a user menu. Get the common data
     // Get the label
     const char *label = getJSONString(item, "Label");
@@ -738,6 +804,8 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
         label = "(empty)";
     }
 
+    // Check for a styled label
+    JsonNode *styledLabel = getJSONObject(item, "StyledLabel");
 
     // Is this an alternate menu item?
     bool alternate = false;
@@ -796,9 +864,36 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
     // Get the Type
     JsonNode *type = json_find_member(item, "Type");
     if( type != NULL ) {
+        if( STREQ(type->string_, "Text") || STREQ(type->string_, "Submenu")) {
+            id thisMenuItem = processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image, fontName, fontSize, RGBA, templateImage, alternate, styledLabel);
 
-        if( STREQ(type->string_, "Text")) {
-            processTextMenuItem(menu, parentMenu, label, menuid, disabled, acceleratorkey, modifiers, tooltip, image, fontName, fontSize, RGBA, templateImage, alternate);
+            // Check if this node has a submenu
+            JsonNode *submenu = json_find_member(item, "SubMenu");
+            if( submenu != NULL ) {
+                // Get the label
+                JsonNode *menuNameNode = json_find_member(item, "Label");
+                const char *name = "";
+                if ( menuNameNode != NULL) {
+                    name = menuNameNode->string_;
+                }
+
+                id thisMenu = createMenu(str(name));
+
+                msg_id(thisMenuItem, s("setSubmenu:"), thisMenu);
+
+                JsonNode *submenuItems = json_find_member(submenu, "Items");
+                // If we have no items, just return
+                if ( submenuItems == NULL ) {
+                    return;
+                }
+
+                // Loop over submenu items
+                JsonNode *item;
+                json_foreach(item, submenuItems) {
+                    // Get item label
+                    processMenuItem(menu, thisMenu, item);
+                }
+            }
         }
         else if ( STREQ(type->string_, "Separator")) {
             addSeparator(parentMenu);
@@ -817,7 +912,6 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
 
             processRadioMenuItem(menu, parentMenu, label, menuid, disabled, checked, "");
         }
-
     }
 
     if ( modifiers != NULL ) {

v2/internal/ffenestri/menu_darwin.h

@@ -105,12 +105,13 @@ id processRadioMenuItem(Menu *menu, id parentmenu, const char *title, const char
 
 id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const char *menuid, bool disabled, bool checked, const char *key);
 
-id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage, bool alternate);
+id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image, const char* fontName, int fontSize, const char* RGBA, bool templateImage, bool alternate, JsonNode* styledLabel);
 void processMenuItem(Menu *menu, id parentMenu, JsonNode *item);
 void processMenuData(Menu *menu, JsonNode *menuData);
 
 void processRadioGroupJSON(Menu *menu, JsonNode *radioGroup);
 id GetMenu(Menu *menu);
 id createAttributedString(const char* title, const char* fontName, int fontSize, const char* RGBA);
+id createAttributedStringFromStyledLabel(JsonNode *styledLabel, const char* fontName, int fontSize);
 
 #endif //ASSETS_C_MENU_DARWIN_H

v2/internal/ffenestri/traymenu_darwin.c

@@ -42,6 +42,8 @@ TrayMenu* NewTrayMenu(const char* menuJSON) {
     result->disabled = false;
     getJSONBool(processedJSON, "Disabled", &result->disabled);
 
+    result->styledLabel = getJSONObject(processedJSON, "StyledLabel");
+
     // Create the menu
     JsonNode* processedMenu = mustJSONObject(processedJSON, "ProcessedMenu");
     result->menu = NewMenu(processedMenu);
@@ -63,23 +65,28 @@ void DumpTrayMenu(TrayMenu* trayMenu) {
 }
 
 
-void UpdateTrayLabel(TrayMenu *trayMenu, const char *label, const char *fontName, int fontSize, const char *RGBA, const char *tooltip, bool disabled) {
+void UpdateTrayLabel(TrayMenu *trayMenu, const char *label, const char *fontName, int fontSize, const char *RGBA, const char *tooltip, bool disabled, JsonNode *styledLabel) {
 
     // Exit early if NULL
     if( trayMenu->label == NULL ) {
         return;
     }
     // Update button label
-    id statusBarButton = msg(trayMenu->statusbaritem, s("button"));
-    id attributedString = createAttributedString(label, fontName, fontSize, RGBA);
-
-    if( tooltip != NULL ) {
-        msg(statusBarButton, s("setToolTip:"), str(tooltip));
+    id statusBarButton = msg_reg(trayMenu->statusbaritem, s("button"));
+    id attributedString = NULL;
+    if( styledLabel != NULL) {
+        attributedString = createAttributedStringFromStyledLabel(styledLabel, fontName, fontSize);
+    } else {
+        attributedString = createAttributedString(label, fontName, fontSize, RGBA);
     }
 
-    msg(statusBarButton, s("setEnabled:"), !disabled);
+    if( tooltip != NULL ) {
+        msg_id(statusBarButton, s("setToolTip:"), str(tooltip));
+    }
 
-    msg(statusBarButton, s("setAttributedTitle:"), attributedString);
+    msg_bool(statusBarButton, s("setEnabled:"), !disabled);
+
+    msg_id(statusBarButton, s("setAttributedTitle:"), attributedString);
 }
 
 void UpdateTrayIcon(TrayMenu *trayMenu) {
@@ -89,12 +96,12 @@ void UpdateTrayIcon(TrayMenu *trayMenu) {
         return;
     }
 
-    id statusBarButton = msg(trayMenu->statusbaritem, s("button"));
+    id statusBarButton = msg_reg(trayMenu->statusbaritem, s("button"));
 
     // Empty icon means remove it
     if( STREMPTY(trayMenu->icon) ) {
         // Remove image
-        msg(statusBarButton, s("setImage:"), NULL);
+        msg_id(statusBarButton, s("setImage:"), NULL);
         return;
     }
 
@@ -102,18 +109,11 @@ void UpdateTrayIcon(TrayMenu *trayMenu) {
 
     // If we don't have the image in the icon cache then assume it's base64 encoded image data
     if (trayImage == NULL) {
-        id data = ALLOC("NSData");
-        id imageData = msg(data, s("initWithBase64EncodedString:options:"), str(trayMenu->icon), 0);
-        trayImage = ALLOC("NSImage");
-        msg(trayImage, s("initWithData:"), imageData);
-
-        if( trayMenu->templateImage ) {
-            msg(trayImage, s("setTemplate:"), YES);
-        }
+        trayImage = createImageFromBase64Data(trayMenu->icon, trayMenu->templateImage);
     }
 
-    msg(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
-    msg(statusBarButton, s("setImage:"), trayImage);
+    msg_int(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
+    msg_id(statusBarButton, s("setImage:"), trayImage);
 
 }
 
@@ -121,33 +121,32 @@ void ShowTrayMenu(TrayMenu* trayMenu) {
 
     // Create a status bar item if we don't have one
     if( trayMenu->statusbaritem == NULL ) {
-        id statusBar = msg( c("NSStatusBar"), s("systemStatusBar") );
-        trayMenu->statusbaritem = msg(statusBar, s("statusItemWithLength:"), NSVariableStatusItemLength);
-        msg(trayMenu->statusbaritem, s("retain"));
+        id statusBar = msg_reg( c("NSStatusBar"), s("systemStatusBar") );
+        trayMenu->statusbaritem = ((id(*)(id, SEL, CGFloat))objc_msgSend)(statusBar, s("statusItemWithLength:"), NSVariableStatusItemLength);
+        msg_reg(trayMenu->statusbaritem, s("retain"));
     }
 
-    id statusBarButton = msg(trayMenu->statusbaritem, s("button"));
-    msg(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
-
+    id statusBarButton = msg_reg(trayMenu->statusbaritem, s("button"));
+    msg_uint(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
     // Update the icon if needed
     UpdateTrayIcon(trayMenu);
 
     // Update the label if needed
-    UpdateTrayLabel(trayMenu, trayMenu->label, trayMenu->fontName, trayMenu->fontSize, trayMenu->RGBA, trayMenu->tooltip, trayMenu->disabled);
+    UpdateTrayLabel(trayMenu, trayMenu->label, trayMenu->fontName, trayMenu->fontSize, trayMenu->RGBA, trayMenu->tooltip, trayMenu->disabled, trayMenu->styledLabel);
 
     // Update the menu
     id menu = GetMenu(trayMenu->menu);
     objc_setAssociatedObject(menu, "trayMenuID", str(trayMenu->ID), OBJC_ASSOCIATION_ASSIGN);
 
 	// Create delegate
-	id trayMenuDelegate = msg((id)trayMenuDelegateClass, s("new"));
-	msg(menu, s("setDelegate:"), trayMenuDelegate);
-	objc_setAssociatedObject(trayMenuDelegate, "menu", menu, OBJC_ASSOCIATION_ASSIGN);
+	id trayMenuDelegate = msg_reg((id)trayMenuDelegateClass, s("new"));
+	msg_id(menu, s("setDelegate:"), trayMenuDelegate);
+    objc_setAssociatedObject(trayMenuDelegate, "menu", menu, OBJC_ASSOCIATION_ASSIGN);
 
     // Create menu delegate
     trayMenu->delegate = trayMenuDelegate;
 
-    msg(trayMenu->statusbaritem, s("setMenu:"), menu);
+    msg_id(trayMenu->statusbaritem, s("setMenu:"), menu);
 }
 
 // UpdateTrayMenuInPlace receives 2 menus. The current menu gets
@@ -169,6 +168,7 @@ void UpdateTrayMenuInPlace(TrayMenu* currentMenu, TrayMenu* newMenu) {
     // Copy the other data
     currentMenu->ID = newMenu->ID;
     currentMenu->label = newMenu->label;
+    currentMenu->styledLabel = newMenu->styledLabel;
     currentMenu->trayIconPosition = newMenu->trayIconPosition;
     currentMenu->icon = newMenu->icon;
 
@@ -189,14 +189,14 @@ void DeleteTrayMenu(TrayMenu* trayMenu) {
 
     // Free the status item
     if ( trayMenu->statusbaritem != NULL ) {
-        id statusBar = msg( c("NSStatusBar"), s("systemStatusBar") );
-        msg(statusBar, s("removeStatusItem:"), trayMenu->statusbaritem);
-        msg(trayMenu->statusbaritem, s("release"));
+        id statusBar = msg_reg( c("NSStatusBar"), s("systemStatusBar") );
+        msg_id(statusBar, s("removeStatusItem:"), trayMenu->statusbaritem);
+        msg_reg(trayMenu->statusbaritem, s("release"));
         trayMenu->statusbaritem = NULL;
     }
 
     if ( trayMenu->delegate != NULL ) {
-        msg(trayMenu->delegate, s("release"));
+        msg_reg(trayMenu->delegate, s("release"));
     }
 
     // Free the tray menu memory
@@ -228,9 +228,9 @@ void LoadTrayIcons() {
         int length = atoi((const char *)lengthAsString);
 
         // Create the icon and add to the hashmap
-        id imageData = msg(c("NSData"), s("dataWithBytes:length:"), data, length);
+        id imageData = ((id(*)(id, SEL, id, int))objc_msgSend)(c("NSData"), s("dataWithBytes:length:"), (id)data, length);
         id trayImage = ALLOC("NSImage");
-        msg(trayImage, s("initWithData:"), imageData);
+        msg_id(trayImage, s("initWithData:"), imageData);
         hashmap_put(&trayIconCache, (const char *)name, strlen((const char *)name), trayImage);
     }
 }

v2/internal/ffenestri/traymenu_darwin.h

@@ -25,10 +25,12 @@ typedef struct {
     Menu* menu;
 
     id statusbaritem;
-    int trayIconPosition;
+    unsigned int trayIconPosition;
 
     JsonNode* processedJSON;
 
+    JsonNode* styledLabel;
+
     id delegate;
 
 } TrayMenu;
@@ -38,7 +40,7 @@ void DumpTrayMenu(TrayMenu* trayMenu);
 void ShowTrayMenu(TrayMenu* trayMenu);
 void UpdateTrayMenuInPlace(TrayMenu* currentMenu, TrayMenu* newMenu);
 void UpdateTrayIcon(TrayMenu *trayMenu);
-void UpdateTrayLabel(TrayMenu *trayMenu, const char *label, const char *fontName, int fontSize, const char *RGBA, const char *tooltip, bool disabled);
+void UpdateTrayLabel(TrayMenu *trayMenu, const char *label, const char *fontName, int fontSize, const char *RGBA, const char *tooltip, bool disabled, JsonNode *styledLabel);
 
 void LoadTrayIcons();
 void UnloadTrayIcons();

v2/internal/ffenestri/traymenustore_darwin.c

@@ -127,7 +127,9 @@ void UpdateTrayMenuLabelInStore(TrayMenuStore* store, const char* JSON) {
     bool disabled = false;
     getJSONBool(parsedUpdate, "Disabled", &disabled);
 
-    UpdateTrayLabel(menu, Label, fontName, fontSize, RGBA, tooltip, disabled);
+    JsonNode *styledLabel = getJSONObject(parsedUpdate, "StyledLabel");
+
+    UpdateTrayLabel(menu, Label, fontName, fontSize, RGBA, tooltip, disabled, styledLabel);
 
 
 }

v2/internal/ffenestri/vec.c

@@ -1,4 +1,6 @@
-/** 
+// +build !windows
+
+/**
  * Copyright (c) 2014 rxi
  *
  * This library is free software; you can redistribute it and/or modify it

v2/internal/ffenestri/vec.h

@@ -1,4 +1,4 @@
-/** 
+/**
  * Copyright (c) 2014 rxi
  *
  * This library is free software; you can redistribute it and/or modify it

v2/internal/ffenestri/windows/EventToken.h

@@ -0,0 +1,68 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 8.01.0622 */
+/* @@MIDL_FILE_HEADING(  ) */
+
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 500
+#endif
+
+/* verify that the <rpcsal.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCSAL_H_VERSION__
+#define __REQUIRED_RPCSAL_H_VERSION__ 100
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif /* __RPCNDR_H_VERSION__ */
+
+
+#ifndef __eventtoken_h__
+#define __eventtoken_h__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+/* Forward Declarations */
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+
+/* interface __MIDL_itf_eventtoken_0000_0000 */
+/* [local] */
+
+//  Microsoft Windows
+//  Copyright (c) Microsoft Corporation. All rights reserved.
+#pragma once
+typedef struct EventRegistrationToken
+    {
+    __int64 value;
+    } 	EventRegistrationToken;
+
+
+
+extern RPC_IF_HANDLE __MIDL_itf_eventtoken_0000_0000_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_eventtoken_0000_0000_v0_0_s_ifspec;
+
+/* Additional Prototypes for ALL interfaces */
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

v2/internal/ffenestri/windows/README.md

@@ -0,0 +1 @@
+These files were generated using the scripts in the [webview](https://github.com/webview/webview) project and compressed using UPX.

v2/internal/ffenestri/windows/test/CMakeLists.txt

@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.19)
+project(test C)
+
+set(CMAKE_C_STANDARD 99)
+set(SOURCES ../../ffenestri_windows.cpp)
+
+add_executable(test ${SOURCES} main.c)

v2/internal/ffenestri/windows/test/compile.bat

@@ -0,0 +1 @@
+g++ main.c ..\..\ffenestri_windows.cpp -lgdi32 -std=c++11

v2/internal/ffenestri/windows/x64/x64.go

@@ -0,0 +1,11 @@
+// +build windows
+
+package x64
+
+import _ "embed"
+
+//go:embed webview.dll
+var WebView2 []byte
+
+//go:embed WebView2Loader.dll
+var WebView2Loader []byte

v2/internal/ffenestri/windows/x64/x64_stub.go

@@ -0,0 +1,9 @@
+// +build !windows
+
+// This is a stub to define the following even though they don't exist
+// on non-Windows systems.  Note: This is not the right way to handle this.
+package x64
+
+var WebView2 []byte
+
+var WebView2Loader []byte

v2/internal/ffenestri/wv2ComHandler_windows.h

@@ -0,0 +1,103 @@
+
+#ifndef WV2COMHANDLER_H
+#define WV2COMHANDLER_H
+
+#include "ffenestri_windows.h"
+#include "windows/WebView2.h"
+
+#include <locale>
+#include <codecvt>
+
+class wv2ComHandler
+        :   public ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler,
+            public ICoreWebView2CreateCoreWebView2ControllerCompletedHandler,
+            public ICoreWebView2WebMessageReceivedEventHandler,
+            public ICoreWebView2PermissionRequestedEventHandler
+{
+
+    struct Application *app;
+    HWND window;
+    messageCallback mcb;
+    comHandlerCallback cb;
+
+    public:
+        wv2ComHandler(struct Application *app, HWND window, messageCallback mcb, comHandlerCallback cb) {
+            this->app = app;
+            this->window = window;
+            this->mcb = mcb;
+            this->cb = cb;
+        }
+        ULONG STDMETHODCALLTYPE AddRef() { return 1; }
+        ULONG STDMETHODCALLTYPE Release() { return 1; }
+        HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID *ppv) {
+          return S_OK;
+        }
+        HRESULT STDMETHODCALLTYPE Invoke(HRESULT res,
+                                         ICoreWebView2Environment *env) {
+          env->CreateCoreWebView2Controller(window, this);
+          return S_OK;
+        }
+        HRESULT STDMETHODCALLTYPE Invoke(HRESULT res,
+                                         ICoreWebView2Controller *controller) {
+          controller->AddRef();
+
+          ICoreWebView2 *webview;
+          ::EventRegistrationToken token;
+          controller->get_CoreWebView2(&webview);
+          webview->add_WebMessageReceived(this, &token);
+          webview->add_PermissionRequested(this, &token);
+
+          cb(controller);
+          return S_OK;
+        }
+
+        // This is called when JS posts a message back to webkit
+        HRESULT STDMETHODCALLTYPE Invoke(
+            ICoreWebView2 *sender, ICoreWebView2WebMessageReceivedEventArgs *args) {
+          LPWSTR message;
+          args->TryGetWebMessageAsString(&message);
+          if ( message == nullptr ) {
+            return S_OK;
+          }
+          const char *m = LPWSTRToCstr(message);
+
+          // check for internal messages
+          if (strcmp(m, "completed") == 0) {
+            completed(app);
+            return S_OK;
+          }
+
+          switch(m[0]) {
+
+          // Standard message for backend
+          case 'S':
+            printf("--> Message to backend: %s\n", &m[1]);
+            messageFromWindowCallback(&m[1]);
+            break;
+          // DOM Initialised
+        case 'I':
+            loadAssets(app);
+            break;
+
+          default:
+            printf("----> Unknown message type: %c\n", m[0]);
+          }
+          delete[] m;
+          return S_OK;
+        }
+        HRESULT STDMETHODCALLTYPE
+        Invoke(ICoreWebView2 *sender,
+               ICoreWebView2PermissionRequestedEventArgs *args) {
+                                                        printf("DDDDDDDDDDDD\n");
+
+          COREWEBVIEW2_PERMISSION_KIND kind;
+          args->get_PermissionKind(&kind);
+          if (kind == COREWEBVIEW2_PERMISSION_KIND_CLIPBOARD_READ) {
+            args->put_State(COREWEBVIEW2_PERMISSION_STATE_ALLOW);
+          }
+          return S_OK;
+        }
+
+};
+
+#endif

v2/internal/fs/fs.go

@@ -201,10 +201,6 @@ func GetSubdirectories(rootDir string) (*slicer.StringSlicer, error) {
 
 func DirIsEmpty(dir string) (bool, error) {
 
-	if !DirExists(dir) {
-		return false, fmt.Errorf("DirIsEmpty called with a non-existant directory: %s", dir)
-	}
-
 	// CREDIT: https://stackoverflow.com/a/30708914/8325411
 	f, err := os.Open(dir)
 	if err != nil {

v2/internal/menumanager/processedMenu.go

@@ -2,6 +2,9 @@ package menumanager
 
 import (
 	"encoding/json"
+	"strings"
+
+	"github.com/leaanthony/go-ansi-parser"
 
 	"github.com/wailsapp/wails/v2/pkg/menu"
 	"github.com/wailsapp/wails/v2/pkg/menu/keys"
@@ -41,11 +44,25 @@ type ProcessedMenuItem struct {
 
 	// Tooltip
 	Tooltip string `json:",omitempty"`
+
+	// Styled label
+	StyledLabel []*ansi.StyledText `json:",omitempty"`
 }
 
 func NewProcessedMenuItem(menuItemMap *MenuItemMap, menuItem *menu.MenuItem) *ProcessedMenuItem {
 
 	ID := menuItemMap.menuItemToIDMap[menuItem]
+
+	// Parse ANSI text
+	var styledLabel []*ansi.StyledText
+	tempLabel := menuItem.Label
+	if strings.Contains(tempLabel, "\033[") {
+		parsedLabel, err := ansi.Parse(menuItem.Label)
+		if err == nil {
+			styledLabel = parsedLabel
+		}
+	}
+
 	result := &ProcessedMenuItem{
 		ID:               ID,
 		Label:            menuItem.Label,
@@ -63,6 +80,7 @@ func NewProcessedMenuItem(menuItemMap *MenuItemMap, menuItem *menu.MenuItem) *Pr
 		MacTemplateImage: menuItem.MacTemplateImage,
 		MacAlternate:     menuItem.MacAlternate,
 		Tooltip:          menuItem.Tooltip,
+		StyledLabel:      styledLabel,
 	}
 
 	if menuItem.SubMenu != nil {

v2/internal/menumanager/traymenu.go

@@ -4,8 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"strconv"
+	"strings"
 	"sync"
 
+	"github.com/leaanthony/go-ansi-parser"
+
 	"github.com/pkg/errors"
 	"github.com/wailsapp/wails/v2/pkg/menu"
 )
@@ -36,6 +39,7 @@ type TrayMenu struct {
 	menu             *menu.Menu
 	ProcessedMenu    *WailsMenu
 	trayMenu         *menu.TrayMenu
+	StyledLabel      []*ansi.StyledText `json:",omitempty"`
 }
 
 func (t *TrayMenu) AsJSON() (string, error) {
@@ -48,6 +52,16 @@ func (t *TrayMenu) AsJSON() (string, error) {
 
 func NewTrayMenu(trayMenu *menu.TrayMenu) *TrayMenu {
 
+	// Parse ANSI text
+	var styledLabel []*ansi.StyledText
+	tempLabel := trayMenu.Label
+	if strings.Contains(tempLabel, "\033[") {
+		parsedLabel, err := ansi.Parse(tempLabel)
+		if err == nil {
+			styledLabel = parsedLabel
+		}
+	}
+
 	result := &TrayMenu{
 		Label:            trayMenu.Label,
 		FontName:         trayMenu.FontName,
@@ -60,6 +74,7 @@ func NewTrayMenu(trayMenu *menu.TrayMenu) *TrayMenu {
 		RGBA:             trayMenu.RGBA,
 		menuItemMap:      NewMenuItemMap(),
 		trayMenu:         trayMenu,
+		StyledLabel:      styledLabel,
 	}
 
 	result.menuItemMap.AddMenu(trayMenu.Menu)
@@ -150,14 +165,25 @@ func (m *Manager) UpdateTrayMenuLabel(trayMenu *menu.TrayMenu) (string, error) {
 
 	type LabelUpdate struct {
 		ID               string
-		Label            string
-		FontName         string
+		Label            string `json:",omitempty"`
+		FontName         string `json:",omitempty"`
 		FontSize         int
-		RGBA             string
+		RGBA             string `json:",omitempty"`
 		Disabled         bool
-		Tooltip          string
-		Image            string
+		Tooltip          string `json:",omitempty"`
+		Image            string `json:",omitempty"`
 		MacTemplateImage bool
+		StyledLabel      []*ansi.StyledText `json:",omitempty"`
+	}
+
+	// Parse ANSI text
+	var styledLabel []*ansi.StyledText
+	tempLabel := trayMenu.Label
+	if strings.Contains(tempLabel, "\033[") {
+		parsedLabel, err := ansi.Parse(tempLabel)
+		if err == nil {
+			styledLabel = parsedLabel
+		}
 	}
 
 	update := &LabelUpdate{
@@ -170,6 +196,7 @@ func (m *Manager) UpdateTrayMenuLabel(trayMenu *menu.TrayMenu) (string, error) {
 		Image:            trayMenu.Image,
 		MacTemplateImage: trayMenu.MacTemplateImage,
 		RGBA:             trayMenu.RGBA,
+		StyledLabel:      styledLabel,
 	}
 
 	data, err := json.Marshal(update)

v2/internal/runtime/js/.eslintrc

@@ -3,12 +3,12 @@
         "browser": true,
         "es6": true,
         "amd": true,
-        "node": true,
+        "node": true
     },
     "extends": "eslint:recommended",
     "parserOptions": {
-        "ecmaVersion": 2016,
-        "sourceType": "module",
+        "ecmaVersion": 2020,
+        "sourceType": "module"
     },
     "rules": {
         "linebreak-style": 0,

v2/internal/runtime/js/desktop/windows.js

@@ -0,0 +1,72 @@
+/*
+ _	   __	  _ __
+| |	 / /___ _(_) /____
+| | /| / / __ `/ / / ___/
+| |/ |/ / /_/ / / (__  )
+|__/|__/\__,_/_/_/____/
+The lightweight framework for web-like apps
+(c) Lea Anthony 2019-present
+*/
+/* jshint esversion: 9 */
+
+/**
+ * Initialises platform specific code
+ */
+
+// import * as common from './common';
+const common = require('./common');
+
+export const System = {
+	...common,
+	Platform: () => 'windows',
+};
+
+export function SendMessage(message) {
+	window.chrome.webview.postMessage('S'+message);
+}
+
+export function RaiseError(message) {
+	window.chrome.webview.postMessage('E'+message);
+}
+
+export function Init() {
+
+	// Setup drag handler
+	// Based on code from: https://github.com/patr0nus/DeskGap
+	window.addEventListener('mousedown', function (e) {
+		let currentElement = e.target;
+		while (currentElement != null) {
+			if (currentElement.hasAttribute('data-wails-no-drag')) {
+				break;
+			} else if (currentElement.hasAttribute('data-wails-drag')) {
+				window.chrome.webview.postMessage('wails-drag');
+				break;
+			}
+			currentElement = currentElement.parentElement;
+		}
+	});
+
+	// Setup context menu hook
+	window.addEventListener('contextmenu', function (e) {
+		let currentElement = e.target;
+		let contextMenuId;
+		while (currentElement != null) {
+			contextMenuId = currentElement.dataset['wails-context-menu-id'];
+			if (contextMenuId != null) {
+				break;
+			}
+			currentElement = currentElement.parentElement;
+		}
+		if (contextMenuId != null || window.disableWailsDefaultContextMenu) {
+			e.preventDefault();
+		}
+		if( contextMenuId != null ) {
+			let contextData = currentElement.dataset['wails-context-menu-data'];
+			let message = {
+				id: contextMenuId,
+				data: contextData || '',
+			};
+			window.chrome.webview.postMessage('C'+JSON.stringify(message));
+		}
+	});
+}

v2/internal/runtime/js/package.json

@@ -4,8 +4,8 @@
   "description": "The Javascript Wails Runtime",
   "main": "index.js",
   "scripts": {
-    "build:desktop": "./node_modules/.bin/eslint core/ && ./node_modules/.bin/webpack --env desktop --colors",
-    "build:server": "./node_modules/.bin/eslint core/ && ./node_modules/.bin/webpack --env server --colors",
+    "build:desktop": "npx eslint core/ && npx webpack --env desktop --colors",
+    "build:server": "npx eslint core/ && npx webpack --env server --colors",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {

v2/internal/runtime/js/runtime/bridge.js

@@ -1647,10 +1647,10 @@
                 }
                 // });
                 break;
-            // 	// Notifications
-            // case 'n':
-            // 	addScript(message.data.slice(1), true);
-            // 	break;
+            // Notifications
+            case 'n':
+            	window.wails._.Notify(message.data.slice(1));
+            	break;
             // 	// Binding
             // case 'b':
             // 	const binding = message.data.slice(1);

v2/internal/runtime/js/runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wails/runtime",
-  "version": "1.3.12",
+  "version": "1.3.13",
   "description": "Wails V2 Javascript runtime library",
   "main": "main.js",
   "types": "runtime.d.ts",

v2/internal/runtime/js/runtime/src/package-lock.json

@@ -1,8 +1,616 @@
 {
   "name": "bridge",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "bridge",
+      "version": "1.0.0",
+      "license": "ISC",
+      "devDependencies": {
+        "@rollup/plugin-commonjs": "^17.1.0",
+        "@rollup/plugin-node-resolve": "^11.1.1",
+        "rollup": "^2.38.5",
+        "rollup-plugin-svelte": "^7.1.0",
+        "rollup-plugin-terser": "^7.0.2",
+        "svelte": "^3.32.2"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.12.13"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+      "dev": true
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
+      "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.12.11",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz",
+      "integrity": "sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "commondir": "^1.0.1",
+        "estree-walker": "^2.0.1",
+        "glob": "^7.1.6",
+        "is-reference": "^1.2.1",
+        "magic-string": "^0.25.7",
+        "resolve": "^1.17.0"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs/node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true
+    },
+    "node_modules/@rollup/plugin-node-resolve": {
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.1.1.tgz",
+      "integrity": "sha512-zlBXR4eRS+2m79TsUZWhsd0slrHUYdRx4JF+aVQm+MI0wsKdlpC2vlDVjmlGvtZY1vsefOT9w3JxvmWSBei+Lg==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "builtin-modules": "^3.1.0",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
+      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "0.0.39",
+        "estree-walker": "^1.0.1",
+        "picomatch": "^2.2.2"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "0.0.39",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "14.14.25",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.25.tgz",
+      "integrity": "sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ==",
+      "dev": true
+    },
+    "node_modules/@types/resolve": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "node_modules/builtin-modules": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
+      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/is-core-module": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
+    "node_modules/is-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
+      "dev": true
+    },
+    "node_modules/is-reference": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
+      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/magic-string": {
+      "version": "0.25.7",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+      "dev": true,
+      "dependencies": {
+        "sourcemap-codec": "^1.4.4"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/require-relative": {
+      "version": "0.8.7",
+      "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz",
+      "integrity": "sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+      "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.1.0",
+        "path-parse": "^1.0.6"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "2.38.5",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.38.5.tgz",
+      "integrity": "sha512-VoWt8DysFGDVRGWuHTqZzT02J0ASgjVq/hPs9QcBOGMd7B+jfTr/iqMVEyOi901rE3xq+Deq66GzIT1yt7sGwQ==",
+      "dev": true,
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.1"
+      }
+    },
+    "node_modules/rollup-plugin-svelte": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-svelte/-/rollup-plugin-svelte-7.1.0.tgz",
+      "integrity": "sha512-vopCUq3G+25sKjwF5VilIbiY6KCuMNHP1PFvx2Vr3REBNMDllKHFZN2B9jwwC+MqNc3UPKkjXnceLPEjTjXGXg==",
+      "dev": true,
+      "dependencies": {
+        "require-relative": "^0.8.7",
+        "rollup-pluginutils": "^2.8.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/rollup-plugin-terser": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
+      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "jest-worker": "^26.2.1",
+        "serialize-javascript": "^4.0.0",
+        "terser": "^5.0.0"
+      }
+    },
+    "node_modules/rollup-pluginutils": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
+      "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
+      "dev": true,
+      "dependencies": {
+        "estree-walker": "^0.6.1"
+      }
+    },
+    "node_modules/rollup-pluginutils/node_modules/estree-walker": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+      "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+      "dev": true
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true
+    },
+    "node_modules/serialize-javascript": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "dev": true
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svelte": {
+      "version": "3.32.2",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.32.2.tgz",
+      "integrity": "sha512-Zxh1MQQl/+vnToKbU1Per+PoMN8Jb2MeKJcGxiOsCGR677hXw7jkMfbnNXq33+dxIzV/HfA4xtoSPJrqeB0VUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz",
+      "integrity": "sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.19"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    }
+  },
   "dependencies": {
     "@babel/code-frame": {
       "version": "7.12.13",

v2/internal/runtime/js/runtime/src/websocket.js

@@ -123,10 +123,10 @@ function handleMessage(message) {
             }
             // });
             break;
-        // 	// Notifications
-        // case 'n':
-        // 	addScript(message.data.slice(1), true);
-        // 	break;
+        // Notifications
+        case 'n':
+        	window.wails._.Notify(message.data.slice(1));
+        	break;
         // 	// Binding
         // case 'b':
         // 	const binding = message.data.slice(1);

v2/internal/runtime/scripts/rebuild.go

@@ -16,7 +16,7 @@ func main() {
 
 	sourceDir := fs.RelativePath("../../../internal/runtime/js")
 
-	platforms := []string{"darwin"}
+	platforms := []string{"darwin", "windows"}
 
 	for _, platform := range platforms {
 		println("Building JS Runtime for " + platform)

v2/internal/templates/templates/angular-template/template.json

@@ -1,6 +0,0 @@
-{
-  "name": "Angular",
-  "shortname": "angular",
-  "author": "bh90210 <ktc@pm.me>",
-  "description": "Angular projects w/ @angular/cli - Note: in order to reach the cli use npx like this: npx ng"
-}

v2/internal/templates/templates/create-react-app/template.json

@@ -1,6 +0,0 @@
-{
-  "name": "React JS",
-  "shortname": "react",
-  "author": "bh90210 <ktc@pm.me>",
-  "description": "Create React App v3 standar tooling"
-}

v2/internal/templates/templates/svelte-mui/basic.tmpl.go

@@ -1,35 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/wailsapp/wails/v2"
-)
-
-// Basic application struct
-type Basic struct {
-	runtime *wails.Runtime
-}
-
-// newBasic creates a new Basic application struct
-func newBasic() *Basic {
-	return &Basic{}
-}
-
-// WailsInit is called at application startup
-func (b *Basic) WailsInit(runtime *wails.Runtime) error {
-	// Perform your setup here
-	b.runtime = runtime
-	runtime.Window.SetTitle("{{.ProjectName}}")
-	return nil
-}
-
-// WailsShutdown is called at application termination
-func (b *Basic) WailsShutdown() {
-	// Perform your teardown here
-}
-
-// Greet returns a greeting for the given name
-func (b *Basic) Greet(name string) string {
-	return fmt.Sprintf("Hello %s!", name)
-}

v2/internal/templates/templates/svelte-mui/frontend/.gitignore

@@ -1,4 +0,0 @@
-/node_modules/
-/public/build/
-
-.DS_Store

v2/internal/templates/templates/svelte-mui/frontend/README.md

@@ -1,93 +0,0 @@
-*Looking for a shareable component template? Go here --> [sveltejs/component-template](https://github.com/sveltejs/component-template)*
-
----
-
-# svelte app
-
-This is a project template for [Svelte](https://svelte.dev) apps. It lives at https://github.com/sveltejs/template.
-
-To create a new project based on this template using [degit](https://github.com/Rich-Harris/degit):
-
-```bash
-npx degit sveltejs/template svelte-app
-cd svelte-app
-```
-
-*Note that you will need to have [Node.js](https://nodejs.org) installed.*
-
-
-## Get started
-
-Install the dependencies...
-
-```bash
-cd svelte-app
-npm install
-```
-
-...then start [Rollup](https://rollupjs.org):
-
-```bash
-npm run dev
-```
-
-Navigate to [localhost:5000](http://localhost:5000). You should see your app running. Edit a component file in `src`, save it, and reload the page to see your changes.
-
-By default, the server will only respond to requests from localhost. To allow connections from other computers, edit the `sirv` commands in package.json to include the option `--host 0.0.0.0`.
-
-
-## Building and running in production mode
-
-To create an optimised version of the app:
-
-```bash
-npm run build
-```
-
-You can run the newly built app with `npm run start`. This uses [sirv](https://github.com/lukeed/sirv), which is included in your package.json's `dependencies` so that the app will work when you deploy to platforms like [Heroku](https://heroku.com).
-
-
-## Single-page app mode
-
-By default, sirv will only respond to requests that match files in `public`. This is to maximise compatibility with static fileservers, allowing you to deploy your app anywhere.
-
-If you're building a single-page app (SPA) with multiple routes, sirv needs to be able to respond to requests for *any* path. You can make it so by editing the `"start"` command in package.json:
-
-```js
-"start": "sirv public --single"
-```
-
-
-## Deploying to the web
-
-### With [now](https://zeit.co/now)
-
-Install `now` if you haven't already:
-
-```bash
-npm install -g now
-```
-
-Then, from within your project folder:
-
-```bash
-cd public
-now deploy --name my-project
-```
-
-As an alternative, use the [Now desktop client](https://zeit.co/download) and simply drag the unzipped project folder to the taskbar icon.
-
-### With [surge](https://surge.sh/)
-
-Install `surge` if you haven't already:
-
-```bash
-npm install -g surge
-```
-
-Then, from within your project folder:
-
-```bash
-npm run build
-surge public my-project.surge.sh
-```

v2/internal/templates/templates/svelte-mui/frontend/package.json

@@ -1,24 +0,0 @@
-{
-  "name": "svelte-app",
-  "version": "1.0.0",
-  "scripts": {
-    "build": "npx rollup -c",
-    "dev": "npx rollup -c -w",
-    "start": "npx sirv public",
-    "start:dev": "npx sirv public --single --host 0.0.0.0 --dev"
-  },
-  "devDependencies": {
-    "@rollup/plugin-commonjs": "^17.0.0",
-    "@rollup/plugin-node-resolve": "^11.0.1",
-    "focus-visible": "^5.2.0",
-    "rollup": "^2.35.1",
-    "rollup-plugin-livereload": "^2.0.0",
-    "rollup-plugin-svelte": "^7.0.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "svelte": "^3.31.1",
-    "svelte-mui": "^0.3.3-5"
-  },
-  "dependencies": {
-    "sirv-cli": "^0.4.4"
-  }
-}

v2/internal/templates/templates/svelte-mui/frontend/public/index.html

@@ -1,24 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-	<meta charset="utf-8" />
-	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-	<meta name="viewport" content="width=device-width,initial-scale=1" />
-	<meta name="mobile-web-app-capable" content="yes" />
-	<meta name="apple-mobile-web-app-capable" content="yes" />
-	<meta name="apple-mobile-web-app-status-bar-style" content="black" />
-	<meta name="apple-mobile-web-app-title" content="svelte-mui" />
-	<meta name="application-name" content="svelte-mui" />
-	<meta name="theme-color" content="#212121" />
-
-	<title>Svelte app</title>
-
-	<link rel='icon' type='image/png' href='/favicon.png'>
-	<link rel='stylesheet' href='/bundle.css'>
-
-	<script defer src='/bundle.js'></script>
-  </head>
-  <body>
-	<noscript>Please enable JavaScript.</noscript>
-  </body>
-</html>

v2/internal/templates/templates/svelte-mui/frontend/rollup.config.js

@@ -1,71 +0,0 @@
-import svelte from 'rollup-plugin-svelte';
-import resolve from '@rollup/plugin-node-resolve';
-import commonjs from '@rollup/plugin-commonjs';
-import livereload from 'rollup-plugin-livereload';
-import { terser } from 'rollup-plugin-terser';
-
-const production = !process.env.ROLLUP_WATCH;
-
-export default {
-	input: 'src/main.js',
-	output: {
-		sourcemap: true,
-		format: 'iife',
-		name: 'app',
-		file: 'public/bundle.js'
-	},
-	plugins: [
-		svelte({
-			// enable run-time checks when not in production
-			dev: !production,
-			// we'll extract any component CSS out into
-			// a separate file - better for performance
-			css: css => {
-				css.write('public/bundle.css');
-			}
-		}),
-
-		// If you have external dependencies installed from
-		// npm, you'll most likely need these plugins. In
-		// some cases you'll need additional configuration -
-		// consult the documentation for details:
-		// https://github.com/rollup/plugins/tree/master/packages/commonjs
-		resolve({
-			browser: true,
-			dedupe: ['svelte']
-		}),
-		commonjs(),
-
-		// In dev mode, call `npm run start` once
-		// the bundle has been generated
-		!production && serve(),
-
-		// Watch the `public` directory and refresh the
-		// browser on changes when not in production
-		!production && livereload('public'),
-
-		// If we're building for production (npm run build
-		// instead of npm run dev), minify
-		production && terser()
-	],
-	watch: {
-		clearScreen: false
-	}
-};
-
-function serve() {
-	let started = false;
-
-	return {
-		writeBundle() {
-			if (!started) {
-				started = true;
-
-				require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], {
-					stdio: ['ignore', 'inherit', 'inherit'],
-					shell: true
-				});
-			}
-		}
-	};
-}

v2/internal/templates/templates/svelte-mui/frontend/src/App.svelte

@@ -1,51 +0,0 @@
-<h1>Hello {name}!</h1>
-
-<Snackbar bind:visible bg="#f44336">
-    {response}
-    <span slot="action">
-        <Button color="#ff0" on:click={() => (visible = false)}>Close</Button>
-    </span>
-</Snackbar>
-
-<Textfield
-    autocomplete="off"
-    label="Message"
-    required
-    bind:value
-    message=""
-/>
-
-<Button
-  outlined
-  shaped
-  color="Red"
-  on:click={() => {
-    window.backend.main.Basic.Greet(value).then((result) => {
-      response = result;
-      visible = true;
-    });
-  }}
->
-    Hello
-</Button>
-
-
-<script>
-  export let name;
-  let value = '';
-  let response = '';
-
-  // optional import focus-visible polyfill only once
-  import 'focus-visible';
-  // import any components
-  import { Button, Checkbox, Snackbar, Textfield } from 'svelte-mui';
-
-  let checked = true;
-  let visible = false;
-</script>
-
-<style>
-    h1 {
-        color: purple;
-    }
-</style>

v2/internal/templates/templates/svelte-mui/frontend/src/main.js

@@ -1,10 +0,0 @@
-import App from './App.svelte';
-
-const app = new App({
-	target: document.body,
-	props: {
-		name: 'Wails User'
-	}
-});
-
-export default app;

v2/internal/templates/templates/svelte-mui/go.mod.tmpl

@@ -1,9 +0,0 @@
-module test
-
-go 1.13
-
-require (
-	github.com/wailsapp/wails/v2 v2.0.0-alpha
-)
-
-replace github.com/wailsapp/wails/v2 v2.0.0-alpha => {{.WailsDirectory}}

v2/internal/templates/templates/svelte-mui/main.tmpl.go

@@ -1,22 +0,0 @@
-package main
-
-import (
-	"github.com/wailsapp/wails/v2"
-	"log"
-)
-
-func main() {
-
-	// Create application with options
-	app, err := wails.CreateApp("{{.ProjectName}}", 1024, 768)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	app.Bind(newBasic())
-
-	err = app.Run()
-	if err != nil {
-		log.Fatal(err)
-	}
-}

v2/internal/templates/templates/svelte-mui/template.json

@@ -1,7 +0,0 @@
-{
-  "name": "Svelte + MUI3",
-  "shortname": "svelte-mui",
-  "author": "Travis McLane <travis.mclane@gmail.com>",
-  "description": "A simple template using Svelte + Mui3",
-  "helpurl": "https://wails.app/help/templates/svelte-mui3"
-}

v2/internal/templates/templates/svelte-mui/wails.tmpl.json

@@ -1,9 +0,0 @@
-{
-    "name": "{{.ProjectName}}",
-    "outputfilename": "{{.BinaryName}}",
-    "html": "frontend/public/index.html",
-    "js": "frontend/public/bundle.js",
-    "css": "frontend/public/bundle.css",
-    "frontend:build": "npm run build",
-    "frontend:install": "npm install"
-}

v2/internal/templates/templates/vanilla/go.mod.tmpl

@@ -1,9 +0,0 @@
-module test
-
-go 1.13
-
-require (
-	github.com/wailsapp/wails/v2 v2.0.0-alpha
-)
-
-replace github.com/wailsapp/wails/v2 v2.0.0-alpha => {{.WailsDirectory}}

v2/internal/templates/templates/vuebasic/template.json

@@ -1,6 +0,0 @@
-{
-  "name": "Vue2/Webpack Basic",
-  "shortname": "vue",
-  "author": "Lea Anthony<lea.anthony@gmail.com>",
-  "description": "A basic template using Vue 2 and bundled using Webpack 4"
-}

v2/internal/templates/templates/vuetify-basic/template.json

@@ -1,6 +0,0 @@
-{
-  "name": "Vuetify1.5/Webpack Basic",
-  "shortname": "vuetify1",
-  "author": "Lea Anthony <lea.anthony@gmail.com>",
-  "description": "Basic template using Vuetify v1.5 and bundled using Webpack"
-}

v2/internal/templates/templates/vuetify2-basic/basic.tmpl.go

@@ -1,35 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/wailsapp/wails/v2"
-)
-
-// Basic application struct
-type Basic struct {
-	runtime *wails.Runtime
-}
-
-// newBasic creates a new Basic application struct
-func newBasic() *Basic {
-	return &Basic{}
-}
-
-// WailsInit is called at application startup
-func (b *Basic) WailsInit(runtime *wails.Runtime) error {
-	// Perform your setup here
-	b.runtime = runtime
-	runtime.Window.SetTitle("{{.ProjectName}}")
-	return nil
-}
-
-// WailsShutdown is called at application termination
-func (b *Basic) WailsShutdown() {
-	// Perform your teardown here
-}
-
-// Greet returns a greeting for the given name
-func (b *Basic) Greet(name string) string {
-	return fmt.Sprintf("Hello %s!", name)
-}

v2/internal/templates/templates/vuetify2-basic/frontend/babel.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-	presets: [
-		[ '@vue/app', { useBuiltIns: 'entry' } ]
-	]
-};

v2/internal/templates/templates/vuetify2-basic/frontend/package.tmpl.json

@@ -1,52 +0,0 @@
-{
-  "name": "vuetify2",
-  "author": "{{.AuthorNameAndEmail}}",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "core-js": "^3.6.1",
-    "regenerator-runtime": "^0.13.3",
-    "vue": "^2.5.22",
-    "vuetify": "^2.2.17"
-  },
-  "devDependencies": {
-    "@mdi/font": "^4.3.95",
-    "@vue/cli-plugin-babel": "^3.4.0",
-    "@vue/cli-plugin-eslint": "^3.4.0",
-    "@vue/cli-service": "^3.4.0",
-    "babel-eslint": "^10.0.1",
-    "eslint": "^5.8.0",
-    "eslint-plugin-vue": "^5.0.0",
-    "eventsource-polyfill": "^0.9.6",
-    "vue-template-compiler": "^2.5.21",
-    "webpack-hot-middleware": "^2.24.3"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "rules": {},
-    "parserOptions": {
-      "parser": "babel-eslint"
-    }
-  },
-  "postcss": {
-    "plugins": {
-      "autoprefixer": {}
-    }
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
-  ]
-}

v2/internal/templates/templates/vuetify2-basic/frontend/public/index.html

@@ -1 +0,0 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><title>Wails</title></head><body><div id=app></div></body></html>

v2/internal/templates/templates/vuetify2-basic/frontend/src/App.vue

@@ -1,60 +0,0 @@
-<template>
-  <v-app id="inspire">
-    <v-navigation-drawer v-model="drawer" clipped fixed app>
-      <v-list dense>
-        <v-list-item>
-          <v-list-item-icon>
-            <v-icon>mdi-view-dashboard</v-icon>
-          </v-list-item-icon>
-          <v-list-item-content>
-            <v-list-item-title>Dashboard</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-        <v-list-item>
-          <v-list-item-icon>
-            <v-icon>mdi-settings</v-icon>
-          </v-list-item-icon>
-          <v-list-item-content>
-            <v-list-item-title>Settings</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-      </v-list>
-    </v-navigation-drawer>
-    <v-app-bar app fixed clipped-left>
-      <v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
-      <v-toolbar-title>Application</v-toolbar-title>
-    </v-app-bar>
-    <v-content>
-      <v-container fluid class="px-0">
-        <v-layout justify-center align-center class="px-0">
-          <hello-world></hello-world>
-        </v-layout>
-      </v-container>
-    </v-content>
-    <v-footer app fixed>
-      <span style="margin-left:1em">&copy; You</span>
-    </v-footer>
-  </v-app>
-</template>
-
-<script>
-  import HelloWorld from "./components/HelloWorld.vue"
-
-  export default {
-    data: () => ({
-      drawer: false
-    }),
-    components: {
-      HelloWorld
-    },
-    props: {
-      source: String
-    }
-  }
-</script>
-
-<style>
-  .logo {
-    width: 16em;
-  }
-</style>

v2/internal/templates/templates/vuetify2-basic/frontend/src/components/HelloWorld.vue

@@ -1,85 +0,0 @@
-<template>
-  <v-container fluid class="px-0">
-    <v-layout>
-      <v-flex xs12 sm6 offset-sm3>
-        <v-card raised="raised" class="pa-4 ma-4">
-          <v-layout justify-center align-center class="pa-4 ma-4">
-            <v-img :src="require('../assets/images/logo.png')"></v-img>
-          </v-layout>
-          <v-card-actions>
-            <v-layout justify-center align-center class="px-0">
-              <v-btn color="blue" @click="getMessage">Press Me</v-btn>
-            </v-layout>
-          </v-card-actions>
-        </v-card>
-      </v-flex>
-    </v-layout>
-    <div class="text-xs-center">
-      <v-dialog v-model="dialog" width="500">
-        <v-card>
-          <v-card-title class="headline" primary-title>Message from Go</v-card-title>
-          <v-card-text>{{message}}</v-card-text>
-          <v-divider></v-divider>
-          <v-card-actions>
-            <v-spacer></v-spacer>
-            <v-btn color="primary" text @click="dialog = false">Awesome</v-btn>
-          </v-card-actions>
-        </v-card>
-      </v-dialog>
-    </div>
-  </v-container>
-</template>
-
-<script>
-  export default {
-    data () {
-      return {
-        message: " ",
-        raised: true,
-        dialog: false
-      }
-    },
-    methods: {
-      getMessage: function () {
-        var self = this
-        window.backend.main.Basic.Greet("Hello from Go!").then(result => {
-          self.message = result
-          self.dialog = true
-        })
-      }
-    }
-  }
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-  h1 {
-    margin-top: 2em;
-    position: relative;
-    min-height: 5rem;
-    width: 100%;
-  }
-
-  a:hover {
-    font-size: 1.7em;
-    border-color: blue;
-    background-color: blue;
-    color: white;
-    border: 3px solid white;
-    border-radius: 10px;
-    padding: 9px;
-    cursor: pointer;
-    transition: 500ms;
-  }
-
-  a {
-    font-size: 1.7em;
-    border-color: white;
-    background-color: #121212;
-    color: white;
-    border: 3px solid white;
-    border-radius: 10px;
-    padding: 9px;
-    cursor: pointer;
-  }
-</style>

v2/internal/templates/templates/vuetify2-basic/frontend/src/main.js

@@ -1,27 +0,0 @@
-import 'core-js/stable';
-import 'regenerator-runtime/runtime';
-import '@mdi/font/css/materialdesignicons.css';
-import Vue from 'vue';
-import Vuetify from 'vuetify';
-import 'vuetify/dist/vuetify.min.css';
-
-Vue.use(Vuetify);
-
-import App from './App.vue';
-
-Vue.config.productionTip = false;
-Vue.config.devtools = true;
-
-Wails.Init(() => {
-	new Vue({
-		vuetify: new Vuetify({
-			icons: {
-				iconfont: 'mdi'
-			},
-			theme: {
-				dark: true
-			}
-		}),
-		render: h => h(App)
-	}).$mount('#app');
-});

v2/internal/templates/templates/vuetify2-basic/frontend/vue.config.js

@@ -1,60 +0,0 @@
-let cssConfig = {};
-
-if (process.env.NODE_ENV == 'production') {
-	cssConfig = {
-		extract: {
-			filename: '[name].css',
-			chunkFilename: '[name].css'
-		}
-	};
-}
-
-module.exports = {
-    indexPath: 'index.html',
-    publicPath: 'public',
-    // disable hashes in filenames
-    filenameHashing: false,
-    // delete HTML related webpack plugins
-    chainWebpack: config => {
-      config.plugins.delete('preload');
-      config.plugins.delete('prefetch');
-      config
-            .plugin('html')
-            .tap(args => {
-                args[0].template = 'public/index.html';
-                args[0].inject = false;
-                args[0].cache = false;
-                args[0].minify = false;
-                args[0].filename = 'index.html';
-                return args;
-            });
-
-		let limit = 9999999999999999;
-		config.module
-			.rule('images')
-			.test(/\.(png|gif|jpg)(\?.*)?$/i)
-			.use('url-loader')
-			.loader('url-loader')
-			.tap(options => Object.assign(options, { limit: limit }));
-		config.module
-			.rule('fonts')
-			.test(/\.(woff2?|eot|ttf|otf|svg)(\?.*)?$/i)
-			.use('url-loader')
-			.loader('url-loader')
-			.options({
-				limit: limit
-			});
-	},
-	css: cssConfig,
-	configureWebpack: {
-		output: {
-			filename: '[name].js'
-		},
-		optimization: {
-			splitChunks: false
-		}
-	},
-	devServer: {
-		disableHostCheck: true
-	}
-};

v2/internal/templates/templates/vuetify2-basic/main.tmpl.go

@@ -1,15 +0,0 @@
-package main
-
-import (
-	"github.com/wailsapp/wails/v2"
-)
-
-func main() {
-
-	// Create application with options
-	app := wails.CreateApp("{{.ProjectName}}", 1024, 768)
-
-	app.Bind(newBasic())
-
-	app.Run()
-}

v2/internal/templates/templates/vuetify2-basic/template.json

@@ -1,7 +0,0 @@
-{
-  "name": "Vuetify 2 ",
-  "shortname": "vuetify2",
-  "author": "Michael Hipp <michael@redmule.com>",
-  "description": "A simple template using only HTML/CSS/JS",
-  "helpurl": "https://wails.app/help/templates/vuetify2"
-}