[v2] v2.0.0-alpha.70

* Fixed multi-line tags being minified incorrectly. Fixed self closing …

* Improved html whitespace minification fix.

.gitignore

@@ -28,4 +28,6 @@ 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/
+!v2/internal/ffenestri/windows/x64/webview2.dll
+!v2/internal/ffenestri/windows/x64/WebView2Loader.dll
 .idea/

v2/.vscode/settings.json

@@ -1,13 +0,0 @@
-{
-    "files.associations": {
-        "ios": "c",
-        "typeinfo": "c",
-        "sstream": "c",
-        "__functional_03": "c",
-        "functional": "c",
-        "__locale": "c",
-        "locale": "c",
-        "chrono": "c",
-        "system_error": "c"
-    }
-}

v2/cmd/wails/internal/commands/build/README.md

@@ -0,0 +1,54 @@
+# Build
+
+The build command processes the Wails project and generates an application binary. 
+
+## Usage
+
+`wails build <flags>`
+
+### Flags
+
+| Flag           | Details      | Default |
+| :------------- | :----------- | :------ |
+| -clean | Clean the bin directory before building   | |
+| -compiler path/to/compiler  | Use a different go compiler, eg go1.15beta1 | go |
+| -ldflags "custom ld flags" | Use given ldflags | | 
+| -o path/to/binary | Compile to given path/filename | |
+| -k | Keep generated assets | |
+| -package | Create a platform specific package | |
+| -production | Compile in production mode: -ldflags="-w -s" + "-h windows" on Windows | |
+| -tags | Build tags to pass to Go compiler (quoted and space separated) | |
+| -upx | Compress final binary with UPX (if installed) | |
+| -upxflags "custom flags" | Flags to pass to upx | |
+| -v int | Verbosity level (0 - silent, 1 - default, 2 - verbose) | 1 |
+
+## The Build Process
+
+The build process is as follows:
+
+  - The flags are processed, and an Options struct built containing the build context.
+  - The type of target is determined, and a custom build process is followed for target.
+
+### Desktop Target 
+
+  - The frontend dependencies are installed. The command is read from the project file `wails.json` under the key `frontend:install` and executed in the `frontend` directory. If this is not defined, it is ignored.
+  - The frontend is then built. This command is read from the project file `wails.json` under the key `frontend:install` and executed in the `frontend` directory. If this is not defined, it is ignored.
+  - The project directory is checked to see if the `build` directory exists. If not, it is created and default project assets are copied to it.
+  - An asset bundle is then created by reading the `html` key from `wails.json` and loading the referenced file. This is then parsed, looking for local Javascript and CSS references. Those files are in turn loaded into memory, converted to C data and saved into the asset bundle located at `build/assets.h`, which also includes the original HTML.
+  - The application icon is then processed: if there is no `build/appicon.png`, a default icon is copied. On Windows, an `app.ico` file is generated from this png. On Mac, `icons.icns` is generated.
+  - If there are icons in the `build/tray` directory, these are processed, converted to C data and saved as `build/trayicons.h`, ready for the compilation step.
+  - If there are icons in the `build/dialog` directory, these are processed, converted to C data and saved as `build/userdialogicons.h`, ready for the compilation step.
+  - If the `-package` flag is given for a Windows target, the Windows assets in the `build/windows` directory are processed: manifest + icons compiled to a `.syso` file (deleted after compilation).
+  - If we are building a universal binary for Mac, the application is compiled for both `arm64` and `amd64`. The `lipo` tool is then executed to create the universal binary.
+  - If we are not building a universal binary for Mac, the application is built using `go build`, using build tags to indicate type of application and build mode (debug/production).
+  - If the `-upx` flag was provided, `upx` is invoked to compress the binary. Custom flags may be provided using the `-upxflags` flag.
+  - If the `package` flag is given for a non Windows target, the application is bundled for the platform. On Mac, this creates a `.app` with the processed icons, the `Info.plist` in `build/darwin` and the compiled binary.
+
+### Server Target
+
+TBD
+
+### Hybrid Target
+
+TBD
+

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

@@ -36,7 +36,10 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
 
 	compress := false
-	command.BoolFlag("compress", "Compress final binary", &compress)
+	command.BoolFlag("upx", "Compress final binary with UPX (if installed)", &compress)
+
+	compressFlags := ""
+	command.StringFlag("upxflags", "Flags to pass to upx", &compressFlags)
 
 	// Setup Platform flag
 	platform := runtime.GOOS
@@ -66,6 +69,9 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	cleanBuildDirectory := false
 	command.BoolFlag("clean", "Clean the build directory before building", &cleanBuildDirectory)
 
+	webview2 := "download"
+	command.StringFlag("webview2", "WebView2 installer strategy: download,embed,browser,error.", &webview2)
+
 	command.Action(func() error {
 
 		quiet := verbosity == 0
@@ -95,6 +101,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			"darwin/amd64",
 			"darwin/arm64",
 			"darwin/universal",
+			"linux",
 			//"linux/amd64",
 			//"linux/arm-7",
 			"windows",
@@ -118,6 +125,25 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			}
 		}
 
+		// Webview2 installer strategy (download by default)
+		wv2rtstrategy := ""
+		webview2 = strings.ToLower(webview2)
+		if webview2 != "" {
+			validWV2Runtime := slicer.String([]string{"download", "embed", "browser", "error"})
+			if !validWV2Runtime.Contains(webview2) {
+				return fmt.Errorf("invalid option for flag 'webview2': %s", webview2)
+			}
+			// These are the build tags associated with the strategies
+			switch webview2 {
+			case "embed":
+				wv2rtstrategy = "wv2runtime.embed"
+			case "error":
+				wv2rtstrategy = "wv2runtime.error"
+			case "browser":
+				wv2rtstrategy = "wv2runtime.browser"
+			}
+		}
+
 		// Create BuildOptions
 		buildOptions := &build.Options{
 			Logger:              logger,
@@ -131,7 +157,9 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			KeepAssets:          keepAssets,
 			Verbosity:           verbosity,
 			Compress:            compress,
+			CompressFlags:       compressFlags,
 			UserTags:            userTags,
+			WebView2Strategy:    wv2rtstrategy,
 		}
 
 		// Calculate platform and arch

v2/cmd/wails/internal/commands/dev/README.md

@@ -0,0 +1,22 @@
+# Dev
+
+The dev command allows you to develop your application through a standard browser. 
+
+## Usage
+
+`wails dev <flags>`
+
+### Flags
+
+| Flag           | Details      | Default |
+| :------------- | :----------- | :------ |
+| -compiler path/to/compiler  | Use a different go compiler, eg go1.15beta1 | go |
+| -ldflags "custom ld flags" | Use given ldflags | | 
+| -e list,of,extensions | File extensions to trigger rebuilds | go |
+| -w | Show warnings | false |
+| -v int | Verbosity level (0 - silent, 1 - default, 2 - verbose) | 1 |
+| -loglevel  | Loglevel to pass to the application - Trace, Debug, Info, Warning, Error | Debug |
+
+## How it works
+
+The project is built using a special mode that starts a webserver and starts listening to port 34115. When the frontend project is run independently, so long as the JS is wrapped with the runtime method `ready`, then the frontend will connect to the backend code via websockets. The interface should be present in your browser, and you should be able to interact with the backend as you would in a desktop app.  

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

@@ -3,6 +3,7 @@ package dev
 import (
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -57,6 +58,10 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 	showWarnings := false
 	command.BoolFlag("w", "Show warnings", &showWarnings)
 
+	// Verbosity
+	verbosity := 1
+	command.IntFlag("v", "Verbosity level (0 - silent, 1 - default, 2 - verbose)", &verbosity)
+
 	loglevel := ""
 	command.StringFlag("loglevel", "Loglevel to use - Trace, Debug, Info, Warning, Error", &loglevel)
 
@@ -72,7 +77,12 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		if err != nil {
 			return err
 		}
-		defer watcher.Close()
+		defer func(watcher *fsnotify.Watcher) {
+			err := watcher.Close()
+			if err != nil {
+				log.Fatal(err)
+			}
+		}(watcher)
 
 		var debugBinaryProcess *process.Process = nil
 		var extensionsThatTriggerARebuild = strings.Split(extensions, ",")
@@ -83,15 +93,22 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 		debounceQuit := make(chan bool, 1)
 
+		var passthruArgs []string
+		//if len(os.Args) > 2 {
+		//	passthruArgs = os.Args[2:]
+		//}
+
 		// Do initial build
 		logger.Println("Building application for development...")
-		newProcess, err := restartApp(logger, "dev", ldflags, compilerCommand, debugBinaryProcess, loglevel)
+		newProcess, appBinary, err := restartApp(logger, ldflags, compilerCommand, debugBinaryProcess, loglevel, passthruArgs, verbosity)
 		if newProcess != nil {
 			debugBinaryProcess = newProcess
 		}
+
 		if err != nil {
 			return err
 		}
+		var newBinaryProcess *process.Process
 		go debounce(100*time.Millisecond, watcher.Events, debounceQuit, func(event fsnotify.Event) {
 			// logger.Println("event: %+v", event)
 
@@ -135,7 +152,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 				// Do a rebuild
 
 				// Try and build the app
-				newBinaryProcess, err := restartApp(logger, "dev", ldflags, compilerCommand, debugBinaryProcess, loglevel)
+				newBinaryProcess, _, err = restartApp(logger, ldflags, compilerCommand, debugBinaryProcess, loglevel, passthruArgs, verbosity)
 				if err != nil {
 					fmt.Printf("Error during build: %s", err.Error())
 					return
@@ -197,6 +214,12 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 			}
 		}
 
+		// Remove dev binary
+		err = os.Remove(appBinary)
+		if err != nil {
+			return err
+		}
+
 		LogGreen("Development mode exited")
 
 		return nil
@@ -224,14 +247,14 @@ exit:
 	}
 }
 
-func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string, debugBinaryProcess *process.Process, loglevel string) (*process.Process, error) {
+func restartApp(logger *clilogger.CLILogger, ldflags string, compilerCommand string, debugBinaryProcess *process.Process, loglevel string, passthruArgs []string, verbosity int) (*process.Process, string, error) {
 
-	appBinary, err := buildApp(logger, outputType, ldflags, compilerCommand)
+	appBinary, err := buildApp(logger, ldflags, compilerCommand, verbosity)
 	println()
 	if err != nil {
 		LogRed("Build error - continuing to run current version")
 		LogDarkYellow(err.Error())
-		return nil, nil
+		return nil, "", nil
 	}
 
 	// Kill existing binary if need be
@@ -247,8 +270,12 @@ func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string,
 
 	// TODO: Generate `backend.js`
 
-	// Start up new binary
-	newProcess := process.NewProcess(logger, appBinary, "-loglevel", loglevel)
+	// Start up new binary with correct args
+	var args = []string{"-loglevel", loglevel}
+	if len(passthruArgs) > 0 {
+		args = append(args, passthruArgs...)
+	}
+	newProcess := process.NewProcess(logger, appBinary, args...)
 	err = newProcess.Start()
 	if err != nil {
 		// Remove binary
@@ -259,18 +286,21 @@ func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string,
 		logger.Fatal("Unable to start application: %s", err.Error())
 	}
 
-	return newProcess, nil
+	return newProcess, appBinary, nil
 }
 
-func buildApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string) (string, error) {
+func buildApp(logger *clilogger.CLILogger, ldflags string, compilerCommand string, verbosity int) (string, error) {
 
 	// Create random output file
-	outputFile := fmt.Sprintf("dev-%d", time.Now().Unix())
+	outputFile := "wailsdev"
+	if runtime.GOOS == "windows" {
+		outputFile += ".exe"
+	}
 
 	// Create BuildOptions
 	buildOptions := &build.Options{
 		Logger:         logger,
-		OutputType:     outputType,
+		OutputType:     "dev",
 		Mode:           build.Debug,
 		Pack:           false,
 		Platform:       runtime.GOOS,
@@ -278,6 +308,7 @@ func buildApp(logger *clilogger.CLILogger, outputType string, ldflags string, co
 		Compiler:       compilerCommand,
 		OutputFile:     outputFile,
 		IgnoreFrontend: true,
+		Verbosity:      verbosity,
 	}
 
 	return build.Build(buildOptions)

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

@@ -3,7 +3,6 @@ package doctor
 import (
 	"fmt"
 	"io"
-	"log"
 	"os"
 	"runtime"
 	"strings"
@@ -25,11 +24,13 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		logger := clilogger.New(w)
 
 		app.PrintBanner()
-		logger.Print("Scanning system - please wait...")
+
+		logger.Print("Scanning system - Please wait (this may take a long time)...")
 
 		// Get system info
 		info, err := system.GetInfo()
 		if err != nil {
+			logger.Println("Failed.")
 			return err
 		}
 		logger.Println("Done.")
@@ -39,25 +40,22 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		w.Init(os.Stdout, 8, 8, 0, '\t', 0)
 
 		// Write out the system information
-		fmt.Fprintf(w, "\n")
 		fmt.Fprintf(w, "System\n")
 		fmt.Fprintf(w, "------\n")
 		fmt.Fprintf(w, "%s\t%s\n", "OS:", info.OS.Name)
 		fmt.Fprintf(w, "%s\t%s\n", "Version: ", info.OS.Version)
 		fmt.Fprintf(w, "%s\t%s\n", "ID:", info.OS.ID)
 
-		// Exit early if PM not found
-		if info.PM == nil {
-			w.Flush()
-			return nil
-		}
-		fmt.Fprintf(w, "%s\t%s\n", "Package Manager: ", info.PM.Name())
-
 		// Output Go Information
 		fmt.Fprintf(w, "%s\t%s\n", "Go Version:", runtime.Version())
 		fmt.Fprintf(w, "%s\t%s\n", "Platform:", runtime.GOOS)
 		fmt.Fprintf(w, "%s\t%s\n", "Architecture:", runtime.GOARCH)
 
+		// Exit early if PM not found
+		if info.PM != nil {
+			fmt.Fprintf(w, "%s\t%s\n", "Package Manager: ", info.PM.Name())
+		}
+
 		// Output Dependencies Status
 		var dependenciesMissing = []string{}
 		var externalPackages = []*packagemanager.Dependancy{}
@@ -67,12 +65,14 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		fmt.Fprintf(w, "Dependency\tPackage Name\tStatus\tVersion\n")
 		fmt.Fprintf(w, "----------\t------------\t------\t-------\n")
 
+		hasOptionalDependencies := false
 		// Loop over dependencies
 		for _, dependency := range info.Dependencies {
 
 			name := dependency.Name
 			if dependency.Optional {
-				name += "*"
+				name = "*" + name
+				hasOptionalDependencies = true
 			}
 			packageName := "Unknown"
 			status := "Not Found"
@@ -107,44 +107,48 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 			fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", name, packageName, status, dependency.Version)
 		}
-		fmt.Fprintf(w, "\n")
-		fmt.Fprintf(w, "* - Optional Dependency\n")
+		if hasOptionalDependencies {
+			fmt.Fprintf(w, "\n")
+			fmt.Fprintf(w, "* - Optional Dependency\n")
+		}
 		w.Flush()
 		logger.Println("")
 		logger.Println("Diagnosis")
-		logger.Println("---------\n")
+		logger.Println("---------")
 
 		// Generate an appropriate diagnosis
 
 		if len(dependenciesMissing) == 0 && dependenciesAvailableRequired == 0 {
 			logger.Println("Your system is ready for Wails development!")
+		} else {
+			logger.Println("Your system has missing dependencies!\n")
 		}
 
 		if dependenciesAvailableRequired != 0 {
-			log.Println("Install required packages using: " + info.Dependencies.InstallAllRequiredCommand())
+			logger.Println("Required package(s) installation details: \n" + info.Dependencies.InstallAllRequiredCommand())
 		}
 
 		if dependenciesAvailableOptional != 0 {
-			log.Println("Install optional packages using: " + info.Dependencies.InstallAllOptionalCommand())
-		}
-
-		if len(externalPackages) > 0 {
-			for _, p := range externalPackages {
-				if p.Optional {
-					print("[Optional] ")
-				}
-				log.Println("Install " + p.Name + ": " + p.InstallCommand)
-			}
+			logger.Println("Optional package(s) installation details: \n" + info.Dependencies.InstallAllOptionalCommand())
 		}
+		//
+		//if len(externalPackages) > 0 {
+		//	for _, p := range externalPackages {
+		//		if p.Optional {
+		//			print("[Optional] ")
+		//		}
+		//		logger.Println("Install " + p.Name + ": " + p.InstallCommand)
+		//	}
+		//}
 
 		if len(dependenciesMissing) != 0 {
 			// TODO: Check if apps are available locally and if so, adjust the diagnosis
-			log.Println("Fatal:")
-			log.Println("Required dependencies missing: " + strings.Join(dependenciesMissing, " "))
-			log.Println("Please read this article on how to resolve this: https://wails.app/guides/resolving-missing-packages")
+			logger.Println("Fatal:")
+			logger.Println("Required dependencies missing: " + strings.Join(dependenciesMissing, " "))
+			logger.Println("Please read this article on how to resolve this: https://wails.app/guides/resolving-missing-packages")
 		}
 
-		log.Println("")
+		logger.Println("")
 		return nil
 	})
 

v2/cmd/wails/internal/commands/generate/README.md

@@ -0,0 +1,18 @@
+# Generate
+
+The `generate` command provides the ability to generate various Wails related components.
+
+## Usage
+
+`wails generate [subcommand] [options]`
+
+## Template
+
+`wails generate template -name <name> [-frontend] [-q]`
+
+Generate a starter template for you to customise.
+
+| Flag           | Details      | 
+| :------------- | :----------- | 
+| -frontend  | Copies all the files from the current directory into the template's `frontend` directory. Useful for converting frontend projects created by boilerplate generators. |
+| -q | Suppress output | 

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

@@ -2,7 +2,8 @@ package generate
 
 import (
 	"io"
-	"time"
+
+	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/generate/template"
 
 	"github.com/leaanthony/clir"
 	"github.com/wailsapp/wails/v2/pkg/clilogger"
@@ -14,50 +15,9 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	command := app.NewSubCommand("generate", "Code Generation Tools")
 
-	// Backend API
-	backendAPI := command.NewSubCommand("module", "Generates a JS module for the frontend to interface with the backend")
+	//AddModuleCommand(app, command, w)
+	template.AddSubCommand(app, command, w)
 
-	// Quiet Init
-	quiet := false
-	backendAPI.BoolFlag("q", "Suppress output to console", &quiet)
-
-	backendAPI.Action(func() error {
-
-		// Create logger
-		logger := clilogger.New(w)
-		logger.Mute(quiet)
-
-		app.PrintBanner()
-
-		logger.Print("Generating Javascript module for Go code...")
-
-		// Start Time
-		start := time.Now()
-
-		p, err := parser.GenerateWailsFrontendPackage()
-		if err != nil {
-			return err
-		}
-
-		logger.Println("done.")
-		logger.Println("")
-
-		elapsed := time.Since(start)
-		packages := p.Packages
-
-		// Print report
-		for _, pkg := range p.Packages {
-			if pkg.ShouldGenerate() {
-				logPackage(pkg, logger)
-			}
-
-		}
-
-		logger.Println("%d packages parsed in %s.", len(packages), elapsed)
-
-		return nil
-
-	})
 	return nil
 }
 

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

@@ -0,0 +1,58 @@
+package generate
+
+import (
+	"io"
+	"time"
+
+	"github.com/leaanthony/clir"
+	"github.com/wailsapp/wails/v2/pkg/clilogger"
+	"github.com/wailsapp/wails/v2/pkg/parser"
+)
+
+func AddModuleCommand(app *clir.Cli, parent *clir.Command, w io.Writer) {
+
+	// Backend API
+	backendAPI := parent.NewSubCommand("module", "Generates a JS module for the frontend to interface with the backend")
+
+	// Quiet Init
+	quiet := false
+	backendAPI.BoolFlag("q", "Suppress output to console", &quiet)
+
+	backendAPI.Action(func() error {
+
+		// Create logger
+		logger := clilogger.New(w)
+		logger.Mute(quiet)
+
+		app.PrintBanner()
+
+		logger.Print("Generating Javascript module for Go code...")
+
+		// Start Time
+		start := time.Now()
+
+		p, err := parser.GenerateWailsFrontendPackage()
+		if err != nil {
+			return err
+		}
+
+		logger.Println("done.")
+		logger.Println("")
+
+		elapsed := time.Since(start)
+		packages := p.Packages
+
+		// Print report
+		for _, pkg := range p.Packages {
+			if pkg.ShouldGenerate() {
+				logPackage(pkg, logger)
+			}
+
+		}
+
+		logger.Println("%d packages parsed in %s.", len(packages), elapsed)
+
+		return nil
+
+	})
+}

v2/cmd/wails/internal/commands/generate/template/base/NEXTSTEPS.md

@@ -0,0 +1,37 @@
+# Next Steps
+
+Congratulations on generating your template!
+
+## Completing your template
+
+The next steps to complete the template are:
+
+  1. Complete the fields in the `template.json` file. 
+  2. Update `README.md`.
+  3. Edit `wails.tmpl.json` and ensure all fields are correct, especially:
+     - `html` - path to your `index.html`
+     - `frontend:install` - The command to install your frontend dependencies
+     - `frontend:build` - The command to build your frontend
+  4. Delete this file.
+
+## Testing your template
+
+You can test your template by running this command:
+
+`wails init -name test -t /path/to/your/new/template`
+
+### Checklist 
+Once generated, do the following tests:
+  - Change into the new project directory and run `wails build`. A working binary should be generated in the `build/bin` project directory.
+  - Run `wails dev`. This will compile your backend and run it. You should be able to go into the frontend directory and run `npm run dev` (or whatever your dev command is) and this should run correctly. You should be able to then open a browser to your local dev server and the application should work.
+
+## Publishing your template
+
+You can publish a template to a git repository and use it as follows:
+
+`wails init -name test -t https://your/git/url`
+
+EG: 
+
+`wails init -name test -t https://github.com/leaanthony/testtemplate`
+

v2/cmd/wails/internal/commands/generate/template/base/README.md

@@ -0,0 +1,16 @@
+# README
+
+## About
+
+About your template
+
+## Building 
+
+To build this project in debug mode, use `wails build`. For production, use `wails build -production`.
+To generate a platform native package, add the `-package` flag.
+
+## Live Development
+
+To run in live development mode, run `wails dev` in the project directory. In another terminal, go into the `frontend` 
+directory and run `npm run dev`. The frontend dev server will run on http://localhost:5000. Connect to this
+in your browser and connect to your application. 

v2/cmd/wails/internal/commands/generate/template/base/basic.tmpl.go

@@ -0,0 +1,34 @@
+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{}
+}
+
+// startup is called at application startup
+func (b *Basic) startup(runtime *wails.Runtime) {
+	// Perform your setup here
+	b.runtime = runtime
+	runtime.Window.SetTitle("{{.ProjectName}}")
+}
+
+// shutdown is called at application termination
+func (b *Basic) shutdown() {
+	// 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/cmd/wails/internal/commands/generate/template/base/frontend/package.tmpl.json

@@ -0,0 +1,27 @@
+{
+  "name": "vanilla",
+  "version": "1.0.0",
+  "description": "Vanilla Wails v2 template",
+  "main": "src/main.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "rollup -c",
+    "dev": "rollup -c -w",
+    "start": "sirv dist"
+  },
+  "author": "{{.AuthorName}}",
+  "license": "ISC",
+  "dependencies": {
+    "@rollup/plugin-commonjs": "^19.0.0",
+    "@rollup/plugin-image": "^2.0.6",
+    "@rollup/plugin-node-resolve": "^13.0.0",
+    "@rollup/plugin-url": "^6.0.0",
+    "@wails/runtime": "^1.3.20",
+    "rollup": "^2.50.4",
+    "rollup-plugin-copy": "^3.4.0",
+    "rollup-plugin-livereload": "^2.0.0",
+    "rollup-plugin-postcss": "^4.0.0",
+    "rollup-plugin-terser": "^7.0.2",
+    "sirv-cli": "^1.0.12"
+  }
+}

v2/cmd/wails/internal/commands/generate/template/base/frontend/rollup.config.js

@@ -0,0 +1,103 @@
+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';
+import postcss from 'rollup-plugin-postcss';
+import image from '@rollup/plugin-image';
+import url from '@rollup/plugin-url';
+import copy from 'rollup-plugin-copy';
+
+const production = !process.env.ROLLUP_WATCH;
+
+export default {
+    input: 'src/main.js',
+    output: {
+        sourcemap: true,
+        format: 'iife',
+        name: 'app',
+        file: 'dist/main.js'
+    },
+    onwarn: handleRollupWarning,
+    plugins: [
+
+        image(),
+
+        copy({
+            targets: [
+                { src: 'src/index.html', dest: 'dist' },
+                { src: 'src/main.css', dest: 'dist' },
+            ]
+        }),
+
+        // Embed binary files
+        url({
+            include: ['**/*.woff', '**/*.woff2'],
+            limit: Infinity,
+        }),
+
+        // 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,
+        }),
+        commonjs(),
+
+        // PostCSS preprocessing
+        postcss({
+            extensions: ['.css', '.scss'],
+            extract: true,
+            minimize: false,
+            use: [
+                ['sass', {
+                    includePaths: [
+                        './src',
+                        './node_modules'
+                    ]
+                }]
+            ],
+        }),
+
+        // 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('dist'),
+
+        // If we're building for production (npm run build
+        // instead of npm run dev), minify
+        production && terser()
+    ],
+    watch: {
+        clearScreen: false
+    }
+};
+
+function handleRollupWarning(warning) {
+    console.error('ERROR: ' + warning.toString());
+}
+
+function serve() {
+    let server;
+
+    function toExit() {
+        if (server) server.kill(0);
+    }
+
+    return {
+        writeBundle() {
+            if (server) return;
+            server = require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], {
+                stdio: ['ignore', 'inherit', 'inherit'],
+                shell: true
+            });
+
+            process.on('SIGTERM', toExit);
+            process.on('exit', toExit);
+        }
+    };
+}

v2/cmd/wails/internal/commands/generate/template/base/frontend/src/index.html

@@ -0,0 +1,18 @@
+<html>
+
+<head>
+  <link rel="stylesheet" href="/main.css">
+</head>
+
+<body data-wails-drag>
+  <div id="logo"></div>
+  <div id="input" data-wails-no-drag>
+    <input id="name" type="text">
+    <button onclick="greet()">Greet</button>
+  </div>
+  <div id="result"></div>
+
+  <script src="/main.js"></script>
+</body>
+
+</html>

v2/cmd/wails/internal/commands/generate/template/base/frontend/src/main.js

@@ -0,0 +1,21 @@
+
+import {ready} from '@wails/runtime';
+
+ready( () => {
+  // Get input + focus
+  let nameElement = document.getElementById("name");
+  nameElement.focus();
+
+  // Setup the greet function
+  window.greet = function () {
+
+    // Get name
+    let name = nameElement.value;
+
+    // Call Basic.Greet(name)
+    window.backend.main.Basic.Greet(name).then((result) => {
+      // Update result with data back from Basic.Greet()
+      document.getElementById("result").innerText = result;
+    });
+  };
+});

v2/cmd/wails/internal/commands/generate/template/base/go.mod.tmpl

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

v2/cmd/wails/internal/commands/generate/template/base/main.tmpl.go

@@ -0,0 +1,56 @@
+package main
+
+import (
+	"log"
+
+	"github.com/wailsapp/wails/v2/pkg/options/windows"
+
+	"github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2/pkg/logger"
+	"github.com/wailsapp/wails/v2/pkg/menu"
+	"github.com/wailsapp/wails/v2/pkg/options"
+	"github.com/wailsapp/wails/v2/pkg/options/mac"
+)
+
+func main() {
+
+	// Create application with options
+	app := NewBasic()
+
+	err := wails.Run(&options.App{
+		Title:             "{{.ProjectName}}",
+		Width:             800,
+		Height:            600,
+		MinWidth:          400,
+		MinHeight:         400,
+		MaxWidth:          1280,
+		MaxHeight:         1024,
+		DisableResize:     false,
+		Fullscreen:        false,
+		Frameless:         false,
+		StartHidden:       false,
+		HideWindowOnClose: false,
+		DevTools:          false,
+		RGBA:              0x000000FF,
+		Windows: &windows.Options{
+			WebviewIsTransparent:          true,
+			WindowBackgroundIsTranslucent: true,
+			DisableWindowIcon:             true,
+		},
+		Mac: &mac.Options{
+			WebviewIsTransparent:          true,
+			WindowBackgroundIsTranslucent: true,
+			TitleBar:                      mac.TitleBarHiddenInset(),
+			Menu:                          menu.DefaultMacMenu(),
+		},
+		LogLevel: logger.DEBUG,
+		Startup:  app.startup,
+		Shutdown: app.shutdown,
+		Bind: []interface{}{
+			app,
+		},
+	})
+	if err != nil {
+		log.Fatal(err)
+	}
+}

v2/cmd/wails/internal/commands/generate/template/base/template.json.template

@@ -0,0 +1,7 @@
+{
+  "name": "Long name",
+  "shortname": "{{.Name}}",
+  "author": "",
+  "description": "Description of the template",
+  "helpurl": "URL for help with the template, eg homepage"
+}

v2/cmd/wails/internal/commands/generate/template/base/wails.tmpl.json

@@ -0,0 +1,11 @@
+{
+    "name": "{{.ProjectName}}",
+    "outputfilename": "{{.BinaryName}}",
+    "html": "frontend/dist/index.html",
+    "frontend:build": "npm run build",
+    "frontend:install": "npm ci",
+    "author": {
+        "name": "{{.AuthorName}}",
+        "email": "{{.AuthorEmail}}"
+    }
+}

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

@@ -0,0 +1,131 @@
+package template
+
+import (
+	"embed"
+	"io"
+	"os"
+	"path/filepath"
+
+	"github.com/leaanthony/debme"
+
+	"github.com/leaanthony/gosod"
+	"github.com/wailsapp/wails/v2/internal/fs"
+
+	"github.com/leaanthony/clir"
+)
+
+//go:embed base
+var base embed.FS
+
+func AddSubCommand(app *clir.Cli, parent *clir.Command, w io.Writer) {
+
+	// command
+	command := parent.NewSubCommand("template", "Generates a wails template")
+
+	name := ""
+	command.StringFlag("name", "The name of the template", &name)
+
+	useLocalFilesAsFrontend := false
+	command.BoolFlag("frontend", "This indicates that the current directory is a frontend project and should be used by the template", &useLocalFilesAsFrontend)
+
+	// Quiet Init
+	quiet := false
+	command.BoolFlag("q", "Suppress output to console", &quiet)
+
+	command.Action(func() error {
+
+		// If the current directory is not empty, we create a new directory
+		cwd, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+		templateDir := cwd
+		empty, err := fs.DirIsEmpty(templateDir)
+		if err != nil {
+			return err
+		}
+		if !empty {
+			templateDir = filepath.Join(cwd, name)
+			err = fs.Mkdir(templateDir)
+			if err != nil {
+				return err
+			}
+		}
+
+		// Create base template
+		baseTemplate, err := debme.FS(base, "base")
+		if err != nil {
+			return err
+		}
+		g := gosod.New(baseTemplate)
+		g.SetTemplateFilters([]string{".template"})
+
+		err = os.Chdir(templateDir)
+		if err != nil {
+			return err
+		}
+
+		type templateData struct {
+			Name        string
+			Description string
+		}
+
+		err = g.Extract(templateDir, &templateData{
+			Name: name,
+		})
+		if err != nil {
+			return err
+		}
+
+		if useLocalFilesAsFrontend == false {
+			return nil
+		}
+
+		// Remove frontend directory
+		frontendDir := filepath.Join(templateDir, "frontend")
+		err = os.RemoveAll(frontendDir)
+		if err != nil {
+			return err
+		}
+
+		err = fs.CopyDirExtended(cwd, frontendDir, []string{name})
+		if err != nil {
+			return err
+		}
+
+		//// Create logger
+		//logger := clilogger.New(w)
+		//logger.Mute(quiet)
+		//
+		//app.PrintBanner()
+		//
+		//logger.Print("Generating Javascript module for Go code...")
+		//
+		//// Start Time
+		//start := time.Now()
+		//
+		//p, err := parser.GenerateWailsFrontendPackage()
+		//if err != nil {
+		//	return err
+		//}
+		//
+		//logger.Println("done.")
+		//logger.Println("")
+		//
+		//elapsed := time.Since(start)
+		//packages := p.Packages
+		//
+		//// Print report
+		//for _, pkg := range p.Packages {
+		//	if pkg.ShouldGenerate() {
+		//		generate.logPackage(pkg, logger)
+		//	}
+		//
+		//}
+		//
+		//logger.Println("%d packages parsed in %s.", len(packages), elapsed)
+
+		return nil
+
+	})
+}

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

@@ -6,6 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/wailsapp/wails/v2/pkg/buildassets"
+
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/initialise/templates"
 
 	"github.com/leaanthony/clir"
@@ -17,17 +19,11 @@ import (
 // AddSubcommand adds the `init` command for the Wails application
 func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
-	// Load the template shortnames
-	validShortNames, err := templates.TemplateShortNames()
-	if err != nil {
-		return err
-	}
-
 	command := app.NewSubCommand("init", "Initialise a new Wails project")
 
 	// Setup template name flag
 	templateName := "vanilla"
-	description := "Name of template to use. Valid tempates: " + validShortNames.Join(" ")
+	description := "Name of built-in template to use, path to template or template url."
 	command.StringFlag("t", description, &templateName)
 
 	// Setup project name
@@ -40,7 +36,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	// Quiet Init
 	quiet := false
-	command.BoolFlag("q", "Supress output to console", &quiet)
+	command.BoolFlag("q", "Suppress output to console", &quiet)
 
 	initGit := false
 	gitInstalled := git.IsInstalled()
@@ -71,14 +67,6 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 			return err
 		}
 
-		// Validate output type
-		if !validShortNames.Contains(templateName) {
-			logger.Print(fmt.Sprintf("[ERROR] Template '%s' is not valid", templateName))
-			logger.Println("")
-			command.PrintHelp()
-			return nil
-		}
-
 		// Validate name
 		if len(projectName) == 0 {
 			logger.Println("ERROR: Project name required")
@@ -106,10 +94,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		}
 
 		// Try to discover author details from git config
-		err := findAuthorDetails(options)
-		if err != nil {
-			return err
-		}
+		findAuthorDetails(options)
 
 		return initProject(options)
 	})
@@ -124,7 +109,13 @@ func initProject(options *templates.Options) error {
 	start := time.Now()
 
 	// Install the template
-	err := templates.Install(options)
+	remote, err := templates.Install(options)
+	if err != nil {
+		return err
+	}
+
+	// Install the default assets
+	err = buildassets.Install(options.TargetDir, options.ProjectName)
 	if err != nil {
 		return err
 	}
@@ -148,6 +139,11 @@ func initProject(options *templates.Options) error {
 	if options.InitGit {
 		options.Logger.Println("Git repository initialised.")
 	}
+
+	if remote {
+		options.Logger.Println("\nNOTE: You have created a project using a remote template. The Wails project takes no responsibility for 3rd party templates. Only use remote templates that you trust.")
+	}
+
 	options.Logger.Println("")
 	options.Logger.Println(fmt.Sprintf("Initialised project '%s' in %s.", options.ProjectName, elapsed.Round(time.Millisecond).String()))
 	options.Logger.Println("")
@@ -164,20 +160,18 @@ func initGit(options *templates.Options) error {
 	return nil
 }
 
-func findAuthorDetails(options *templates.Options) error {
+// findAuthorDetails tries to find the user's name and email
+// from gitconfig. If it finds them, it stores them in the project options
+func findAuthorDetails(options *templates.Options) {
 	if git.IsInstalled() {
 		name, err := git.Name()
-		if err != nil {
-			return err
+		if err == nil {
+			options.AuthorName = strings.TrimSpace(name)
 		}
-		options.AuthorName = strings.TrimSpace(name)
 
 		email, err := git.Email()
-		if err != nil {
-			return err
+		if err == nil {
+			options.AuthorEmail = strings.TrimSpace(email)
 		}
-		options.AuthorEmail = strings.TrimSpace(email)
 	}
-
-	return nil
 }

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

@@ -5,14 +5,19 @@ import (
 	"encoding/json"
 	"fmt"
 	gofs "io/fs"
+	"io/ioutil"
+	"log"
 	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
 
+	"github.com/go-git/go-git/v5"
+
+	"github.com/pkg/errors"
+
 	"github.com/leaanthony/debme"
 	"github.com/leaanthony/gosod"
-	"github.com/leaanthony/slicer"
 	"github.com/olekukonko/tablewriter"
 	"github.com/wailsapp/wails/v2/internal/fs"
 	"github.com/wailsapp/wails/v2/pkg/clilogger"
@@ -74,7 +79,7 @@ func parseTemplate(template gofs.FS) (Template, error) {
 	var result Template
 	data, err := gofs.ReadFile(template, "template.json")
 	if err != nil {
-		return result, err
+		return result, errors.Wrap(err, "Error parsing template")
 	}
 	err = json.Unmarshal(data, &result)
 	if err != nil {
@@ -84,26 +89,6 @@ func parseTemplate(template gofs.FS) (Template, error) {
 	return result, nil
 }
 
-// TemplateShortNames returns a slicer of short template names
-func TemplateShortNames() (*slicer.StringSlicer, error) {
-
-	var result slicer.StringSlicer
-
-	// If the cache isn't loaded, load it
-	if templateCache == nil {
-		err := loadTemplateCache()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	for _, template := range templateCache {
-		result.Add(template.ShortName)
-	}
-
-	return &result, nil
-}
-
 // List returns the list of available templates
 func List() ([]Template, error) {
 
@@ -175,12 +160,12 @@ func loadTemplateCache() error {
 	return nil
 }
 
-// Install the given template
-func Install(options *Options) error {
+// Install the given template. Returns true if the template is remote.
+func Install(options *Options) (bool, error) {
 	// Get cwd
 	cwd, err := os.Getwd()
 	if err != nil {
-		return err
+		return false, err
 	}
 
 	// Did the user want to install in current directory?
@@ -189,7 +174,7 @@ func Install(options *Options) error {
 		// If the current directory is empty, use it
 		isEmpty, err := fs.DirIsEmpty(cwd)
 		if err != nil {
-			return err
+			return false, err
 		}
 
 		if isEmpty {
@@ -198,7 +183,7 @@ func Install(options *Options) error {
 		} else {
 			options.TargetDir = filepath.Join(cwd, options.ProjectName)
 			if fs.DirExists(options.TargetDir) {
-				return fmt.Errorf("cannot create project directory. Dir exists: %s", options.TargetDir)
+				return false, fmt.Errorf("cannot create project directory. Dir exists: %s", options.TargetDir)
 			}
 		}
 
@@ -206,21 +191,47 @@ func Install(options *Options) error {
 		// Get the absolute path of the given directory
 		targetDir, err := filepath.Abs(filepath.Join(cwd, options.TargetDir))
 		if err != nil {
-			return err
+			return false, err
 		}
 		options.TargetDir = targetDir
 		if !fs.DirExists(options.TargetDir) {
 			err := fs.Mkdir(options.TargetDir)
 			if err != nil {
-				return err
+				return false, err
 			}
 		}
 	}
 
-	// Get template
+	// Flag to indicate remote template
+	remoteTemplate := false
+
+	// Is this a shortname?
 	template, err := getTemplateByShortname(options.TemplateName)
 	if err != nil {
-		return err
+		// Is this a filepath?
+		templatePath, err := filepath.Abs(options.TemplateName)
+		if fs.DirExists(templatePath) {
+			templateFS := os.DirFS(templatePath)
+			template, err = parseTemplate(templateFS)
+			if err != nil {
+				return false, errors.Wrap(err, "Error installing template")
+			}
+		} else {
+			// git clone to temporary dir
+			tempdir, err := gitclone(options)
+			defer func(path string) {
+				err := os.RemoveAll(path)
+				if err != nil {
+					log.Fatal(err)
+				}
+			}(tempdir)
+			templateFS := os.DirFS(tempdir)
+			template, err = parseTemplate(templateFS)
+			if err != nil {
+				return false, err
+			}
+			remoteTemplate = true
+		}
 	}
 
 	// Use Gosod to install the template
@@ -255,15 +266,30 @@ func Install(options *Options) error {
 	// Extract the template
 	err = installer.Extract(options.TargetDir, templateData)
 	if err != nil {
-		return err
+		return false, err
 	}
 
 	err = generateIDEFiles(options)
 	if err != nil {
-		return err
+		return false, err
 	}
 
-	return nil
+	return remoteTemplate, nil
+}
+
+// Clones the given uri and returns the temporary cloned directory
+func gitclone(options *Options) (string, error) {
+	// Create temporary directory
+	dirname, err := ioutil.TempDir("", "wails-template-*")
+	if err != nil {
+		return "", err
+	}
+	_, err = git.PlainClone(dirname, false, &git.CloneOptions{
+		URL: options.TemplateName,
+	})
+
+	return dirname, err
+
 }
 
 // OutputList prints the list of available tempaltes to the given logger

v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/README.md

@@ -0,0 +1,16 @@
+# README
+
+## About
+
+This template uses vanilla JS / HTML and CSS. [Rollup](https://rollupjs.org/guide/en/) is used for processing and bundling the files.
+
+## Building 
+
+To build this project in debug mode, use `wails build`. For production, use `wails build -production`.
+To generate a platform native package, add the `-package` flag.
+
+## Live Development
+
+To run in live development mode, run `wails dev` in the project directory. In another terminal, go into the `frontend` 
+directory and run `npm run dev`. The frontend dev server will run on http://localhost:5000. Connect to this
+in your browser and connect to your application. 

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

@@ -0,0 +1,27 @@
+{
+  "name": "vanilla",
+  "version": "1.0.0",
+  "description": "Vanilla Wails v2 template",
+  "main": "src/main.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "rollup -c",
+    "dev": "rollup -c -w",
+    "start": "sirv dist"
+  },
+  "author": "{{.AuthorName}}",
+  "license": "ISC",
+  "dependencies": {
+    "@rollup/plugin-commonjs": "^19.0.0",
+    "@rollup/plugin-image": "^2.0.6",
+    "@rollup/plugin-node-resolve": "^13.0.0",
+    "@rollup/plugin-url": "^6.0.0",
+    "@wails/runtime": "^1.3.20",
+    "rollup": "^2.50.4",
+    "rollup-plugin-copy": "^3.4.0",
+    "rollup-plugin-livereload": "^2.0.0",
+    "rollup-plugin-postcss": "^4.0.0",
+    "rollup-plugin-terser": "^7.0.2",
+    "sirv-cli": "^1.0.12"
+  }
+}

v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/rollup.config.js

@@ -0,0 +1,103 @@
+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';
+import postcss from 'rollup-plugin-postcss';
+import image from '@rollup/plugin-image';
+import url from '@rollup/plugin-url';
+import copy from 'rollup-plugin-copy';
+
+const production = !process.env.ROLLUP_WATCH;
+
+export default {
+    input: 'src/main.js',
+    output: {
+        sourcemap: true,
+        format: 'iife',
+        name: 'app',
+        file: 'dist/main.js'
+    },
+    onwarn: handleRollupWarning,
+    plugins: [
+
+        image(),
+
+        copy({
+            targets: [
+                { src: 'src/index.html', dest: 'dist' },
+                { src: 'src/main.css', dest: 'dist' },
+            ]
+        }),
+
+        // Embed binary files
+        url({
+            include: ['**/*.woff', '**/*.woff2'],
+            limit: Infinity,
+        }),
+
+        // 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,
+        }),
+        commonjs(),
+
+        // PostCSS preprocessing
+        postcss({
+            extensions: ['.css', '.scss'],
+            extract: true,
+            minimize: false,
+            use: [
+                ['sass', {
+                    includePaths: [
+                        './src',
+                        './node_modules'
+                    ]
+                }]
+            ],
+        }),
+
+        // 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('dist'),
+
+        // If we're building for production (npm run build
+        // instead of npm run dev), minify
+        production && terser()
+    ],
+    watch: {
+        clearScreen: false
+    }
+};
+
+function handleRollupWarning(warning) {
+    console.error('ERROR: ' + warning.toString());
+}
+
+function serve() {
+    let server;
+
+    function toExit() {
+        if (server) server.kill(0);
+    }
+
+    return {
+        writeBundle() {
+            if (server) return;
+            server = require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], {
+                stdio: ['ignore', 'inherit', 'inherit'],
+                shell: true
+            });
+
+            process.on('SIGTERM', toExit);
+            process.on('exit', toExit);
+        }
+    };
+}

v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/index.html

@@ -6,8 +6,8 @@
 
 <body data-wails-drag>
   <div id="logo"></div>
-  <div id="input">
-    <input id="name" type="text"></input>
+  <div id="input" data-wails-no-drag>
+    <input id="name" type="text">
     <button onclick="greet()">Greet</button>
   </div>
   <div id="result"></div>

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

@@ -1,16 +1,21 @@
-// Get input + focus
-let nameElement = document.getElementById("name");
-nameElement.focus();
 
-// Setup the greet function
-window.greet = function () {
+import {ready} from '@wails/runtime';
 
-  // Get name
-  let name = nameElement.value;
+ready( () => {
+  // Get input + focus
+  let nameElement = document.getElementById("name");
+  nameElement.focus();
 
-  // Call Basic.Greet(name)
-  window.backend.main.Basic.Greet(name).then((result) => {
-    // Update result with data back from Basic.Greet()
-    document.getElementById("result").innerText = result;
-  });
-}
+  // Setup the greet function
+  window.greet = function () {
+
+    // Get name
+    let name = nameElement.value;
+
+    // Call Basic.Greet(name)
+    window.backend.main.Basic.Greet(name).then((result) => {
+      // Update result with data back from Basic.Greet()
+      document.getElementById("result").innerText = result;
+    });
+  };
+});

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

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"github.com/wailsapp/wails/v2/pkg/options/windows"
 	"log"
 
 	"github.com/wailsapp/wails/v2"
@@ -16,10 +17,25 @@ func main() {
 	app := NewBasic()
 
 	err := wails.Run(&options.App{
-		Title:         "{{.ProjectName}}",
-		Width:         800,
-		Height:        600,
-		DisableResize: true,
+		Title:             "{{.ProjectName}}",
+		Width:             800,
+		Height:            600,
+		MinWidth:          400,
+		MinHeight:         400,
+		MaxWidth:          1280,
+		MaxHeight:         1024,
+		DisableResize:     false,
+		Fullscreen:        false,
+		Frameless:         false,
+		StartHidden:       false,
+		HideWindowOnClose: false,
+		DevTools:          false,
+		RGBA:              0x000000FF,
+		Windows: &windows.Options{
+			WebviewIsTransparent:          true,
+			WindowBackgroundIsTranslucent: true,
+			DisableWindowIcon:             true,
+		},
 		Mac: &mac.Options{
 			WebviewIsTransparent:          true,
 			WindowBackgroundIsTranslucent: true,

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

@@ -1,7 +1,9 @@
 {
     "name": "{{.ProjectName}}",
     "outputfilename": "{{.BinaryName}}",
-    "html": "frontend/src/index.html",
+    "html": "frontend/dist/index.html",
+    "frontend:build": "npm run build",
+    "frontend:install": "npm ci",
     "author": {
         "name": "{{.AuthorName}}",
         "email": "{{.AuthorEmail}}"

v2/cmd/wails/version.go

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

v2/go.mod

@@ -6,25 +6,37 @@ require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/fatih/structtag v1.2.0
 	github.com/fsnotify/fsnotify v1.4.9
+	github.com/go-git/go-billy/v5 v5.2.0 // indirect
+	github.com/go-git/go-git/v5 v5.3.0
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/uuid v1.1.2 // indirect
 	github.com/gorilla/websocket v1.4.1
-	github.com/imdario/mergo v0.3.11
+	github.com/imdario/mergo v0.3.12
 	github.com/jackmordaunt/icns v1.0.0
+	github.com/klauspost/compress v1.11.3 // indirect
 	github.com/leaanthony/clir v1.0.4
-	github.com/leaanthony/debme v1.1.2
+	github.com/leaanthony/debme v1.2.1
 	github.com/leaanthony/go-ansi-parser v1.0.1
+	github.com/leaanthony/go-common-file-dialog v1.0.3
 	github.com/leaanthony/gosod v1.0.1
 	github.com/leaanthony/slicer v1.5.0
+	github.com/leaanthony/webview2runtime v1.1.0
+	github.com/leaanthony/winicon v0.0.0-20200606125418-4419cea822a0
 	github.com/matryer/is v1.4.0
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/olekukonko/tablewriter v0.0.4
 	github.com/pkg/errors v0.9.1
+	github.com/stretchr/testify v1.7.0 // indirect
 	github.com/tdewolff/minify v2.3.6+incompatible
 	github.com/tdewolff/parse v2.3.4+incompatible // indirect
 	github.com/tdewolff/test v1.0.6 // indirect
 	github.com/wzshiming/ctc v1.2.3
 	github.com/xyproto/xpm v1.2.1
-	golang.org/x/net v0.0.0-20200822124328-c89045814202
-	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c
-	golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82
+	golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
+	golang.org/x/mod v0.4.1 // indirect
+	golang.org/x/net v0.0.0-20210326060303-6b1517762897
+	golang.org/x/sys v0.0.0-20210611083646-a4fc73990273
+	golang.org/x/text v0.3.5 // indirect
+	golang.org/x/tools v0.1.0
 	nhooyr.io/websocket v1.8.6
 )

v2/go.sum

@@ -1,15 +1,43 @@
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
+github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
+github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 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/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
+github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 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=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
+github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
+github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
+github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
+github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
+github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
+github.com/go-git/go-billy/v5 v5.1.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
+github.com/go-git/go-billy/v5 v5.2.0 h1:GcoouCP9J+5slw2uXAocL70z8ml4A8B/H8nEPt6CLPk=
+github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
+github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12 h1:PbKy9zOy4aAKrJ5pibIRpVO2BXnK1Tlcg+caKI7Ox5M=
+github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=
+github.com/go-git/go-git/v5 v5.3.0 h1:8WKMtJR2j8RntEXR/uvTKagfEt4GYlwQ7mntE4+0GWc=
+github.com/go-git/go-git/v5 v5.3.0/go.mod h1:xdX4bWJ48aOrdhnl2XqHYstHbbp6+LFS4r4X+lNVprw=
+github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
+github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
@@ -24,32 +52,59 @@ github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6Wezm
 github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
-github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
+github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/jackmordaunt/icns v1.0.0 h1:RYSxplerf/l/DUd09AHtITwckkv/mqjVv4DjYdPmAMQ=
 github.com/jackmordaunt/icns v1.0.0/go.mod h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
+github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8=
+github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck=
+github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/klauspost/compress v1.11.3 h1:dB4Bn0tN3wdCzQxnS8r06kV74qN/TAfaIS0bVE8h3jc=
+github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leaanthony/clir v1.0.4 h1:Dov2y9zWJmZr7CjaCe86lKa4b5CSxskGAt2yBkoDyiU=
 github.com/leaanthony/clir v1.0.4/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0=
 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/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oOc=
+github.com/leaanthony/debme v1.2.1/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/go-common-file-dialog v1.0.3 h1:O0uGjKnWtdEADGrkg+TyAAbZylykMwwx/MNEXn9fp+Y=
+github.com/leaanthony/go-common-file-dialog v1.0.3/go.mod h1:TGhEc9eSJgRsupZ+iH1ZgAOnEo9zp05cRH2j08RPrF0=
 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/leaanthony/webview2runtime v1.1.0 h1:N0pv55ift8XtqozIp4PNOtRCJ/Qdd/qzx80lUpalS4c=
+github.com/leaanthony/webview2runtime v1.1.0/go.mod h1:hH9GnWCve3DYzNaPOcPbhHQ7fodXR1QJNsnwixid4Tk=
+github.com/leaanthony/winicon v0.0.0-20200606125418-4419cea822a0 h1:FPGYnfxuuxqCZhrGq8nKjthEcYHgHmFbyY953Xv9cNI=
+github.com/leaanthony/winicon v0.0.0-20200606125418-4419cea822a0/go.mod h1:en5xhijl92aphrJdmRPlh4NI1L6wq3gEm0LpXAPghjU=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
@@ -58,20 +113,32 @@ github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHX
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tdewolff/minify v2.3.6+incompatible h1:2hw5/9ZvxhWLvBUnHE06gElGYz+Jv9R4Eys0XUzItYo=
 github.com/tdewolff/minify v2.3.6+incompatible/go.mod h1:9Ov578KJUmAWpS6NeZwRZyT56Uf6o3Mcz9CEsg8USYs=
 github.com/tdewolff/parse v2.3.4+incompatible h1:x05/cnGwIMf4ceLuDMBOdQ1qGniMoxpP46ghf0Qzh38=
@@ -86,44 +153,80 @@ github.com/wzshiming/ctc v1.2.3 h1:q+hW3IQNsjIlOFBTGZZZeIXTElFM4grF4spW/errh/c=
 github.com/wzshiming/ctc v1.2.3/go.mod h1:2tVAtIY7SUyraSk0JxvwmONNPFL4ARavPuEsg5+KA28=
 github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae h1:tpXvBXC3hpQBDCc9OojJZCQMVRAbT3TTdUMP8WguXkY=
 github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae/go.mod h1:VTAq37rkGeV+WOybvZwjXiJOicICdpLCN8ifpISjK20=
+github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
+github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
 github.com/xyproto/xpm v1.2.1 h1:trdvGjjWBsOOKzBBUPT6JvaIQM3acJEEYfbxN7M96wg=
 github.com/xyproto/xpm v1.2.1/go.mod h1:cMnesLsD0PBXLgjDfTDEaKr8XyTFsnP1QycSqRw7BiY=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
+golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg=
+golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/image v0.0.0-20200430140353-33d19683fad8 h1:6WW6V3x1P/jokJBpRQYUJnMHRP6isStQwCozxnU7XQw=
+golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY=
+golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210326060303-6b1517762897 h1:KrsHThm5nFk34YtATK1LsThyGhGbGe1olrte/HInHvs=
+golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210611083646-a4fc73990273 h1:faDu4veV+8pcThn4fewv6TVlNCezafGoC1gM/mxQLbQ=
+golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82 h1:shxDsb9Dz27xzk3A0DxP0JuJnZMpKrdg8+E14eiUAX4=
-golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k=
 nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=

v2/init_windows.go

@@ -5,6 +5,7 @@ import (
 	"syscall"
 )
 
+// Init is called at the start of the application
 func Init() error {
 	status, r, err := syscall.NewLazyDLL("user32.dll").NewProc("SetProcessDPIAware").Call()
 	if status == 0 {

v2/internal/app/desktop.go

@@ -103,8 +103,17 @@ func CreateApp(appoptions *options.App) (*App, error) {
 
 	// Initialise the app
 	err := result.Init()
+	if err != nil {
+		return nil, err
+	}
 
-	return result, err
+	// Preflight Checks
+	err = result.PreflightChecks(appoptions)
+	if err != nil {
+		return nil, err
+	}
+
+	return result, nil
 
 }
 

v2/internal/app/dev.go

@@ -125,7 +125,7 @@ func (a *App) Run() error {
 		return err
 	}
 
-	runtimesubsystem, err := subsystem.NewRuntime(ctx, a.servicebus, a.logger, a.startupCallback)
+	runtimesubsystem, err := subsystem.NewRuntime(ctx, a.servicebus, a.logger, a.startupCallback, nil)
 	if err != nil {
 		return err
 	}

v2/internal/app/preflight_default.go

@@ -0,0 +1,9 @@
+//+build !windows
+
+package app
+
+import "github.com/wailsapp/wails/v2/pkg/options"
+
+func (a *App) PreflightChecks(options *options.App) error {
+	return nil
+}

v2/internal/app/preflight_windows.go

@@ -0,0 +1,19 @@
+//+build windows
+
+package app
+
+import (
+	"github.com/wailsapp/wails/v2/internal/ffenestri/windows/wv2runtime"
+	"github.com/wailsapp/wails/v2/pkg/options"
+)
+
+func (a *App) PreflightChecks(options *options.App) error {
+
+	// Process the webview2 runtime situation. We can pass a strategy in via the `webview2` flag for `wails build`.
+	// This will determine how wv2runtime.Process will handle a lack of valid runtime.
+	err := wv2runtime.Process()
+	if err != nil {
+		return err
+	}
+	return nil
+}

v2/internal/app/server.go

@@ -79,7 +79,7 @@ func (a *App) Run() error {
 	// Default app options
 	var port = 8080
 	var ip = "localhost"
-	var supressLogging = false
+	var SuppressLogging = false
 	var debugMode = false
 
 	// Create CLI
@@ -89,7 +89,7 @@ func (a *App) Run() error {
 	cli.IntFlag("p", "Port to serve on", &port)
 	cli.StringFlag("i", "IP to serve on", &ip)
 	cli.BoolFlag("d", "Debug mode", &debugMode)
-	cli.BoolFlag("q", "Supress logging", &supressLogging)
+	cli.BoolFlag("q", "Suppress logging", &SuppressLogging)
 
 	// Setup main action
 	cli.Action(func() error {
@@ -98,8 +98,8 @@ func (a *App) Run() error {
 		a.webserver.SetPort(port)
 		a.webserver.SetIP(ip)
 		a.webserver.SetBindings(a.bindings)
-		// Log information (if we aren't supressing it)
-		if !supressLogging {
+		// Log information (if we aren't Suppressing it)
+		if !SuppressLogging {
 			cli.PrintBanner()
 			a.logger.Info("Running server at %s", a.webserver.URL())
 		}

v2/internal/bridge/session.go

@@ -18,6 +18,12 @@ import (
 //go:embed darwin.js
 var darwinRuntime string
 
+//go:embed windows.js
+var windowsRuntime string
+
+//go:embed linux.js
+var linuxRuntime string
+
 // session represents a single websocket session
 type session struct {
 	bindings string
@@ -84,6 +90,10 @@ func (s *session) start(firstSession bool) {
 	switch runtime.GOOS {
 	case "darwin":
 		wailsRuntime = darwinRuntime
+	case "windows":
+		wailsRuntime = windowsRuntime
+	case "linux":
+		wailsRuntime = linuxRuntime
 	default:
 		log.Fatal("platform not supported")
 	}
@@ -92,7 +102,10 @@ func (s *session) start(firstSession bool) {
 	s.log.Info(bindingsMessage)
 	bootstrapMessage := bindingsMessage + wailsRuntime
 
-	s.sendMessage("b" + bootstrapMessage)
+	err := s.sendMessage("b" + bootstrapMessage)
+	if err != nil {
+		s.log.Error(err.Error())
+	}
 
 	// Send menus
 	traymenus, err := s.menumanager.GetTrayMenus()
@@ -101,7 +114,10 @@ func (s *session) start(firstSession bool) {
 	}
 
 	for _, trayMenu := range traymenus {
-		s.sendMessage("TS" + trayMenu)
+		err := s.sendMessage("TS" + trayMenu)
+		if err != nil {
+			s.log.Error(err.Error())
+		}
 	}
 
 	for {
@@ -130,7 +146,10 @@ func (s *session) start(firstSession bool) {
 
 // Shutdown
 func (s *session) Shutdown() {
-	s.conn.Close()
+	err := s.conn.Close()
+	if err != nil {
+		s.log.Error(err.Error())
+	}
 	s.done = true
 	s.log.Info("session %v exit", s.Identifier())
 }
@@ -146,10 +165,16 @@ func (s *session) writePump() {
 			s.Shutdown()
 			return
 		case msg, ok := <-s.writeChan:
-			s.conn.SetWriteDeadline(time.Now().Add(1 * time.Second))
+			err := s.conn.SetWriteDeadline(time.Now().Add(1 * time.Second))
+			if err != nil {
+				s.log.Error(err.Error())
+			}
 			if !ok {
 				s.log.Debug("writeChan was closed!")
-				s.conn.WriteMessage(websocket.CloseMessage, []byte{})
+				err := s.conn.WriteMessage(websocket.CloseMessage, []byte{})
+				if err != nil {
+					s.log.Error(err.Error())
+				}
 				return
 			}
 

v2/internal/ffenestri/ffenestri.go

@@ -20,7 +20,7 @@ import (
 #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
+#cgo windows,amd64 LDFLAGS: -L./windows/x64 -lWebView2Loader -lgdi32 -lole32 -lShlwapi -luser32 -loleaut32 -ldwmapi
 
 #include <stdlib.h>
 #include "ffenestri.h"
@@ -130,7 +130,6 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug
 	// Set debug if needed
 	C.SetDebug(app, a.bool2Cint(debug))
 
-	// TODO: Move frameless to Linux options
 	if a.config.Frameless {
 		C.DisableFrame(a.app)
 	}

v2/internal/ffenestri/ffenestri.h

@@ -47,6 +47,7 @@ extern void AddContextMenu(struct Application*, char *contextMenuJSON);
 extern void UpdateContextMenu(struct Application*, char *contextMenuJSON);
 extern void WebviewIsTransparent(struct Application*);
 extern void WindowBackgroundIsTranslucent(struct Application*);
+extern void* GetWindowHandle(struct Application*);
 
 #ifdef __cplusplus
 }

v2/internal/ffenestri/ffenestri_client.go

@@ -1,3 +1,5 @@
+// +build !windows
+
 package ffenestri
 
 /*
@@ -6,14 +8,16 @@ package ffenestri
 import "C"
 
 import (
+	"runtime"
 	"strconv"
+	"strings"
 
 	"github.com/wailsapp/wails/v2/pkg/options/dialog"
 
 	"github.com/wailsapp/wails/v2/internal/logger"
 )
 
-// Client is our implentation of messageDispatcher.Client
+// Client is our implementation of messageDispatcher.Client
 type Client struct {
 	app    *Application
 	logger logger.CustomLogger
@@ -122,17 +126,72 @@ func (c *Client) WindowSetColour(colour int) {
 	C.SetColour(c.app.app, r, g, b, a)
 }
 
-// OpenDialog will open a dialog with the given title and filter
-func (c *Client) OpenDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
+// OpenFileDialog will open a dialog with the given title and filter
+func (c *Client) OpenFileDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
+	filters := []string{}
+	if runtime.GOOS == "darwin" {
+		for _, filter := range dialogOptions.Filters {
+			filters = append(filters, strings.Split(filter.Pattern, ",")...)
+		}
+	}
 	C.OpenDialog(c.app.app,
 		c.app.string2CString(callbackID),
 		c.app.string2CString(dialogOptions.Title),
-		c.app.string2CString(dialogOptions.Filters),
+		c.app.string2CString(strings.Join(filters, ";")),
 		c.app.string2CString(dialogOptions.DefaultFilename),
 		c.app.string2CString(dialogOptions.DefaultDirectory),
 		c.app.bool2Cint(dialogOptions.AllowFiles),
 		c.app.bool2Cint(dialogOptions.AllowDirectories),
-		c.app.bool2Cint(dialogOptions.AllowMultiple),
+		c.app.bool2Cint(false),
+		c.app.bool2Cint(dialogOptions.ShowHiddenFiles),
+		c.app.bool2Cint(dialogOptions.CanCreateDirectories),
+		c.app.bool2Cint(dialogOptions.ResolvesAliases),
+		c.app.bool2Cint(dialogOptions.TreatPackagesAsDirectories),
+	)
+}
+
+
+// OpenDirectoryDialog will open a dialog with the given title and filter
+func (c *Client) OpenDirectoryDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
+	filters := []string{}
+	if runtime.GOOS == "darwin" {
+		for _, filter := range dialogOptions.Filters {
+			filters = append(filters, strings.Split(filter.Pattern, ",")...)
+		}
+	}
+	C.OpenDialog(c.app.app,
+		c.app.string2CString(callbackID),
+		c.app.string2CString(dialogOptions.Title),
+		c.app.string2CString(strings.Join(filters, ";")),
+		c.app.string2CString(dialogOptions.DefaultFilename),
+		c.app.string2CString(dialogOptions.DefaultDirectory),
+		c.app.bool2Cint(false), // Files
+		c.app.bool2Cint(true), // Directories
+		c.app.bool2Cint(false), // Multiple
+		c.app.bool2Cint(dialogOptions.ShowHiddenFiles),
+		c.app.bool2Cint(dialogOptions.CanCreateDirectories),
+		c.app.bool2Cint(dialogOptions.ResolvesAliases),
+		c.app.bool2Cint(dialogOptions.TreatPackagesAsDirectories),
+	)
+}
+
+// OpenMultipleFilesDialog will open a dialog with the given title and filter
+func (c *Client) OpenMultipleFilesDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
+	filters := []string{}
+	if runtime.GOOS == "darwin" {
+		for _, filter := range dialogOptions.Filters {
+			filters = append(filters, strings.Split(filter.Pattern, ",")...)
+		}
+	}
+	C.OpenDialog(c.app.app,
+		c.app.string2CString(callbackID),
+		c.app.string2CString(dialogOptions.Title),
+		c.app.string2CString(strings.Join(filters, ";")),
+		c.app.string2CString(dialogOptions.DefaultFilename),
+		c.app.string2CString(dialogOptions.DefaultDirectory),
+		c.app.bool2Cint(dialogOptions.AllowFiles),
+		c.app.bool2Cint(dialogOptions.AllowDirectories),
+		c.app.bool2Cint(true),
 		c.app.bool2Cint(dialogOptions.ShowHiddenFiles),
 		c.app.bool2Cint(dialogOptions.CanCreateDirectories),
 		c.app.bool2Cint(dialogOptions.ResolvesAliases),
@@ -142,10 +201,16 @@ func (c *Client) OpenDialog(dialogOptions *dialog.OpenDialog, callbackID string)
 
 // SaveDialog will open a dialog with the given title and filter
 func (c *Client) SaveDialog(dialogOptions *dialog.SaveDialog, callbackID string) {
+	filters := []string{}
+	if runtime.GOOS == "darwin" {
+		for _, filter := range dialogOptions.Filters {
+			filters = append(filters, strings.Split(filter.Pattern, ",")...)
+		}
+	}
 	C.SaveDialog(c.app.app,
 		c.app.string2CString(callbackID),
 		c.app.string2CString(dialogOptions.Title),
-		c.app.string2CString(dialogOptions.Filters),
+		c.app.string2CString(strings.Join(filters, ";")),
 		c.app.string2CString(dialogOptions.DefaultFilename),
 		c.app.string2CString(dialogOptions.DefaultDirectory),
 		c.app.bool2Cint(dialogOptions.ShowHiddenFiles),

v2/internal/ffenestri/ffenestri_client_windows.go

@@ -0,0 +1,309 @@
+// +build windows
+
+package ffenestri
+
+/*
+#include "ffenestri.h"
+*/
+import "C"
+
+import (
+	"encoding/json"
+	"github.com/leaanthony/go-common-file-dialog/cfd"
+	"golang.org/x/sys/windows"
+	"log"
+	"strconv"
+	"syscall"
+
+	"github.com/wailsapp/wails/v2/pkg/options/dialog"
+
+	"github.com/wailsapp/wails/v2/internal/logger"
+)
+
+// Client is our implementation of messageDispatcher.Client
+type Client struct {
+	app    *Application
+	logger logger.CustomLogger
+}
+
+func newClient(app *Application) *Client {
+	return &Client{
+		app:    app,
+		logger: app.logger,
+	}
+}
+
+// Quit the application
+func (c *Client) Quit() {
+	c.app.logger.Trace("Got shutdown message")
+	C.Quit(c.app.app)
+}
+
+// NotifyEvent will pass on the event message to the frontend
+func (c *Client) NotifyEvent(message string) {
+	eventMessage := `window.wails._.Notify(` + strconv.Quote(message) + `);`
+	c.app.logger.Trace("eventMessage = %+v", eventMessage)
+	C.ExecJS(c.app.app, c.app.string2CString(eventMessage))
+}
+
+// CallResult contains the result of the call from JS
+func (c *Client) CallResult(message string) {
+	callbackMessage := `window.wails._.Callback(` + strconv.Quote(message) + `);`
+	c.app.logger.Trace("callbackMessage = %+v", callbackMessage)
+	C.ExecJS(c.app.app, c.app.string2CString(callbackMessage))
+}
+
+// WindowSetTitle sets the window title to the given string
+func (c *Client) WindowSetTitle(title string) {
+	C.SetTitle(c.app.app, c.app.string2CString(title))
+}
+
+// WindowFullscreen will set the window to be fullscreen
+func (c *Client) WindowFullscreen() {
+	C.Fullscreen(c.app.app)
+}
+
+// WindowUnFullscreen will unfullscreen the window
+func (c *Client) WindowUnFullscreen() {
+	C.UnFullscreen(c.app.app)
+}
+
+// WindowShow will show the window
+func (c *Client) WindowShow() {
+	C.Show(c.app.app)
+}
+
+// WindowHide will hide the window
+func (c *Client) WindowHide() {
+	C.Hide(c.app.app)
+}
+
+// WindowCenter will hide the window
+func (c *Client) WindowCenter() {
+	C.Center(c.app.app)
+}
+
+// WindowMaximise will maximise the window
+func (c *Client) WindowMaximise() {
+	C.Maximise(c.app.app)
+}
+
+// WindowMinimise will minimise the window
+func (c *Client) WindowMinimise() {
+	C.Minimise(c.app.app)
+}
+
+// WindowUnmaximise will unmaximise the window
+func (c *Client) WindowUnmaximise() {
+	C.Unmaximise(c.app.app)
+}
+
+// WindowUnminimise will unminimise the window
+func (c *Client) WindowUnminimise() {
+	C.Unminimise(c.app.app)
+}
+
+// WindowPosition will position the window to x,y on the
+// monitor that the window is mostly on
+func (c *Client) WindowPosition(x int, y int) {
+	C.SetPosition(c.app.app, C.int(x), C.int(y))
+}
+
+// WindowSize will resize the window to the given
+// width and height
+func (c *Client) WindowSize(width int, height int) {
+	C.SetSize(c.app.app, C.int(width), C.int(height))
+}
+
+// WindowSetMinSize sets the minimum window size
+func (c *Client) WindowSetMinSize(width int, height int) {
+	C.SetMinWindowSize(c.app.app, C.int(width), C.int(height))
+}
+
+// WindowSetMaxSize sets the maximum window size
+func (c *Client) WindowSetMaxSize(width int, height int) {
+	C.SetMaxWindowSize(c.app.app, C.int(width), C.int(height))
+}
+
+// WindowSetColour sets the window colour
+func (c *Client) WindowSetColour(colour int) {
+	r, g, b, a := intToColour(colour)
+	C.SetColour(c.app.app, r, g, b, a)
+}
+
+func convertFilters(filters []dialog.FileFilter) []cfd.FileFilter {
+	var result []cfd.FileFilter
+	for _, filter := range filters {
+		result = append(result, cfd.FileFilter(filter))
+	}
+	return result
+}
+
+// OpenFileDialog will open a dialog with the given title and filter
+func (c *Client) OpenFileDialog(options *dialog.OpenDialog, callbackID string) {
+	config := cfd.DialogConfig{
+		Folder:      options.DefaultDirectory,
+		FileFilters: convertFilters(options.Filters),
+		FileName:    options.DefaultFilename,
+	}
+	thisdialog, err := cfd.NewOpenFileDialog(config)
+	if err != nil {
+		log.Fatal(err)
+	}
+	thisdialog.SetParentWindowHandle(uintptr(C.GetWindowHandle(c.app.app)))
+	defer func(thisdialog cfd.OpenFileDialog) {
+		err := thisdialog.Release()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}(thisdialog)
+	result, err := thisdialog.ShowAndGetResult()
+	if err != nil && err != cfd.ErrorCancelled {
+		log.Fatal(err)
+	}
+
+	dispatcher.DispatchMessage("DO" + callbackID + "|" + result)
+}
+
+// OpenDirectoryDialog will open a dialog with the given title and filter
+func (c *Client) OpenDirectoryDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
+	config := cfd.DialogConfig{
+		Title:  dialogOptions.Title,
+		Role:   "PickFolder",
+		Folder: dialogOptions.DefaultDirectory,
+	}
+	thisDialog, err := cfd.NewSelectFolderDialog(config)
+	if err != nil {
+		log.Fatal()
+	}
+	thisDialog.SetParentWindowHandle(uintptr(C.GetWindowHandle(c.app.app)))
+	defer func(thisDialog cfd.SelectFolderDialog) {
+		err := thisDialog.Release()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}(thisDialog)
+	result, err := thisDialog.ShowAndGetResult()
+	if err != nil && err != cfd.ErrorCancelled {
+		log.Fatal(err)
+	}
+	dispatcher.DispatchMessage("DD" + callbackID + "|" + result)
+}
+
+// OpenMultipleFilesDialog will open a dialog with the given title and filter
+func (c *Client) OpenMultipleFilesDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
+	config := cfd.DialogConfig{
+		Title:       dialogOptions.Title,
+		Role:        "OpenMultipleFiles",
+		FileFilters: convertFilters(dialogOptions.Filters),
+		FileName:    dialogOptions.DefaultFilename,
+		Folder:      dialogOptions.DefaultDirectory,
+	}
+	thisdialog, err := cfd.NewOpenMultipleFilesDialog(config)
+	if err != nil {
+		log.Fatal(err)
+	}
+	thisdialog.SetParentWindowHandle(uintptr(C.GetWindowHandle(c.app.app)))
+	defer func(thisdialog cfd.OpenMultipleFilesDialog) {
+		err := thisdialog.Release()
+		if err != nil {
+			log.Fatal(err)
+		}
+	}(thisdialog)
+	result, err := thisdialog.ShowAndGetResults()
+	if err != nil && err != cfd.ErrorCancelled {
+		log.Fatal(err)
+	}
+	resultJSON, err := json.Marshal(result)
+	if err != nil {
+		log.Fatal(err)
+	}
+	dispatcher.DispatchMessage("D*" + callbackID + "|" + string(resultJSON))
+}
+
+// SaveDialog will open a dialog with the given title and filter
+func (c *Client) SaveDialog(dialogOptions *dialog.SaveDialog, callbackID string) {
+	saveDialog, err := cfd.NewSaveFileDialog(cfd.DialogConfig{
+		Title:       dialogOptions.Title,
+		Role:        "SaveFile",
+		FileFilters: convertFilters(dialogOptions.Filters),
+		FileName:    dialogOptions.DefaultFilename,
+		Folder:      dialogOptions.DefaultDirectory,
+	})
+	if err != nil {
+		log.Fatal(err)
+	}
+	saveDialog.SetParentWindowHandle(uintptr(C.GetWindowHandle(c.app.app)))
+	err = saveDialog.Show()
+	if err != nil {
+		log.Fatal(err)
+	}
+	result, err := saveDialog.GetResult()
+	if err != nil && err != cfd.ErrorCancelled {
+		log.Fatal(err)
+	}
+	dispatcher.DispatchMessage("DS" + callbackID + "|" + result)
+}
+
+// MessageDialog will open a message dialog with the given options
+func (c *Client) MessageDialog(options *dialog.MessageDialog, callbackID string) {
+
+	title, err := syscall.UTF16PtrFromString(options.Title)
+	if err != nil {
+		log.Fatal(err)
+	}
+	message, err := syscall.UTF16PtrFromString(options.Message)
+	if err != nil {
+		log.Fatal(err)
+	}
+	var flags uint32
+	switch options.Type {
+	case dialog.InfoDialog:
+		flags = windows.MB_OK | windows.MB_ICONINFORMATION
+	case dialog.ErrorDialog:
+		flags = windows.MB_ICONERROR | windows.MB_OK
+	case dialog.QuestionDialog:
+		flags = windows.MB_YESNO
+	case dialog.WarningDialog:
+		flags = windows.MB_OK | windows.MB_ICONWARNING
+	}
+
+	button, _ := windows.MessageBox(windows.HWND(C.GetWindowHandle(c.app.app)), message, title, flags|windows.MB_SYSTEMMODAL)
+	// This maps MessageBox return values to strings
+	responses := []string{"", "Ok", "Cancel", "Abort", "Retry", "Ignore", "Yes", "No", "", "", "Try Again", "Continue"}
+	result := "Error"
+	if int(button) < len(responses) {
+		result = responses[button]
+	}
+	dispatcher.DispatchMessage("DM" + callbackID + "|" + result)
+}
+
+// DarkModeEnabled sets the application to use dark mode
+func (c *Client) DarkModeEnabled(callbackID string) {
+	C.DarkModeEnabled(c.app.app, c.app.string2CString(callbackID))
+}
+
+// SetApplicationMenu sets the application menu
+func (c *Client) SetApplicationMenu(applicationMenuJSON string) {
+	C.SetApplicationMenu(c.app.app, c.app.string2CString(applicationMenuJSON))
+}
+
+// SetTrayMenu sets the tray menu
+func (c *Client) SetTrayMenu(trayMenuJSON string) {
+	C.SetTrayMenu(c.app.app, c.app.string2CString(trayMenuJSON))
+}
+
+// UpdateTrayMenuLabel updates a tray menu label
+func (c *Client) UpdateTrayMenuLabel(JSON string) {
+	C.UpdateTrayMenuLabel(c.app.app, c.app.string2CString(JSON))
+}
+
+// UpdateContextMenu will update the current context menu
+func (c *Client) UpdateContextMenu(contextMenuJSON string) {
+	C.UpdateContextMenu(c.app.app, c.app.string2CString(contextMenuJSON))
+}
+
+// DeleteTrayMenuByID will remove a tray menu based on the given id
+func (c *Client) DeleteTrayMenuByID(id string) {
+	C.DeleteTrayMenuByID(c.app.app, c.app.string2CString(id))
+}

v2/internal/ffenestri/ffenestri_darwin.c

@@ -102,6 +102,7 @@ struct Application {
 	id mouseDownMonitor;
 	id mouseUpMonitor;
 	int activationPolicy;
+	id pool;
 
 	// Window Data
 	const char *title;
@@ -560,7 +561,7 @@ void ToggleFullscreen(struct Application *app) {
 }
 
 bool isFullScreen(struct Application *app) {
-	int mask = (int)msg_reg(app->mainWindow, s("styleMask"));
+	long mask = (long)msg_reg(app->mainWindow, s("styleMask"));
 	bool result = (mask & NSWindowStyleMaskFullscreen) == NSWindowStyleMaskFullscreen;
 	return result;
 }
@@ -789,7 +790,7 @@ void MessageDialog(struct Application *app, char *callbackID, char *type, char *
 
 		// Run modal
 		char *buttonPressed;
-	    int response = (int)msg_reg(alert, s("runModal"));
+	    long response = (long)msg_reg(alert, s("runModal"));
 	    if( response == NSAlertFirstButtonReturn ) {
 	        buttonPressed = button1;
 	    }
@@ -983,7 +984,7 @@ void SaveDialog(struct Application *app, char *callbackID, char *title, char *fi
 	);
 }
 
-const char *invoke = "window.external={invoke:function(x){window.webkit.messageHandlers.external.postMessage(x);}};";
+const char *invoke = "window.wailsInvoke=function(message){window.webkit.messageHandlers.external.postMessage(message);};window.wailsDrag=function(message){window.webkit.messageHandlers.windowDrag.postMessage(message);};window.wailsContextMenuMessage=function(message){window.webkit.messageHandlers.contextMenu.postMessage(message);};";
 
 // DisableFrame disables the window frame
 void DisableFrame(struct Application *app)
@@ -1451,6 +1452,7 @@ void processDialogIcons(struct hashmap_s *hashmap, const unsigned char *dialogIc
         // Create the icon and add to the hashmap
         id imageData = ((id(*)(id, SEL, const unsigned char *, int))objc_msgSend)(c("NSData"), s("dataWithBytes:length:"), data, length);
         id dialogImage = ALLOC("NSImage");
+        msg_reg(dialogImage, s("autorelease"));
         msg_id(dialogImage, s("initWithData:"), imageData);
         hashmap_put(hashmap, (const char *)name, strlen((const char *)name), dialogImage);
     }
@@ -1622,7 +1624,9 @@ void Run(struct Application *app, int argc, char **argv) {
 	MEMFREE(temp);
 
 	// Add code that sets up the initial state, EG: State Stores.
-	temp = concat(internalCode, getInitialState(app));
+	const char *initialState = getInitialState(app);
+	temp = concat(internalCode, initialState);
+	MEMFREE(initialState);
 	MEMFREE(internalCode);
 	internalCode = temp;
 
@@ -1723,7 +1727,10 @@ id createImageFromBase64Data(const char *data, bool isTemplateImage) {
         imageData = ((id(*)(id, SEL, id, int))objc_msgSend)(nsdata, s("initWithBase64EncodedString:options:"), str(BrokenImage), 0);
     }
     id result = ALLOC("NSImage");
+    msg_reg(result, s("autorelease"));
     msg_id(result, s("initWithData:"), imageData);
+    msg_reg(nsdata, s("release"));
+    msg_reg(imageData, s("release"));
 
     if( isTemplateImage ) {
         msg_bool(result, s("setTemplate:"), YES);
@@ -1801,6 +1808,8 @@ void* NewApplication(const char *title, int width, int height, int resizable, in
 
 	result->running = false;
 
+	result->pool = msg_reg(c("NSAutoreleasePool"), s("new"));
+
     return (void*) result;
 }
 

v2/internal/ffenestri/ffenestri_linux.c

@@ -2,6 +2,7 @@
 #ifndef __FFENESTRI_LINUX_H__
 #define __FFENESTRI_LINUX_H__
 
+#include "common.h"
 #include "gtk/gtk.h"
 #include "webkit2/webkit2.h"
 #include <time.h>
@@ -11,9 +12,10 @@
 #include <stdarg.h>
 
 // References to assets
-extern const unsigned char *assets[];
 extern const unsigned char runtime;
-extern const char *icon[];
+
+#include "icon.h"
+#include "assets.h"
 
 // Constants
 #define PRIMARY_MOUSE_BUTTON 1
@@ -23,17 +25,6 @@ extern const char *icon[];
 // MAIN DEBUG FLAG
 int debug;
 
-// Credit: https://stackoverflow.com/a/8465083
-char *concat(const char *s1, const char *s2)
-{
-    const size_t len1 = strlen(s1);
-    const size_t len2 = strlen(s2);
-    char *result = malloc(len1 + len2 + 1);
-    memcpy(result, s1, len1);
-    memcpy(result + len1, s2, len2 + 1);
-    return result;
-}
-
 // Debug works like sprintf but mutes if the global debug flag is true
 // Credit: https://stackoverflow.com/a/20639708
 void Debug(char *message, ...)
@@ -312,17 +303,17 @@ void SetMaxWindowSize(struct Application *app, int maxWidth, int maxHeight)
 }
 
 // SetColour sets the colour of the webview to the given colour string
-int SetColour(struct Application *app, const char *colourString)
+void SetColour(struct Application *app, int red, int green, int blue, int alpha)
 {
-    GdkRGBA rgba;
-    gboolean result = gdk_rgba_parse(&rgba, colourString);
-    if (result == FALSE)
-    {
-        return 0;
-    }
-    // Debug("Setting webview colour to: %s", colourString);
-    webkit_web_view_get_background_color((WebKitWebView *)(app->webView), &rgba);
-    return 1;
+//    GdkRGBA rgba;
+//    rgba.
+//    gboolean result = gdk_rgba_parse(&rgba, colourString);
+//    if (result == FALSE)
+//    {
+//        return 0;
+//    }
+//    // Debug("Setting webview colour to: %s", colourString);
+//    webkit_web_view_get_background_color((WebKitWebView *)(app->webView), &rgba);
 }
 
 // DisableFrame disables the window frame
@@ -523,6 +514,11 @@ static void load_finished_cb(WebKitWebView *webView,
         Debug("Binding Methods");
         syncEval(app, app->bindings);
 
+        // Setup IPC commands
+        Debug("Setting up IPC methods");
+        const char *invoke = "window.wailsInvoke=function(message){window.webkit.messageHandlers.external.postMessage(message);};window.wailsDrag=function(message){window.webkit.messageHandlers.windowDrag.postMessage(message);};window.wailsContextMenuMessage=function(message){window.webkit.messageHandlers.contextMenu.postMessage(message);};";
+        syncEval(app, invoke);
+
         // Runtime
         Debug("Setting up Wails runtime");
         syncEval(app, &runtime);
@@ -824,7 +820,7 @@ void Show(struct Application *app) {
 
 // maximiseInternal maximises the main window
 void maximiseInternal(struct Application *app) {
-    gtk_window_maximize(GTK_WIDGET(app->mainWindow));
+    gtk_window_maximize(GTK_WINDOW(app->mainWindow));
 }
 
 // Maximise places the maximiseInternal method onto the main thread for execution
@@ -841,7 +837,7 @@ void Maximise(struct Application *app) {
 
 // unmaximiseInternal unmaximises the main window
 void unmaximiseInternal(struct Application *app) {
-    gtk_window_unmaximize(GTK_WIDGET(app->mainWindow));
+    gtk_window_unmaximize(GTK_WINDOW(app->mainWindow));
 }
 
 // Unmaximise places the unmaximiseInternal method onto the main thread for execution
@@ -857,6 +853,21 @@ void Unmaximise(struct Application *app) {
 }
 
 
+void DarkModeEnabled(struct Application* app, char *callbackID) {}
+void SetApplicationMenu(struct Application* app, const char *menuJSON) {}
+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) {}
+void WebviewIsTransparent(struct Application* app) {}
+void WindowBackgroundIsTranslucent(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) {}
+
+
 // minimiseInternal minimises the main window
 void minimiseInternal(struct Application *app) {
     gtk_window_iconify(app->mainWindow);

v2/internal/ffenestri/ffenestri_linux.go

@@ -0,0 +1,17 @@
+package ffenestri
+
+/*
+#cgo linux CFLAGS: -DFFENESTRI_LINUX=1
+#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+
+
+#include "ffenestri.h"
+#include "ffenestri_linux.h"
+
+*/
+import "C"
+
+func (a *Application) processPlatformSettings() error {
+
+	return nil
+}

v2/internal/ffenestri/ffenestri_linux.h

@@ -0,0 +1,6 @@
+
+#ifndef FFENESTRI_LINUX_H
+#define FFENESTRI_LINUX_H
+
+
+#endif

v2/internal/ffenestri/ffenestri_windows.cpp

@@ -9,12 +9,15 @@
 #include <locale>
 #include <codecvt>
 #include "windows/WebView2.h"
+#include <winuser.h>
 #include "effectstructs_windows.h"
 #include <Shlobj.h>
 
 int debug = 0;
 DWORD mainThread;
 
+#define WS_EX_NOREDIRECTIONBITMAP 0x00200000L
+
 // --- Assets
 extern const unsigned char runtime;
 extern const unsigned char *defaultDialogIcons[];
@@ -59,6 +62,7 @@ struct Application *NewApplication(const char *title, int width, int height, int
     result->hideWindowOnClose = hideWindowOnClose;
     result->webviewIsTranparent = false;
     result->windowBackgroundIsTranslucent = false;
+    result->disableWindowIcon = false;
 
     // Min/Max Width/Height
     result->minWidth = 0;
@@ -81,9 +85,16 @@ struct Application *NewApplication(const char *title, int width, int height, int
     // Startup url
     result->startupURL = nullptr;
 
+    // Used to remember the window location when going fullscreen
+    result->previousPlacement = { sizeof(result->previousPlacement) };
+
     return result;
 }
 
+void* GetWindowHandle(struct Application *app) {
+    return (void*)app->window;
+}
+
 void SetMinWindowSize(struct Application* app, int minWidth, int minHeight) {
     app->minWidth = (LONG)minWidth;
     app->minHeight = (LONG)minHeight;
@@ -107,6 +118,7 @@ void performShutdown(struct Application *app) {
     messageFromWindowCallback("WC");
 }
 
+// Credit: https://gist.github.com/ysc3839/b08d2bff1c7dacde529bed1d37e85ccf
 void enableTranslucentBackground(struct Application *app) {
     HMODULE hUser = GetModuleHandleA("user32.dll");
     if (hUser)
@@ -130,11 +142,22 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 
     switch(msg) {
 
+        case WM_CLOSE: {
+            DestroyWindow( app->window );
+            break;
+        }
         case WM_DESTROY: {
-            DestroyApplication(app);
+            if( app->hideWindowOnClose ) {
+                Hide(app);
+            } else {
+                PostQuitMessage(0);
+            }
             break;
         }
         case WM_SIZE: {
+            if ( app == NULL ) {
+                return 0;
+            }
             if( app->webviewController != nullptr) {
                 RECT bounds;
                 GetClientRect(app->window, &bounds);
@@ -195,8 +218,8 @@ void execJS(struct Application* app, const char *script) {
 
 void loadAssets(struct Application* app) {
 
-    // patch window.external.invoke
-    std::string initialCode = std::string("window.external={invoke:s=>window.chrome.webview.postMessage(s)};");
+    // setup window.wailsInvoke
+    std::string initialCode = std::string("window.wailsInvoke=function(m){window.chrome.webview.postMessage(m)};");
 
     // Load bindings
     initialCode += std::string(app->bindings);
@@ -224,7 +247,7 @@ void loadAssets(struct Application* app) {
         initialCode += std::string("wails._.DisableDefaultContextMenu();");
     }
 
-    initialCode += std::string("window.external.invoke('completed');");
+    initialCode += std::string("window.wailsInvoke('completed');");
 
     // Keep a copy of the code
     app->initialCode = new char[initialCode.length()+1];
@@ -243,6 +266,26 @@ void completed(struct Application* app) {
     delete[] app->initialCode;
     app->initialCode = nullptr;
 
+    // Process whether window should show by default
+    int startVisibility = SW_SHOWNORMAL;
+    if ( app->startHidden == 1 ) {
+        startVisibility = SW_HIDE;
+    }
+
+    // Fix for webview2 bug: https://github.com/MicrosoftEdge/WebView2Feedback/issues/1077
+    // Will be fixed in next stable release
+    app->webviewController->put_IsVisible(false);
+    app->webviewController->put_IsVisible(true);
+
+    // Private setTitle as we're on the main thread
+    if( app->frame == 1) {
+        setTitle(app, app->title);
+    }
+
+    ShowWindow(app->window, startVisibility);
+    UpdateWindow(app->window);
+    SetFocus(app->window);
+
     if( app->startupURL == nullptr ) {
         messageFromWindowCallback("SS");
         return;
@@ -262,31 +305,73 @@ bool initWebView2(struct Application *app, int debugEnabled, messageCallback cb)
     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;
-//    }
-//
+    char currentExePath[MAX_PATH];
+    GetModuleFileNameA(NULL, currentExePath, MAX_PATH);
+    char *currentExeName = PathFindFileNameA(currentExePath);
+
+    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> wideCharConverter;
+    std::wstring userDataFolder =
+        wideCharConverter.from_bytes(std::getenv("APPDATA"));
+    std::wstring currentExeNameW = wideCharConverter.from_bytes(currentExeName);
 
     ICoreWebView2Controller *controller;
     ICoreWebView2* webview;
 
     HRESULT res = CreateCoreWebView2EnvironmentWithOptions(
-            nullptr, nullptr, nullptr,
+            nullptr, (userDataFolder + L"/" + currentExeNameW).c_str(), nullptr,
             new wv2ComHandler(app, app->window, cb,
                                      [&](ICoreWebView2Controller *webviewController) {
                                          controller = webviewController;
                                          controller->get_CoreWebView2(&webview);
                                          webview->AddRef();
+                                         ICoreWebView2Settings* settings;
+                                         webview->get_Settings(&settings);
+                                         if ( debugEnabled == 0 ) {
+                                            settings->put_AreDefaultContextMenusEnabled(FALSE);
+                                         }
+                                         // Fix for invisible webview
+                                         if( app->startHidden ) {}
                                          flag.clear();
                                      }));
+    if (!SUCCEEDED(res))
+    {
+        switch (res)
+        {
+            case HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND):
+            {
+                MessageBox(
+                    app->window,
+                    L"Couldn't find Edge installation. "
+                    "Do you have a version installed that's compatible with this "
+                    "WebView2 SDK version?",
+                    nullptr, MB_OK);
+            }
+            break;
+            case HRESULT_FROM_WIN32(ERROR_FILE_EXISTS):
+            {
+                MessageBox(
+                    app->window, L"User data folder cannot be created because a file with the same name already exists.", nullptr, MB_OK);
+            }
+            break;
+            case E_ACCESSDENIED:
+            {
+                MessageBox(
+                    app->window, L"Unable to create user data folder, Access Denied.", nullptr, MB_OK);
+            }
+            break;
+            case E_FAIL:
+            {
+                MessageBox(
+                    app->window, L"Edge runtime unable to start", nullptr, MB_OK);
+            }
+            break;
+            default:
+            {
+                 MessageBox(app->window, L"Failed to create WebView2 environment", nullptr, MB_OK);
+            }
+        }
+    }
+
     if (res != S_OK) {
         CoUninitialize();
         return false;
@@ -304,8 +389,8 @@ bool initWebView2(struct Application *app, int debugEnabled, messageCallback cb)
     GetClientRect(app->window, &bounds);
     app->webviewController->put_Bounds(bounds);
 
-    // Callback hack
-    app->webview->AddScriptToExecuteOnDocumentCreated(L"window.chrome.webview.postMessage('I');", nullptr);
+    // Let the backend know we have initialised
+    app->webview->AddScriptToExecuteOnDocumentCreated(L"window.chrome.webview.postMessage('initialised');", nullptr);
     // Load the HTML
     LPCWSTR html = (LPCWSTR) cstrToLPWSTR((char*)assets[0]);
     app->webview->Navigate(html);
@@ -320,64 +405,148 @@ void initialCallback(std::string message) {
 
 void Run(struct Application* app, int argc, char **argv) {
 
-    WNDCLASSEX wc;
-    HINSTANCE hInstance = GetModuleHandle(NULL);
-    ZeroMemory(&wc, sizeof(WNDCLASSEX));
+    // Register the window class.
+    const wchar_t CLASS_NAME[]  = L"Ffenestri";
+
+    WNDCLASSEX wc = { };
+
     wc.cbSize = sizeof(WNDCLASSEX);
-    wc.style = CS_HREDRAW | CS_VREDRAW;
-    wc.hInstance = hInstance;
-    wc.lpszClassName = (LPCWSTR)"ffenestri";
     wc.lpfnWndProc   = WndProc;
+    wc.hInstance     = GetModuleHandle(NULL);
+    wc.lpszClassName = CLASS_NAME;
 
-    // TODO: Menu
-//    wc.lpszMenuName = nullptr;
+    if( app->disableWindowIcon == false ) {
+        wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(100));
+        wc.hIconSm = LoadIcon(wc.hInstance, MAKEINTRESOURCE(100));
+    }
 
+    // Configure translucency
+    DWORD dwExStyle = 0;
+    if ( app->windowBackgroundIsTranslucent) {
+        dwExStyle = WS_EX_NOREDIRECTIONBITMAP;
+        wc.hbrBackground = CreateSolidBrush(RGB(255,255,255));
+    }
+
+    RegisterClassEx(&wc);
+
+    // Process window style
+    DWORD windowStyle = WS_OVERLAPPEDWINDOW | WS_THICKFRAME | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
 
-    // Process window resizable
-    DWORD windowStyle = WS_OVERLAPPEDWINDOW;
     if (app->resizable == 0) {
         windowStyle &= ~WS_MAXIMIZEBOX;
         windowStyle &= ~WS_THICKFRAME;
     }
     if ( app->frame == 0 ) {
-        windowStyle = WS_POPUP;
+        windowStyle &= ~WS_OVERLAPPEDWINDOW;
+        windowStyle &= ~WS_CAPTION;
+        windowStyle |= WS_POPUP;
     }
 
-    RegisterClassEx(&wc);
-    app->window = CreateWindow((LPCWSTR)"ffenestri", (LPCWSTR)"", windowStyle, CW_USEDEFAULT,
-                                CW_USEDEFAULT, app->width, app->height, NULL, NULL,
-                                hInstance, NULL);
+    // Create the window.
+    app->window = CreateWindowEx(
+        dwExStyle,      // Optional window styles.
+        CLASS_NAME,     // Window class
+        L"",            // Window text
+        windowStyle,    // Window style
 
-    // Private setTitle as we're on the main thread
-    setTitle(app, app->title);
+        // Size and position
+        CW_USEDEFAULT, CW_USEDEFAULT, app->width, app->height,
+
+        NULL,       // Parent window
+        NULL,       // Menu
+        wc.hInstance,  // Instance handle
+        NULL        // Additional application data
+    );
+
+    if (app->window == NULL)
+    {
+        return;
+    }
+
+    if ( app->fullscreen ) {
+        fullscreen(app);
+    }
+
+    // Credit: https://stackoverflow.com/a/35482689
+    if( app->disableWindowIcon && app->frame == 1 ) {
+        int extendedStyle = GetWindowLong(app->window, GWL_EXSTYLE);
+        SetWindowLong(app->window, GWL_EXSTYLE, extendedStyle | WS_EX_DLGMODALFRAME);
+        SetWindowPos(nullptr, nullptr, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER);
+    }
+
+    if ( app->windowBackgroundIsTranslucent ) {
+
+        // Enable the translucent background effect
+        enableTranslucentBackground(app);
+
+        // Setup transparency of main window. This allows the blur to show through.
+        SetLayeredWindowAttributes(app->window,RGB(255,255,255),0,LWA_COLORKEY);
+    }
 
     // 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);
+    initWebView2(app, debug, initialCallback);
+
+    if( app->webviewIsTranparent ) {
+        wchar_t szBuff[64];
+        ICoreWebView2Controller2 *wc2;
+        wc2 = nullptr;
+        app->webviewController->QueryInterface(IID_ICoreWebView2Controller2, (void**)&wc2);
+
+        COREWEBVIEW2_COLOR wvColor;
+        wvColor.R = app->backgroundColour.R;
+        wvColor.G = app->backgroundColour.G;
+        wvColor.B = app->backgroundColour.B;
+        wvColor.A = app->backgroundColour.A == 0 ? 0 : 255;
+        if( app->windowBackgroundIsTranslucent ) {
+            wvColor.A = 0;
+        }
+        HRESULT result = wc2->put_DefaultBackgroundColor(wvColor);
+        if (!SUCCEEDED(result))
+        {
+            switch (result)
+            {
+                case HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND):
+                {
+                    MessageBox(
+                        app->window,
+                        L"Couldn't find Edge installation. "
+                        "Do you have a version installed that's compatible with this "
+                        "WebView2 SDK version?",
+                        nullptr, MB_OK);
+                }
+                break;
+                case HRESULT_FROM_WIN32(ERROR_FILE_EXISTS):
+                {
+                    MessageBox(
+                        app->window, L"User data folder cannot be created because a file with the same name already exists.", nullptr, MB_OK);
+                }
+                break;
+                case E_ACCESSDENIED:
+                {
+                    MessageBox(
+                        app->window, L"Unable to create user data folder, Access Denied.", nullptr, MB_OK);
+                }
+                break;
+                case E_FAIL:
+                {
+                    MessageBox(
+                        app->window, L"Edge runtime unable to start", nullptr, MB_OK);
+                }
+                break;
+                default:
+                {
+                     MessageBox(app->window, L"Failed to create WebView2 environment", nullptr, MB_OK);
+                }
+            }
+        }
+
+    }
 
     // Main event loop
     MSG  msg;
@@ -399,9 +568,6 @@ void Run(struct Application* app, int argc, char **argv) {
     }
 }
 
-void DestroyApplication(struct Application* app) {
-    PostQuitMessage(0);
-}
 void SetDebug(struct Application* app, int flag) {
     debug = flag;
 }
@@ -432,6 +598,10 @@ void Show(struct Application* app) {
     );
 }
 
+void DisableWindowIcon(struct Application* app) {
+    app->disableWindowIcon = true;
+}
+
 void center(struct Application* app) {
 
     HMONITOR currentMonitor = MonitorFromWindow(app->window, MONITOR_DEFAULTTONEAREST);
@@ -537,25 +707,46 @@ void ToggleMinimise(struct Application* app) {
 }
 
 void SetColour(struct Application* app, int red, int green, int blue, int alpha) {
-// TBD
+    app->backgroundColour.R = red;
+    app->backgroundColour.G = green;
+    app->backgroundColour.B = blue;
+    app->backgroundColour.A = alpha;
 }
 
 void SetSize(struct Application* app, int width, int height) {
-    // TBD
+    if( app->maxWidth > 0 && width > app->maxWidth ) {
+        width = app->maxWidth;
+    }
+    if ( app->maxHeight > 0 && height > app->maxHeight ) {
+        height = app->maxHeight;
+    }
+    SetWindowPos(app->window, nullptr, 0, 0, width, height, SWP_NOMOVE);
 }
 
 void setPosition(struct Application* app, int x, int y) {
-    // TBD
+    HMONITOR currentMonitor = MonitorFromWindow(app->window, MONITOR_DEFAULTTONEAREST);
+    MONITORINFO info = {0};
+    info.cbSize = sizeof(info);
+    GetMonitorInfoA(currentMonitor, &info);
+    RECT workRect = info.rcWork;
+    LONG newX = workRect.left + x;
+    LONG newY = workRect.top + y;
+
+    SetWindowPos(app->window, HWND_TOP, newX, newY, 0, 0, SWP_NOSIZE);
 }
 
 void SetPosition(struct Application* app, int x, int y) {
-//    ON_MAIN_THREAD(
-//        setPosition(app, x, y);
-//    );
+    ON_MAIN_THREAD(
+        setPosition(app, x, y);
+    );
 }
 
 void Quit(struct Application* app) {
-    DestroyWindow(app->window);
+    // Override the hide window on close flag
+    app->hideWindowOnClose = 0;
+    ON_MAIN_THREAD(
+        DestroyWindow(app->window);
+    );
 }
 
 
@@ -572,13 +763,47 @@ void SetTitle(struct Application* app, const char *title) {
     );
 }
 
+void fullscreen(struct Application* app) {
+
+    // Ensure we aren't in fullscreen
+    if (app->isFullscreen) return;
+
+    app->isFullscreen = true;
+    app->previousWindowStyle = GetWindowLong(app->window, GWL_STYLE);
+    MONITORINFO mi = { sizeof(mi) };
+    if (GetWindowPlacement(app->window, &(app->previousPlacement)) && GetMonitorInfo(MonitorFromWindow(app->window, MONITOR_DEFAULTTOPRIMARY), &mi)) {
+        SetWindowLong(app->window, GWL_STYLE, app->previousWindowStyle & ~WS_OVERLAPPEDWINDOW);
+        SetWindowPos(app->window, HWND_TOP,
+            mi.rcMonitor.left,
+            mi.rcMonitor.top,
+            mi.rcMonitor.right - mi.rcMonitor.left,
+            mi.rcMonitor.bottom - mi.rcMonitor.top,
+            SWP_NOOWNERZORDER | SWP_FRAMECHANGED);
+    }
+}
+
 void Fullscreen(struct Application* app) {
+    ON_MAIN_THREAD(
+        fullscreen(app);
+        show(app);
+    );
+}
+
+void unfullscreen(struct Application* app) {
+    if (app->isFullscreen) {
+        SetWindowLong(app->window, GWL_STYLE, app->previousWindowStyle);
+        SetWindowPlacement(app->window, &(app->previousPlacement));
+        SetWindowPos(app->window, NULL, 0, 0, 0, 0,
+                         SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER |
+                         SWP_NOOWNERZORDER | SWP_FRAMECHANGED);
+        app->isFullscreen = false;
+    }
 }
 
 void UnFullscreen(struct Application* app) {
-}
-
-void ToggleFullscreen(struct Application* app) {
+    ON_MAIN_THREAD(
+        unfullscreen(app);
+    );
 }
 
 void DisableFrame(struct Application* app) {

v2/internal/ffenestri/ffenestri_windows.go

@@ -5,16 +5,21 @@ import "C"
 /*
 
 #cgo windows CXXFLAGS: -std=c++11
-#cgo windows,amd64 LDFLAGS: -L./windows/x64 -lwebview -lWebView2Loader -lgdi32 -lole32 -lShlwapi -luser32 -loleaut32
+#cgo windows,amd64 LDFLAGS: -lgdi32 -lole32 -lShlwapi -luser32 -loleaut32 -ldwmapi
 
 #include "ffenestri.h"
 
+extern void DisableWindowIcon(struct Application* app);
+
 */
 import "C"
 
 func (a *Application) processPlatformSettings() error {
 
 	config := a.config.Windows
+	if config == nil {
+		return nil
+	}
 
 	// Check if the webview should be transparent
 	if config.WebviewIsTransparent {
@@ -25,6 +30,10 @@ func (a *Application) processPlatformSettings() error {
 		C.WindowBackgroundIsTranslucent(a.app)
 	}
 
+	if config.DisableWindowIcon {
+		C.DisableWindowIcon(a.app)
+	}
+
 	//// Process menu
 	////applicationMenu := options.GetApplicationMenu(a.config)
 	//applicationMenu := a.menuManager.GetApplicationMenuJSON()

v2/internal/ffenestri/ffenestri_windows.h

@@ -45,6 +45,12 @@ struct Application{
     bool webviewIsTranparent;
     bool windowBackgroundIsTranslucent;
     COREWEBVIEW2_COLOR backgroundColour;
+    bool disableWindowIcon;
+
+    // Used by fullscreen/unfullscreen
+    bool isFullscreen;
+    WINDOWPLACEMENT previousPlacement;
+    DWORD previousWindowStyle;
 
     // placeholders
     char* bindings;
@@ -59,6 +65,8 @@ typedef std::function<void(ICoreWebView2Controller *)> comHandlerCallback;
 
 void center(struct Application*);
 void setTitle(struct Application* app, const char *title);
+void fullscreen(struct Application* app);
+void unfullscreen(struct Application* app);
 char* LPWSTRToCstr(LPWSTR input);
 
 // called when the DOM is ready
@@ -69,7 +77,9 @@ void completed(struct Application* app);
 
 // Callback
 extern "C" {
+    void DisableWindowIcon(struct Application* app);
     void messageFromWindowCallback(const char *);
+    void* GetWindowHandle(struct Application*);
 }
 
 #endif

v2/internal/ffenestri/menu_darwin.c

@@ -85,13 +85,12 @@ void DeleteMenu(Menu *menu) {
         menu->processedMenu = NULL;
     }
 
-    // Release the vector memory
-    vec_deinit(&menu->callbackDataCache);
-
-    // Free nsmenu if we have it
-    if ( menu->menu != NULL ) {
-        msg_reg(menu->menu, s("release"));
+    // Release the callback data memory + vector
+    int i; MenuItemCallbackData* callbackData;
+    vec_foreach(&menu->callbackDataCache, callbackData, i) {
+      free(callbackData);
     }
+    vec_deinit(&menu->callbackDataCache);
 
     free(menu);
 }
@@ -376,7 +375,7 @@ id createMenu(id title) {
     id menu = ALLOC("NSMenu");
     msg_id(menu, s("initWithTitle:"), title);
     msg_bool(menu, s("setAutoenablesItems:"), NO);
-//  msg(menu, s("autorelease"));
+    msg_reg(menu, s("autorelease"));
     return menu;
 }
 
@@ -562,6 +561,7 @@ 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 item = ALLOC("NSMenuItem");
+    msg_reg(item, s("autorelease"));
 
     // Store the item in the menu item map
     hashmap_put(&menu->menuItemMap, (char*)menuid, strlen(menuid), item);
@@ -573,7 +573,6 @@ id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const c
     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;
@@ -727,6 +726,7 @@ id createAttributedString(const char* title, const char* fontName, int fontSize,
 
 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");
+    msg_reg(item, s("autorelease"));
 
     // Create a MenuItemCallbackData
     MenuItemCallbackData *callback = CreateMenuItemCallbackData(menu, item, menuid, Text);
@@ -763,7 +763,6 @@ id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char
 //msg_id(item, s("setTitle:"), str(title));
 
     msg_bool(item, s("setEnabled:"), !disabled);
-    msg_reg(item, s("autorelease"));
 
     // Process modifiers
     if( modifiers != NULL && !alternate) {

v2/internal/ffenestri/traymenu_darwin.c

@@ -140,6 +140,7 @@ void ShowTrayMenu(TrayMenu* trayMenu) {
 
 	// Create delegate
 	id trayMenuDelegate = msg_reg((id)trayMenuDelegateClass, s("new"));
+	msg_reg(trayMenuDelegate, s("autorelease"));
 	msg_id(menu, s("setDelegate:"), trayMenuDelegate);
     objc_setAssociatedObject(trayMenuDelegate, "menu", menu, OBJC_ASSOCIATION_ASSIGN);
 
@@ -176,9 +177,6 @@ void UpdateTrayMenuInPlace(TrayMenu* currentMenu, TrayMenu* newMenu) {
 
 void DeleteTrayMenu(TrayMenu* trayMenu) {
 
-//    printf("Freeing TrayMenu:\n");
-//    DumpTrayMenu(trayMenu);
-
     // Delete the menu
     DeleteMenu(trayMenu->menu);
 
@@ -195,8 +193,17 @@ void DeleteTrayMenu(TrayMenu* trayMenu) {
         trayMenu->statusbaritem = NULL;
     }
 
-    if ( trayMenu->delegate != NULL ) {
-        msg_reg(trayMenu->delegate, s("release"));
+    // Free the tray menu memory
+    MEMFREE(trayMenu);
+}
+void DeleteTrayMenuKeepStatusBarItem(TrayMenu* trayMenu) {
+
+    // Delete the menu
+    DeleteMenu(trayMenu->menu);
+
+    // Free JSON
+    if (trayMenu->processedJSON != NULL ) {
+        json_delete(trayMenu->processedJSON);
     }
 
     // Free the tray menu memory

v2/internal/ffenestri/traymenu_darwin.h

@@ -46,5 +46,6 @@ void LoadTrayIcons();
 void UnloadTrayIcons();
 
 void DeleteTrayMenu(TrayMenu* trayMenu);
+void DeleteTrayMenuKeepStatusBarItem(TrayMenu* trayMenu);
 
 #endif //TRAYMENU_DARWIN_H

v2/internal/ffenestri/traymenustore_darwin.c

@@ -131,7 +131,7 @@ void UpdateTrayMenuLabelInStore(TrayMenuStore* store, const char* JSON) {
 
     UpdateTrayLabel(menu, Label, fontName, fontSize, RGBA, tooltip, disabled, styledLabel);
 
-
+    json_delete(parsedUpdate);
 }
 
 void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
@@ -162,11 +162,7 @@ void UpdateTrayMenuInStore(TrayMenuStore* store, const char* menuJSON) {
     pthread_mutex_unlock(&store->lock);
 
     // Delete the current menu
-    DeleteMenu(currentMenu->menu);
-    currentMenu->menu = NULL;
-
-    // Free the tray menu memory
-    MEMFREE(currentMenu);
+    DeleteTrayMenuKeepStatusBarItem(currentMenu);
 
     pthread_mutex_lock(&store->lock);
     hashmap_put(&store->trayMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);

v2/internal/ffenestri/windows/README.md

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

v2/internal/ffenestri/windows/WebView2EnvironmentOptions.h

@@ -0,0 +1,144 @@
+// Copyright (C) Microsoft Corporation. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef __core_webview2_environment_options_h__
+#define __core_webview2_environment_options_h__
+
+#include <objbase.h>
+#include <wrl/implements.h>
+
+#include "webview2.h"
+#define CORE_WEBVIEW_TARGET_PRODUCT_VERSION L"91.0.864.35"
+
+#define COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(p)     \
+ public:                                                      \
+  HRESULT STDMETHODCALLTYPE get_##p(LPWSTR* value) override { \
+    if (!value)                                               \
+      return E_POINTER;                                       \
+    *value = m_##p.Copy();                                    \
+    if ((*value == nullptr) && (m_##p.Get() != nullptr))      \
+      return HRESULT_FROM_WIN32(GetLastError());              \
+    return S_OK;                                              \
+  }                                                           \
+  HRESULT STDMETHODCALLTYPE put_##p(LPCWSTR value) override { \
+    LPCWSTR result = m_##p.Set(value);                        \
+    if ((result == nullptr) && (value != nullptr))            \
+      return HRESULT_FROM_WIN32(GetLastError());              \
+    return S_OK;                                              \
+  }                                                           \
+                                                              \
+ protected:                                                   \
+  AutoCoMemString m_##p;
+
+#define COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(p)     \
+ public:                                                    \
+  HRESULT STDMETHODCALLTYPE get_##p(BOOL* value) override { \
+    if (!value)                                             \
+      return E_POINTER;                                     \
+    *value = m_##p;                                         \
+    return S_OK;                                            \
+  }                                                         \
+  HRESULT STDMETHODCALLTYPE put_##p(BOOL value) override {  \
+    m_##p = value;                                          \
+    return S_OK;                                            \
+  }                                                         \
+                                                            \
+ protected:                                                 \
+  BOOL m_##p = FALSE;
+
+// This is a base COM class that implements ICoreWebView2EnvironmentOptions.
+template <typename allocate_fn_t,
+          allocate_fn_t allocate_fn,
+          typename deallocate_fn_t,
+          deallocate_fn_t deallocate_fn>
+class CoreWebView2EnvironmentOptionsBase
+    : public Microsoft::WRL::Implements<
+          Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
+          ICoreWebView2EnvironmentOptions> {
+ public:
+  CoreWebView2EnvironmentOptionsBase() {
+    // Initialize the target compatible browser version value to the version of
+    // the browser binaries corresponding to this version of the SDK.
+    m_TargetCompatibleBrowserVersion.Set(CORE_WEBVIEW_TARGET_PRODUCT_VERSION);
+  }
+
+ protected:
+  ~CoreWebView2EnvironmentOptionsBase(){};
+
+  class AutoCoMemString {
+   public:
+    AutoCoMemString() {}
+    ~AutoCoMemString() { Release(); }
+    void Release() {
+      if (m_string) {
+        deallocate_fn(m_string);
+        m_string = nullptr;
+      }
+    }
+
+    LPCWSTR Set(LPCWSTR str) {
+      Release();
+      if (str) {
+        m_string = MakeCoMemString(str);
+      }
+      return m_string;
+    }
+    LPCWSTR Get() { return m_string; }
+    LPWSTR Copy() {
+      if (m_string)
+        return MakeCoMemString(m_string);
+      return nullptr;
+    }
+
+   protected:
+    LPWSTR MakeCoMemString(LPCWSTR source) {
+      const size_t length = wcslen(source);
+      const size_t bytes = (length + 1) * sizeof(*source);
+      // Ensure we didn't overflow during our size calculation.
+      if (bytes <= length) {
+        return nullptr;
+      }
+
+      wchar_t* result = reinterpret_cast<wchar_t*>(allocate_fn(bytes));
+      if (result)
+        memcpy(result, source, bytes);
+
+      return result;
+    }
+
+    LPWSTR m_string = nullptr;
+  };
+
+  COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(AdditionalBrowserArguments)
+  COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(Language)
+  COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(TargetCompatibleBrowserVersion)
+  COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(
+      AllowSingleSignOnUsingOSPrimaryAccount)
+};
+
+template <typename allocate_fn_t,
+          allocate_fn_t allocate_fn,
+          typename deallocate_fn_t,
+          deallocate_fn_t deallocate_fn>
+class CoreWebView2EnvironmentOptionsBaseClass
+    : public Microsoft::WRL::RuntimeClass<
+          Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
+          CoreWebView2EnvironmentOptionsBase<allocate_fn_t,
+                                             allocate_fn,
+                                             deallocate_fn_t,
+                                             deallocate_fn>> {
+ public:
+  CoreWebView2EnvironmentOptionsBaseClass() {}
+
+ protected:
+  ~CoreWebView2EnvironmentOptionsBaseClass() override{};
+};
+
+typedef CoreWebView2EnvironmentOptionsBaseClass<decltype(&::CoTaskMemAlloc),
+                                                ::CoTaskMemAlloc,
+                                                decltype(&::CoTaskMemFree),
+                                                ::CoTaskMemFree>
+    CoreWebView2EnvironmentOptions;
+
+#endif  // __core_webview2_environment_options_h__

v2/internal/ffenestri/windows/scripts/README.md

@@ -0,0 +1,11 @@
+# Build
+
+This script will download the given webview2 sdk version and copy out the files necessary for building Wails apps.
+
+## Prerequistes
+
+  - nuget
+
+## Usage
+
+`updatesdk.bat <version>`

v2/internal/ffenestri/windows/scripts/sdkversion.txt

@@ -0,0 +1 @@
+The version of WebView2 used: 1.0.864.35 

v2/internal/ffenestri/windows/scripts/updatesdk.bat

@@ -0,0 +1,18 @@
+@echo off
+IF %1.==. GOTO NoVersion
+nuget install microsoft.web.webview2 -Version %1 -OutputDirectory . >NUL || goto :eof
+echo Downloaded microsoft.web.webview2.%1
+
+set sdk_version=%1
+set native_dir="%~dp0\microsoft.web.webview2.%sdk_version%\build\native"
+copy "%native_dir%\include\*.h" .. >NUL
+copy "%native_dir%\x64\WebView2Loader.dll" "..\x64" >NUL
+@rd /S /Q "microsoft.web.webview2.%sdk_version%"
+del /s version.txt  >nul 2>&1
+echo The version of WebView2 SDK used: %sdk_version% > sdkversion.txt
+echo SDK updated to %sdk_version%
+goto :eof
+
+:NoVersion
+  echo Please provide a version number, EG: 1.0.664.37
+  goto :eof

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

@@ -1,7 +0,0 @@
-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

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

v2/internal/ffenestri/windows/wv2runtime/browser.go

@@ -0,0 +1,23 @@
+// +build wv2runtime.browser
+
+package wv2runtime
+
+import (
+	"fmt"
+	"github.com/leaanthony/webview2runtime"
+)
+
+func doInstallationStrategy(installStatus installationStatus) error {
+	confirmed, err := webview2runtime.Confirm("This application requires the WebView2 runtime. Press OK to open the download page. Minimum version required: "+minimumRuntimeVersion, "Missing Requirements")
+	if err != nil {
+		return err
+	}
+	if confirmed {
+		err = webview2runtime.OpenInstallerDownloadWebpage()
+		if err != nil {
+			return err
+		}
+	}
+
+	return fmt.Errorf("webview2 runtime not installed")
+}

v2/internal/ffenestri/windows/wv2runtime/download.go

@@ -0,0 +1,35 @@
+// +build !wv2runtime.error
+// +build !wv2runtime.browser
+// +build !wv2runtime.embed
+
+package wv2runtime
+
+import (
+	"fmt"
+	"github.com/leaanthony/webview2runtime"
+)
+
+func doInstallationStrategy(installStatus installationStatus) error {
+	message := "The WebView2 runtime is required. "
+	if installStatus == needsUpdating {
+		message = "The Webview2 runtime needs updating. "
+	}
+	message += "Press Ok to download and install. Note: The installer will download silently so please wait."
+	confirmed, err := webview2runtime.Confirm(message, "Missing Requirements")
+	if err != nil {
+		return err
+	}
+	if !confirmed {
+		return fmt.Errorf("webview2 runtime not installed")
+	}
+	installedCorrectly, err := webview2runtime.InstallUsingBootstrapper()
+	if err != nil {
+		_ = webview2runtime.Error(err.Error(), "Error")
+		return err
+	}
+	if !installedCorrectly {
+		err = webview2runtime.Error("The runtime failed to install correctly. Please try again.", "Error")
+		return err
+	}
+	return nil
+}

v2/internal/ffenestri/windows/wv2runtime/embed.go

@@ -0,0 +1,33 @@
+// +build wv2runtime.embed
+
+package wv2runtime
+
+import (
+	"fmt"
+	"github.com/leaanthony/webview2runtime"
+)
+
+func doInstallationStrategy(installStatus installationStatus) error {
+	message := "The WebView2 runtime is required. "
+	if installStatus == needsUpdating {
+		message = "The Webview2 runtime needs updating. "
+	}
+	message += "Press Ok to install."
+	confirmed, err := webview2runtime.Confirm(message, "Missing Requirements")
+	if err != nil {
+		return err
+	}
+	if !confirmed {
+		return fmt.Errorf("webview2 runtime not installed")
+	}
+	installedCorrectly, err := webview2runtime.InstallUsingEmbeddedBootstrapper()
+	if err != nil {
+		_ = webview2runtime.Error(err.Error(), "Error")
+		return err
+	}
+	if !installedCorrectly {
+		err = webview2runtime.Error("The runtime failed to install correctly. Please try again.", "Error")
+		return err
+	}
+	return nil
+}

v2/internal/ffenestri/windows/wv2runtime/error.go

@@ -0,0 +1,13 @@
+// +build wv2runtime.error
+
+package wv2runtime
+
+import (
+	"fmt"
+	"github.com/leaanthony/webview2runtime"
+)
+
+func doInstallationStrategy(installStatus installationStatus) error {
+	_ = webview2runtime.Error("The WebView2 runtime is required to run this application. Please contact your system administrator.", "Error")
+	return fmt.Errorf("webview2 runtime not installed")
+}

v2/internal/ffenestri/windows/wv2runtime/wv2runtime.go

@@ -0,0 +1,34 @@
+package wv2runtime
+
+import (
+	"github.com/leaanthony/webview2runtime"
+)
+
+const minimumRuntimeVersion string = "91.0.864.48"
+
+type installationStatus int
+
+const (
+	needsInstalling installationStatus = iota
+	needsUpdating
+	installed
+)
+
+func Process() error {
+	installStatus := needsInstalling
+	installedVersion := webview2runtime.GetInstalledVersion()
+	if installedVersion != nil {
+		installStatus = installed
+		updateRequired, err := installedVersion.IsOlderThan(minimumRuntimeVersion)
+		if err != nil {
+			_ = webview2runtime.Error(err.Error(), "Error")
+			return err
+		}
+		// Installed and does not require updating
+		if !updateRequired {
+			return nil
+		}
+		installStatus = needsUpdating
+	}
+	return doInstallationStrategy(installStatus)
+}

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

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

v2/internal/ffenestri/wv2ComHandler_windows.h

@@ -66,21 +66,20 @@ class wv2ComHandler
             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':
+          else if (strcmp(m, "initialised") == 0) {
             loadAssets(app);
-            break;
-
-          default:
-            printf("----> Unknown message type: %c\n", m[0]);
+            return S_OK;
+          }
+          else if (strcmp(m, "wails-drag") == 0) {
+            // We don't drag in fullscreen mode
+            if (!app->isFullscreen) {
+                ReleaseCapture();
+                SendMessage(this->window, WM_NCLBUTTONDOWN, HTCAPTION, 0);
+            }
+            return S_OK;
+          }
+          else {
+            messageFromWindowCallback(m);
           }
           delete[] m;
           return S_OK;

v2/internal/fs/fs.go

@@ -215,10 +215,10 @@ func DirIsEmpty(dir string) (bool, error) {
 	return false, err // Either not empty or error, suits both cases
 }
 
-// Credit: https://gist.github.com/r0l1/92462b38df26839a3ca324697c8cba04
 // CopyDir recursively copies a directory tree, attempting to preserve permissions.
 // Source directory must exist, destination directory must *not* exist.
 // Symlinks are ignored and skipped.
+// Credit: https://gist.github.com/r0l1/92462b38df26839a3ca324697c8cba04
 func CopyDir(src string, dst string) (err error) {
 	src = filepath.Clean(src)
 	dst = filepath.Clean(dst)
@@ -273,3 +273,68 @@ func CopyDir(src string, dst string) (err error) {
 
 	return
 }
+
+// CopyDirExtended recursively copies a directory tree, attempting to preserve permissions.
+// Source directory must exist, destination directory must *not* exist. It ignores any files or
+// directories that are given through the ignore parameter.
+// Symlinks are ignored and skipped.
+// Credit: https://gist.github.com/r0l1/92462b38df26839a3ca324697c8cba04
+func CopyDirExtended(src string, dst string, ignore []string) (err error) {
+
+	ignoreList := slicer.String(ignore)
+	src = filepath.Clean(src)
+	dst = filepath.Clean(dst)
+
+	si, err := os.Stat(src)
+	if err != nil {
+		return err
+	}
+	if !si.IsDir() {
+		return fmt.Errorf("source is not a directory")
+	}
+
+	_, err = os.Stat(dst)
+	if err != nil && !os.IsNotExist(err) {
+		return
+	}
+	if err == nil {
+		return fmt.Errorf("destination already exists")
+	}
+
+	err = MkDirs(dst)
+	if err != nil {
+		return
+	}
+
+	entries, err := ioutil.ReadDir(src)
+	if err != nil {
+		return
+	}
+
+	for _, entry := range entries {
+		if ignoreList.Contains(entry.Name()) {
+			continue
+		}
+		srcPath := filepath.Join(src, entry.Name())
+		dstPath := filepath.Join(dst, entry.Name())
+
+		if entry.IsDir() {
+			err = CopyDir(srcPath, dstPath)
+			if err != nil {
+				return
+			}
+		} else {
+			// Skip symlinks.
+			if entry.Mode()&os.ModeSymlink != 0 {
+				continue
+			}
+
+			err = CopyFile(srcPath, dstPath)
+			if err != nil {
+				return
+			}
+		}
+	}
+
+	return
+}

v2/internal/html/asset.go

@@ -52,21 +52,13 @@ func (a *Asset) AsString() string {
 	return a.Data
 }
 
-// AsCHexData processes the asset data so it may be used by C
-func (a *Asset) AsCHexData() string {
-
-	// This will be our final string to hexify
-	dataString := a.Data
-
+func (a *Asset) minifiedData() (string, error) {
 	switch a.Type {
 	case AssetTypes.HTML:
 
 		// Escape HTML
-		var re = regexp.MustCompile(`\s{2,}`)
-		result := re.ReplaceAllString(a.Data, ``)
-		result = strings.ReplaceAll(result, "\n", "")
-		result = strings.ReplaceAll(result, "\r\n", "")
-		result = strings.ReplaceAll(result, "\n", "")
+		var re = regexp.MustCompile(`[\s]+`)
+		result := re.ReplaceAllString(a.Data, ` `)
 
 		// Inject wailsloader code
 		result = strings.Replace(result, `</body>`, `<script id='wailsloader'>window.wailsloader = { html: true, runtime: false, userjs: false, usercss: false };var self=document.querySelector('#wailsloader');self.parentNode.removeChild(self);</script></body>`, 1)
@@ -75,7 +67,7 @@ func (a *Asset) AsCHexData() string {
 		urlString := strings.ReplaceAll(url.String(), "/", "%2f")
 
 		// Save Data uRI string
-		dataString = "data:text/html;charset=utf-8," + urlString
+		return "data:text/html;charset=utf-8," + urlString, nil
 
 	case AssetTypes.CSS:
 
@@ -91,19 +83,28 @@ func (a *Asset) AsCHexData() string {
 		result = strings.ReplaceAll(result, `'`, `\'`)
 		result = strings.ReplaceAll(result, ` {`, `{`)
 		result = strings.ReplaceAll(result, `: `, `:`)
-		dataString = fmt.Sprintf("window.wails._.InjectCSS(\"%s\");", result)
+		return fmt.Sprintf("window.wails._.InjectCSS(\"%s\");", result), nil
 
 	case AssetTypes.JS:
 		m := minify.New()
 		m.AddFunc("application/javascript", js.Minify)
 		var err error
-		dataString, err = m.String("application/javascript", a.Data+";")
+		result, err := m.String("application/javascript", a.Data+";")
 		if err != nil {
-			log.Fatal(err)
+			return "", err
 		}
-		a.Data = dataString
+		return result, nil
+	default:
+		return "", fmt.Errorf("minification for asset type %s not implemented", a.Type)
 	}
+}
 
+// AsCHexData processes the asset data so it may be used by C
+func (a *Asset) AsCHexData() string {
+	dataString, err := a.minifiedData()
+	if err != nil {
+		log.Fatal(err)
+	}
 	// Get byte data of the string
 	bytes := *(*[]byte)(unsafe.Pointer(&dataString))
 

v2/internal/html/asset_test.go

@@ -0,0 +1,53 @@
+package html
+
+import "testing"
+
+func TestAsset_minifiedData(t *testing.T) {
+	type fields struct {
+		Type string
+		Path string
+		Data string
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		want    string
+		wantErr bool
+	}{
+		{
+			name: "multi-line tag",
+			fields: fields{
+				Type: AssetTypes.HTML,
+				Path: "foo.html",
+				Data: "<link\n  rel=\"stylesheet\"\n href=\"src/foo.css\"\n>\n",
+			},
+			want: "data:text/html;charset=utf-8,%3Clink%20rel=%22stylesheet%22%20href=%22src%2ffoo.css%22%20%3E%20",
+		},
+		{
+			name: "multi-line tag no spaces",
+			fields: fields{
+				Type: AssetTypes.HTML,
+				Path: "foo.html",
+				Data: "<link\nrel=\"stylesheet\"\nhref=\"src/foo.css\"\n>\n",
+			},
+			want: "data:text/html;charset=utf-8,%3Clink%20rel=%22stylesheet%22%20href=%22src%2ffoo.css%22%20%3E%20",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			a := &Asset{
+				Type: tt.fields.Type,
+				Path: tt.fields.Path,
+				Data: tt.fields.Data,
+			}
+			got, err := a.minifiedData()
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Asset.minifiedData() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("Asset.minifiedData() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

v2/internal/html/assetbundle.go

@@ -84,7 +84,7 @@ func (a *AssetBundle) processHTML(htmldata string) error {
 		}
 
 		//process the token according to the token type...
-		if tokenType == html.StartTagToken {
+		if tokenType == html.StartTagToken || tokenType == html.SelfClosingTagToken {
 			//get the token
 			token := tokenizer.Token()
 

v2/internal/html/assetbundle_test.go

@@ -0,0 +1,73 @@
+package html
+
+import (
+	"testing"
+)
+
+func TestNewAssetBundle(t *testing.T) {
+	tests := []struct {
+		name       string
+		pathToHTML string
+		wantAssets []string
+		wantErr    bool
+	}{
+		{
+			name:       "basic html",
+			pathToHTML: "testdata/basic.html",
+			wantAssets: []string{
+				AssetTypes.HTML,
+				AssetTypes.FAVICON,
+				AssetTypes.JS,
+				AssetTypes.CSS,
+			},
+			wantErr: false,
+		},
+		{
+			name:       "self closing tags",
+			pathToHTML: "testdata/self_closing.html",
+			wantAssets: []string{
+				AssetTypes.HTML,
+				AssetTypes.FAVICON,
+				AssetTypes.JS,
+				AssetTypes.CSS,
+			},
+			wantErr: false,
+		},
+		{
+			name:       "multi-line tags",
+			pathToHTML: "testdata/self_closing.html",
+			wantAssets: []string{
+				AssetTypes.HTML,
+				AssetTypes.FAVICON,
+				AssetTypes.JS,
+				AssetTypes.CSS,
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := NewAssetBundle(tt.pathToHTML)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("NewAssetBundle() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if len(got.assets) != len(tt.wantAssets) {
+				t.Errorf("NewAssetBundle() len(assets) = %d, want %d",
+					len(got.assets), len(tt.wantAssets))
+			}
+
+			for i := range tt.wantAssets {
+				if i >= len(got.assets) {
+					t.Errorf("NewAssetBundle() missing assets[%d].Type = %s",
+						i, tt.wantAssets[i])
+				} else {
+					if got.assets[i].Type != tt.wantAssets[i] {
+						t.Errorf("NewAssetBundle() assets[%d].Type = %s, want %s",
+							i, got.assets[i].Type, tt.wantAssets[i])
+					}
+				}
+			}
+		})
+	}
+}

v2/internal/html/testdata/basic.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/src/favicon.svg"></link>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <script type="text/javascript" src="src/bundle.js"></script>
+    <link rel="stylesheet" href="src/style.css"></link>
+    <title>Vite App</title>
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>

v2/internal/html/testdata/multi_line.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <script type="text/javascript" src="src/bundle.js"></script>
+    <link 
+      rel="stylesheet" 
+      href="src/style.css" 
+    />
+    <title>Vite App</title>
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>

v2/internal/html/testdata/self_closing.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <script type="text/javascript" src="src/bundle.js"></script>
+    <link rel="stylesheet" href="src/style.css" />
+    <title>Vite App</title>
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>

v2/internal/html/testdata/src/bundle.js

@@ -0,0 +1 @@
+window.alert("I am JS!");

v2/internal/html/testdata/src/favicon.svg

@@ -0,0 +1,8 @@
+<svg version="1.1"
+     baseProfile="full"
+     width="300" height="200"
+     xmlns="http://www.w3.org/2000/svg">
+
+  <rect width="100%" height="100%" fill="blue" />
+
+</svg>

v2/internal/html/testdata/src/style.css

@@ -0,0 +1,3 @@
+.body {
+  background: blue;
+}

v2/internal/messagedispatcher/dispatchclient.go

@@ -14,7 +14,9 @@ type Client interface {
 	Quit()
 	NotifyEvent(message string)
 	CallResult(message string)
-	OpenDialog(dialogOptions *dialog.OpenDialog, callbackID string)
+	OpenFileDialog(dialogOptions *dialog.OpenDialog, callbackID string)
+	OpenMultipleFilesDialog(dialogOptions *dialog.OpenDialog, callbackID string)
+	OpenDirectoryDialog(dialogOptions *dialog.OpenDialog, callbackID string)
 	SaveDialog(dialogOptions *dialog.SaveDialog, callbackID string)
 	MessageDialog(dialogOptions *dialog.MessageDialog, callbackID string)
 	WindowSetTitle(title string)

v2/internal/messagedispatcher/message/dialog.go

@@ -32,8 +32,14 @@ func dialogMessageParser(message string) (*parsedMessage, error) {
 
 		switch dialogType {
 		case 'O':
-			var data []string
 			topic = "dialog:openselected:" + callbackID
+			responseMessage = &parsedMessage{Topic: topic, Data: payloadData}
+		case 'D':
+			topic = "dialog:opendirectoryselected:" + callbackID
+			responseMessage = &parsedMessage{Topic: topic, Data: payloadData}
+		case '*':
+			var data []string
+			topic = "dialog:openmultipleselected:" + callbackID
 			err := json.Unmarshal([]byte(payloadData), &data)
 			if err != nil {
 				return nil, err

v2/internal/messagedispatcher/messagedispatcher.go

@@ -422,7 +422,35 @@ func (d *Dispatcher) processDialogMessage(result *servicebus.Message) {
 			// TODO: Work out what we mean in a multi window environment...
 			// For now we will just pick the first one
 			for _, client := range d.clients {
-				client.frontend.OpenDialog(dialogOptions, callbackID)
+				client.frontend.OpenFileDialog(dialogOptions, callbackID)
+			}
+		case "openmultiple":
+			dialogOptions, ok := result.Data().(*dialog.OpenDialog)
+			if !ok {
+				d.logger.Error("Invalid data for 'dialog:select:openmultiple' : %#v", result.Data())
+				return
+			}
+			// This is hardcoded in the sender too
+			callbackID := splitTopic[3]
+
+			// TODO: Work out what we mean in a multi window environment...
+			// For now we will just pick the first one
+			for _, client := range d.clients {
+				client.frontend.OpenMultipleFilesDialog(dialogOptions, callbackID)
+			}
+		case "directory":
+			dialogOptions, ok := result.Data().(*dialog.OpenDialog)
+			if !ok {
+				d.logger.Error("Invalid data for 'dialog:select:directory' : %#v", result.Data())
+				return
+			}
+			// This is hardcoded in the sender too
+			callbackID := splitTopic[3]
+
+			// TODO: Work out what we mean in a multi window environment...
+			// For now we will just pick the first one
+			for _, client := range d.clients {
+				client.frontend.OpenDirectoryDialog(dialogOptions, callbackID)
 			}
 		case "save":
 			dialogOptions, ok := result.Data().(*dialog.SaveDialog)

v2/internal/process/process.go

@@ -39,12 +39,7 @@ func (p *Process) Start() error {
 
 	go func(cmd *exec.Cmd, running *bool, logger *clilogger.CLILogger, exitChannel chan bool) {
 		logger.Println("Starting process (PID: %d)", cmd.Process.Pid)
-		err := cmd.Wait()
-		if err != nil {
-			if err.Error() != "signal: killed" {
-				logger.Fatal("Fatal error from app: " + err.Error())
-			}
-		}
+		_ = cmd.Wait()
 		logger.Println("Exiting process (PID: %d)", cmd.Process.Pid)
 		*running = false
 		exitChannel <- true
@@ -59,6 +54,13 @@ func (p *Process) Kill() error {
 		return nil
 	}
 	err := p.cmd.Process.Kill()
+	if err != nil {
+		return err
+	}
+	err = p.cmd.Process.Release()
+	if err != nil {
+		return err
+	}
 
 	// Wait for command to exit properly
 	<-p.exitChannel

v2/internal/project/project.go

@@ -25,8 +25,8 @@ type Project struct {
 	// The path to the project directory
 	Path string
 
-	// Assets directory
-	AssetsDir string `json:"assetsdir"`
+	// Build directory
+	BuildDir string `json:"builddir"`
 
 	// The output filename
 	OutputFilename string `json:"outputfilename"`
@@ -76,8 +76,8 @@ func Load(projectPath string) (*Project, error) {
 	}
 
 	// Set default assets directory if none given
-	if result.AssetsDir == "" {
-		result.AssetsDir = filepath.Join(result.Path, "assets")
+	if result.BuildDir == "" {
+		result.BuildDir = filepath.Join(result.Path, "build")
 	}
 
 	// Fix up OutputFilename

v2/internal/runtime/assets/assets.go

@@ -0,0 +1,12 @@
+package assets
+
+import _ "embed"
+
+//go:embed desktop_darwin.js
+var desktopDarwinJS string
+
+//go:embed desktop_windows.js
+var desktopWindowsJS string
+
+//go:embed wails.js
+var wailsJS string