TEMP COMMIT

.gitignore

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

CONTRIBUTORS.md

@@ -40,5 +40,4 @@ Wails is what it is because of the time and effort given by these great people.
   * [Balakrishna Prasad Ganne](https://github.com/aayush420)
   * [Charaf Rezrazi](https://github.com/Rezrazi)
   * [misitebao](https://github.com/misitebao)
-  * [Elie Grenon](https://github.com/DrunkenPoney)
-  * [Amaury Tobias Quiroz](https://github.com/amaury-tobias)
+  * [Elie Grenon](https://github.com/DrunkenPoney)

runtime/js/.eslintrc

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

runtime/js/core/browser.js

@@ -26,7 +26,7 @@ export function OpenURL(url) {
  * Opens the given filename using the system's default file handler
  *
  * @export
- * @param {string} filename
+ * @param {sting} filename
  * @returns
  */
 export function OpenFile(filename) {

runtime/js/core/calls.js

@@ -62,7 +62,7 @@ if (window.crypto) {
 export function Call(bindingName, data, timeout) {
 
 	// Timeout infinite by default
-	if (timeout == null) {
+	if (timeout == null || timeout == undefined) {
 		timeout = 0;
 	}
 

runtime/js/core/ipc.js

@@ -45,7 +45,7 @@ function Invoke(message) {
  *
  * @export
  * @param {string} type
- * @param {Object} payload
+ * @param {string} payload
  * @param {string=} callbackID
  */
 export function SendMessage(type, payload, callbackID) {

runtime/js/runtime/.npmignore

@@ -1 +1 @@
-index.js
+bridge.js

scripts/build.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 echo "**** Checking if Wails passes unit tests ****"
-if ! go test ./lib/... ./runtime/... ./cmd/...
+if ! go test ./...
 then
     echo ""
     echo "ERROR: Unit tests failed!"

v2/.vscode/settings.json

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

@@ -1,48 +0,0 @@
-# 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 |
-| -delve | If true, runs delve on the compiled binary | false |
-
-## 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.
-
-

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

@@ -3,17 +3,10 @@ package build
 import (
 	"fmt"
 	"io"
-	"os"
-	"os/exec"
 	"runtime"
 	"strings"
-	"text/tabwriter"
 	"time"
 
-	"github.com/wailsapp/wails/v2/internal/system"
-
-	"github.com/wailsapp/wails/v2/internal/shell"
-
 	"github.com/leaanthony/clir"
 	"github.com/leaanthony/slicer"
 	"github.com/wailsapp/wails/v2/pkg/clilogger"
@@ -29,6 +22,10 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 
 	command := app.NewSubCommand("build", "Builds the application")
 
+	// Setup target type flag
+	description := "Type of application to build. Valid types: " + validTargetTypes.Join(",")
+	command.StringFlag("t", description, &outputType)
+
 	// Setup production flag
 	production := false
 	command.BoolFlag("production", "Build in production mode", &production)
@@ -40,50 +37,28 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	compilerCommand := "go"
 	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
 
-	compress := false
-	command.BoolFlag("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
 	command.StringFlag("platform", "Platform to target", &platform)
 
-	// Verbosity
-	verbosity := 1
-	command.IntFlag("v", "Verbosity level (0 - silent, 1 - default, 2 - verbose)", &verbosity)
+	// Quiet Build
+	quiet := false
+	command.BoolFlag("q", "Suppress output to console", &quiet)
 
 	// ldflags to pass to `go`
 	ldflags := ""
 	command.StringFlag("ldflags", "optional ldflags", &ldflags)
 
-	// tags to pass to `go`
-	tags := ""
-	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &tags)
+	// Log to file
+	logFile := ""
+	command.StringFlag("l", "Log to file", &logFile)
 
 	// Retain assets
 	keepAssets := false
 	command.BoolFlag("k", "Keep generated assets", &keepAssets)
 
-	// Retain assets
-	outputFilename := ""
-	command.StringFlag("o", "Output filename", &outputFilename)
-
-	// Clean build directory
-	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)
-
-	runDelve := false
-	command.BoolFlag("delve", "Runs the built binary in delve for debugging", &runDelve)
-
 	command.Action(func() error {
 
-		quiet := verbosity == 0
-
 		// Create logger
 		logger := clilogger.New(w)
 		logger.Mute(quiet)
@@ -97,133 +72,28 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			app.PrintBanner()
 		}
 
+		task := fmt.Sprintf("Building %s Application", strings.Title(outputType))
+		logger.Println(task)
+		logger.Println(strings.Repeat("-", len(task)))
+
 		// Setup mode
 		mode := build.Debug
 		if production {
 			mode = build.Production
 		}
 
-		// Check platform
-		validPlatformArch := slicer.String([]string{
-			"darwin",
-			"darwin/amd64",
-			"darwin/arm64",
-			"darwin/universal",
-			"linux",
-			//"linux/amd64",
-			//"linux/arm-7",
-			"windows",
-			"windows/amd64",
-		})
-		if !validPlatformArch.Contains(platform) {
-			return fmt.Errorf("platform %s is not supported", platform)
-		}
-
-		if compress && platform == "darwin/universal" {
-			println("Warning: compress flag unsupported for universal binaries. Ignoring.")
-			compress = false
-		}
-
-		// Lookup compiler path
-		compilerPath, err := exec.LookPath(compilerCommand)
-		if err != nil {
-			return fmt.Errorf("unable to find compiler: %s", compilerCommand)
-		}
-
-		// Tags
-		userTags := []string{}
-		for _, tag := range strings.Split(tags, " ") {
-			thisTag := strings.TrimSpace(tag)
-			if thisTag != "" {
-				userTags = append(userTags, thisTag)
-			}
-		}
-
-		// 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"
-			}
-		}
-
-		// If we want to use delve we need to compile in DEBUG mode
-		if runDelve {
-			mode = build.Debug
-		}
-
 		// Create BuildOptions
 		buildOptions := &build.Options{
-			Logger:              logger,
-			OutputType:          outputType,
-			OutputFile:          outputFilename,
-			CleanBuildDirectory: cleanBuildDirectory,
-			Mode:                mode,
-			Pack:                pack,
-			LDFlags:             ldflags,
-			Compiler:            compilerCommand,
-			KeepAssets:          keepAssets,
-			Verbosity:           verbosity,
-			Compress:            compress,
-			CompressFlags:       compressFlags,
-			UserTags:            userTags,
-			WebView2Strategy:    wv2rtstrategy,
-			RunDelve:            runDelve,
+			Logger:     logger,
+			OutputType: outputType,
+			Mode:       mode,
+			Pack:       pack,
+			Platform:   platform,
+			LDFlags:    ldflags,
+			Compiler:   compilerCommand,
+			KeepAssets: keepAssets,
 		}
 
-		// Calculate platform and arch
-		platformSplit := strings.Split(platform, "/")
-		buildOptions.Platform = platformSplit[0]
-		if system.IsAppleSilicon() {
-			buildOptions.Arch = "arm64"
-		} else {
-			buildOptions.Arch = runtime.GOARCH
-		}
-		if len(platformSplit) == 2 {
-			buildOptions.Arch = platformSplit[1]
-		}
-
-		println("Build arch =", buildOptions.Arch)
-
-		// Start a new tabwriter
-		w := new(tabwriter.Writer)
-		w.Init(os.Stdout, 8, 8, 0, '\t', 0)
-
-		buildModeText := "debug"
-		if production {
-			buildModeText = "production"
-		}
-
-		// Write out the system information
-		fmt.Fprintf(w, "\n")
-		fmt.Fprintf(w, "App Type: \t%s\n", buildOptions.OutputType)
-		fmt.Fprintf(w, "Platform: \t%s\n", buildOptions.Platform)
-		fmt.Fprintf(w, "Arch: \t%s\n", buildOptions.Arch)
-		fmt.Fprintf(w, "Compiler: \t%s\n", compilerPath)
-		fmt.Fprintf(w, "Compress: \t%t\n", buildOptions.Compress)
-		fmt.Fprintf(w, "Build Mode: \t%s\n", buildModeText)
-		fmt.Fprintf(w, "Package: \t%t\n", buildOptions.Pack)
-		fmt.Fprintf(w, "Clean Build Dir: \t%t\n", buildOptions.CleanBuildDirectory)
-		fmt.Fprintf(w, "KeepAssets: \t%t\n", buildOptions.KeepAssets)
-		fmt.Fprintf(w, "LDFlags: \t\"%s\"\n", buildOptions.LDFlags)
-		fmt.Fprintf(w, "Tags: \t[%s]\n", strings.Join(buildOptions.UserTags, ","))
-		if len(buildOptions.OutputFile) > 0 {
-			fmt.Fprintf(w, "Output File: \t%s\n", buildOptions.OutputFile)
-		}
-		fmt.Fprintf(w, "\n")
-		w.Flush()
-
 		return doBuild(buildOptions)
 	})
 }
@@ -245,40 +115,5 @@ func doBuild(buildOptions *build.Options) error {
 	buildOptions.Logger.Println(fmt.Sprintf("Built '%s' in %s.", outputFilename, elapsed.Round(time.Millisecond).String()))
 	buildOptions.Logger.Println("")
 
-	if buildOptions.RunDelve {
-		// Check delve exists
-		delveExists := shell.CommandExists("dlv")
-		if !delveExists {
-			return fmt.Errorf("cannot launch delve (Is it installed?)")
-		}
-
-		// Get cwd
-		cwd, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-
-		// Launch delve
-		buildOptions.Logger.Println("Launching Delve on port 2345...")
-		cmdArgs := slicer.String([]string{"--listen=:2345", "--headless=true", "--api-version=2", "--accept-multiclient", "exec", outputFilename})
-		if buildOptions.Verbosity == build.VERBOSE {
-			buildOptions.Logger.Println("\tRunning: dlv %s", cmdArgs.Join(" "))
-		}
-		stdout, stderr, err := shell.RunCommand(cwd, "dlv", cmdArgs.AsSlice()...)
-		if buildOptions.Verbosity == build.VERBOSE || err != nil {
-			trimstdout := strings.TrimSpace(stdout)
-			if trimstdout != "" {
-				buildOptions.Logger.Println(trimstdout)
-			}
-			trimstderr := strings.TrimSpace(stderr)
-			if trimstderr != "" {
-				buildOptions.Logger.Println(trimstderr)
-			}
-		}
-		if err != nil {
-			return err
-		}
-	}
-
 	return nil
 }

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

@@ -0,0 +1,123 @@
+package debug
+
+import (
+	"fmt"
+	"github.com/wailsapp/wails/v2/internal/shell"
+	"io"
+	"os"
+	"runtime"
+	"strings"
+	"time"
+
+	"github.com/leaanthony/clir"
+	"github.com/leaanthony/slicer"
+	"github.com/wailsapp/wails/v2/pkg/clilogger"
+	"github.com/wailsapp/wails/v2/pkg/commands/build"
+)
+
+// AddSubcommand adds the `debug` command for the Wails application
+func AddSubcommand(app *clir.Cli, w io.Writer) error {
+
+	outputType := "desktop"
+
+	validTargetTypes := slicer.String([]string{"desktop", "hybrid", "server"})
+
+	command := app.NewSubCommand("debug", "Builds the application then runs delve on the binary")
+
+	// Setup target type flag
+	description := "Type of application to build. Valid types: " + validTargetTypes.Join(",")
+	command.StringFlag("t", description, &outputType)
+
+	compilerCommand := "go"
+	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
+
+	quiet := false
+	command.BoolFlag("q", "Suppress output to console", &quiet)
+
+	// ldflags to pass to `go`
+	ldflags := ""
+	command.StringFlag("ldflags", "optional ldflags", &ldflags)
+
+	// Log to file
+	logFile := ""
+	command.StringFlag("l", "Log to file", &logFile)
+
+	command.Action(func() error {
+
+		// Create logger
+		logger := clilogger.New(w)
+		logger.Mute(quiet)
+
+		// Validate output type
+		if !validTargetTypes.Contains(outputType) {
+			return fmt.Errorf("output type '%s' is not valid", outputType)
+		}
+
+		if !quiet {
+			app.PrintBanner()
+		}
+
+		task := fmt.Sprintf("Building %s Application", strings.Title(outputType))
+		logger.Println(task)
+		logger.Println(strings.Repeat("-", len(task)))
+
+		// Setup mode
+		mode := build.Debug
+
+		// Create BuildOptions
+		buildOptions := &build.Options{
+			Logger:     logger,
+			OutputType: outputType,
+			Mode:       mode,
+			Pack:       false,
+			Platform:   runtime.GOOS,
+			LDFlags:    ldflags,
+			Compiler:   compilerCommand,
+			KeepAssets: false,
+		}
+
+		outputFilename, err := doDebugBuild(buildOptions)
+		if err != nil {
+			return err
+		}
+
+		// Check delve exists
+		delveExists := shell.CommandExists("dlv")
+		if !delveExists {
+			return fmt.Errorf("cannot launch delve (Is it installed?)")
+		}
+
+		// Get cwd
+		cwd, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+
+		// Launch delve
+		println("Launching Delve on port 2345...")
+		command := shell.CreateCommand(cwd, "dlv", "--listen=:2345", "--headless=true", "--api-version=2", "--accept-multiclient", "exec", outputFilename)
+		return command.Run()
+	})
+
+	return nil
+}
+
+// doDebugBuild is our main build command
+func doDebugBuild(buildOptions *build.Options) (string, error) {
+
+	// Start Time
+	start := time.Now()
+
+	outputFilename, err := build.Build(buildOptions)
+	if err != nil {
+		return "", err
+	}
+
+	// Output stats
+	elapsed := time.Since(start)
+	buildOptions.Logger.Println("")
+	buildOptions.Logger.Println(fmt.Sprintf("Built '%s' in %s.", outputFilename, elapsed.Round(time.Millisecond).String()))
+	buildOptions.Logger.Println("")
+
+	return outputFilename, nil
+}

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

@@ -1,22 +0,0 @@
-# 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,45 +3,35 @@ package dev
 import (
 	"fmt"
 	"io"
-	"log"
 	"os"
 	"os/signal"
-	"path/filepath"
 	"runtime"
 	"strings"
 	"syscall"
 	"time"
 
-	"github.com/wailsapp/wails/v2/internal/colour"
-
 	"github.com/fsnotify/fsnotify"
 	"github.com/leaanthony/clir"
+	"github.com/leaanthony/slicer"
 	"github.com/wailsapp/wails/v2/internal/fs"
 	"github.com/wailsapp/wails/v2/internal/process"
 	"github.com/wailsapp/wails/v2/pkg/clilogger"
 	"github.com/wailsapp/wails/v2/pkg/commands/build"
 )
 
-func LogGreen(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.Green(text))
-}
-
-func LogRed(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.Red(text))
-}
-
-func LogDarkYellow(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.DarkYellow(text))
-}
-
 // AddSubcommand adds the `dev` command for the Wails application
 func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	command := app.NewSubCommand("dev", "Development mode")
 
+	outputType := "desktop"
+
+	validTargetTypes := slicer.String([]string{"desktop", "hybrid", "server"})
+
+	// Setup target type flag
+	description := "Type of application to develop. Valid types: " + validTargetTypes.Join(",")
+	command.StringFlag("t", description, &outputType)
+
 	// Passthrough ldflags
 	ldflags := ""
 	command.StringFlag("ldflags", "optional ldflags", &ldflags)
@@ -52,21 +42,15 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	// extensions to trigger rebuilds
 	extensions := "go"
-	command.StringFlag("e", "Extensions to trigger rebuilds (comma separated) eg go,js,css,html", &extensions)
-
-	// extensions to trigger rebuilds
-	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)
+	command.StringFlag("m", "Extensions to trigger rebuilds (comma separated) eg go,js,css,html", &extensions)
 
 	command.Action(func() error {
 
+		// Validate inputs
+		if !validTargetTypes.Contains(outputType) {
+			return fmt.Errorf("output type '%s' is not valid", outputType)
+		}
+
 		// Create logger
 		logger := clilogger.New(w)
 		app.PrintBanner()
@@ -77,14 +61,10 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		if err != nil {
 			return err
 		}
-		defer func(watcher *fsnotify.Watcher) {
-			err := watcher.Close()
-			if err != nil {
-				log.Fatal(err)
-			}
-		}(watcher)
+		defer watcher.Close()
 
 		var debugBinaryProcess *process.Process = nil
+		var buildFrontend bool = true
 		var extensionsThatTriggerARebuild = strings.Split(extensions, ",")
 
 		// Setup signal handler
@@ -93,22 +73,10 @@ 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, appBinary, err := restartApp(logger, ldflags, compilerCommand, debugBinaryProcess, loglevel, passthruArgs, verbosity)
-		if newProcess != nil {
-			debugBinaryProcess = newProcess
-		}
+		debugBinaryProcess = restartApp(logger, outputType, ldflags, compilerCommand, buildFrontend, debugBinaryProcess)
 
-		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)
 
@@ -121,7 +89,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 						if err != nil {
 							logger.Fatal("%s", err.Error())
 						}
-						LogGreen("[New Directory] Watching new directory: %s", event.Name)
+						logger.Println("Watching directory: %s", event.Name)
 					}
 				}
 				return
@@ -130,33 +98,38 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 			// Check for file writes
 			if event.Op&fsnotify.Write == fsnotify.Write {
 
+				// logger.Println("modified file: %s", event.Name)
 				var rebuild bool = false
 
 				// Iterate all file patterns
 				for _, pattern := range extensionsThatTriggerARebuild {
-					if strings.HasSuffix(event.Name, pattern) {
-						rebuild = true
+					rebuild = strings.HasSuffix(event.Name, pattern)
+					if err != nil {
+						logger.Fatal(err.Error())
+					}
+					if rebuild {
+						// Only build frontend when the file isn't a Go file
+						buildFrontend = !strings.HasSuffix(event.Name, "go")
 						break
 					}
 				}
 
 				if !rebuild {
-					if showWarnings {
-						LogDarkYellow("[File change] %s did not match extension list (%s)", event.Name, extensions)
-					}
+					logger.Println("Filename change: %s did not match extension list %s", event.Name, extensions)
 					return
 				}
 
-				LogGreen("[Attempting rebuild] %s updated", event.Name)
+				if buildFrontend {
+					logger.Println("Full rebuild triggered: %s updated", event.Name)
+				} else {
+					logger.Println("Partial build triggered: %s updated", event.Name)
+				}
 
 				// Do a rebuild
 
 				// Try and build the app
-				newBinaryProcess, _, err = restartApp(logger, ldflags, compilerCommand, debugBinaryProcess, loglevel, passthruArgs, verbosity)
-				if err != nil {
-					fmt.Printf("Error during build: %s", err.Error())
-					return
-				}
+				newBinaryProcess := restartApp(logger, outputType, ldflags, compilerCommand, buildFrontend, debugBinaryProcess)
+
 				// If we have a new process, save it
 				if newBinaryProcess != nil {
 					debugBinaryProcess = newBinaryProcess
@@ -166,28 +139,23 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		})
 
 		// Get project dir
-		projectDir, err := os.Getwd()
+		dir, err := os.Getwd()
 		if err != nil {
 			return err
 		}
 
 		// Get all subdirectories
-		dirs, err := fs.GetSubdirectories(projectDir)
+		dirs, err := fs.GetSubdirectories(dir)
 		if err != nil {
 			return err
 		}
 
-		LogGreen("Watching (sub)/directory: %s", projectDir)
-
 		// Setup a watcher for non-node_modules directories
 		dirs.Each(func(dir string) {
 			if strings.Contains(dir, "node_modules") {
 				return
 			}
-			// Ignore build directory
-			if strings.HasPrefix(dir, filepath.Join(projectDir, "build")) {
-				return
-			}
+			logger.Println("Watching directory: %s", dir)
 			err = watcher.Add(dir)
 			if err != nil {
 				logger.Fatal(err.Error())
@@ -199,7 +167,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		for quit == false {
 			select {
 			case <-quitChannel:
-				LogGreen("\nCaught quit")
+				println()
 				// Notify debouncer to quit
 				debounceQuit <- true
 				quit = true
@@ -214,13 +182,7 @@ 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")
+		logger.Println("Development mode exited")
 
 		return nil
 	})
@@ -247,15 +209,15 @@ exit:
 	}
 }
 
-func restartApp(logger *clilogger.CLILogger, ldflags string, compilerCommand string, debugBinaryProcess *process.Process, loglevel string, passthruArgs []string, verbosity int) (*process.Process, string, error) {
+func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string, buildFrontend bool, debugBinaryProcess *process.Process) *process.Process {
 
-	appBinary, err := buildApp(logger, ldflags, compilerCommand, verbosity)
+	appBinary, err := buildApp(logger, outputType, ldflags, compilerCommand, buildFrontend)
 	println()
 	if err != nil {
-		LogRed("Build error - continuing to run current version")
-		LogDarkYellow(err.Error())
-		return nil, "", nil
+		logger.Println("[ERROR] Build Failed: %s", err.Error())
+		return nil
 	}
+	logger.Println("Build new binary: %s", appBinary)
 
 	// Kill existing binary if need be
 	if debugBinaryProcess != nil {
@@ -270,12 +232,8 @@ func restartApp(logger *clilogger.CLILogger, ldflags string, compilerCommand str
 
 	// TODO: Generate `backend.js`
 
-	// 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...)
+	// Start up new binary
+	newProcess := process.NewProcess(logger, appBinary)
 	err = newProcess.Start()
 	if err != nil {
 		// Remove binary
@@ -286,29 +244,25 @@ func restartApp(logger *clilogger.CLILogger, ldflags string, compilerCommand str
 		logger.Fatal("Unable to start application: %s", err.Error())
 	}
 
-	return newProcess, appBinary, nil
+	return newProcess
 }
 
-func buildApp(logger *clilogger.CLILogger, ldflags string, compilerCommand string, verbosity int) (string, error) {
+func buildApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string, buildFrontend bool) (string, error) {
 
 	// Create random output file
-	outputFile := "wailsdev"
-	if runtime.GOOS == "windows" {
-		outputFile += ".exe"
-	}
+	outputFile := fmt.Sprintf("debug-%d", time.Now().Unix())
 
 	// Create BuildOptions
 	buildOptions := &build.Options{
 		Logger:         logger,
-		OutputType:     "dev",
+		OutputType:     outputType,
 		Mode:           build.Debug,
 		Pack:           false,
 		Platform:       runtime.GOOS,
 		LDFlags:        ldflags,
 		Compiler:       compilerCommand,
 		OutputFile:     outputFile,
-		IgnoreFrontend: true,
-		Verbosity:      verbosity,
+		IgnoreFrontend: !buildFrontend,
 	}
 
 	return build.Build(buildOptions)

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

@@ -3,6 +3,7 @@ package doctor
 import (
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"runtime"
 	"strings"
@@ -24,13 +25,11 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		logger := clilogger.New(w)
 
 		app.PrintBanner()
-
-		logger.Print("Scanning system - Please wait (this may take a long time)...")
+		logger.Print("Scanning system - please wait...")
 
 		// Get system info
 		info, err := system.GetInfo()
 		if err != nil {
-			logger.Println("Failed.")
 			return err
 		}
 		logger.Println("Done.")
@@ -40,22 +39,27 @@ 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 {
+			fmt.Fprintf(w, "\n%s\t%s", "Package Manager:", "Not Found")
+			w.Flush()
+			println()
+			return nil
+		}
+		fmt.Fprintf(w, "%s\t%s\n", "Package Manager: ", info.PM.Name())
+
 		// 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{}
@@ -65,14 +69,12 @@ 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
-				hasOptionalDependencies = true
+				name += "*"
 			}
 			packageName := "Unknown"
 			status := "Not Found"
@@ -107,48 +109,44 @@ 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)
 		}
-		if hasOptionalDependencies {
-			fmt.Fprintf(w, "\n")
-			fmt.Fprintf(w, "* - Optional Dependency\n")
-		}
+		fmt.Fprintf(w, "\n")
+		fmt.Fprintf(w, "* - Optional Dependency\n")
 		w.Flush()
 		logger.Println("")
 		logger.Println("Diagnosis")
-		logger.Println("---------")
+		logger.Println("---------\n")
 
 		// 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 {
-			logger.Println("Required package(s) installation details: \n" + info.Dependencies.InstallAllRequiredCommand())
+			log.Println("Install required packages using: " + info.Dependencies.InstallAllRequiredCommand())
 		}
 
 		if dependenciesAvailableOptional != 0 {
-			logger.Println("Optional package(s) installation details: \n" + info.Dependencies.InstallAllOptionalCommand())
+			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)
+			}
 		}
-		//
-		//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
-			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("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("")
+		log.Println("")
 		return nil
 	})
 

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

@@ -1,18 +0,0 @@
-# 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,22 +2,62 @@ package generate
 
 import (
 	"io"
-
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/generate/template"
+	"time"
 
 	"github.com/leaanthony/clir"
 	"github.com/wailsapp/wails/v2/pkg/clilogger"
 	"github.com/wailsapp/wails/v2/pkg/parser"
 )
 
-// AddSubcommand adds the `generate` command for the Wails application
+// AddSubcommand adds the `dev` command for the Wails application
 func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	command := app.NewSubCommand("generate", "Code Generation Tools")
 
-	//AddModuleCommand(app, command, w)
-	template.AddSubCommand(app, command, w)
+	// Backend API
+	backendAPI := command.NewSubCommand("module", "Generates a JS module for the frontend to interface with the backend")
 
+	// Quiet Init
+	quiet := false
+	backendAPI.BoolFlag("q", "Supress 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
 }
 
@@ -45,4 +85,7 @@ func logPackage(pkg *parser.Package, logger *clilogger.CLILogger) {
 		}
 	}
 	logger.Println("")
+
+	// logger.Println("  Original Go Package Path:", pkg.Gopackage.PkgPath)
+	// logger.Println("  Original Go Package Path:", pkg.Gopackage.PkgPath)
 }

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

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

@@ -1,38 +0,0 @@
-# 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. Remove any `public` or `dist` directories.
-  5. Delete this file.
-
-## Testing your template
-
-You can test your template by running this command:
-
-`wails init -name test -t {{.TemplateDir}}`
-
-### 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

@@ -1,16 +0,0 @@
-# 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/app.tmpl.go

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

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

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

@@ -1,103 +0,0 @@
-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/main.js

@@ -1,21 +0,0 @@
-
-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/main.tmpl.go

@@ -1,56 +0,0 @@
-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 := NewApp()
-
-	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

@@ -1,7 +0,0 @@
-{
-  "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/template.go

@@ -1,188 +0,0 @@
-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"
-	"github.com/tidwall/sjson"
-)
-
-//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)
-
-	migrate := false
-	command.BoolFlag("migrate", "This indicates that the current directory is a frontend project and should be used by the template", &migrate)
-
-	// 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)
-			println("Creating new template directory:", 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
-			TemplateDir string
-		}
-
-		println("Extracting base template files...")
-
-		err = g.Extract(templateDir, &templateData{
-			Name:        name,
-			TemplateDir: templateDir,
-		})
-		if err != nil {
-			return err
-		}
-
-		// If we aren't migrating the files, just exit
-		if migrate == false {
-			return nil
-		}
-
-		// Remove frontend directory
-		frontendDir := filepath.Join(templateDir, "frontend")
-		err = os.RemoveAll(frontendDir)
-		if err != nil {
-			return err
-		}
-
-		// Move the files into a new frontend directory
-		println("Migrating files to frontend directory...")
-		err = fs.MoveDirExtended(cwd, frontendDir, []string{name})
-		if err != nil {
-			return err
-		}
-
-		// Process package.json
-		err = processPackageJSON(frontendDir)
-		if err != nil {
-			return err
-		}
-
-		// Process package-lock.json
-		err = processPackageLockJSON(frontendDir)
-		if err != nil {
-			return err
-		}
-
-		// Remove node_modules - ignore error, eg it doesn't exist
-		_ = os.RemoveAll(filepath.Join(frontendDir, "node_modules"))
-
-		return nil
-
-	})
-}
-
-func processPackageJSON(frontendDir string) error {
-	var err error
-
-	packageJSON := filepath.Join(frontendDir, "package.json")
-	if !fs.FileExists(packageJSON) {
-		println("No package.json found - cannot process.")
-		return nil
-	}
-
-	data, err := os.ReadFile(packageJSON)
-	if err != nil {
-		return err
-	}
-	json := string(data)
-
-	// We will ignore these errors - it's not critical
-	println("Updating package.json data...")
-	json, _ = sjson.Set(json, "name", "{{.ProjectName}}")
-	json, _ = sjson.Set(json, "author", "{{.AuthorName}}")
-
-	err = os.WriteFile(packageJSON, []byte(json), 0644)
-	if err != nil {
-		return err
-	}
-	baseDir := filepath.Dir(packageJSON)
-	println("Renaming package.json -> package.tmpl.json...")
-	err = os.Rename(packageJSON, filepath.Join(baseDir, "package.tmpl.json"))
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func processPackageLockJSON(frontendDir string) error {
-	var err error
-
-	filename := filepath.Join(frontendDir, "package-lock.json")
-	if !fs.FileExists(filename) {
-		println("No package-lock.json found - cannot process.")
-		return nil
-	}
-
-	data, err := os.ReadFile(filename)
-	if err != nil {
-		return err
-	}
-	json := string(data)
-
-	// We will ignore these errors - it's not critical
-	println("Updating package-lock.json data...")
-	json, _ = sjson.Set(json, "name", "{{.ProjectName}}")
-
-	err = os.WriteFile(filename, []byte(json), 0644)
-	if err != nil {
-		return err
-	}
-	baseDir := filepath.Dir(filename)
-	println("Renaming package-lock.json -> package-lock.tmpl.json...")
-	err = os.Rename(filename, filepath.Join(baseDir, "package-lock.tmpl.json"))
-	if err != nil {
-		return err
-	}
-	return nil
-}

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

@@ -6,12 +6,9 @@ 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"
 	"github.com/pkg/errors"
+	"github.com/wailsapp/wails/v2/internal/templates"
 	"github.com/wailsapp/wails/v2/pkg/clilogger"
 	"github.com/wailsapp/wails/v2/pkg/git"
 )
@@ -19,11 +16,17 @@ 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 built-in template to use, path to template or template url."
+	description := "Name of template to use. Valid tempates: " + validShortNames.Join(" ")
 	command.StringFlag("t", description, &templateName)
 
 	// Setup project name
@@ -36,7 +39,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	// Quiet Init
 	quiet := false
-	command.BoolFlag("q", "Suppress output to console", &quiet)
+	command.BoolFlag("q", "Supress output to console", &quiet)
 
 	initGit := false
 	gitInstalled := git.IsInstalled()
@@ -67,6 +70,14 @@ 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")
@@ -94,7 +105,10 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		}
 
 		// Try to discover author details from git config
-		findAuthorDetails(options)
+		err := findAuthorDetails(options)
+		if err != nil {
+			return err
+		}
 
 		return initProject(options)
 	})
@@ -109,13 +123,7 @@ func initProject(options *templates.Options) error {
 	start := time.Now()
 
 	// Install the template
-	remote, err := templates.Install(options)
-	if err != nil {
-		return err
-	}
-
-	// Install the default assets
-	err = buildassets.Install(options.TargetDir, options.ProjectName)
+	err := templates.Install(options)
 	if err != nil {
 		return err
 	}
@@ -139,11 +147,6 @@ 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("")
@@ -160,18 +163,20 @@ func initGit(options *templates.Options) error {
 	return nil
 }
 
-// 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) {
+func findAuthorDetails(options *templates.Options) error {
 	if git.IsInstalled() {
 		name, err := git.Name()
-		if err == nil {
-			options.AuthorName = strings.TrimSpace(name)
+		if err != nil {
+			return err
 		}
+		options.AuthorName = strings.TrimSpace(name)
 
 		email, err := git.Email()
-		if err == nil {
-			options.AuthorEmail = strings.TrimSpace(email)
+		if err != nil {
+			return err
 		}
+		options.AuthorEmail = strings.TrimSpace(email)
 	}
+
+	return nil
 }

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

@@ -1,24 +0,0 @@
-# README
-
-## About
-
-This is a basic Svelte template, using rollup to bundle the assets into a single JS file.
-Rollup is configured to do the following:
-
-  - Convert imported images to base64 strings
-  - Convert `url()` in `@font-face` declarations to base64 strings
-  - Bundle all css into the JS bundle
-  - Copy `index.html` from `frontend/src/` to `frontend/dist/`
-
-Clicking the button will call the backend 
-
-## 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/svelte/app.tmpl.go

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

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

@@ -1,27 +0,0 @@
-{
-  "name": "{{.ProjectName}}",
-  "version": "1.0.0",
-  "private": true,
-  "scripts": {
-    "build": "rollup -c",
-    "dev": "rollup -c -w",
-    "start": "sirv dist --no-clear"
-  },
-  "devDependencies": {
-    "@rollup/plugin-commonjs": "^17.0.0",
-    "@rollup/plugin-image": "^2.0.6",
-    "@rollup/plugin-node-resolve": "^11.0.0",
-    "postcss": "^8.3.5",
-    "postcss-url": "^10.1.3",
-    "rollup": "^2.3.4",
-    "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-livereload": "^2.0.0",
-    "rollup-plugin-postcss": "^4.0.0",
-    "rollup-plugin-svelte": "^7.0.0",
-    "rollup-plugin-terser": "^7.0.0",
-    "svelte": "^3.0.0"
-  },
-  "dependencies": {
-    "sirv-cli": "^1.0.0"
-  }
-,"author":"{{.AuthorName}}"}

v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/scripts/setupTypeScript.js

@@ -1,121 +0,0 @@
-// @ts-check
-
-/** This script modifies the project to support TS code in .svelte files like:
-
-  <script lang="ts">
-  	export let name: string;
-  </script>
- 
-  As well as validating the code for CI.
-  */
-
-/**  To work on this script:
-  rm -rf test-template template && git clone sveltejs/template test-template && node scripts/setupTypeScript.js test-template
-*/
-
-const fs = require("fs")
-const path = require("path")
-const { argv } = require("process")
-
-const projectRoot = argv[2] || path.join(__dirname, "..")
-
-// Add deps to pkg.json
-const packageJSON = JSON.parse(fs.readFileSync(path.join(projectRoot, "package.json"), "utf8"))
-packageJSON.devDependencies = Object.assign(packageJSON.devDependencies, {
-  "svelte-check": "^2.0.0",
-  "svelte-preprocess": "^4.0.0",
-  "@rollup/plugin-typescript": "^8.0.0",
-  "typescript": "^4.0.0",
-  "tslib": "^2.0.0",
-  "@tsconfig/svelte": "^2.0.0"
-})
-
-// Add script for checking
-packageJSON.scripts = Object.assign(packageJSON.scripts, {
-  "check": "svelte-check --tsconfig ./tsconfig.json"
-})
-
-// Write the package JSON
-fs.writeFileSync(path.join(projectRoot, "package.json"), JSON.stringify(packageJSON, null, "  "))
-
-// mv src/main.js to main.ts - note, we need to edit rollup.config.js for this too
-const beforeMainJSPath = path.join(projectRoot, "src", "main.js")
-const afterMainTSPath = path.join(projectRoot, "src", "main.ts")
-fs.renameSync(beforeMainJSPath, afterMainTSPath)
-
-// Switch the app.svelte file to use TS
-const appSveltePath = path.join(projectRoot, "src", "App.svelte")
-let appFile = fs.readFileSync(appSveltePath, "utf8")
-appFile = appFile.replace("<script>", '<script lang="ts">')
-appFile = appFile.replace("export let name;", 'export let name: string;')
-fs.writeFileSync(appSveltePath, appFile)
-
-// Edit rollup config
-const rollupConfigPath = path.join(projectRoot, "rollup.config.js")
-let rollupConfig = fs.readFileSync(rollupConfigPath, "utf8")
-
-// Edit imports
-rollupConfig = rollupConfig.replace(`'rollup-plugin-terser';`, `'rollup-plugin-terser';
-import sveltePreprocess from 'svelte-preprocess';
-import typescript from '@rollup/plugin-typescript';`)
-
-// Replace name of entry point
-rollupConfig = rollupConfig.replace(`'src/main.js'`, `'src/main.ts'`)
-
-// Add preprocessor
-rollupConfig = rollupConfig.replace(
-  'compilerOptions:',
-  'preprocess: sveltePreprocess({ sourceMap: !production }),\n\t\t\tcompilerOptions:'
-);
-
-// Add TypeScript
-rollupConfig = rollupConfig.replace(
-  'commonjs(),',
-  'commonjs(),\n\t\ttypescript({\n\t\t\tsourceMap: !production,\n\t\t\tinlineSources: !production\n\t\t}),'
-);
-fs.writeFileSync(rollupConfigPath, rollupConfig)
-
-// Add TSConfig
-const tsconfig = `{
-  "extends": "@tsconfig/svelte/tsconfig.json",
-
-  "include": ["src/**/*"],
-  "exclude": ["node_modules/*", "__sapper__/*", "public/*"]
-}`
-const tsconfigPath =  path.join(projectRoot, "tsconfig.json")
-fs.writeFileSync(tsconfigPath, tsconfig)
-
-// Add global.d.ts
-const dtsPath =  path.join(projectRoot, "src", "global.d.ts")
-fs.writeFileSync(dtsPath, `/// <reference types="svelte" />`)
-
-// Delete this script, but not during testing
-if (!argv[2]) {
-  // Remove the script
-  fs.unlinkSync(path.join(__filename))
-
-  // Check for Mac's DS_store file, and if it's the only one left remove it
-  const remainingFiles = fs.readdirSync(path.join(__dirname))
-  if (remainingFiles.length === 1 && remainingFiles[0] === '.DS_store') {
-    fs.unlinkSync(path.join(__dirname, '.DS_store'))
-  }
-
-  // Check if the scripts folder is empty
-  if (fs.readdirSync(path.join(__dirname)).length === 0) {
-    // Remove the scripts folder
-    fs.rmdirSync(path.join(__dirname))
-  }
-}
-
-// Adds the extension recommendation
-fs.mkdirSync(path.join(projectRoot, ".vscode"), { recursive: true })
-fs.writeFileSync(path.join(projectRoot, ".vscode", "extensions.json"), `{
-  "recommendations": ["svelte.svelte-vscode"]
-}
-`)
-
-console.log("Converted to TypeScript.")
-
-if (fs.existsSync(path.join(projectRoot, "node_modules"))) {
-  console.log("\nYou will need to re-run your dependency manager to get started.")
-}

v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/App.svelte

@@ -1,57 +0,0 @@
-<script>
-	let name = "";
-	let greeting = "";
-
-	function greet() {
-		window.backend.main.App.Greet(name).then((result) => {
-			greeting = result;
-		});
-	}
-</script>
-
-<main>
-	<div id="logo"></div>
-	<div id="input" data-wails-no-drag>
-		<input id="name" type="text" bind:value={name}>
-		<button class="button" on:click={greet}>Greet</button>
-	</div>
-	{#if greeting}
-		<div id="result">{greeting}</div>
-	{/if}
-</main>
-
-<style>
-
-	main {
-		height: 100%;
-		width: 100%;
-	}
-
-	#result {
-		margin-top: 1rem;
-		font-size: 1.5rem;
-	}
-
-	button {
-		-webkit-appearance: default-button;
-		padding: 6px;
-	}
-
-	#name {
-		border-radius: 3px;
-		outline: none;
-		-webkit-font-smoothing: antialiased;
-	}
-
-	#logo {
-		width: 40%;
-		height: 40%;
-		padding-top: 20%;
-		margin: auto;
-		display: block;
-		background-position: center;
-		background-repeat: no-repeat;
-		background-image: url("assets/images/logo-dark.svg");
-	}
-
-</style>

v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/assets/fonts/OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2016 The Nunito Project Authors (contact@sansoxygen.com),
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/assets/images/logo-dark.svg

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 551 436" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1.27527,0,0,1.27527,104.01,410.563)">
-        <path d="M0,-51.891L14.429,-51.891L13.043,-21.183L22.568,-51.891L34.226,-51.891L34.084,-21.183L42.365,-51.891L56.794,-51.891L38.526,0L25.198,0L25.34,-32.45L15.211,0L1.919,0L0,-51.891Z" style="fill:white;fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(1.27527,0,0,1.27527,224.985,367.503)">
-        <path d="M0,15.639L5.793,15.639L5.971,-3.589L0,15.639ZM-20.187,33.765L-0.675,-18.126L16.42,-18.126L20.08,33.765L5.437,33.765L5.509,26.123L-3.057,26.123L-5.332,33.765L-20.187,33.765Z" style="fill:white;fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(0.19929,-1.2596,-1.2596,-0.19929,332.323,396.949)">
-        <path d="M-16.046,33.107L36.491,33.107L38.757,18.784L-13.785,18.82L-16.046,33.107Z" style="fill:white;fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(1.27527,0,0,1.27527,353.217,344.388)">
-        <path d="M0,51.891L8.246,0L22.781,0L16.597,39.024L27.224,39.024L25.199,51.891L0,51.891Z" style="fill:white;fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(1.27527,0,0,1.27527,427.939,364.922)">
-        <path d="M0,19.83C1.611,21.181 3.305,22.224 5.083,22.959C6.859,23.693 8.565,24.06 10.2,24.06C11.645,24.06 12.794,23.663 13.647,22.87C14.5,22.076 14.927,20.992 14.927,19.617C14.927,18.434 14.571,17.254 13.861,16.081C13.15,14.908 11.775,13.351 9.738,11.408C7.273,9.015 5.58,6.906 4.655,5.081C3.731,3.257 3.27,1.243 3.27,-0.96C3.27,-5.912 4.839,-9.846 7.979,-12.76C11.118,-15.674 15.377,-17.132 20.756,-17.132C22.936,-17.132 25.008,-16.889 26.975,-16.403C28.941,-15.917 30.943,-15.165 32.982,-14.146L30.92,-1.493C29.356,-2.583 27.834,-3.412 26.354,-3.981C24.872,-4.551 23.457,-4.835 22.106,-4.835C20.898,-4.835 19.943,-4.521 19.245,-3.894C18.546,-3.265 18.196,-2.406 18.196,-1.316C18.196,0.154 19.535,2.215 22.213,4.868C22.544,5.2 22.805,5.46 22.995,5.649C25.696,8.304 27.473,10.578 28.326,12.475C29.179,14.37 29.605,16.56 29.605,19.049C29.605,24.594 27.893,28.965 24.469,32.163C21.046,35.361 16.36,36.962 10.413,36.962C7.877,36.962 5.479,36.66 3.216,36.056C0.953,35.45 -0.948,34.615 -2.488,33.549L0,19.83Z" style="fill:white;fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(-166.599,4.57132,4.57132,166.599,147.403,167.648)">
-        <path d="M0.883,-0.081L0.121,0.081L0.256,-0.063L0.883,-0.081Z" style="fill:url(#_Linear1);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(-106.443,-16.0669,-16.0669,106.443,428.19,188.033)">
-        <path d="M0.878,-0.285L-0.073,0.71L-1.186,0.542L0.015,0.207L-0.846,0.077L0.355,-0.258L-0.505,-0.388L0.649,-0.71L0.878,-0.285Z" style="fill:url(#_Linear2);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(-114.484,-162.408,-162.408,114.484,333.291,285.804)">
-        <path d="M0.44,-0.04L0.44,-0.04L0.44,-0.04L0.265,-0.056L0.177,0.437L-0.311,-0.255L0.262,-0.437L0.568,-0.437L0.44,-0.04Z" style="fill:url(#_Linear3);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(61.6919,58.8091,58.8091,-61.6919,258.631,180.413)">
-        <path d="M0.5,0L0.5,-0L0.5,0L0.5,0Z" style="fill:url(#_Linear4);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(238.126,298.893,298.893,-238.126,113.516,-150.536)">
-        <path d="M0.622,-0.115L0.761,-0.115L0.806,-0.013L0.826,0.182L0.622,-0.115Z" style="fill:url(#_Linear5);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(-369.529,-97.4118,-97.4118,369.529,582.38,94.027)">
-        <path d="M0.467,0.005L0.49,0.062L0.271,-0.062L0.467,0.005Z" style="fill:url(#_Linear6);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(-496.156,-53.9751,-53.9751,496.156,367.888,125.085)">
-        <path d="M0.2,0.001L0.219,-0.018L0.614,0.012L0.519,0.089L0.282,0.068L0.2,0.135L0.463,0.194L0.374,0.266L0.138,0.186L0.138,0.186L0.138,0.186L0.047,0.033L-0.131,-0.266L0.2,0.001Z" style="fill:url(#_Linear7);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(185.076,176.427,176.427,-185.076,153.446,80.1488)">
-        <path d="M0.735,-0L0.735,-0L0.735,0L0.735,-0Z" style="fill:url(#_Linear8);fill-rule:nonzero;"/>
-    </g>
-    <defs>
-        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,-3.46945e-18,-3.46945e-18,-1,0,-3.05761e-06)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,-1,0,-2.75467e-06)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear3" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,-1.11022e-16,-1.11022e-16,-1,0,-2.61861e-06)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear4" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,-5.55112e-17,-5.55112e-17,-1,0,-1.57562e-06)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear5" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.801899,-0.59746,-0.59746,0.801899,1.3495,0.447457)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear6" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,-2.77556e-17,-2.77556e-17,-1,0,-1.92826e-06)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear7" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,-1,0,9.68429e-07)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear8" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,-1,0,1.43665e-07)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-    </defs>
-</svg>

v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/global.css

@@ -1,24 +0,0 @@
-
-html {
-	text-align: center;
-	color: white;
-	background-color: rgba(1,1,1,0.1);
-	width: 100%;
-	height: 100%;
-}
-
-body {
-	color: white;
-	font-family: 'Nunito', -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-	margin: 0;
-	width: 100%;
-	height: 100%;
-}
-
-@font-face {
-	font-family: 'Nunito';
-	font-style: normal;
-	font-weight: 400;
-	src: local(''),
-	url('./assets/fonts/nunito-v16-latin-regular.woff2') format('woff2')
-}

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

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset='utf-8'>
-	<meta name='viewport' content='width=device-width,initial-scale=1'>
-
-	<title>Svelte app</title>
-
-	<script defer src='bundle.js'></script>
-</head>
-
-<body data-wails-drag>
-</body>
-</html>

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

@@ -1,56 +0,0 @@
-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 := NewApp()
-
-	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/initialise/templates/templates/svelte/template.json

@@ -1,7 +0,0 @@
-{
-  "name": "Basic Svelte + Rollup",
-  "shortname": "svelte",
-  "author": "Lea Anthony",
-  "description": "Svelte template using rollup to bundle css, images and fonts",
-  "helpurl": "https://github.com/wailsapp/wails"
-}

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

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

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

@@ -1,16 +0,0 @@
-# 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/app.tmpl.go

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

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

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

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

@@ -1,18 +0,0 @@
-<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/initialise/templates/templates/vanilla/frontend/src/main.js

@@ -1,21 +0,0 @@
-
-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 App.Greet(name)
-    window.backend.main.App.Greet(name).then((result) => {
-      // Update result with data back from App.Greet()
-      document.getElementById("result").innerText = result;
-    });
-  };
-});

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

@@ -1,56 +0,0 @@
-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 := NewApp()
-
-	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/initialise/templates/templates_test.go

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

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

@@ -1,164 +0,0 @@
-package update
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"os"
-
-	"github.com/wailsapp/wails/v2/internal/shell"
-
-	"github.com/wailsapp/wails/v2/internal/github"
-
-	"github.com/leaanthony/clir"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-)
-
-// AddSubcommand adds the `init` command for the Wails application
-func AddSubcommand(app *clir.Cli, w io.Writer, currentVersion string) error {
-
-	command := app.NewSubCommand("update", "Update the Wails CLI")
-	command.LongDescription(`This command allows you to update your version of the Wails CLI.`)
-
-	// Setup flags
-	var prereleaseRequired bool
-	command.BoolFlag("pre", "Update CLI to latest Prerelease", &prereleaseRequired)
-
-	var specificVersion string
-	command.StringFlag("version", "Install a specific version (Overrides other flags) of the CLI", &specificVersion)
-
-	command.Action(func() error {
-
-		// Create logger
-		logger := clilogger.New(w)
-
-		// Print banner
-		app.PrintBanner()
-		logger.Println("Checking for updates...")
-
-		var desiredVersion *github.SemanticVersion
-		var err error
-		var valid bool
-
-		if len(specificVersion) > 0 {
-			// Check if this is a valid version
-			valid, err = github.IsValidTag(specificVersion)
-			if err == nil {
-				if !valid {
-					err = fmt.Errorf("version '%s' is invalid", specificVersion)
-				} else {
-					desiredVersion, err = github.NewSemanticVersion(specificVersion)
-				}
-			}
-		} else {
-			if prereleaseRequired {
-				desiredVersion, err = github.GetLatestPreRelease()
-			} else {
-				desiredVersion, err = github.GetLatestStableRelease()
-			}
-		}
-		if err != nil {
-			return err
-		}
-		fmt.Println()
-
-		fmt.Println("    Current Version : " + currentVersion)
-
-		if len(specificVersion) > 0 {
-			fmt.Printf("    Desired Version : v%s\n", desiredVersion)
-		} else {
-			if prereleaseRequired {
-				fmt.Printf("  Latest Prerelease : v%s\n", desiredVersion)
-			} else {
-				fmt.Printf("     Latest Release : v%s\n", desiredVersion)
-			}
-		}
-
-		return updateToVersion(logger, desiredVersion, len(specificVersion) > 0, currentVersion)
-	})
-
-	return nil
-}
-
-func updateToVersion(logger *clilogger.CLILogger, targetVersion *github.SemanticVersion, force bool, currentVersion string) error {
-
-	var targetVersionString = "v" + targetVersion.String()
-
-	// Early exit
-	if targetVersionString == currentVersion {
-		logger.Println("Looks like you're up to date!")
-		return nil
-	}
-
-	var desiredVersion string
-
-	if !force {
-
-		compareVersion := currentVersion
-
-		currentVersion, err := github.NewSemanticVersion(compareVersion)
-		if err != nil {
-			return err
-		}
-
-		var success bool
-
-		// Release -> Pre-Release = Massage current version to prerelease format
-		if targetVersion.IsPreRelease() && currentVersion.IsRelease() {
-			testVersion, err := github.NewSemanticVersion(compareVersion + "-0")
-			if err != nil {
-				return err
-			}
-			success, _ = targetVersion.IsGreaterThan(testVersion)
-		}
-		// Pre-Release -> Release = Massage target version to prerelease format
-		if targetVersion.IsRelease() && currentVersion.IsPreRelease() {
-			// We are ok with greater than or equal
-			mainversion := currentVersion.MainVersion()
-			targetVersion, err = github.NewSemanticVersion(targetVersion.String())
-			if err != nil {
-				return err
-			}
-			success, _ = targetVersion.IsGreaterThanOrEqual(mainversion)
-		}
-
-		// Release -> Release = Standard check
-		if (targetVersion.IsRelease() && currentVersion.IsRelease()) ||
-			(targetVersion.IsPreRelease() && currentVersion.IsPreRelease()) {
-
-			success, _ = targetVersion.IsGreaterThan(currentVersion)
-		}
-
-		// Compare
-		if !success {
-			logger.Println("Error: The requested version is lower than the current version.")
-			logger.Println("If this is what you really want to do, use `wails update -version %s`", targetVersionString)
-			return nil
-		}
-
-		desiredVersion = "v" + targetVersion.String()
-
-	} else {
-		desiredVersion = "v" + targetVersion.String()
-	}
-
-	fmt.Println()
-	logger.Print("Installing Wails CLI " + desiredVersion + "...")
-
-	// Run command in non module directory
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		log.Fatal("Cannot find home directory! Please file a bug report!")
-	}
-
-	sout, serr, err := shell.RunCommand(homeDir, "go", "get", "github.com/wailsapp/wails/v2/cmd/wails@"+desiredVersion)
-	if err != nil {
-		logger.Println("Failed.")
-		logger.Println(sout + `\n` + serr)
-		return err
-	}
-	fmt.Println()
-	logger.Println("Wails CLI updated to " + desiredVersion)
-
-	return nil
-}

v2/cmd/wails/main.go

@@ -1,15 +1,11 @@
 package main
 
 import (
-	"fmt"
 	"os"
 
-	"github.com/wailsapp/wails/v2/internal/colour"
-
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/update"
-
 	"github.com/leaanthony/clir"
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/build"
+	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/debug"
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/dev"
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/doctor"
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/generate"
@@ -21,17 +17,11 @@ func fatal(message string) {
 	os.Exit(1)
 }
 
-func banner(_ *clir.Cli) string {
-	return fmt.Sprintf("%s %s", colour.Yellow("Wails CLI"), colour.DarkRed(version))
-}
-
 func main() {
 
 	var err error
 
-	app := clir.NewCli("Wails", "Go/HTML Appkit", version)
-
-	app.SetBannerFunction(banner)
+	app := clir.NewCli("Wails", "Go/HTML Application Framework", version)
 
 	build.AddBuildSubcommand(app, os.Stdout)
 	err = initialise.AddSubcommand(app, os.Stdout)
@@ -39,6 +29,10 @@ func main() {
 		fatal(err.Error())
 	}
 
+	err = debug.AddSubcommand(app, os.Stdout)
+	if err != nil {
+		fatal(err.Error())
+	}
 	err = doctor.AddSubcommand(app, os.Stdout)
 	if err != nil {
 		fatal(err.Error())
@@ -54,14 +48,8 @@ func main() {
 		fatal(err.Error())
 	}
 
-	err = update.AddSubcommand(app, os.Stdout, version)
-	if err != nil {
-		fatal(err.Error())
-	}
-
 	err = app.Run()
 	if err != nil {
 		println("\n\nERROR: " + err.Error())
-		os.Exit(1)
 	}
 }

v2/cmd/wails/version.go

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

v2/go.mod

@@ -1,45 +1,28 @@
 module github.com/wailsapp/wails/v2
 
-go 1.16
+go 1.15
 
 require (
-	github.com/Masterminds/semver v1.5.0
+	github.com/davecgh/go-spew v1.1.1
 	github.com/fatih/structtag v1.2.0
 	github.com/fsnotify/fsnotify v1.4.9
-	github.com/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.12
+	github.com/imdario/mergo v0.3.11
 	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.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/idgen v1.0.0
+	github.com/leaanthony/gosod v0.0.4
 	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/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // 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/tidwall/sjson v1.1.7
-	github.com/wzshiming/ctc v1.2.3
 	github.com/xyproto/xpm v1.2.1
-	github.com/ztrue/tracerr v0.3.0
-	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
+	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
+	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 	nhooyr.io/websocket v1.8.6
 )

v2/go.sum

@@ -1,43 +1,15 @@
-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 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 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=
@@ -52,195 +24,111 @@ 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/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 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 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.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
-github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+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/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/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 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8=
 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 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 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.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/idgen v1.0.0 h1:IZreR+JGEzFV4yeVuBZA25gM0keUoFy+RDUldncQ+Jw=
-github.com/leaanthony/idgen v1.0.0/go.mod h1:4nBZnt8ml/f/ic/EVQuLxuj817RccT2fyrUaZFxrcVA=
+github.com/leaanthony/gosod v0.0.4 h1:v4hepo4IyL8E8c9qzDsvYcA0KGh7Npf8As74K5ibQpI=
+github.com/leaanthony/gosod v0.0.4/go.mod h1:nGMCb1PJfXwBDbOAike78jEYlpqge+xUKFf0iBKjKxU=
 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/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e h1:9MlwzLdW7QSDrhDjFlsEYmxpFyIoXmYRon3dt0io31k=
-github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 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 h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 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 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 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=
 github.com/tdewolff/parse v2.3.4+incompatible/go.mod h1:8oBwCsVmUkgHO8M5iCzSIDtpzXOT0WXX9cWhz+bIzJQ=
 github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4=
 github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
-github.com/tidwall/gjson v1.8.0 h1:Qt+orfosKn0rbNTZqHYDqBrmm3UDA4KRkv70fDzG+PQ=
-github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
-github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/sjson v1.1.7 h1:sgVPwu/yygHJ2m1pJDLgGM/h+1F5odx5Q9ljG3imRm8=
-github.com/tidwall/sjson v1.1.7/go.mod h1:w/yG+ezBeTdUxiKs5NcPicO9diP38nk96QBAbIIGeFs=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-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=
-github.com/ztrue/tracerr v0.3.0 h1:lDi6EgEYhPYPnKcjsYzmWw4EkFEoA/gfe+I9Y5f+h6Y=
-github.com/ztrue/tracerr v0.3.0/go.mod h1:qEalzze4VN9O8tnhBXScfCrmoJo10o8TN5ciKjm6Mww=
-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/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 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 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-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/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/sync v0.0.0-20190423024810-112230192c58/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/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 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 h1:L2auWcuQIvxz9xSEqzESnV/QN/gNRXNApHi3fYwl2w0=
 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-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/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
+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/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 h1:FDhOuMEY4JVRztM/gsbk+IKUQ8kj74bxZrgw87eMMVc=
 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.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+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/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 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 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/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 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 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 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.go

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

v2/init_windows.go

@@ -1,15 +0,0 @@
-package wails
-
-import (
-	"fmt"
-	"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 {
-		return fmt.Errorf("exit status %d: %v %v", status, r, err)
-	}
-	return nil
-}

v2/internal/app/debug.go

@@ -2,40 +2,11 @@
 
 package app
 
-import (
-	"flag"
-	"strings"
-
-	"github.com/wailsapp/wails/v2/pkg/logger"
-)
-
 // Init initialises the application for a debug environment
 func (a *App) Init() error {
 	// Indicate debug mode
 	a.debug = true
-
-	if a.appType == "desktop" {
-		// Enable dev tools
-		a.options.DevTools = true
-	}
-
-	// Set log levels
-	loglevel := flag.String("loglevel", "debug", "Loglevel to use - Trace, Debug, Info, Warning, Error")
-	flag.Parse()
-	if len(*loglevel) > 0 {
-		switch strings.ToLower(*loglevel) {
-		case "trace":
-			a.logger.SetLogLevel(logger.TRACE)
-		case "info":
-			a.logger.SetLogLevel(logger.INFO)
-		case "warning":
-			a.logger.SetLogLevel(logger.WARNING)
-		case "error":
-			a.logger.SetLogLevel(logger.ERROR)
-		default:
-			a.logger.SetLogLevel(logger.DEBUG)
-		}
-	}
-
+	// Enable dev tools
+	a.options.DevTools = true
 	return nil
 }

v2/internal/app/default.go

@@ -1,4 +1,4 @@
-// +build !desktop,!hybrid,!server,!dev
+// +build !desktop,!hybrid,!server
 
 package app
 
@@ -8,9 +8,8 @@ package app
 // will be unknown and the application will not work as expected.
 
 import (
-	"os"
-
 	"github.com/wailsapp/wails/v2/internal/logger"
+	"os"
 
 	"github.com/wailsapp/wails/v2/pkg/options"
 )
@@ -39,3 +38,7 @@ func (a *App) Run() error {
 	os.Exit(1)
 	return nil
 }
+
+// Bind the dummy interface
+func (a *App) Bind(_ interface{}) {
+}

v2/internal/app/desktop.go

@@ -3,9 +3,6 @@
 package app
 
 import (
-	"context"
-	"sync"
-
 	"github.com/wailsapp/wails/v2/internal/binding"
 	"github.com/wailsapp/wails/v2/internal/ffenestri"
 	"github.com/wailsapp/wails/v2/internal/logger"
@@ -20,8 +17,6 @@ import (
 
 // App defines a Wails application structure
 type App struct {
-	appType string
-
 	window     *ffenestri.Application
 	servicebus *servicebus.ServiceBus
 	logger     *logger.Logger
@@ -29,13 +24,12 @@ type App struct {
 	options    *options.App
 
 	// Subsystems
-	log     *subsystem.Log
-	runtime *subsystem.Runtime
-	event   *subsystem.Event
-	//binding    *subsystem.Binding
+	log        *subsystem.Log
+	runtime    *subsystem.Runtime
+	event      *subsystem.Event
+	binding    *subsystem.Binding
 	call       *subsystem.Call
 	menu       *subsystem.Menu
-	url        *subsystem.URL
 	dispatcher *messagedispatcher.Dispatcher
 
 	menuManager *menumanager.Manager
@@ -69,8 +63,7 @@ func CreateApp(appoptions *options.App) (*App, error) {
 	menuManager := menumanager.NewManager()
 
 	// Process the application menu
-	appMenu := options.GetApplicationMenu(appoptions)
-	menuManager.SetApplicationMenu(appMenu)
+	menuManager.SetApplicationMenu(options.GetApplicationMenu(appoptions))
 
 	// Process context menus
 	contextMenus := options.GetContextMenus(appoptions)
@@ -86,15 +79,11 @@ func CreateApp(appoptions *options.App) (*App, error) {
 
 	window := ffenestri.NewApplicationWithConfig(appoptions, myLogger, menuManager)
 
-	// Create binding exemptions - Ugly hack. There must be a better way
-	bindingExemptions := []interface{}{appoptions.Startup, appoptions.Shutdown}
-
 	result := &App{
-		appType:          "desktop",
 		window:           window,
 		servicebus:       servicebus.New(myLogger),
 		logger:           myLogger,
-		bindings:         binding.NewBindings(myLogger, appoptions.Bind, bindingExemptions),
+		bindings:         binding.NewBindings(myLogger),
 		menuManager:      menuManager,
 		startupCallback:  appoptions.Startup,
 		shutdownCallback: appoptions.Shutdown,
@@ -104,17 +93,8 @@ func CreateApp(appoptions *options.App) (*App, error) {
 
 	// Initialise the app
 	err := result.Init()
-	if err != nil {
-		return nil, err
-	}
 
-	// Preflight Checks
-	err = result.PreflightChecks(appoptions)
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
+	return result, err
 
 }
 
@@ -123,10 +103,13 @@ func (a *App) Run() error {
 
 	var err error
 
-	// Setup a context
-	var subsystemWaitGroup sync.WaitGroup
-	parentContext := context.WithValue(context.Background(), "waitgroup", &subsystemWaitGroup)
-	ctx, cancel := context.WithCancel(parentContext)
+	// Setup signal handler
+	signalsubsystem, err := signal.NewManager(a.servicebus, a.logger)
+	if err != nil {
+		return err
+	}
+	a.signal = signalsubsystem
+	a.signal.Start()
 
 	// Start the service bus
 	a.servicebus.Debug()
@@ -135,7 +118,7 @@ func (a *App) Run() error {
 		return err
 	}
 
-	runtimesubsystem, err := subsystem.NewRuntime(ctx, a.servicebus, a.logger, a.startupCallback)
+	runtimesubsystem, err := subsystem.NewRuntime(a.servicebus, a.logger, a.startupCallback, a.shutdownCallback)
 	if err != nil {
 		return err
 	}
@@ -149,6 +132,17 @@ func (a *App) Run() error {
 	a.loglevelStore = a.runtime.GoRuntime().Store.New("wails:loglevel", a.options.LogLevel)
 	a.appconfigStore = a.runtime.GoRuntime().Store.New("wails:appconfig", a.options)
 
+	// Start the binding subsystem
+	bindingsubsystem, err := subsystem.NewBinding(a.servicebus, a.logger, a.bindings, a.runtime.GoRuntime())
+	if err != nil {
+		return err
+	}
+	a.binding = bindingsubsystem
+	err = a.binding.Start()
+	if err != nil {
+		return err
+	}
+
 	// Start the logging subsystem
 	log, err := subsystem.NewLog(a.servicebus, a.logger, a.loglevelStore)
 	if err != nil {
@@ -171,32 +165,19 @@ func (a *App) Run() error {
 		return err
 	}
 
-	if a.options.Mac.URLHandlers != nil {
-		// Start the url handler subsystem
-		url, err := subsystem.NewURL(a.servicebus, a.logger, a.options.Mac.URLHandlers)
-		if err != nil {
-			return err
-		}
-		a.url = url
-		err = a.url.Start()
-		if err != nil {
-			return err
-		}
-	}
-
 	// Start the eventing subsystem
-	eventsubsystem, err := subsystem.NewEvent(ctx, a.servicebus, a.logger)
+	event, err := subsystem.NewEvent(a.servicebus, a.logger)
 	if err != nil {
 		return err
 	}
-	a.event = eventsubsystem
+	a.event = event
 	err = a.event.Start()
 	if err != nil {
 		return err
 	}
 
 	// Start the menu subsystem
-	menusubsystem, err := subsystem.NewMenu(ctx, a.servicebus, a.logger, a.menuManager)
+	menusubsystem, err := subsystem.NewMenu(a.servicebus, a.logger, a.menuManager)
 	if err != nil {
 		return err
 	}
@@ -207,11 +188,11 @@ func (a *App) Run() error {
 	}
 
 	// Start the call subsystem
-	callSubsystem, err := subsystem.NewCall(ctx, a.servicebus, a.logger, a.bindings.DB(), a.runtime.GoRuntime())
+	call, err := subsystem.NewCall(a.servicebus, a.logger, a.bindings.DB(), a.runtime.GoRuntime())
 	if err != nil {
 		return err
 	}
-	a.call = callSubsystem
+	a.call = call
 	err = a.call.Start()
 	if err != nil {
 		return err
@@ -223,42 +204,23 @@ func (a *App) Run() error {
 		return err
 	}
 
-	// Setup signal handler
-	signalsubsystem, err := signal.NewManager(ctx, cancel, a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.signal = signalsubsystem
-	a.signal.Start()
-
-	err = a.window.Run(dispatcher, bindingDump, a.debug)
+	result := a.window.Run(dispatcher, bindingDump, a.debug)
 	a.logger.Trace("Ffenestri.Run() exited")
-	if err != nil {
-		return err
-	}
-
-	// Close down all the subsystems
-	a.logger.Trace("Cancelling subsystems")
-	cancel()
-	subsystemWaitGroup.Wait()
-
-	a.logger.Trace("Cancelling dispatcher")
-	dispatcher.Close()
-
-	// Close log
-	a.logger.Trace("Stopping log")
-	log.Close()
-
-	a.logger.Trace("Stopping Service bus")
 	err = a.servicebus.Stop()
 	if err != nil {
 		return err
 	}
 
-	// Shutdown callback
-	if a.shutdownCallback != nil {
-		a.shutdownCallback()
-	}
-
-	return nil
+	return result
+}
+
+// Bind a struct to the application by passing in
+// a pointer to it
+func (a *App) Bind(structPtr interface{}) {
+
+	// Add the struct to the bindings
+	err := a.bindings.Add(structPtr)
+	if err != nil {
+		a.logger.Fatal("Error during binding: " + err.Error())
+	}
 }

v2/internal/app/dev.go

@@ -1,245 +0,0 @@
-// +build dev
-
-package app
-
-import (
-	"context"
-	"sync"
-
-	"github.com/wailsapp/wails/v2/internal/bridge"
-	"github.com/wailsapp/wails/v2/internal/menumanager"
-
-	"github.com/wailsapp/wails/v2/pkg/options"
-
-	"github.com/wailsapp/wails/v2/internal/binding"
-	"github.com/wailsapp/wails/v2/internal/logger"
-	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-	"github.com/wailsapp/wails/v2/internal/runtime"
-	"github.com/wailsapp/wails/v2/internal/servicebus"
-	"github.com/wailsapp/wails/v2/internal/signal"
-	"github.com/wailsapp/wails/v2/internal/subsystem"
-)
-
-// App defines a Wails application structure
-type App struct {
-	appType string
-
-	servicebus *servicebus.ServiceBus
-	logger     *logger.Logger
-	signal     *signal.Manager
-	options    *options.App
-
-	// Subsystems
-	log     *subsystem.Log
-	runtime *subsystem.Runtime
-	event   *subsystem.Event
-	//binding    *subsystem.Binding
-	call       *subsystem.Call
-	menu       *subsystem.Menu
-	dispatcher *messagedispatcher.Dispatcher
-
-	menuManager *menumanager.Manager
-
-	// Indicates if the app is in debug mode
-	debug bool
-
-	// This is our binding DB
-	bindings *binding.Bindings
-
-	// Application Stores
-	loglevelStore  *runtime.Store
-	appconfigStore *runtime.Store
-
-	// Startup/Shutdown
-	startupCallback  func(*runtime.Runtime)
-	shutdownCallback func()
-
-	// Bridge
-	bridge *bridge.Bridge
-}
-
-// Create App
-func CreateApp(appoptions *options.App) (*App, error) {
-
-	// Merge default options
-	options.MergeDefaults(appoptions)
-
-	// Set up logger
-	myLogger := logger.New(appoptions.Logger)
-
-	// Create the menu manager
-	menuManager := menumanager.NewManager()
-
-	// Process the application menu
-	menuManager.SetApplicationMenu(options.GetApplicationMenu(appoptions))
-
-	// Process context menus
-	contextMenus := options.GetContextMenus(appoptions)
-	for _, contextMenu := range contextMenus {
-		menuManager.AddContextMenu(contextMenu)
-	}
-
-	// Process tray menus
-	trayMenus := options.GetTrayMenus(appoptions)
-	for _, trayMenu := range trayMenus {
-		menuManager.AddTrayMenu(trayMenu)
-	}
-
-	// Create binding exemptions - Ugly hack. There must be a better way
-	bindingExemptions := []interface{}{appoptions.Startup, appoptions.Shutdown}
-
-	result := &App{
-		appType:          "dev",
-		bindings:         binding.NewBindings(myLogger, appoptions.Bind, bindingExemptions),
-		logger:           myLogger,
-		servicebus:       servicebus.New(myLogger),
-		startupCallback:  appoptions.Startup,
-		shutdownCallback: appoptions.Shutdown,
-		bridge:           bridge.NewBridge(myLogger),
-		menuManager:      menuManager,
-	}
-
-	result.options = appoptions
-
-	// Initialise the app
-	err := result.Init()
-
-	return result, err
-
-}
-
-// Run the application
-func (a *App) Run() error {
-
-	var err error
-
-	// Setup a context
-	var subsystemWaitGroup sync.WaitGroup
-	parentContext := context.WithValue(context.Background(), "waitgroup", &subsystemWaitGroup)
-	ctx, cancel := context.WithCancel(parentContext)
-	defer cancel()
-
-	// Start the service bus
-	a.servicebus.Debug()
-	err = a.servicebus.Start()
-	if err != nil {
-		return err
-	}
-
-	runtimesubsystem, err := subsystem.NewRuntime(ctx, a.servicebus, a.logger, a.startupCallback)
-	if err != nil {
-		return err
-	}
-	a.runtime = runtimesubsystem
-	err = a.runtime.Start()
-	if err != nil {
-		return err
-	}
-
-	// Application Stores
-	a.loglevelStore = a.runtime.GoRuntime().Store.New("wails:loglevel", a.options.LogLevel)
-	a.appconfigStore = a.runtime.GoRuntime().Store.New("wails:appconfig", a.options)
-
-	// Start the logging subsystem
-	log, err := subsystem.NewLog(a.servicebus, a.logger, a.loglevelStore)
-	if err != nil {
-		return err
-	}
-	a.log = log
-	err = a.log.Start()
-	if err != nil {
-		return err
-	}
-
-	// create the dispatcher
-	dispatcher, err := messagedispatcher.New(a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.dispatcher = dispatcher
-	err = dispatcher.Start()
-	if err != nil {
-		return err
-	}
-
-	// Start the eventing subsystem
-	eventsubsystem, err := subsystem.NewEvent(ctx, a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.event = eventsubsystem
-	err = a.event.Start()
-	if err != nil {
-		return err
-	}
-
-	// Start the menu subsystem
-	menusubsystem, err := subsystem.NewMenu(ctx, a.servicebus, a.logger, a.menuManager)
-	if err != nil {
-		return err
-	}
-	a.menu = menusubsystem
-	err = a.menu.Start()
-	if err != nil {
-		return err
-	}
-
-	// Start the call subsystem
-	callSubsystem, err := subsystem.NewCall(ctx, a.servicebus, a.logger, a.bindings.DB(), a.runtime.GoRuntime())
-	if err != nil {
-		return err
-	}
-	a.call = callSubsystem
-	err = a.call.Start()
-	if err != nil {
-		return err
-	}
-
-	// Dump bindings as a debug
-	bindingDump, err := a.bindings.ToJSON()
-	if err != nil {
-		return err
-	}
-
-	// Generate backend.js
-	a.bindings.GenerateBackendJS()
-
-	// Setup signal handler
-	signalsubsystem, err := signal.NewManager(ctx, cancel, a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.signal = signalsubsystem
-	a.signal.Start()
-
-	err = a.bridge.Run(dispatcher, a.menuManager, bindingDump, a.debug)
-	a.logger.Trace("Bridge.Run() exited")
-	if err != nil {
-		return err
-	}
-
-	// Close down all the subsystems
-	a.logger.Trace("Cancelling subsystems")
-	cancel()
-	subsystemWaitGroup.Wait()
-
-	a.logger.Trace("Cancelling dispatcher")
-	dispatcher.Close()
-
-	// Close log
-	a.logger.Trace("Stopping log")
-	log.Close()
-
-	a.logger.Trace("Stopping Service bus")
-	err = a.servicebus.Stop()
-	if err != nil {
-		return err
-	}
-
-	// Shutdown callback
-	if a.shutdownCallback != nil {
-		a.shutdownCallback()
-	}
-	return nil
-
-}

v2/internal/app/hybrid.go

@@ -75,7 +75,7 @@ func CreateApp(options *Options) *App {
 		webserver:  webserver.NewWebServer(myLogger),
 		servicebus: servicebus.New(myLogger),
 		logger:     myLogger,
-		bindings:   binding.NewBindings(myLogger, options.Bind),
+		bindings:   binding.NewBindings(myLogger),
 	}
 
 	// Initialise the app
@@ -192,3 +192,14 @@ func (a *App) Run() error {
 
 	return cli.Run()
 }
+
+// Bind a struct to the application by passing in
+// a pointer to it
+func (a *App) Bind(structPtr interface{}) {
+
+	// Add the struct to the bindings
+	err := a.bindings.Add(structPtr)
+	if err != nil {
+		a.logger.Fatal("Error during binding: " + err.Error())
+	}
+}

v2/internal/app/preflight_default.go

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

@@ -1,26 +0,0 @@
-//+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 {
-
-	_ = options
-
-	// 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.
-	installedVersion, err := wv2runtime.Process()
-	if installedVersion != nil {
-		a.logger.Debug("WebView2 Runtime installed: Name: '%s' Version:'%s' Location:'%s'. Minimum version required: %s.",
-			installedVersion.Name, installedVersion.Version, installedVersion.Location, wv2runtime.MinimumRuntimeVersion)
-	}
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

v2/internal/app/server.go

@@ -6,13 +6,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/wailsapp/wails/v2/pkg/options"
-
 	"github.com/leaanthony/clir"
 	"github.com/wailsapp/wails/v2/internal/binding"
 	"github.com/wailsapp/wails/v2/internal/logger"
 	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-	"github.com/wailsapp/wails/v2/internal/runtime"
 	"github.com/wailsapp/wails/v2/internal/servicebus"
 	"github.com/wailsapp/wails/v2/internal/subsystem"
 	"github.com/wailsapp/wails/v2/internal/webserver"
@@ -20,16 +17,12 @@ import (
 
 // App defines a Wails application structure
 type App struct {
-	appType string
-
 	binding *subsystem.Binding
 	call    *subsystem.Call
 	event   *subsystem.Event
 	log     *subsystem.Log
 	runtime *subsystem.Runtime
 
-	options *options.App
-
 	bindings   *binding.Bindings
 	logger     *logger.Logger
 	dispatcher *messagedispatcher.Dispatcher
@@ -37,40 +30,28 @@ type App struct {
 	webserver  *webserver.WebServer
 
 	debug bool
-
-	// Application Stores
-	loglevelStore  *runtime.Store
-	appconfigStore *runtime.Store
-
-	// Startup/Shutdown
-	startupCallback  func(*runtime.Runtime)
-	shutdownCallback func()
 }
 
 // Create App
-func CreateApp(appoptions *options.App) (*App, error) {
+func CreateApp(options *Options) *App {
+	options.mergeDefaults()
+	// We ignore the inputs (for now)
 
-	// Merge default options
-	options.MergeDefaults(appoptions)
-
-	// Set up logger
-	myLogger := logger.New(appoptions.Logger)
-	myLogger.SetLogLevel(appoptions.LogLevel)
+	// TODO: Allow logger output override on CLI
+	myLogger := logger.New(os.Stdout)
+	myLogger.SetLogLevel(logger.TRACE)
 
 	result := &App{
-		appType:          "server",
-		bindings:         binding.NewBindings(myLogger, options.Bind),
-		logger:           myLogger,
-		servicebus:       servicebus.New(myLogger),
-		webserver:        webserver.NewWebServer(myLogger),
-		startupCallback:  appoptions.Startup,
-		shutdownCallback: appoptions.Shutdown,
+		bindings:   binding.NewBindings(myLogger),
+		logger:     myLogger,
+		servicebus: servicebus.New(myLogger),
+		webserver:  webserver.NewWebServer(myLogger),
 	}
 
 	// Initialise app
 	result.Init()
 
-	return result, nil
+	return result
 }
 
 // Run the application
@@ -79,7 +60,7 @@ func (a *App) Run() error {
 	// Default app options
 	var port = 8080
 	var ip = "localhost"
-	var SuppressLogging = false
+	var supressLogging = false
 	var debugMode = false
 
 	// Create CLI
@@ -89,7 +70,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", "Suppress logging", &SuppressLogging)
+	cli.BoolFlag("q", "Supress logging", &supressLogging)
 
 	// Setup main action
 	cli.Action(func() error {
@@ -98,8 +79,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 Suppressing it)
-		if !SuppressLogging {
+		// Log information (if we aren't supressing it)
+		if !supressLogging {
 			cli.PrintBanner()
 			a.logger.Info("Running server at %s", a.webserver.URL())
 		}
@@ -107,21 +88,8 @@ func (a *App) Run() error {
 		if debugMode {
 			a.servicebus.Debug()
 		}
-
-		// Start the runtime
-		runtime, err := subsystem.NewRuntime(a.servicebus, a.logger, a.startupCallback, a.shutdownCallback)
-		if err != nil {
-			return err
-		}
-		a.runtime = runtime
-		a.runtime.Start()
-
-		// Application Stores
-		a.loglevelStore = a.runtime.GoRuntime().Store.New("wails:loglevel", a.options.LogLevel)
-		a.appconfigStore = a.runtime.GoRuntime().Store.New("wails:appconfig", a.options)
-
 		a.servicebus.Start()
-		log, err := subsystem.NewLog(a.servicebus, a.logger, a.loglevelStore)
+		log, err := subsystem.NewLog(a.servicebus, a.logger)
 		if err != nil {
 			return err
 		}
@@ -134,6 +102,14 @@ func (a *App) Run() error {
 		a.dispatcher = dispatcher
 		a.dispatcher.Start()
 
+		// Start the runtime
+		runtime, err := subsystem.NewRuntime(a.servicebus, a.logger)
+		if err != nil {
+			return err
+		}
+		a.runtime = runtime
+		a.runtime.Start()
+
 		// Start the binding subsystem
 		binding, err := subsystem.NewBinding(a.servicebus, a.logger, a.bindings, runtime.GoRuntime())
 		if err != nil {
@@ -151,7 +127,7 @@ func (a *App) Run() error {
 		a.event.Start()
 
 		// Start the call subsystem
-		call, err := subsystem.NewCall(a.servicebus, a.logger, a.bindings.DB(), a.runtime.GoRuntime())
+		call, err := subsystem.NewCall(a.servicebus, a.logger, a.bindings.DB())
 		if err != nil {
 			return err
 		}
@@ -171,3 +147,14 @@ func (a *App) Run() error {
 
 	return cli.Run()
 }
+
+// Bind a struct to the application by passing in
+// a pointer to it
+func (a *App) Bind(structPtr interface{}) {
+
+	// Add the struct to the bindings
+	err := a.bindings.Add(structPtr)
+	if err != nil {
+		a.logger.Fatal("Error during binding: " + err.Error())
+	}
+}

v2/internal/binding/assets/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "backend",
-  "version": "1.0.0",
-  "description": "Package to wrap backend method calls",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC"
-}

v2/internal/binding/binding.go

@@ -2,53 +2,28 @@ package binding
 
 import (
 	"fmt"
-	"reflect"
-	"runtime"
 	"strings"
 
-	"github.com/leaanthony/slicer"
-
 	"github.com/wailsapp/wails/v2/internal/logger"
 )
 
 type Bindings struct {
-	db         *DB
-	logger     logger.CustomLogger
-	exemptions slicer.StringSlicer
+	db     *DB
+	logger logger.CustomLogger
 }
 
 // NewBindings returns a new Bindings object
-func NewBindings(logger *logger.Logger, structPointersToBind []interface{}, exemptions []interface{}) *Bindings {
-	result := &Bindings{
+func NewBindings(logger *logger.Logger) *Bindings {
+	return &Bindings{
 		db:     newDB(),
 		logger: logger.CustomLogger("Bindings"),
 	}
-
-	for _, exemption := range exemptions {
-		if exemptions == nil {
-			continue
-		}
-		name := runtime.FuncForPC(reflect.ValueOf(exemption).Pointer()).Name()
-		// Yuk yuk yuk! Is there a better way?
-		name = strings.TrimSuffix(name, "-fm")
-		result.exemptions.Add(name)
-	}
-
-	// Add the structs to bind
-	for _, ptr := range structPointersToBind {
-		err := result.Add(ptr)
-		if err != nil {
-			logger.Fatal("Error during binding: " + err.Error())
-		}
-	}
-
-	return result
 }
 
 // Add the given struct methods to the Bindings
 func (b *Bindings) Add(structPtr interface{}) error {
 
-	methods, err := b.getMethods(structPtr)
+	methods, err := getMethods(structPtr)
 	if err != nil {
 		return fmt.Errorf("cannot bind value to app: %s", err.Error())
 	}
@@ -61,6 +36,7 @@ func (b *Bindings) Add(structPtr interface{}) error {
 
 		// Add it as a regular method
 		b.db.AddMethod(packageName, structName, methodName, method)
+
 	}
 	return nil
 }

v2/internal/binding/boundMethod.go

@@ -30,9 +30,6 @@ func (b *BoundMethod) OutputCount() int {
 func (b *BoundMethod) ParseArgs(args []json.RawMessage) ([]interface{}, error) {
 
 	result := make([]interface{}, b.InputCount())
-	if len(args) != b.InputCount() {
-		return nil, fmt.Errorf("received %d arguments to method '%s', expected %d", len(args), b.Name, b.InputCount())
-	}
 	for index, arg := range args {
 		typ := b.Inputs[index].reflectType
 		inputValue := reflect.New(typ).Interface()

v2/internal/binding/generate.go

@@ -1,155 +0,0 @@
-package binding
-
-import (
-	"bytes"
-	_ "embed"
-	"fmt"
-	"log"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/wailsapp/wails/v2/internal/fs"
-
-	"github.com/leaanthony/slicer"
-)
-
-//go:embed assets/package.json
-var packageJSON []byte
-
-func (b *Bindings) GenerateBackendJS() {
-
-	store := b.db.store
-	var output bytes.Buffer
-
-	output.WriteString(`// @ts-check
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-const backend = {`)
-	output.WriteString("\n")
-
-	var sortedPackageNames slicer.StringSlicer
-	for packageName := range store {
-		sortedPackageNames.Add(packageName)
-	}
-	sortedPackageNames.Sort()
-	sortedPackageNames.Each(func(packageName string) {
-		packages := store[packageName]
-		output.WriteString(fmt.Sprintf("  \"%s\": {", packageName))
-		output.WriteString("\n")
-		var sortedStructNames slicer.StringSlicer
-		for structName := range packages {
-			sortedStructNames.Add(structName)
-		}
-		sortedStructNames.Sort()
-
-		sortedStructNames.Each(func(structName string) {
-			structs := packages[structName]
-			output.WriteString(fmt.Sprintf("    \"%s\": {", structName))
-			output.WriteString("\n")
-
-			var sortedMethodNames slicer.StringSlicer
-			for methodName := range structs {
-				sortedMethodNames.Add(methodName)
-			}
-			sortedMethodNames.Sort()
-
-			sortedMethodNames.Each(func(methodName string) {
-				methodDetails := structs[methodName]
-				output.WriteString("      /**\n")
-				output.WriteString("       * " + methodName + "\n")
-				var args slicer.StringSlicer
-				for count, input := range methodDetails.Inputs {
-					arg := fmt.Sprintf("arg%d", count+1)
-					args.Add(arg)
-					output.WriteString(fmt.Sprintf("       * @param {%s} %s - Go Type: %s\n", goTypeToJSDocType(input.TypeName), arg, input.TypeName))
-				}
-				returnType := "Promise"
-				returnTypeDetails := ""
-				if methodDetails.OutputCount() > 0 {
-					firstType := goTypeToJSDocType(methodDetails.Outputs[0].TypeName)
-					returnType += "<" + firstType
-					if methodDetails.OutputCount() == 2 {
-						secondType := goTypeToJSDocType(methodDetails.Outputs[1].TypeName)
-						returnType += "|" + secondType
-					}
-					returnType += ">"
-					returnTypeDetails = " - Go Type: " + methodDetails.Outputs[0].TypeName
-				} else {
-					returnType = "Promise<void>"
-				}
-				output.WriteString("       * @returns {" + returnType + "} " + returnTypeDetails + "\n")
-				output.WriteString("       */\n")
-				argsString := args.Join(", ")
-				output.WriteString(fmt.Sprintf("      \"%s\": (%s) => {", methodName, argsString))
-				output.WriteString("\n")
-				output.WriteString(fmt.Sprintf("        return window.backend.%s.%s.%s(%s);", packageName, structName, methodName, argsString))
-				output.WriteString("\n")
-				output.WriteString(fmt.Sprintf("      },"))
-				output.WriteString("\n")
-
-			})
-
-			output.WriteString(fmt.Sprintf("    }"))
-			output.WriteString("\n")
-		})
-
-		output.WriteString(fmt.Sprintf("  }\n"))
-		output.WriteString("\n")
-	})
-
-	output.WriteString(`};
-export default backend;`)
-	output.WriteString("\n")
-
-	// TODO: Make this configurable in wails.json
-	dirname, err := fs.RelativeToCwd("frontend/src/backend")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if !fs.DirExists(dirname) {
-		err := fs.MkDirs(dirname)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-
-	packageJsonFile := filepath.Join(dirname, "package.json")
-	if !fs.FileExists(packageJsonFile) {
-		err := os.WriteFile(packageJsonFile, packageJSON, 0755)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-
-	filename := filepath.Join(dirname, "index.js")
-	err = os.WriteFile(filename, output.Bytes(), 0755)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-func goTypeToJSDocType(input string) string {
-	switch true {
-	case input == "string":
-		return "string"
-	case input == "error":
-		return "Error"
-	case
-		strings.HasPrefix(input, "int"),
-		strings.HasPrefix(input, "uint"),
-		strings.HasPrefix(input, "float"):
-		return "number"
-	case input == "bool":
-		return "boolean"
-	case input == "[]byte":
-		return "string"
-	case strings.HasPrefix(input, "[]"):
-		arrayType := goTypeToJSDocType(input[2:])
-		return "Array.<" + arrayType + ">"
-	default:
-		return "any"
-	}
-}

v2/internal/binding/generate_test.go

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

v2/internal/binding/reflect.go

@@ -23,7 +23,7 @@ func isStruct(value interface{}) bool {
 	return reflect.ValueOf(value).Kind() == reflect.Struct
 }
 
-func (b *Bindings) getMethods(value interface{}) ([]*BoundMethod, error) {
+func getMethods(value interface{}) ([]*BoundMethod, error) {
 
 	// Create result placeholder
 	var result []*BoundMethod
@@ -56,11 +56,6 @@ func (b *Bindings) getMethods(value interface{}) ([]*BoundMethod, error) {
 		fullMethodName := baseName + "." + methodName
 		method := structValue.MethodByName(methodName)
 
-		methodReflectName := runtime.FuncForPC(methodDef.Func.Pointer()).Name()
-		if b.exemptions.Contains(methodReflectName) {
-			continue
-		}
-
 		// Create new method
 		boundMethod := &BoundMethod{
 			Name:     fullMethodName,

v2/internal/bridge/bridge.go

@@ -1,113 +0,0 @@
-package bridge
-
-import (
-	"context"
-	"log"
-	"net/http"
-	"sync"
-
-	"github.com/wailsapp/wails/v2/internal/menumanager"
-
-	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-
-	"github.com/gorilla/websocket"
-	"github.com/wailsapp/wails/v2/internal/logger"
-)
-
-type Bridge struct {
-	upgrader websocket.Upgrader
-	server   *http.Server
-	myLogger *logger.Logger
-
-	bindings   string
-	dispatcher *messagedispatcher.Dispatcher
-
-	mu       sync.Mutex
-	sessions map[string]*session
-
-	ctx    context.Context
-	cancel context.CancelFunc
-
-	// Dialog client
-	dialog *messagedispatcher.DispatchClient
-
-	// Menus
-	menumanager *menumanager.Manager
-}
-
-func NewBridge(myLogger *logger.Logger) *Bridge {
-	result := &Bridge{
-		myLogger: myLogger,
-		upgrader: websocket.Upgrader{CheckOrigin: func(r *http.Request) bool { return true }},
-		sessions: make(map[string]*session),
-	}
-
-	myLogger.SetLogLevel(1)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	result.ctx = ctx
-	result.cancel = cancel
-	result.server = &http.Server{Addr: ":34115"}
-	http.HandleFunc("/bridge", result.wsBridgeHandler)
-	return result
-}
-
-func (b *Bridge) Run(dispatcher *messagedispatcher.Dispatcher, menumanager *menumanager.Manager, bindings string, debug bool) error {
-
-	// Ensure we cancel the context when we shutdown
-	defer b.cancel()
-
-	b.bindings = bindings
-	b.dispatcher = dispatcher
-	b.menumanager = menumanager
-
-	// Setup dialog handler
-	dialogClient := NewDialogClient(b.myLogger)
-	b.dialog = dispatcher.RegisterClient(dialogClient)
-	dialogClient.dispatcher = b.dialog
-
-	b.myLogger.Info("Bridge mode started.")
-
-	err := b.server.ListenAndServe()
-	if err != nil && err != http.ErrServerClosed {
-		return err
-	}
-
-	return nil
-}
-
-func (b *Bridge) wsBridgeHandler(w http.ResponseWriter, r *http.Request) {
-	c, err := b.upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Print("upgrade:", err)
-		return
-	}
-
-	if err != nil {
-		http.Error(w, "Could not open websocket connection", http.StatusBadRequest)
-	}
-	b.myLogger.Info("Connection from frontend accepted [%s].", c.RemoteAddr().String())
-	b.startSession(c)
-
-}
-
-func (b *Bridge) startSession(conn *websocket.Conn) {
-
-	// Create a new session for this connection
-	s := newSession(conn, b.menumanager, b.bindings, b.dispatcher, b.myLogger, b.ctx)
-
-	// Setup the close handler
-	conn.SetCloseHandler(func(int, string) error {
-		b.myLogger.Info("Connection dropped [%s].", s.Identifier())
-		b.dispatcher.RemoveClient(s.client)
-		b.mu.Lock()
-		delete(b.sessions, s.Identifier())
-		b.mu.Unlock()
-		return nil
-	})
-
-	b.mu.Lock()
-	go s.start(len(b.sessions) == 0)
-	b.sessions[s.Identifier()] = s
-	b.mu.Unlock()
-}

v2/internal/bridge/client.go

@@ -1,141 +0,0 @@
-package bridge
-
-import (
-	"github.com/wailsapp/wails/v2/pkg/options/dialog"
-)
-
-type BridgeClient struct {
-	session *session
-
-	// Tray menu cache to send to reconnecting clients
-	messageCache chan string
-}
-
-func (b BridgeClient) DeleteTrayMenuByID(id string) {
-	b.session.sendMessage("TD" + id)
-}
-
-func NewBridgeClient() *BridgeClient {
-	return &BridgeClient{
-		messageCache: make(chan string, 100),
-	}
-}
-
-func (b BridgeClient) Quit() {
-	b.session.log.Info("Quit unsupported in Bridge mode")
-}
-
-func (b BridgeClient) NotifyEvent(message string) {
-	b.session.sendMessage("n" + message)
-	b.session.log.Info("NotifyEvent: %s", message)
-}
-
-func (b BridgeClient) CallResult(message string) {
-	b.session.sendMessage("c" + message)
-}
-
-func (b BridgeClient) OpenFileDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
-	// Handled by dialog_client
-}
-
-func (b BridgeClient) OpenMultipleFilesDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
-	// Handled by dialog_client
-}
-
-func (b BridgeClient) OpenDirectoryDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
-	// Handled by dialog_client
-}
-
-func (b BridgeClient) SaveDialog(dialogOptions *dialog.SaveDialog, callbackID string) {
-	// Handled by dialog_client
-}
-
-func (b BridgeClient) MessageDialog(dialogOptions *dialog.MessageDialog, callbackID string) {
-	// Handled by dialog_client
-}
-
-func (b BridgeClient) WindowSetTitle(title string) {
-	b.session.log.Info("WindowSetTitle unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowShow() {
-	b.session.log.Info("WindowShow unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowHide() {
-	b.session.log.Info("WindowHide unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowCenter() {
-	b.session.log.Info("WindowCenter unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowMaximise() {
-	b.session.log.Info("WindowMaximise unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowUnmaximise() {
-	b.session.log.Info("WindowUnmaximise unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowMinimise() {
-	b.session.log.Info("WindowMinimise unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowUnminimise() {
-	b.session.log.Info("WindowUnminimise unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowPosition(x int, y int) {
-	b.session.log.Info("WindowPosition unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowSize(width int, height int) {
-	b.session.log.Info("WindowSize unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowSetMinSize(width int, height int) {
-	b.session.log.Info("WindowSetMinSize unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowSetMaxSize(width int, height int) {
-	b.session.log.Info("WindowSetMaxSize unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowFullscreen() {
-	b.session.log.Info("WindowFullscreen unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowUnFullscreen() {
-	b.session.log.Info("WindowUnFullscreen unsupported in Bridge mode")
-}
-
-func (b BridgeClient) WindowSetColour(colour int) {
-	b.session.log.Info("WindowSetColour unsupported in Bridge mode")
-}
-
-func (b BridgeClient) DarkModeEnabled(callbackID string) {
-	b.session.log.Info("DarkModeEnabled unsupported in Bridge mode")
-}
-
-func (b BridgeClient) SetApplicationMenu(menuJSON string) {
-	b.session.log.Info("SetApplicationMenu unsupported in Bridge mode")
-}
-
-func (b BridgeClient) SetTrayMenu(trayMenuJSON string) {
-	b.session.sendMessage("TS" + trayMenuJSON)
-}
-
-func (b BridgeClient) UpdateTrayMenuLabel(trayMenuJSON string) {
-	b.session.sendMessage("TU" + trayMenuJSON)
-}
-
-func (b BridgeClient) UpdateContextMenu(contextMenuJSON string) {
-	b.session.log.Info("UpdateContextMenu unsupported in Bridge mode")
-}
-
-func newBridgeClient(session *session) *BridgeClient {
-	return &BridgeClient{
-		session: session,
-	}
-}

v2/internal/bridge/dialog_client.go

@@ -1,148 +0,0 @@
-package bridge
-
-import (
-	"fmt"
-	"os/exec"
-	"strconv"
-	"strings"
-
-	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-
-	"github.com/wailsapp/wails/v2/internal/logger"
-
-	"github.com/leaanthony/slicer"
-	"github.com/wailsapp/wails/v2/pkg/options/dialog"
-)
-
-type DialogClient struct {
-	dispatcher *messagedispatcher.DispatchClient
-	log        *logger.Logger
-}
-
-func (d *DialogClient) DeleteTrayMenuByID(id string) {
-}
-
-func NewDialogClient(log *logger.Logger) *DialogClient {
-	return &DialogClient{
-		log: log,
-	}
-}
-
-func (d *DialogClient) Quit() {
-}
-
-func (d *DialogClient) NotifyEvent(message string) {
-}
-
-func (d *DialogClient) CallResult(message string) {
-}
-
-func (d *DialogClient) OpenDirectoryDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
-}
-func (d *DialogClient) OpenFileDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
-}
-func (d *DialogClient) OpenMultipleFilesDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
-}
-
-func (d *DialogClient) SaveDialog(dialogOptions *dialog.SaveDialog, callbackID string) {
-}
-
-func (d *DialogClient) MessageDialog(dialogOptions *dialog.MessageDialog, callbackID string) {
-
-	osa, err := exec.LookPath("osascript")
-	if err != nil {
-		d.log.Info("MessageDialog unavailable (osascript not found)")
-		return
-	}
-
-	var btns slicer.StringSlicer
-	defaultButton := ""
-	cancelButton := ""
-	for index, btn := range dialogOptions.Buttons {
-		btns.Add(strconv.Quote(btn))
-		if btn == dialogOptions.DefaultButton {
-			defaultButton = fmt.Sprintf("default button %d", index+1)
-		}
-		if btn == dialogOptions.CancelButton {
-			cancelButton = fmt.Sprintf("cancel button %d", index+1)
-		}
-	}
-	buttons := "{" + btns.Join(",") + "}"
-	script := fmt.Sprintf("display dialog \"%s\" buttons %s %s %s with title \"%s\"", dialogOptions.Message, buttons, defaultButton, cancelButton, dialogOptions.Title)
-	go func() {
-		out, err := exec.Command(osa, "-e", script).Output()
-		if err != nil {
-			// Assume user has pressed cancel button
-			if dialogOptions.CancelButton != "" {
-				d.dispatcher.DispatchMessage("DM" + callbackID + "|" + dialogOptions.CancelButton)
-				return
-			}
-			d.log.Error("Dialog had bad exit code. If this was a Cancel button, add 'CancelButton' to the dialog.MessageDialog struct. Error: %s", err.Error())
-			d.dispatcher.DispatchMessage("DM" + callbackID + "|error - check logs")
-			return
-		}
-
-		buttonPressed := strings.TrimSpace(strings.TrimPrefix(string(out), "button returned:"))
-		d.dispatcher.DispatchMessage("DM" + callbackID + "|" + buttonPressed)
-	}()
-}
-
-func (d *DialogClient) WindowSetTitle(title string) {
-}
-
-func (d *DialogClient) WindowShow() {
-}
-
-func (d *DialogClient) WindowHide() {
-}
-
-func (d *DialogClient) WindowCenter() {
-}
-
-func (d *DialogClient) WindowMaximise() {
-}
-
-func (d *DialogClient) WindowUnmaximise() {
-}
-
-func (d *DialogClient) WindowMinimise() {
-}
-
-func (d *DialogClient) WindowUnminimise() {
-}
-
-func (d *DialogClient) WindowPosition(x int, y int) {
-}
-
-func (d *DialogClient) WindowSize(width int, height int) {
-}
-
-func (d *DialogClient) WindowSetMinSize(width int, height int) {
-}
-
-func (d *DialogClient) WindowSetMaxSize(width int, height int) {
-}
-
-func (d *DialogClient) WindowFullscreen() {
-}
-
-func (d *DialogClient) WindowUnFullscreen() {
-}
-
-func (d *DialogClient) WindowSetColour(colour int) {
-}
-
-func (d *DialogClient) DarkModeEnabled(callbackID string) {
-}
-
-func (d *DialogClient) SetApplicationMenu(menuJSON string) {
-}
-
-func (d *DialogClient) SetTrayMenu(trayMenuJSON string) {
-}
-
-func (d *DialogClient) UpdateTrayMenuLabel(trayMenuJSON string) {
-}
-
-func (d *DialogClient) UpdateContextMenu(contextMenuJSON string) {
-}

v2/internal/bridge/session.go

@@ -1,187 +0,0 @@
-package bridge
-
-import (
-	"context"
-	_ "embed"
-	"log"
-	"runtime"
-	"time"
-
-	"github.com/wailsapp/wails/v2/internal/menumanager"
-
-	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-
-	"github.com/gorilla/websocket"
-	"github.com/wailsapp/wails/v2/internal/logger"
-)
-
-//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
-	conn     *websocket.Conn
-	//eventManager interfaces.EventManager
-	log *logger.Logger
-	//ipc          interfaces.IPCManager
-
-	// Mutex for writing to the socket
-	shutdown  chan bool
-	writeChan chan []byte
-
-	done bool
-
-	// context
-	ctx context.Context
-
-	// client
-	client *messagedispatcher.DispatchClient
-
-	// Menus
-	menumanager *menumanager.Manager
-}
-
-func newSession(conn *websocket.Conn, menumanager *menumanager.Manager, bindings string, dispatcher *messagedispatcher.Dispatcher, logger *logger.Logger, ctx context.Context) *session {
-	result := &session{
-		conn:        conn,
-		bindings:    bindings,
-		log:         logger,
-		shutdown:    make(chan bool),
-		writeChan:   make(chan []byte, 100),
-		ctx:         ctx,
-		menumanager: menumanager,
-	}
-
-	result.client = dispatcher.RegisterClient(newBridgeClient(result))
-
-	return result
-
-}
-
-// Identifier returns a string identifier for the remote connection.
-// Taking the form of the client's <ip address>:<port>.
-func (s *session) Identifier() string {
-	if s.conn != nil {
-		return s.conn.RemoteAddr().String()
-	}
-	return ""
-}
-
-func (s *session) sendMessage(msg string) error {
-	if !s.done {
-		s.writeChan <- []byte(msg)
-	}
-	return nil
-}
-
-func (s *session) start(firstSession bool) {
-	s.log.SetLogLevel(1)
-	s.log.Info("Connected to frontend.")
-	go s.writePump()
-
-	var wailsRuntime string
-	switch runtime.GOOS {
-	case "darwin":
-		wailsRuntime = darwinRuntime
-	case "windows":
-		wailsRuntime = windowsRuntime
-	case "linux":
-		wailsRuntime = linuxRuntime
-	default:
-		log.Fatal("platform not supported")
-	}
-
-	bindingsMessage := "window.wailsbindings = `" + s.bindings + "`;"
-	s.log.Info(bindingsMessage)
-	bootstrapMessage := bindingsMessage + wailsRuntime
-
-	err := s.sendMessage("b" + bootstrapMessage)
-	if err != nil {
-		s.log.Error(err.Error())
-	}
-
-	// Send menus
-	traymenus, err := s.menumanager.GetTrayMenus()
-	if err != nil {
-		s.log.Error(err.Error())
-	}
-
-	for _, trayMenu := range traymenus {
-		err := s.sendMessage("TS" + trayMenu)
-		if err != nil {
-			s.log.Error(err.Error())
-		}
-	}
-
-	for {
-		messageType, buffer, err := s.conn.ReadMessage()
-		if messageType == -1 {
-			return
-		}
-		if err != nil {
-			s.log.Error("Error reading message: %v", err)
-			err = s.conn.Close()
-			return
-		}
-
-		message := string(buffer)
-
-		s.log.Debug("Got message: %#v\n", message)
-
-		// Dispatch message as normal
-		s.client.DispatchMessage(message)
-
-		if s.done {
-			break
-		}
-	}
-}
-
-// Shutdown
-func (s *session) Shutdown() {
-	err := s.conn.Close()
-	if err != nil {
-		s.log.Error(err.Error())
-	}
-	s.done = true
-	s.log.Info("session %v exit", s.Identifier())
-}
-
-// writePump pulls messages from the writeChan and sends them to the client
-// since it uses a channel to read the messages the socket is protected without locks
-func (s *session) writePump() {
-	s.log.Debug("Session %v - writePump start", s.Identifier())
-	defer s.log.Debug("Session %v - writePump shutdown", s.Identifier())
-	for {
-		select {
-		case <-s.ctx.Done():
-			s.Shutdown()
-			return
-		case msg, ok := <-s.writeChan:
-			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!")
-				err := s.conn.WriteMessage(websocket.CloseMessage, []byte{})
-				if err != nil {
-					s.log.Error(err.Error())
-				}
-				return
-			}
-
-			if err := s.conn.WriteMessage(websocket.TextMessage, msg); err != nil {
-				s.log.Debug(err.Error())
-				return
-			}
-		}
-	}
-}

v2/internal/colour/colour.go

@@ -1,89 +0,0 @@
-package colour
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/wzshiming/ctc"
-)
-
-func Col(col ctc.Color, text string) string {
-	return fmt.Sprintf("%s%s%s", col, text, ctc.Reset)
-}
-
-func Yellow(text string) string {
-	return Col(ctc.ForegroundBrightYellow, text)
-}
-
-func Red(text string) string {
-	return Col(ctc.ForegroundBrightRed, text)
-}
-
-func Blue(text string) string {
-	return Col(ctc.ForegroundBrightBlue, text)
-}
-
-func Green(text string) string {
-	return Col(ctc.ForegroundBrightGreen, text)
-}
-
-func Cyan(text string) string {
-	return Col(ctc.ForegroundBrightCyan, text)
-}
-
-func Magenta(text string) string {
-	return Col(ctc.ForegroundBrightMagenta, text)
-}
-
-func White(text string) string {
-	return Col(ctc.ForegroundBrightWhite, text)
-}
-
-func Black(text string) string {
-	return Col(ctc.ForegroundBrightBlack, text)
-}
-
-func DarkYellow(text string) string {
-	return Col(ctc.ForegroundYellow, text)
-}
-
-func DarkRed(text string) string {
-	return Col(ctc.ForegroundRed, text)
-}
-
-func DarkBlue(text string) string {
-	return Col(ctc.ForegroundBlue, text)
-}
-
-func DarkGreen(text string) string {
-	return Col(ctc.ForegroundGreen, text)
-}
-
-func DarkCyan(text string) string {
-	return Col(ctc.ForegroundCyan, text)
-}
-
-func DarkMagenta(text string) string {
-	return Col(ctc.ForegroundMagenta, text)
-}
-
-func DarkWhite(text string) string {
-	return Col(ctc.ForegroundWhite, text)
-}
-
-func DarkBlack(text string) string {
-	return Col(ctc.ForegroundBlack, text)
-}
-
-var rainbowCols = []func(string) string{Red, Yellow, Green, Cyan, Blue, Magenta}
-
-func Rainbow(text string) string {
-	var builder strings.Builder
-
-	for i := 0; i < len(text); i++ {
-		fn := rainbowCols[i%len(rainbowCols)]
-		builder.WriteString(fn(text[i : i+1]))
-	}
-
-	return builder.String()
-}

v2/internal/counter/counter.go

@@ -0,0 +1,40 @@
+package counter
+
+import "sync"
+
+type Counter struct {
+	initialValue uint64
+	value        uint64
+	lock         sync.Mutex
+}
+
+func NewCounter(initialValue uint64) *Counter {
+	return &Counter{
+		initialValue: initialValue,
+		value:        initialValue,
+	}
+}
+
+// SetValue sets the value to the given value
+func (c *Counter) SetValue(value uint64) {
+	c.lock.Lock()
+	c.value = value
+	c.lock.Unlock()
+}
+
+// Increment adds 1 to the counter and returns its value
+func (c *Counter) Increment() uint64 {
+	var result uint64
+	c.lock.Lock()
+	c.value++
+	result = c.value
+	c.lock.Unlock()
+	return result
+}
+
+// Reset the value to the initial value
+func (c *Counter) Reset() {
+	c.lock.Lock()
+	c.value = c.initialValue
+	c.lock.Unlock()
+}

v2/internal/deepcopy/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Joel
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

v2/internal/deepcopy/deepcopy.go

@@ -1,125 +0,0 @@
-// deepcopy makes deep copies of things. A standard copy will copy the
-// pointers: deep copy copies the values pointed to.  Unexported field
-// values are not copied.
-//
-// Copyright (c)2014-2016, Joel Scoble (github.com/mohae), all rights reserved.
-// License: MIT, for more details check the included LICENSE file.
-package deepcopy
-
-import (
-	"reflect"
-	"time"
-)
-
-// Interface for delegating copy process to type
-type Interface interface {
-	DeepCopy() interface{}
-}
-
-// Iface is an alias to Copy; this exists for backwards compatibility reasons.
-func Iface(iface interface{}) interface{} {
-	return Copy(iface)
-}
-
-// Copy creates a deep copy of whatever is passed to it and returns the copy
-// in an interface{}.  The returned value will need to be asserted to the
-// correct type.
-func Copy(src interface{}) interface{} {
-	if src == nil {
-		return nil
-	}
-
-	// Make the interface a reflect.Value
-	original := reflect.ValueOf(src)
-
-	// Make a copy of the same type as the original.
-	cpy := reflect.New(original.Type()).Elem()
-
-	// Recursively copy the original.
-	copyRecursive(original, cpy)
-
-	// Return the copy as an interface.
-	return cpy.Interface()
-}
-
-// copyRecursive does the actual copying of the interface. It currently has
-// limited support for what it can handle. Add as needed.
-func copyRecursive(original, cpy reflect.Value) {
-	// check for implement deepcopy.Interface
-	if original.CanInterface() {
-		if copier, ok := original.Interface().(Interface); ok {
-			cpy.Set(reflect.ValueOf(copier.DeepCopy()))
-			return
-		}
-	}
-
-	// handle according to original's Kind
-	switch original.Kind() {
-	case reflect.Ptr:
-		// Get the actual value being pointed to.
-		originalValue := original.Elem()
-
-		// if  it isn't valid, return.
-		if !originalValue.IsValid() {
-			return
-		}
-		cpy.Set(reflect.New(originalValue.Type()))
-		copyRecursive(originalValue, cpy.Elem())
-
-	case reflect.Interface:
-		// If this is a nil, don't do anything
-		if original.IsNil() {
-			return
-		}
-		// Get the value for the interface, not the pointer.
-		originalValue := original.Elem()
-
-		// Get the value by calling Elem().
-		copyValue := reflect.New(originalValue.Type()).Elem()
-		copyRecursive(originalValue, copyValue)
-		cpy.Set(copyValue)
-
-	case reflect.Struct:
-		t, ok := original.Interface().(time.Time)
-		if ok {
-			cpy.Set(reflect.ValueOf(t))
-			return
-		}
-		// Go through each field of the struct and copy it.
-		for i := 0; i < original.NumField(); i++ {
-			// The Type's StructField for a given field is checked to see if StructField.PkgPath
-			// is set to determine if the field is exported or not because CanSet() returns false
-			// for settable fields.  I'm not sure why.  -mohae
-			if original.Type().Field(i).PkgPath != "" {
-				continue
-			}
-			copyRecursive(original.Field(i), cpy.Field(i))
-		}
-
-	case reflect.Slice:
-		if original.IsNil() {
-			return
-		}
-		// Make a new slice and copy each element.
-		cpy.Set(reflect.MakeSlice(original.Type(), original.Len(), original.Cap()))
-		for i := 0; i < original.Len(); i++ {
-			copyRecursive(original.Index(i), cpy.Index(i))
-		}
-
-	case reflect.Map:
-		if original.IsNil() {
-			return
-		}
-		cpy.Set(reflect.MakeMap(original.Type()))
-		for _, key := range original.MapKeys() {
-			originalValue := original.MapIndex(key)
-			copyValue := reflect.New(originalValue.Type()).Elem()
-			copyRecursive(originalValue, copyValue)
-			copyKey := Copy(key.Interface())
-			cpy.SetMapIndex(reflect.ValueOf(copyKey), copyValue)
-		}
-
-	default:
-		cpy.Set(original)
-	}
-}

v2/internal/ffenestri/LICENCES.md

@@ -1,11 +1,5 @@
 # 3rd Party Licenses
 
-## Webview
-Whilst not using the library directly, there is certainly some code that is inspired by or used from the webview library.
-
-Homepage: https://github.com/webview/webview
-License: https://github.com/webview/webview/blob/master/LICENSE
-
 ## vec
 Homepage: https://github.com/rxi/vec
 License: https://github.com/rxi/vec/blob/master/LICENSE
@@ -16,4 +10,8 @@ License: http://git.ozlabs.org/?p=ccan;a=blob;f=licenses/BSD-MIT;h=89de354795ec7
 
 ## hashmap
 Homepage: https://github.com/sheredom/hashmap.h
-License: https://github.com/sheredom/hashmap.h/blob/master/LICENSE
+License: https://github.com/sheredom/hashmap.h/blob/master/LICENSE
+
+## utf8.h
+Homepage: https://github.com/sheredom/utf8.h
+License: https://github.com/sheredom/utf8.h/blob/master/LICENSE

v2/internal/ffenestri/common.c

@@ -1,6 +1,3 @@
-// +build !windows
-
-
 //
 // Created by Lea Anthony on 6/1/21.
 //
@@ -41,21 +38,31 @@ int freeHashmapItem(void *const context, struct hashmap_element_s *const e) {
 const char* getJSONString(JsonNode *item, const char* key) {
     // Get key
     JsonNode *node = json_find_member(item, key);
-    const char *result = "";
+    const char *result = NULL;
     if ( node != NULL && node->tag == JSON_STRING) {
         result = node->string_;
     }
     return result;
 }
 
+const char* getJSONStringDefault(JsonNode *item, const char* key, const char* defaultValue) {
+    const char* result = getJSONString(item, key);
+    if ( result == NULL ) result = defaultValue;
+    return result;
+}
+
 void ABORT_JSON(JsonNode *node, const char* key) {
     ABORT("Unable to read required key '%s' from JSON: %s\n", key, json_encode(node));
 }
 
-const char* mustJSONString(JsonNode *node, const char* key) {
-    const char* result = getJSONString(node, key);
-    if ( result == NULL ) {
-        ABORT_JSON(node, key);
+const char* mustJSONString(JsonNode *item, const char* key) {
+    JsonNode *member = json_find_member(item, key);
+    if ( member == NULL ) {
+        ABORT_JSON(item, key);
+    }
+    const char *result = "";
+    if ( member != NULL && member->tag == JSON_STRING) {
+        result = member->string_;
     }
     return result;
 }
@@ -71,15 +78,23 @@ JsonNode* getJSONObject(JsonNode* node, const char* key) {
     return json_find_member(node, key);
 }
 
-bool getJSONBool(JsonNode *item, const char* key, bool *result) {
-    JsonNode *node = json_find_member(item, key);
-    if ( node != NULL && node->tag == JSON_BOOL) {
-        *result = node->bool_;
-        return true;
+bool getJSONBool(JsonNode *node, const char* key) {
+    JsonNode *result = json_find_member(node, key);
+    if ( result != NULL && result->tag == JSON_BOOL) {
+        return result->bool_;
     }
     return false;
 }
 
+int mustJSONInt(JsonNode *node, const char* key) {
+    JsonNode *result = json_find_member(node, key);
+    if ( result == NULL || result->tag != JSON_NUMBER) {
+        ABORT_JSON(result, key);
+    }
+
+    return (int) result->number_;
+}
+
 bool getJSONInt(JsonNode *item, const char* key, int *result) {
     JsonNode *node = json_find_member(item, key);
     if ( node != NULL && node->tag == JSON_NUMBER) {

v2/internal/ffenestri/common.h

@@ -5,6 +5,10 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#define OBJC_OLD_DISPATCH_PROTOTYPES 1
+#include <objc/objc-runtime.h>
+#include <CoreGraphics/CoreGraphics.h>
+
 #include <stdio.h>
 #include <stdarg.h>
 #include "string.h"
@@ -14,23 +18,45 @@
 
 #define STREQ(a,b) strcmp(a, b) == 0
 #define STREMPTY(string) strlen(string) == 0
-#define STRCOPY(a) concat(a, "")
+#define STRCOPY(str) (str == NULL ? NULL : concat(str, ""))
 #define STR_HAS_CHARS(input) input != NULL && strlen(input) > 0
-#define MEMFREE(input) free((void*)input); input = NULL;
+#define MEMFREE(input) if(input != NULL) { free((void*)input); input = NULL; }
 #define FREE_AND_SET(variable, value) if( variable != NULL ) { MEMFREE(variable); } variable = value
+#define NEW(struct) malloc(sizeof(struct));
+
+#define HASHMAP_INIT(hashmap, initialSize, name) \
+    if( 0 != hashmap_create((const unsigned)initialSize, &hashmap)) { \
+        ABORT("Not enough memory to allocate %s!\n", name);          \
+    }
+
+#define HASHMAP_PUT(hashmap, key, value) hashmap_put(&hashmap, key, strlen(key), value);
+#define HASHMAP_GET(hashmap, key) hashmap_get(&hashmap, key, strlen(key));
+#define HASHMAP_DESTROY(hashmap) hashmap_destroy(&hashmap);
+#define HASHMAP_SIZE(hashmap) hashmap_num_entries(&hashmap)
+#define HASHMAP_ITERATE(hashmap, function, context) if( hashmap_num_entries(&hashmap) > 0 ) { \
+        if (0!=hashmap_iterate_pairs(&hashmap, function, context)) { \
+            ABORT("failed to iterate hashmap entries!"); \
+        } \
+    }
+#define JSON_ADD_STRING(jsonObject, key, value) if( value != NULL ) { json_append_member(jsonObject, (char*)key, json_mkstring(value)); }
+#define JSON_ADD_NUMBER(jsonObject, key, value) json_append_member(jsonObject, (char*)key, json_mknumber(value));
+#define JSON_ADD_OBJECT(jsonObject, key, value) if( value != NULL ) { json_append_member(jsonObject, (char*)key, value); }
+#define JSON_ADD_BOOL(jsonObject, key, value) json_append_member(jsonObject, (char*)key, json_mkbool(value));
+#define JSON_ADD_ELEMENT(jsonObject, value) json_append_element(jsonObject, value);
 
 // Credit: https://stackoverflow.com/a/8465083
 char* concat(const char *string1, const char *string2);
 void ABORT(const char *message, ...);
-int freeHashmapItem(void *const context, struct hashmap_element_s *const e);
+int freeHashmapItem(void *context, struct hashmap_element_s *e);
 const char* getJSONString(JsonNode *item, const char* key);
+const char* getJSONStringDefault(JsonNode *item, const char* key, const char* defaultValue);
 const char* mustJSONString(JsonNode *node, const char* key);
 JsonNode* getJSONObject(JsonNode* node, const char* key);
 JsonNode* mustJSONObject(JsonNode *node, const char* key);
 
-bool getJSONBool(JsonNode *item, const char* key, bool *result);
+bool getJSONBool(JsonNode *item, const char* key);
 bool getJSONInt(JsonNode *item, const char* key, int *result);
-
+int mustJSONInt(JsonNode *node, const char* key);
 JsonNode* mustParseJSON(const char* JSON);
 
 #endif //ASSETS_C_COMMON_H

v2/internal/ffenestri/contextmenus_darwin.c

@@ -1,99 +1,99 @@
-////
-//// Created by Lea Anthony on 6/1/21.
+//////
+////// Created by Lea Anthony on 6/1/21.
+//////
 ////
 //
-
-#include "ffenestri_darwin.h"
-#include "common.h"
-#include "contextmenus_darwin.h"
-#include "menu_darwin.h"
-
-ContextMenu* NewContextMenu(const char* contextMenuJSON) {
-    ContextMenu* result = malloc(sizeof(ContextMenu));
-
-    JsonNode* processedJSON = json_decode(contextMenuJSON);
-    if( processedJSON == NULL ) {
-        ABORT("[NewTrayMenu] Unable to parse TrayMenu JSON: %s", contextMenuJSON);
-    }
-    // Save reference to this json
-    result->processedJSON = processedJSON;
-
-    result->ID = mustJSONString(processedJSON, "ID");
-    JsonNode* processedMenu = mustJSONObject(processedJSON, "ProcessedMenu");
-
-    result->menu = NewMenu(processedMenu);
-    result->nsmenu = NULL;
-    result->menu->menuType = ContextMenuType;
-    result->menu->parentData = result;
-    result->contextMenuData = NULL;
-    return result;
-}
-
-ContextMenu* GetContextMenuByID(ContextMenuStore* store, const char *contextMenuID) {
-    return (ContextMenu*)hashmap_get(&store->contextMenuMap, (char*)contextMenuID, strlen(contextMenuID));
-}
-
-void DeleteContextMenu(ContextMenu* contextMenu) {
-    // Free Menu
-    DeleteMenu(contextMenu->menu);
-
-    // Delete any context menu data we may have stored
-    if( contextMenu->contextMenuData != NULL ) {
-        MEMFREE(contextMenu->contextMenuData);
-    }
-
-    // Free JSON
-    if (contextMenu->processedJSON != NULL ) {
-        json_delete(contextMenu->processedJSON);
-        contextMenu->processedJSON = NULL;
-    }
-
-    // Free context menu
-    free(contextMenu);
-}
-
-int freeContextMenu(void *const context, struct hashmap_element_s *const e) {
-    DeleteContextMenu(e->data);
-    return -1;
-}
-
-void ShowContextMenu(ContextMenuStore* store, id mainWindow, const char *contextMenuID, const char *contextMenuData) {
-
-	// If no context menu ID was given, abort
-	if( contextMenuID == NULL ) {
-		return;
-	}
-
-	ContextMenu* contextMenu = GetContextMenuByID(store, contextMenuID);
-
-	// We don't need the ID now
-    MEMFREE(contextMenuID);
-
-    if( contextMenu == NULL ) {
-        // Free context menu data
-        if( contextMenuData != NULL ) {
-	        MEMFREE(contextMenuData);
-			return;
-		}
-	}
-
-    // We need to store the context menu data. Free existing data if we have it
-    // and set to the new value.
-    FREE_AND_SET(contextMenu->contextMenuData, contextMenuData);
-
-	// Grab the content view and show the menu
-	id contentView = msg_reg(mainWindow, s("contentView"));
-
-	// Get the triggering event
-	id menuEvent = msg_reg(mainWindow, s("currentEvent"));
-
-	if( contextMenu->nsmenu == NULL ) {
-        // GetMenu creates the NSMenu
-        contextMenu->nsmenu = GetMenu(contextMenu->menu);
-	}
-
-	// Show popup
-	((id(*)(id, SEL, id, id, id))objc_msgSend)(c("NSMenu"), s("popUpContextMenu:withEvent:forView:"), contextMenu->nsmenu, menuEvent, contentView);
-
-}
-
+//#include "ffenestri_darwin.h"
+//#include "common.h"
+//#include "contextmenus_darwin.h"
+//#include "menu_darwin.h"
+//
+//ContextMenu* NewContextMenu(const char* contextMenuJSON, struct TrayMenuStore *store) {
+//    ContextMenu* result = malloc(sizeof(ContextMenu));
+//
+//    JsonNode* processedJSON = json_decode(contextMenuJSON);
+//    if( processedJSON == NULL ) {
+//        ABORT("[NewTrayMenu] Unable to parse TrayMenu JSON: %s", contextMenuJSON);
+//    }
+//    // Save reference to this json
+//    result->processedJSON = processedJSON;
+//
+//    result->ID = mustJSONString(processedJSON, "ID");
+//    JsonNode* processedMenu = mustJSONObject(processedJSON, "ProcessedMenu");
+//
+////    result->menu = NewMenu(processedMenu);
+//    result->nsmenu = NULL;
+//    result->menu->menuType = ContextMenuType;
+//    result->menu->store = store;
+//    result->contextMenuData = NULL;
+//    return result;
+//}
+//
+//ContextMenu* GetContextMenuByID(ContextMenuStore* store, const char *contextMenuID) {
+//    return (ContextMenu*)hashmap_get(&store->contextMenuMap, (char*)contextMenuID, strlen(contextMenuID));
+//}
+//
+//void DeleteContextMenu(ContextMenu* contextMenu) {
+//    // Free Menu
+//    DeleteMenu(contextMenu->menu);
+//
+//    // Delete any context menu data we may have stored
+//    if( contextMenu->contextMenuData != NULL ) {
+//        MEMFREE(contextMenu->contextMenuData);
+//    }
+//
+//    // Free JSON
+//    if (contextMenu->processedJSON != NULL ) {
+//        json_delete(contextMenu->processedJSON);
+//        contextMenu->processedJSON = NULL;
+//    }
+//
+//    // Free context menu
+//    free(contextMenu);
+//}
+//
+//int freeContextMenu(void *const context, struct hashmap_element_s *const e) {
+//    DeleteContextMenu(e->data);
+//    return -1;
+//}
+//
+//void ShowContextMenu(ContextMenuStore* store, id mainWindow, const char *contextMenuID, const char *contextMenuData) {
+//
+//	// If no context menu ID was given, abort
+//	if( contextMenuID == NULL ) {
+//		return;
+//	}
+//
+//	ContextMenu* contextMenu = GetContextMenuByID(store, contextMenuID);
+//
+//	// We don't need the ID now
+//    MEMFREE(contextMenuID);
+//
+//    if( contextMenu == NULL ) {
+//        // Free context menu data
+//        if( contextMenuData != NULL ) {
+//	        MEMFREE(contextMenuData);
+//			return;
+//		}
+//	}
+//
+//    // We need to store the context menu data. Free existing data if we have it
+//    // and set to the new value.
+//    FREE_AND_SET(contextMenu->contextMenuData, contextMenuData);
+//
+//	// Grab the content view and show the menu
+//	id contentView = msg(mainWindow, s("contentView"));
+//
+//	// Get the triggering event
+//	id menuEvent = msg(mainWindow, s("currentEvent"));
+//
+////	if( contextMenu->nsmenu == NULL ) {
+////        // GetMenu creates the NSMenu
+////        contextMenu->nsmenu = GetMenu(contextMenu->menu);
+////	}
+//
+//	// Show popup
+//	msg(c("NSMenu"), s("popUpContextMenu:withEvent:forView:"), contextMenu->nsmenu, menuEvent, contentView);
+//
+//}
+//

v2/internal/ffenestri/contextmenus_darwin.h

@@ -1,33 +1,33 @@
+//////
+////// Created by Lea Anthony on 6/1/21.
+//////
 ////
-//// Created by Lea Anthony on 6/1/21.
-////
+//#ifndef CONTEXTMENU_DARWIN_H
+//#define CONTEXTMENU_DARWIN_H
 //
-#ifndef CONTEXTMENU_DARWIN_H
-#define CONTEXTMENU_DARWIN_H
-
-#include "json.h"
-#include "menu_darwin.h"
-#include "contextmenustore_darwin.h"
-
-typedef struct {
-    const char* ID;
-    id nsmenu;
-    Menu* menu;
-
-    JsonNode* processedJSON;
-
-    // Context menu data is given by the frontend when clicking a context menu.
-    // We send this to the backend when an item is selected
-	const char* contextMenuData;
-} ContextMenu;
-
-
-ContextMenu* NewContextMenu(const char* contextMenuJSON);
-
-ContextMenu* GetContextMenuByID( ContextMenuStore* store, const char *contextMenuID);
-void DeleteContextMenu(ContextMenu* contextMenu);
-int freeContextMenu(void *const context, struct hashmap_element_s *const e);
-
-void ShowContextMenu(ContextMenuStore* store, id mainWindow, const char *contextMenuID, const char *contextMenuData);
-
-#endif //CONTEXTMENU_DARWIN_H
+//#include "json.h"
+//#include "menu_darwin.h"
+//#include "contextmenustore_darwin.h"
+//
+//typedef struct {
+//    const char* ID;
+//    id nsmenu;
+//    Menu* menu;
+//
+//    JsonNode* processedJSON;
+//
+//    // Context menu data is given by the frontend when clicking a context menu.
+//    // We send this to the backend when an item is selected
+//	const char* contextMenuData;
+//} ContextMenu;
+//
+//
+//ContextMenu* NewContextMenu(const char* contextMenuJSON);
+//
+//ContextMenu* GetContextMenuByID( ContextMenuStore* store, const char *contextMenuID);
+//void DeleteContextMenu(ContextMenu* contextMenu);
+//int freeContextMenu(void *const context, struct hashmap_element_s *const e);
+//
+//void ShowContextMenu(ContextMenuStore* store, id mainWindow, const char *contextMenuID, const char *contextMenuData);
+//
+//#endif //CONTEXTMENU_DARWIN_H

v2/internal/ffenestri/contextmenustore_darwin.c

@@ -1,65 +1,65 @@
-
-#include "contextmenus_darwin.h"
-#include "contextmenustore_darwin.h"
-
-ContextMenuStore* NewContextMenuStore() {
-
-    ContextMenuStore* result = malloc(sizeof(ContextMenuStore));
-
-    // Allocate Context Menu Store
-    if( 0 != hashmap_create((const unsigned)4, &result->contextMenuMap)) {
-        ABORT("[NewContextMenus] Not enough memory to allocate contextMenuStore!");
-    }
-
-    return result;
-}
-
-void AddContextMenuToStore(ContextMenuStore* store, const char* contextMenuJSON) {
-    ContextMenu* newMenu = NewContextMenu(contextMenuJSON);
-
-    //TODO: check if there is already an entry for this menu
-    hashmap_put(&store->contextMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
-}
-
-ContextMenu* GetContextMenuFromStore(ContextMenuStore* store, const char* menuID) {
-    // Get the current menu
-    return hashmap_get(&store->contextMenuMap, menuID, strlen(menuID));
-}
-
-void UpdateContextMenuInStore(ContextMenuStore* store, const char* menuJSON) {
-    ContextMenu* newContextMenu = NewContextMenu(menuJSON);
-
-    // Get the current menu
-    ContextMenu *currentMenu = GetContextMenuFromStore(store, newContextMenu->ID);
-    if ( currentMenu == NULL ) {
-        ABORT("Attempted to update unknown context menu with ID '%s'.", newContextMenu->ID);
-    }
-
-    hashmap_remove(&store->contextMenuMap, newContextMenu->ID, strlen(newContextMenu->ID));
-
-    // Save the status bar reference
-    DeleteContextMenu(currentMenu);
-
-    hashmap_put(&store->contextMenuMap, newContextMenu->ID, strlen(newContextMenu->ID), newContextMenu);
-
-}
-
-
-void DeleteContextMenuStore(ContextMenuStore* store) {
-
-    // Guard against NULLs
-    if( store == NULL ) {
-        return;
-    }
-
-    // Delete context menus
-    if( hashmap_num_entries(&store->contextMenuMap) > 0 ) {
-        if (0 != hashmap_iterate_pairs(&store->contextMenuMap, freeContextMenu, NULL)) {
-            ABORT("[DeleteContextMenuStore] Failed to release contextMenuStore entries!");
-        }
-    }
-
-    // Free context menu hashmap
-    hashmap_destroy(&store->contextMenuMap);
-
-}
+//
+//#include "contextmenus_darwin.h"
+//#include "contextmenustore_darwin.h"
+//
+//ContextMenuStore* NewContextMenuStore() {
+//
+//    ContextMenuStore* result = malloc(sizeof(ContextMenuStore));
+//
+//    // Allocate Context Menu Store
+//    if( 0 != hashmap_create((const unsigned)4, &result->contextMenuMap)) {
+//        ABORT("[NewContextMenus] Not enough memory to allocate contextMenuStore!");
+//    }
+//
+//    return result;
+//}
+//
+//void AddContextMenuToStore(ContextMenuStore* store, const char* contextMenuJSON) {
+//    ContextMenu* newMenu = NewContextMenu(contextMenuJSON);
+//
+//    //TODO: check if there is already an entry for this menu
+//    hashmap_put(&store->contextMenuMap, newMenu->ID, strlen(newMenu->ID), newMenu);
+//}
+//
+//ContextMenu* GetContextMenuFromStore(ContextMenuStore* store, const char* menuID) {
+//    // Get the current menu
+//    return hashmap_get(&store->contextMenuMap, menuID, strlen(menuID));
+//}
+//
+//void UpdateContextMenuInStore(ContextMenuStore* store, const char* menuJSON) {
+//    ContextMenu* newContextMenu = NewContextMenu(menuJSON);
+//
+//    // Get the current menu
+//    ContextMenu *currentMenu = GetContextMenuFromStore(store, newContextMenu->ID);
+//    if ( currentMenu == NULL ) {
+//        ABORT("Attempted to update unknown context menu with ID '%s'.", newContextMenu->ID);
+//    }
+//
+//    hashmap_remove(&store->contextMenuMap, newContextMenu->ID, strlen(newContextMenu->ID));
+//
+//    // Save the status bar reference
+//    DeleteContextMenu(currentMenu);
+//
+//    hashmap_put(&store->contextMenuMap, newContextMenu->ID, strlen(newContextMenu->ID), newContextMenu);
+//
+//}
+//
+//
+//void DeleteContextMenuStore(ContextMenuStore* store) {
+//
+//    // Guard against NULLs
+//    if( store == NULL ) {
+//        return;
+//    }
+//
+//    // Delete context menus
+//    if( hashmap_num_entries(&store->contextMenuMap) > 0 ) {
+//        if (0 != hashmap_iterate_pairs(&store->contextMenuMap, freeContextMenu, NULL)) {
+//            ABORT("[DeleteContextMenuStore] Failed to release contextMenuStore entries!");
+//        }
+//    }
+//
+//    // Free context menu hashmap
+//    hashmap_destroy(&store->contextMenuMap);
+//
+//}

v2/internal/ffenestri/contextmenustore_darwin.h

@@ -1,27 +1,27 @@
+////
+//// Created by Lea Anthony on 7/1/21.
+////
 //
-// Created by Lea Anthony on 7/1/21.
+//#ifndef CONTEXTMENUSTORE_DARWIN_H
+//#define CONTEXTMENUSTORE_DARWIN_H
 //
-
-#ifndef CONTEXTMENUSTORE_DARWIN_H
-#define CONTEXTMENUSTORE_DARWIN_H
-
-#include "common.h"
-
-typedef struct {
-
-    int dummy;
-
-    // This is our context menu store which keeps track
-    // of all instances of ContextMenus
-    struct hashmap_s contextMenuMap;
-
-} ContextMenuStore;
-
-ContextMenuStore* NewContextMenuStore();
-
-void DeleteContextMenuStore(ContextMenuStore* store);
-void UpdateContextMenuInStore(ContextMenuStore* store, const char* menuJSON);
-
-void AddContextMenuToStore(ContextMenuStore* store, const char* contextMenuJSON);
-
-#endif //CONTEXTMENUSTORE_DARWIN_H
+//#include "common.h"
+//
+//typedef struct {
+//
+//    int dummy;
+//
+//    // This is our context menu store which keeps track
+//    // of all instances of ContextMenus
+//    struct hashmap_s contextMenuMap;
+//
+//} ContextMenuStore;
+//
+//ContextMenuStore* NewContextMenuStore();
+//
+//void DeleteContextMenuStore(ContextMenuStore* store);
+//void UpdateContextMenuInStore(ContextMenuStore* store, const char* menuJSON);
+//
+//void AddContextMenuToStore(ContextMenuStore* store, const char* contextMenuJSON);
+//
+//#endif //CONTEXTMENUSTORE_DARWIN_H

v2/internal/ffenestri/effectstructs_windows.h

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

v2/internal/ffenestri/ffenestri.go

@@ -1,29 +1,28 @@
 package ffenestri
 
 import (
+	"github.com/wailsapp/wails/v2/internal/menumanager"
 	"runtime"
 	"strings"
 	"unsafe"
 
-	"github.com/wailsapp/wails/v2/internal/menumanager"
-
 	"github.com/wailsapp/wails/v2/internal/logger"
 	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
 	"github.com/wailsapp/wails/v2/pkg/options"
 )
 
 /*
+
 #cgo linux CFLAGS: -DFFENESTRI_LINUX=1
 #cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
 
 #cgo darwin CFLAGS: -DFFENESTRI_DARWIN=1
 #cgo darwin LDFLAGS: -framework WebKit -lobjc
 
-#cgo windows CXXFLAGS: -std=c++11
-#cgo windows,amd64 LDFLAGS: -L./windows/x64 -lWebView2Loader -lgdi32 -lole32 -lShlwapi -luser32 -loleaut32 -ldwmapi
-
 #include <stdlib.h>
 #include "ffenestri.h"
+
+
 */
 import "C"
 
@@ -65,6 +64,14 @@ func NewApplicationWithConfig(config *options.App, logger *logger.Logger, menuMa
 	}
 }
 
+// NewApplication creates a new Application with the default config
+func NewApplication(logger *logger.Logger) *Application {
+	return &Application{
+		config: options.Default,
+		logger: logger.CustomLogger("Ffenestri"),
+	}
+}
+
 func (a *Application) freeMemory() {
 	for _, mem := range a.memory {
 		// fmt.Printf("Freeing memory: %+v\n", mem)
@@ -111,8 +118,7 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug
 	fullscreen := a.bool2Cint(a.config.Fullscreen)
 	startHidden := a.bool2Cint(a.config.StartHidden)
 	logLevel := C.int(a.config.LogLevel)
-	hideWindowOnClose := a.bool2Cint(a.config.HideWindowOnClose)
-	app := C.NewApplication(title, width, height, resizable, devtools, fullscreen, startHidden, logLevel, hideWindowOnClose)
+	app := C.NewApplication(title, width, height, resizable, devtools, fullscreen, startHidden, logLevel)
 
 	// Save app reference
 	a.app = (*C.struct_Application)(app)
@@ -130,9 +136,10 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug
 	// Set debug if needed
 	C.SetDebug(app, a.bool2Cint(debug))
 
-	if a.config.Frameless {
-		C.DisableFrame(a.app)
-	}
+	// TODO: Move frameless to Linux options
+	// if a.config.Frameless {
+	// 	C.DisableFrame(a.app)
+	// }
 
 	if a.config.RGBA != 0 {
 		r, g, b, alpha := intToColour(a.config.RGBA)
@@ -164,7 +171,7 @@ func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug
 		// Oh no! We couldn't initialise the application
 		a.logger.Fatal("Cannot initialise Application.")
 	}
-	//println("\n\n\n\n\n\nhererererer\n\n\n\n")
+
 	a.freeMemory()
 	return nil
 }

v2/internal/ffenestri/ffenestri.h

@@ -1,14 +1,10 @@
 #ifndef __FFENESTRI_H__
 #define __FFENESTRI_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdio.h>
 struct Application;
 
-extern struct Application *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel, int hideWindowOnClose);
+extern struct Application *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel);
 extern void SetMinWindowSize(struct Application*, int minWidth, int minHeight);
 extern void SetMaxWindowSize(struct Application*, int maxWidth, int maxHeight);
 extern void Run(struct Application*, int argc, char **argv);
@@ -34,23 +30,15 @@ extern void Fullscreen(struct Application*);
 extern void UnFullscreen(struct Application*);
 extern void ToggleFullscreen(struct Application*);
 extern void DisableFrame(struct Application*);
-extern void OpenDialog(struct Application*, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolvesAliases, int treatPackagesAsDirectories);
-extern void SaveDialog(struct Application*, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int showHiddenFiles, int canCreateDirectories, int treatPackagesAsDirectories);
-extern void MessageDialog(struct Application*, char *callbackID, char *type, char *title, char *message, char *icon, char *button1, char *button2, char *button3, char *button4, char *defaultButton, char *cancelButton);
-extern void DarkModeEnabled(struct Application*, char *callbackID);
+extern void OpenDialog(struct Application*, const char *callbackID, const char *title, const char *filters, const char *defaultFilename, const char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolvesAliases, int treatPackagesAsDirectories);
+extern void SaveDialog(struct Application*, const char *callbackID, const char *title, const char *filters, const char *defaultFilename, const char *defaultDir, int showHiddenFiles, int canCreateDirectories, int treatPackagesAsDirectories);
+extern void MessageDialog(struct Application*, const char *callbackID, const char *type, const char *title, const char *message, const char *icon, const char *button1, const char *button2, const char *button3, const char *button4, const char *defaultButton, const char *cancelButton);
+extern void DarkModeEnabled(struct Application*, const char *callbackID);
 extern void SetApplicationMenu(struct Application*, const char *);
 extern void AddTrayMenu(struct Application*, const char *menuTrayJSON);
 extern void SetTrayMenu(struct Application*, const char *menuTrayJSON);
-extern void DeleteTrayMenuByID(struct Application*, const char *id);
 extern void UpdateTrayMenuLabel(struct Application*, const char* JSON);
-extern void AddContextMenu(struct Application*, char *contextMenuJSON);
-extern void UpdateContextMenu(struct Application*, char *contextMenuJSON);
-extern void WebviewIsTransparent(struct Application*);
-extern void WindowBackgroundIsTranslucent(struct Application*);
-extern void* GetWindowHandle(struct Application*);
-
-#ifdef __cplusplus
-}
-#endif
+extern void AddContextMenu(struct Application*, const char *contextMenuJSON);
+extern void UpdateContextMenu(struct Application*, const char *contextMenuJSON);
 
 #endif

v2/internal/ffenestri/ffenestri_client.go

@@ -1,23 +1,24 @@
-// +build !windows
-
 package ffenestri
 
 /*
+
+#cgo linux CFLAGS: -DFFENESTRI_LINUX=1
+#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+
+#include <stdlib.h>
 #include "ffenestri.h"
+
 */
 import "C"
 
 import (
-	"runtime"
-	"strconv"
-	"strings"
-
 	"github.com/wailsapp/wails/v2/pkg/options/dialog"
+	"strconv"
 
 	"github.com/wailsapp/wails/v2/internal/logger"
 )
 
-// Client is our implementation of messageDispatcher.Client
+// Client is our implentation of messageDispatcher.Client
 type Client struct {
 	app    *Application
 	logger logger.CustomLogger
@@ -112,86 +113,23 @@ func (c *Client) WindowSize(width int, height int) {
 	C.SetSize(c.app.app, C.int(width), C.int(height))
 }
 
-func (c *Client) WindowSetMinSize(width int, height int) {
-	C.SetMinWindowSize(c.app.app, C.int(width), C.int(height))
-}
-
-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)
 }
 
-// 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, ",")...)
-		}
-	}
+// OpenDialog will open a dialog with the given title and filter
+func (c *Client) OpenDialog(dialogOptions *dialog.OpenDialog, callbackID string) {
 	C.OpenDialog(c.app.app,
 		c.app.string2CString(callbackID),
 		c.app.string2CString(dialogOptions.Title),
-		c.app.string2CString(strings.Join(filters, ";")),
+		c.app.string2CString(dialogOptions.Filters),
 		c.app.string2CString(dialogOptions.DefaultFilename),
 		c.app.string2CString(dialogOptions.DefaultDirectory),
 		c.app.bool2Cint(dialogOptions.AllowFiles),
 		c.app.bool2Cint(dialogOptions.AllowDirectories),
-		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.AllowMultiple),
 		c.app.bool2Cint(dialogOptions.ShowHiddenFiles),
 		c.app.bool2Cint(dialogOptions.CanCreateDirectories),
 		c.app.bool2Cint(dialogOptions.ResolvesAliases),
@@ -201,16 +139,10 @@ func (c *Client) OpenMultipleFilesDialog(dialogOptions *dialog.OpenDialog, callb
 
 // 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(strings.Join(filters, ";")),
+		c.app.string2CString(dialogOptions.Filters),
 		c.app.string2CString(dialogOptions.DefaultFilename),
 		c.app.string2CString(dialogOptions.DefaultDirectory),
 		c.app.bool2Cint(dialogOptions.ShowHiddenFiles),
@@ -267,7 +199,3 @@ func (c *Client) UpdateTrayMenuLabel(JSON string) {
 func (c *Client) UpdateContextMenu(contextMenuJSON string) {
 	C.UpdateContextMenu(c.app.app, c.app.string2CString(contextMenuJSON))
 }
-
-func (c *Client) DeleteTrayMenuByID(id string) {
-	C.DeleteTrayMenuByID(c.app.app, c.app.string2CString(id))
-}

v2/internal/ffenestri/ffenestri_client_windows.go

@@ -1,309 +0,0 @@
-// +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(_ string) {
-	c.updateApplicationMenu()
-}
-
-// 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))
-}