[v2] v2.0.0-alpha.66

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

* Improved html whitespace minification fix.

.gitignore

@@ -27,3 +27,7 @@ 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/

v2/.vscode/settings.json

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

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

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

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

@@ -36,7 +36,10 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
 
 	compress := false
-	command.BoolFlag("compress", "Compress final binary", &compress)
+	command.BoolFlag("upx", "Compress final binary with UPX (if installed)", &compress)
+
+	compressFlags := ""
+	command.StringFlag("upxflags", "Flags to pass to upx", &compressFlags)
 
 	// Setup Platform flag
 	platform := runtime.GOOS
@@ -95,9 +98,11 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			"darwin/amd64",
 			"darwin/arm64",
 			"darwin/universal",
+			"linux",
 			//"linux/amd64",
 			//"linux/arm-7",
-			//"windows/amd64",
+			"windows",
+			"windows/amd64",
 		})
 		if !validPlatformArch.Contains(platform) {
 			return fmt.Errorf("platform %s is not supported", platform)
@@ -130,6 +135,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			KeepAssets:          keepAssets,
 			Verbosity:           verbosity,
 			Compress:            compress,
+			CompressFlags:       compressFlags,
 			UserTags:            userTags,
 		}
 

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

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

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

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

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

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

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

@@ -2,6 +2,7 @@ package initialise
 
 import (
 	"fmt"
+	"github.com/wailsapp/wails/v2/pkg/buildassets"
 	"io"
 	"strings"
 	"time"
@@ -40,7 +41,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	// Quiet Init
 	quiet := false
-	command.BoolFlag("q", "Supress output to console", &quiet)
+	command.BoolFlag("q", "Suppress output to console", &quiet)
 
 	initGit := false
 	gitInstalled := git.IsInstalled()
@@ -106,10 +107,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		}
 
 		// Try to discover author details from git config
-		err := findAuthorDetails(options)
-		if err != nil {
-			return err
-		}
+		findAuthorDetails(options)
 
 		return initProject(options)
 	})
@@ -129,6 +127,12 @@ func initProject(options *templates.Options) error {
 		return err
 	}
 
+	// Install the default assets
+	err = buildassets.Install(options.TargetDir, options.ProjectName)
+	if err != nil {
+		return err
+	}
+
 	if options.InitGit {
 		err = initGit(options)
 		if err != nil {
@@ -164,20 +168,18 @@ func initGit(options *templates.Options) error {
 	return nil
 }
 
-func findAuthorDetails(options *templates.Options) error {
+// findAuthorDetails tries to find the user's name and email
+// from gitconfig. If it finds them, it stores them in the project options
+func findAuthorDetails(options *templates.Options) {
 	if git.IsInstalled() {
 		name, err := git.Name()
-		if err != nil {
-			return err
+		if err == nil {
+			options.AuthorName = strings.TrimSpace(name)
 		}
-		options.AuthorName = strings.TrimSpace(name)
 
 		email, err := git.Email()
-		if err != nil {
-			return err
+		if err == nil {
+			options.AuthorEmail = strings.TrimSpace(email)
 		}
-		options.AuthorEmail = strings.TrimSpace(email)
 	}
-
-	return nil
 }

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

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

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

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

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

@@ -0,0 +1,103 @@
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import livereload from 'rollup-plugin-livereload';
+import { terser } from 'rollup-plugin-terser';
+import postcss from 'rollup-plugin-postcss';
+import image from '@rollup/plugin-image';
+import url from '@rollup/plugin-url';
+import copy from 'rollup-plugin-copy';
+
+const production = !process.env.ROLLUP_WATCH;
+
+export default {
+    input: 'src/main.js',
+    output: {
+        sourcemap: true,
+        format: 'iife',
+        name: 'app',
+        file: 'dist/main.js'
+    },
+    onwarn: handleRollupWarning,
+    plugins: [
+
+        image(),
+
+        copy({
+            targets: [
+                { src: 'src/index.html', dest: 'dist' },
+                { src: 'src/main.css', dest: 'dist' },
+            ]
+        }),
+
+        // Embed binary files
+        url({
+            include: ['**/*.woff', '**/*.woff2'],
+            limit: Infinity,
+        }),
+
+        // If you have external dependencies installed from
+        // npm, you'll most likely need these plugins. In
+        // some cases you'll need additional configuration -
+        // consult the documentation for details:
+        // https://github.com/rollup/plugins/tree/master/packages/commonjs
+        resolve({
+            browser: true,
+        }),
+        commonjs(),
+
+        // PostCSS preprocessing
+        postcss({
+            extensions: ['.css', '.scss'],
+            extract: true,
+            minimize: false,
+            use: [
+                ['sass', {
+                    includePaths: [
+                        './src',
+                        './node_modules'
+                    ]
+                }]
+            ],
+        }),
+
+        // In dev mode, call `npm run start` once
+        // the bundle has been generated
+        !production && serve(),
+
+        // Watch the `public` directory and refresh the
+        // browser on changes when not in production
+        !production && livereload('dist'),
+
+        // If we're building for production (npm run build
+        // instead of npm run dev), minify
+        production && terser()
+    ],
+    watch: {
+        clearScreen: false
+    }
+};
+
+function handleRollupWarning(warning) {
+    console.error('ERROR: ' + warning.toString());
+}
+
+function serve() {
+    let server;
+
+    function toExit() {
+        if (server) server.kill(0);
+    }
+
+    return {
+        writeBundle() {
+            if (server) return;
+            server = require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], {
+                stdio: ['ignore', 'inherit', 'inherit'],
+                shell: true
+            });
+
+            process.on('SIGTERM', toExit);
+            process.on('exit', toExit);
+        }
+    };
+}

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

@@ -2,6 +2,7 @@
 html {
   text-align: center;
   color: white;
+  background-color: black;
 }
 
 body {

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

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

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

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

v2/cmd/wails/version.go

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

v2/go.mod

@@ -10,10 +10,11 @@ require (
 	github.com/imdario/mergo v0.3.11
 	github.com/jackmordaunt/icns v1.0.0
 	github.com/leaanthony/clir v1.0.4
-	github.com/leaanthony/debme v1.1.1
+	github.com/leaanthony/debme v1.2.0
 	github.com/leaanthony/go-ansi-parser v1.0.1
 	github.com/leaanthony/gosod v1.0.1
 	github.com/leaanthony/slicer v1.5.0
+	github.com/leaanthony/winicon v0.0.0-20200606125418-4419cea822a0
 	github.com/matryer/is v1.4.0
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/olekukonko/tablewriter v0.0.4

v2/go.sum

@@ -41,14 +41,17 @@ github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eT
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/leaanthony/clir v1.0.4 h1:Dov2y9zWJmZr7CjaCe86lKa4b5CSxskGAt2yBkoDyiU=
 github.com/leaanthony/clir v1.0.4/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0=
-github.com/leaanthony/debme v1.1.1 h1:2CQjJkfrjr4b2VgpDmkq2aghem5R2bNbg1Yg5cKQGBQ=
 github.com/leaanthony/debme v1.1.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
+github.com/leaanthony/debme v1.2.0 h1:i7JUQhuv7PtJ/7qV+SIa5QARTGBcojUZ+2eCiV9begU=
+github.com/leaanthony/debme v1.2.0/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
 github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQOk2DgKxGG4=
 github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM=
 github.com/leaanthony/gosod v1.0.1 h1:F+4c3DmEBfigi7oAswCV2RpQ+k4DcNbhuCZUGdBHacQ=
 github.com/leaanthony/gosod v1.0.1/go.mod h1:W8RyeSFBXu7RpIxPGEJfW4moSyGGEjlJMLV25wEbAdU=
 github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY=
 github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
+github.com/leaanthony/winicon v0.0.0-20200606125418-4419cea822a0 h1:FPGYnfxuuxqCZhrGq8nKjthEcYHgHmFbyY953Xv9cNI=
+github.com/leaanthony/winicon v0.0.0-20200606125418-4419cea822a0/go.mod h1:en5xhijl92aphrJdmRPlh4NI1L6wq3gEm0LpXAPghjU=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
@@ -91,6 +94,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 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/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/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=

v2/init.go

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

v2/init_windows.go

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

v2/internal/app/server.go

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

v2/internal/binding/generate.go

@@ -144,6 +144,8 @@ func goTypeToJSDocType(input string) string {
 		return "number"
 	case input == "bool":
 		return "boolean"
+	case input == "[]byte":
+		return "string"
 	case strings.HasPrefix(input, "[]"):
 		arrayType := goTypeToJSDocType(input[2:])
 		return "Array.<" + arrayType + ">"

v2/internal/binding/generate_test.go

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

v2/internal/bridge/client.go

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

v2/internal/bridge/session.go

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

v2/internal/ffenestri/LICENCES.md

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

v2/internal/ffenestri/common.c

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

v2/internal/ffenestri/effectstructs_windows.h

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

v2/internal/ffenestri/ffenestri.go

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

v2/internal/ffenestri/ffenestri.h

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

v2/internal/ffenestri/ffenestri_client.go

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

v2/internal/ffenestri/ffenestri_darwin.c

@@ -983,7 +983,7 @@ void SaveDialog(struct Application *app, char *callbackID, char *title, char *fi
 	);
 }
 
-const char *invoke = "window.external={invoke:function(x){window.webkit.messageHandlers.external.postMessage(x);}};";
+const char *invoke = "window.wailsInvoke=function(message){window.webkit.messageHandlers.external.postMessage(message);};window.wailsDrag=function(message){window.webkit.messageHandlers.windowDrag.postMessage(message);};window.wailsContextMenuMessage=function(message){window.webkit.messageHandlers.contextMenu.postMessage(message);};";
 
 // DisableFrame disables the window frame
 void DisableFrame(struct Application *app)

v2/internal/ffenestri/ffenestri_linux.c

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

v2/internal/ffenestri/ffenestri_linux.go

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

v2/internal/ffenestri/ffenestri_linux.h

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

v2/internal/ffenestri/ffenestri_windows.c

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

v2/internal/ffenestri/ffenestri_windows.cpp

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

v2/internal/ffenestri/ffenestri_windows.go

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

v2/internal/ffenestri/ffenestri_windows.h

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

v2/internal/ffenestri/json.c

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

v2/internal/ffenestri/vec.c

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

v2/internal/ffenestri/vec.h

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

v2/internal/ffenestri/windows/EventToken.h

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

v2/internal/ffenestri/windows/README.md

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

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

@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.19)
+project(test)
+
+set(CMAKE_CXX_STANDARD 14)
+
+add_executable(test main.cpp)

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

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

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

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

v2/internal/ffenestri/wv2ComHandler_windows.h

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

v2/internal/html/asset.go

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

v2/internal/html/asset_test.go

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

v2/internal/html/assetbundle.go

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

v2/internal/html/assetbundle_test.go

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

v2/internal/html/testdata/basic.html

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

v2/internal/html/testdata/multi_line.html

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

v2/internal/html/testdata/self_closing.html

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

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

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

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

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

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

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

v2/internal/process/process.go

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

v2/internal/project/project.go

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

v2/internal/runtime/assets/assets.go

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

v2/internal/runtime/js/.eslintrc

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

v2/internal/runtime/js/core/desktop.js

@@ -10,20 +10,6 @@ The lightweight framework for web-like apps
 /* jshint esversion: 6 */
 import { SetBindings } from './bindings';
 import { Init } from './main';
-import {RaiseError} from '../desktop/darwin';
-
-// Setup global error handler
-window.onerror = function (msg, url, lineNo, columnNo, error) {
-	const errorMessage = {
-		message: msg,
-		url: url,
-		line: lineNo,
-		column: columnNo,
-		error: JSON.stringify(error),
-		stack: function() { return JSON.stringify(new Error().stack); }(),
-	};
-	RaiseError(errorMessage);
-};
 
 // Initialise the Runtime
 Init();

v2/internal/runtime/js/core/main.js

@@ -15,7 +15,7 @@ import * as Dialog from './dialog';
 import { On, Once, OnMultiple, Emit, Notify } from './events';
 import { Callback, SystemCall } from './calls';
 import { AddScript, InjectCSS, DisableDefaultContextMenu } from './utils';
-import { AddIPCListener } from 'ipc';
+import { AddIPCListener, SendMessage } from 'ipc';
 import * as Platform from 'platform';
 import * as Store from './store';
 import * as Tray from './tray';
@@ -47,6 +47,7 @@ export function Init() {
 			// Init,
 			AddIPCListener,
 			SystemCall,
+			SendMessage,
 		},
 		Store,
 	};

v2/internal/runtime/js/desktop/darwin.js

@@ -13,60 +13,53 @@ The lightweight framework for web-like apps
  * Initialises platform specific code
  */
 
-// import * as common from './common';
-const common = require('./common');
-
 export const System = {
-    ...common,
-    Platform: () => "darwin",
-}
+	AppType: 'desktop',
+	Platform: () => 'darwin',
+};
 
 export function SendMessage(message) {
-    window.webkit.messageHandlers.external.postMessage(message);
-}
-
-export function RaiseError(message) {
-    window.webkit.messageHandlers.error.postMessage(message);
+	window.wailsInvoke(message);
 }
 
 export function Init() {
 
-    // Setup drag handler
-    // Based on code from: https://github.com/patr0nus/DeskGap
-    window.addEventListener('mousedown', function (e) {
-        let currentElement = e.target;
-        while (currentElement != null) {
-            if (currentElement.hasAttribute('data-wails-no-drag')) {
-                break;
-            } else if (currentElement.hasAttribute('data-wails-drag')) {
-                window.webkit.messageHandlers.windowDrag.postMessage(null);
-                break;
-            }
-            currentElement = currentElement.parentElement;
-        }
-    });
+	// Setup drag handler
+	// Based on code from: https://github.com/patr0nus/DeskGap
+	window.addEventListener('mousedown', function (e) {
+		let currentElement = e.target;
+		while (currentElement != null) {
+			if (currentElement.hasAttribute('data-wails-no-drag')) {
+				break;
+			} else if (currentElement.hasAttribute('data-wails-drag')) {
+				window.wailsDrag(null);
+				break;
+			}
+			currentElement = currentElement.parentElement;
+		}
+	});
 
-    // Setup context menu hook
-    window.addEventListener('contextmenu', function (e) {
-        let currentElement = e.target;
-        let contextMenuId;
-        while (currentElement != null) {
-            contextMenuId = currentElement.dataset['wails-context-menu-id'];
-            if (contextMenuId != null) {
-                break;
-            }
-            currentElement = currentElement.parentElement;
-        }
-        if (contextMenuId != null || window.disableWailsDefaultContextMenu) {
-            e.preventDefault();
-        }
-        if( contextMenuId != null ) {
-            let contextData = currentElement.dataset['wails-context-menu-data'];
-            let message = {
-                id: contextMenuId,
-                data: contextData || "",
-            };
-            window.webkit.messageHandlers.contextMenu.postMessage(JSON.stringify(message));
-        }
-    });
+	// Setup context menu hook
+	window.addEventListener('contextmenu', function (e) {
+		let currentElement = e.target;
+		let contextMenuId;
+		while (currentElement != null) {
+			contextMenuId = currentElement.dataset['wails-context-menu-id'];
+			if (contextMenuId != null) {
+				break;
+			}
+			currentElement = currentElement.parentElement;
+		}
+		if (contextMenuId != null || window.disableWailsDefaultContextMenu) {
+			e.preventDefault();
+		}
+		if( contextMenuId != null ) {
+			let contextData = currentElement.dataset['wails-context-menu-data'];
+			let message = {
+				id: contextMenuId,
+				data: contextData || '',
+			};
+			window.wailsContextMenuMessage(JSON.stringify(message));
+		}
+	});
 }

v2/internal/runtime/js/desktop/linux.js

@@ -14,28 +14,52 @@ The lightweight framework for web-like apps
  */
 
 export const System = {
-    ...common,
-    Platform: () => "linux",
-}
+	AppType: 'desktop',
+	Platform: () => 'linux',
+};
 
 export function SendMessage(message) {
-    window.webkit.messageHandlers.external.postMessage(message);
+	window.wailsInvoke(message);
 }
 
 export function Init() {
 
-    // Setup drag handler
-    // Based on code from: https://github.com/patr0nus/DeskGap
-    window.addEventListener('mousedown', function (e) {
-        let currentElement = e.target;
-        while (currentElement != null) {
-            if (currentElement.hasAttribute('data-wails-no-drag')) {
-                break;
-            } else if (currentElement.hasAttribute('data-wails-drag')) {
-                window.webkit.messageHandlers.windowDrag.postMessage(null);
-                break;
-            }
-            currentElement = currentElement.parentElement;
-        }
-    });
+	// Setup drag handler
+	// Based on code from: https://github.com/patr0nus/DeskGap
+	window.addEventListener('mousedown', function (e) {
+		let currentElement = e.target;
+		while (currentElement != null) {
+			if (currentElement.hasAttribute('data-wails-no-drag')) {
+				break;
+			} else if (currentElement.hasAttribute('data-wails-drag')) {
+				window.wailsDrag(null);
+				break;
+			}
+			currentElement = currentElement.parentElement;
+		}
+	});
+
+	// Setup context menu hook
+	window.addEventListener('contextmenu', function (e) {
+		let currentElement = e.target;
+		let contextMenuId;
+		while (currentElement != null) {
+			contextMenuId = currentElement.dataset['wails-context-menu-id'];
+			if (contextMenuId != null) {
+				break;
+			}
+			currentElement = currentElement.parentElement;
+		}
+		if (contextMenuId != null || window.disableWailsDefaultContextMenu) {
+			e.preventDefault();
+		}
+		if( contextMenuId != null ) {
+			let contextData = currentElement.dataset['wails-context-menu-data'];
+			let message = {
+				id: contextMenuId,
+				data: contextData || '',
+			};
+			window.wailsContextMenuMessage(JSON.stringify(message));
+		}
+	});
 }

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

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

v2/internal/runtime/js/package.json

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

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

@@ -678,7 +678,7 @@
     function add_css() {
     	var style = element("style");
     	style.id = "svelte-9nqyfr-style";
-    	style.textContent = ".wails-reconnect-overlay.svelte-9nqyfr{position:fixed;top:0;left:0;width:100%;height:100%;backdrop-filter:blur(20px) saturate(160%) contrast(45%) brightness(140%);z-index:999999\n    }.wails-reconnect-overlay-content.svelte-9nqyfr{position:relative;top:50%;transform:translateY(-50%);margin:0;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC8AAAAuCAMAAACPpbA7AAAAflBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQAAAAAAAAAAAABAQEEBAQAAAAAAAAEBAQAAAADAwMAAAABAQEAAAAAAAAAAAAAAAAAAAACAgICAgIBAQEAAAAAAAAAAAAAAAAAAAACAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBQWCC3waAAAAKXRSTlMALgUMIBk0+xEqJs70Xhb3lu3EjX2EZTlv5eHXvbarQj3cdmpXSqOeUDwaqNAAAAKCSURBVEjHjZTntqsgEIUPVVCwtxg1vfD+L3hHRe8K6snZf+KKn8OewvzsSSeXLruLnz+KHs0gr6DkT3xsRkU6VVn4Ha/UxLe1Z4y64i847sykPBh/AvQ7ry3eFN70oKrfcBJYvm/tQ1qxP4T3emXPeXAkvodPUvtdjbhk+Ft4c0hslTiXVOzxOJ15NWUblQhRsdu3E1AfCjj3Gdm18zSOsiH8Lk4TB480ksy62fiqNo4OpyU8O21l6+hyRtS6z8r1pHlmle5sR1/WXS6Mq2Nl+YeKt3vr+vdH/q4O68tzXuwkiZmngYb4R8Co1jh0+Ww2UTyWxBvtyxLO7QVjO3YOD/lWZpbXDGellFG2Mws58mMnjVZSn7p+XvZ6IF4nn02OJZV0aTO22arp/DgLPtrgpVoi6TPbZm4XQBjY159w02uO0BDdYsfrOEi0M2ulRXlCIPAOuN1NOVhi+riBR3dgwQplYsZRZJLXq23Mlo5njkbY0rZFu3oiNIYG2kqsbVz67OlNuZZIOlfxHDl0UpyRX86z/OYC/3qf1A1xTrMp/PWWM4ePzf8DDp1nesQRpcFk7BlwdzN08ZIALJpCaciQXO0f6k4dnuT/Ewg4l7qSTNzm2SykdHn6GJ12mWc6aCNj/g1cTXpB8YFfr0uVc96aFkkqiIiX4nO+salKwGtIkvfB+Ja8DxMeD3hIXP5mTOYPB4eVT0+32I5ykvPZjesnkGgIREgYnmLrPb0PdV3hoLup2TjcGBPM4mgsfF5BrawZR4/GpzYQzQfrUZCf0TCWYo2DqhdhTJBQ6j4xqmmLN5LjdRIY8LWExiFUsSrza/nmFBqw3I9tEZB9h0lIQSO9if8DkISDAj8CDawAAAAASUVORK5CYII=);background-repeat:no-repeat;background-position:center\n    }.wails-reconnect-overlay-loadingspinner.svelte-9nqyfr{pointer-events:none;width:2.5em;height:2.5em;border:.4em solid transparent;border-color:#f00 #eee0 #f00 #eee0;border-radius:50%;animation:svelte-9nqyfr-loadingspin 1s linear infinite;margin:auto;padding:2.5em\n    }@keyframes svelte-9nqyfr-loadingspin{100%{transform:rotate(360deg)}}";
+    	style.textContent = ".wails-reconnect-overlay.svelte-9nqyfr{position:fixed;top:0;left:0;width:100%;height:100%;backdrop-filter:blur(20px) saturate(160%) contrast(45%) brightness(140%);z-index:999999\r\n    }.wails-reconnect-overlay-content.svelte-9nqyfr{position:relative;top:50%;transform:translateY(-50%);margin:0;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC8AAAAuCAMAAACPpbA7AAAAflBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQAAAAAAAAAAAABAQEEBAQAAAAAAAAEBAQAAAADAwMAAAABAQEAAAAAAAAAAAAAAAAAAAACAgICAgIBAQEAAAAAAAAAAAAAAAAAAAACAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBQWCC3waAAAAKXRSTlMALgUMIBk0+xEqJs70Xhb3lu3EjX2EZTlv5eHXvbarQj3cdmpXSqOeUDwaqNAAAAKCSURBVEjHjZTntqsgEIUPVVCwtxg1vfD+L3hHRe8K6snZf+KKn8OewvzsSSeXLruLnz+KHs0gr6DkT3xsRkU6VVn4Ha/UxLe1Z4y64i847sykPBh/AvQ7ry3eFN70oKrfcBJYvm/tQ1qxP4T3emXPeXAkvodPUvtdjbhk+Ft4c0hslTiXVOzxOJ15NWUblQhRsdu3E1AfCjj3Gdm18zSOsiH8Lk4TB480ksy62fiqNo4OpyU8O21l6+hyRtS6z8r1pHlmle5sR1/WXS6Mq2Nl+YeKt3vr+vdH/q4O68tzXuwkiZmngYb4R8Co1jh0+Ww2UTyWxBvtyxLO7QVjO3YOD/lWZpbXDGellFG2Mws58mMnjVZSn7p+XvZ6IF4nn02OJZV0aTO22arp/DgLPtrgpVoi6TPbZm4XQBjY159w02uO0BDdYsfrOEi0M2ulRXlCIPAOuN1NOVhi+riBR3dgwQplYsZRZJLXq23Mlo5njkbY0rZFu3oiNIYG2kqsbVz67OlNuZZIOlfxHDl0UpyRX86z/OYC/3qf1A1xTrMp/PWWM4ePzf8DDp1nesQRpcFk7BlwdzN08ZIALJpCaciQXO0f6k4dnuT/Ewg4l7qSTNzm2SykdHn6GJ12mWc6aCNj/g1cTXpB8YFfr0uVc96aFkkqiIiX4nO+salKwGtIkvfB+Ja8DxMeD3hIXP5mTOYPB4eVT0+32I5ykvPZjesnkGgIREgYnmLrPb0PdV3hoLup2TjcGBPM4mgsfF5BrawZR4/GpzYQzQfrUZCf0TCWYo2DqhdhTJBQ6j4xqmmLN5LjdRIY8LWExiFUsSrza/nmFBqw3I9tEZB9h0lIQSO9if8DkISDAj8CDawAAAAASUVORK5CYII=);background-repeat:no-repeat;background-position:center\r\n    }.wails-reconnect-overlay-loadingspinner.svelte-9nqyfr{pointer-events:none;width:2.5em;height:2.5em;border:.4em solid transparent;border-color:#f00 #eee0 #f00 #eee0;border-radius:50%;animation:svelte-9nqyfr-loadingspin 1s linear infinite;margin:auto;padding:2.5em\r\n    }@keyframes svelte-9nqyfr-loadingspin{100%{transform:rotate(360deg)}}";
     	append(document.head, style);
     }
 
@@ -1543,154 +1543,148 @@
 
     function StartWebsocket(userCallback) {
 
-        callback = userCallback;
+    	callback = userCallback;
 
-        window.onbeforeunload = function() {
-            if( websocket ) {
-                websocket.onclose = function () { };
-                websocket.close();
-                websocket = null;
-            }
-        };
+    	window.onbeforeunload = function() {
+    		if( websocket ) {
+    			websocket.onclose = function () { };
+    			websocket.close();
+    			websocket = null;
+    		}
+    	};
 
-        // ...and attempt to connect
-        connect();
+    	// ...and attempt to connect
+    	connect();
 
     }
 
     function setupIPCBridge() {
-        // darwin
-        window.webkit = {
-            messageHandlers: {
-                external: {
-                    postMessage: (message) => {
-                        websocket.send(message);
-                    }
-                },
-                windowDrag: {
-                    postMessage: () => {
-                        // Ignore window drag events
-                    }
-                }
-            }
+    	window.wailsInvoke = (message) => {
+    		websocket.send(message);
+    	};
+        window.wailsDrag = (message) => {
+            websocket.send(message);
+        };
+        window.wailsContextMenuMessage = (message) => {
+            websocket.send(message);
         };
     }
 
     // Handles incoming websocket connections
     function handleConnect() {
-        log('Connected to backend');
-        setupIPCBridge();
-        hideOverlay();
-        clearInterval(connectTimer);
-        websocket.onclose = handleDisconnect;
-        websocket.onmessage = handleMessage;
+    	log('Connected to backend');
+    	setupIPCBridge();
+    	hideOverlay();
+    	clearInterval(connectTimer);
+    	websocket.onclose = handleDisconnect;
+    	websocket.onmessage = handleMessage;
     }
 
     // Handles websocket disconnects
     function handleDisconnect() {
-        log('Disconnected from backend');
-        websocket = null;
-        showOverlay();
-        connect();
+    	log('Disconnected from backend');
+    	websocket = null;
+    	showOverlay();
+    	connect();
     }
 
     // Try to connect to the backend every 1s (default value).
     function connect() {
-        connectTimer = setInterval(function () {
-            if (websocket == null) {
-                websocket = new WebSocket('ws://' + window.location.hostname + ':34115/bridge');
-                websocket.onopen = handleConnect;
-                websocket.onerror = function (e) {
-                    e.stopImmediatePropagation();
-                    e.stopPropagation();
-                    e.preventDefault();
-                    websocket = null;
-                    return false;
-                };
-            }
-        }, 1000);
+    	connectTimer = setInterval(function () {
+    		if (websocket == null) {
+    			websocket = new WebSocket('ws://' + window.location.hostname + ':34115/bridge');
+    			websocket.onopen = handleConnect;
+    			websocket.onerror = function (e) {
+    				e.stopImmediatePropagation();
+    				e.stopPropagation();
+    				e.preventDefault();
+    				websocket = null;
+    				return false;
+    			};
+    		}
+    	}, 1000);
     }
 
     // Adds a script to the Dom.
     // Removes it if second parameter is true.
     function addScript(script, remove) {
-        const s = document.createElement('script');
-        s.setAttribute('type', 'text/javascript');
-        s.textContent = script;
-        document.head.appendChild(s);
+    	const s = document.createElement('script');
+    	s.setAttribute('type', 'text/javascript');
+    	s.textContent = script;
+    	document.head.appendChild(s);
 
-        // Remove internal messages from the DOM
-        if (remove) {
-            s.parentNode.removeChild(s);
-        }
+    	// Remove internal messages from the DOM
+    	if (remove) {
+    		s.parentNode.removeChild(s);
+    	}
     }
 
     function handleMessage(message) {
-        // As a bridge we ignore js and css injections
-        switch (message.data[0]) {
-            // Wails library - inject!
-            case 'b':
-                message = message.data.slice(1);
-                addScript(message);
-                log('Loaded Wails Runtime');
+    	// As a bridge we ignore js and css injections
+    	switch (message.data[0]) {
+    	// Wails library - inject!
+    	case 'b':
+    		message = message.data.slice(1);
+    		addScript(message);
+    		log('Loaded Wails Runtime');
 
-                // We need to now send a message to the backend telling it
-                // we have loaded (System Start)
-                window.webkit.messageHandlers.external.postMessage("SS");
+    		// We need to now send a message to the backend telling it
+    		// we have loaded (System Start)
+    		window.wailsInvoke('SS');
+    		
+    		// Now wails runtime is loaded, wails for the ready event
+    		// and callback to the main app
+    		// window.wails.Events.On('wails:loaded', function () {
+    		if (callback) {
+    			log('Notifying application');
+    			callback(window.wails);
+    		}
+    		// });
+    		break;
+    		// Notifications
+    	case 'n':
+    		window.wails._.Notify(message.data.slice(1));
+    		break;
+    		// 	// Binding
+    		// case 'b':
+    		// 	const binding = message.data.slice(1);
+    		// 	//log("Binding: " + binding)
+    		// 	window.wails._.NewBinding(binding);
+    		// 	break;
+    		// 	// Call back
+    	case 'c':
+    		const callbackData = message.data.slice(1);
+    		window.wails._.Callback(callbackData);
+    		break;
+    		// Tray
+    	case 'T':
+    		const trayMessage = message.data.slice(1);
+    		switch (trayMessage[0]) {
+    		case 'S':
+    			// Set tray
+    			const trayJSON = trayMessage.slice(1);
+    			let tray = JSON.parse(trayJSON);
+    			setTray(tray);
+    			break;
+    		case 'U':
+    			// Update label
+    			const updateTrayLabelJSON = trayMessage.slice(1);
+    			let trayLabelData = JSON.parse(updateTrayLabelJSON);
+    			updateTrayLabel(trayLabelData);
+    			break;
+    		case 'D':
+    			// Delete Tray Menu
+    			const id = trayMessage.slice(1);
+    			deleteTrayMenu(id);
+    			break;
+    		default:
+    			log('Unknown tray message: ' + message.data);
+    		}
+    		break;
 
-                // Now wails runtime is loaded, wails for the ready event
-                // and callback to the main app
-                // window.wails.Events.On('wails:loaded', function () {
-                if (callback) {
-                    log('Notifying application');
-                    callback(window.wails);
-                }
-                // });
-                break;
-            // 	// Notifications
-            // case 'n':
-            // 	addScript(message.data.slice(1), true);
-            // 	break;
-            // 	// Binding
-            // case 'b':
-            // 	const binding = message.data.slice(1);
-            // 	//log("Binding: " + binding)
-            // 	window.wails._.NewBinding(binding);
-            // 	break;
-            // 	// Call back
-            case 'c':
-                const callbackData = message.data.slice(1);
-                window.wails._.Callback(callbackData);
-                break;
-            // Tray
-            case 'T':
-                const trayMessage = message.data.slice(1);
-                switch (trayMessage[0]) {
-                    case 'S':
-                        // Set tray
-                        const trayJSON = trayMessage.slice(1);
-                        let tray = JSON.parse(trayJSON);
-                        setTray(tray);
-                        break
-                    case 'U':
-                        // Update label
-                        const updateTrayLabelJSON = trayMessage.slice(1);
-                        let trayLabelData = JSON.parse(updateTrayLabelJSON);
-                        updateTrayLabel(trayLabelData);
-                        break
-                    case 'D':
-                        // Delete Tray Menu
-                        const id = trayMessage.slice(1);
-                        deleteTrayMenu(id);
-                        break
-                    default:
-                        log('Unknown tray message: ' + message.data);
-                }
-                break;
-
-            default:
-                log('Unknown message: ' + message.data);
-        }
+    	default:
+    		log('Unknown message: ' + message.data);
+    	}
     }
 
     /*

v2/internal/runtime/js/runtime/init.js

@@ -9,7 +9,7 @@ The lightweight framework for web-like apps
 */
 /* jshint esversion: 6 */
 
-import bridge from './bridge';
+const bridge = require('./bridge');
 
 /**
  * ready will execute the callback when Wails has loaded

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

@@ -1,6 +1,6 @@
 {
   "name": "@wails/runtime",
-  "version": "1.2.24",
+  "version": "1.3.15",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

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

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

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

@@ -10,8 +10,8 @@ The lightweight framework for web-like apps
 /* jshint esversion: 6 */
 
 
-import {setTray, hideOverlay, showOverlay, updateTrayLabel, deleteTrayMenu} from "./store";
-import {log} from "./log";
+import {setTray, hideOverlay, showOverlay, updateTrayLabel, deleteTrayMenu} from './store';
+import {log} from './log';
 
 let websocket = null;
 let callback = null;
@@ -19,152 +19,140 @@ let connectTimer;
 
 export function StartWebsocket(userCallback) {
 
-    callback = userCallback;
+	callback = userCallback;
 
-    window.onbeforeunload = function() {
-        if( websocket ) {
-            websocket.onclose = function () { };
-            websocket.close();
-            websocket = null;
-        }
-    }
+	window.onbeforeunload = function() {
+		if( websocket ) {
+			websocket.onclose = function () { };
+			websocket.close();
+			websocket = null;
+		}
+	};
 
-    // ...and attempt to connect
-    connect();
+	// ...and attempt to connect
+	connect();
 
 }
 
 function setupIPCBridge() {
-    // darwin
-    window.webkit = {
-        messageHandlers: {
-            external: {
-                postMessage: (message) => {
-                    websocket.send(message);
-                }
-            },
-            windowDrag: {
-                postMessage: () => {
-                    // Ignore window drag events
-                }
-            }
-        }
-    };
+	window.wailsInvoke = (message) => {
+		websocket.send(message);
+	};
 }
 
 // Handles incoming websocket connections
 function handleConnect() {
-    log('Connected to backend');
-    setupIPCBridge();
-    hideOverlay();
-    clearInterval(connectTimer);
-    websocket.onclose = handleDisconnect;
-    websocket.onmessage = handleMessage;
+	log('Connected to backend');
+	setupIPCBridge();
+	hideOverlay();
+	clearInterval(connectTimer);
+	websocket.onclose = handleDisconnect;
+	websocket.onmessage = handleMessage;
 }
 
 // Handles websocket disconnects
 function handleDisconnect() {
-    log('Disconnected from backend');
-    websocket = null;
-    showOverlay();
-    connect();
+	log('Disconnected from backend');
+	websocket = null;
+	showOverlay();
+	connect();
 }
 
 // Try to connect to the backend every 1s (default value).
 function connect() {
-    connectTimer = setInterval(function () {
-        if (websocket == null) {
-            websocket = new WebSocket('ws://' + window.location.hostname + ':34115/bridge');
-            websocket.onopen = handleConnect;
-            websocket.onerror = function (e) {
-                e.stopImmediatePropagation();
-                e.stopPropagation();
-                e.preventDefault();
-                websocket = null;
-                return false;
-            };
-        }
-    }, 1000);
+	connectTimer = setInterval(function () {
+		if (websocket == null) {
+			websocket = new WebSocket('ws://' + window.location.hostname + ':34115/bridge');
+			websocket.onopen = handleConnect;
+			websocket.onerror = function (e) {
+				e.stopImmediatePropagation();
+				e.stopPropagation();
+				e.preventDefault();
+				websocket = null;
+				return false;
+			};
+		}
+	}, 1000);
 }
 
 // Adds a script to the Dom.
 // Removes it if second parameter is true.
 function addScript(script, remove) {
-    const s = document.createElement('script');
-    s.setAttribute('type', 'text/javascript');
-    s.textContent = script;
-    document.head.appendChild(s);
+	const s = document.createElement('script');
+	s.setAttribute('type', 'text/javascript');
+	s.textContent = script;
+	document.head.appendChild(s);
 
-    // Remove internal messages from the DOM
-    if (remove) {
-        s.parentNode.removeChild(s);
-    }
+	// Remove internal messages from the DOM
+	if (remove) {
+		s.parentNode.removeChild(s);
+	}
 }
 
 function handleMessage(message) {
-    // As a bridge we ignore js and css injections
-    switch (message.data[0]) {
-        // Wails library - inject!
-        case 'b':
-            message = message.data.slice(1)
-            addScript(message);
-            log('Loaded Wails Runtime');
+	// As a bridge we ignore js and css injections
+	switch (message.data[0]) {
+	// Wails library - inject!
+	case 'b':
+		message = message.data.slice(1);
+		addScript(message);
+		log('Loaded Wails Runtime');
 
-            // We need to now send a message to the backend telling it
-            // we have loaded (System Start)
-            window.webkit.messageHandlers.external.postMessage("SS");
+		// We need to now send a message to the backend telling it
+		// we have loaded (System Start)
+		window.wailsInvoke('SS');
+		
+		// Now wails runtime is loaded, wails for the ready event
+		// and callback to the main app
+		// window.wails.Events.On('wails:loaded', function () {
+		if (callback) {
+			log('Notifying application');
+			callback(window.wails);
+		}
+		// });
+		break;
+		// Notifications
+	case 'n':
+		window.wails._.Notify(message.data.slice(1));
+		break;
+		// 	// Binding
+		// case 'b':
+		// 	const binding = message.data.slice(1);
+		// 	//log("Binding: " + binding)
+		// 	window.wails._.NewBinding(binding);
+		// 	break;
+		// 	// Call back
+	case 'c':
+		const callbackData = message.data.slice(1);
+		window.wails._.Callback(callbackData);
+		break;
+		// Tray
+	case 'T':
+		const trayMessage = message.data.slice(1);
+		switch (trayMessage[0]) {
+		case 'S':
+			// Set tray
+			const trayJSON = trayMessage.slice(1);
+			let tray = JSON.parse(trayJSON);
+			setTray(tray);
+			break;
+		case 'U':
+			// Update label
+			const updateTrayLabelJSON = trayMessage.slice(1);
+			let trayLabelData = JSON.parse(updateTrayLabelJSON);
+			updateTrayLabel(trayLabelData);
+			break;
+		case 'D':
+			// Delete Tray Menu
+			const id = trayMessage.slice(1);
+			deleteTrayMenu(id);
+			break;
+		default:
+			log('Unknown tray message: ' + message.data);
+		}
+		break;
 
-            // Now wails runtime is loaded, wails for the ready event
-            // and callback to the main app
-            // window.wails.Events.On('wails:loaded', function () {
-            if (callback) {
-                log('Notifying application');
-                callback(window.wails);
-            }
-            // });
-            break;
-        // 	// Notifications
-        // case 'n':
-        // 	addScript(message.data.slice(1), true);
-        // 	break;
-        // 	// Binding
-        // case 'b':
-        // 	const binding = message.data.slice(1);
-        // 	//log("Binding: " + binding)
-        // 	window.wails._.NewBinding(binding);
-        // 	break;
-        // 	// Call back
-        case 'c':
-            const callbackData = message.data.slice(1);
-            window.wails._.Callback(callbackData);
-            break;
-        // Tray
-        case 'T':
-            const trayMessage = message.data.slice(1);
-            switch (trayMessage[0]) {
-                case 'S':
-                    // Set tray
-                    const trayJSON = trayMessage.slice(1);
-                    let tray = JSON.parse(trayJSON)
-                    setTray(tray)
-                    break
-                case 'U':
-                    // Update label
-                    const updateTrayLabelJSON = trayMessage.slice(1);
-                    let trayLabelData = JSON.parse(updateTrayLabelJSON)
-                    updateTrayLabel(trayLabelData)
-                    break
-                case 'D':
-                    // Delete Tray Menu
-                    const id = trayMessage.slice(1);
-                    deleteTrayMenu(id)
-                    break
-                default:
-                    log('Unknown tray message: ' + message.data);
-            }
-            break;
-
-        default:
-            log('Unknown message: ' + message.data);
-    }
+	default:
+		log('Unknown message: ' + message.data);
+	}
 }

v2/internal/runtime/scripts/rebuild.go

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

v2/internal/system/apps/apps.go

@@ -1,5 +0,0 @@
-package apps
-
-func Find() []Apps {
-
-}

v2/internal/system/packagemanager/dnf.go

@@ -9,23 +9,23 @@ import (
 	"github.com/wailsapp/wails/v2/internal/shell"
 )
 
-// Yum represents the Yum manager
-type Yum struct {
+// Dnf represents the Dnf manager
+type Dnf struct {
 	name string
 	osid string
 }
 
-// NewYum creates a new Yum instance
-func NewYum(osid string) *Yum {
-	return &Yum{
-		name: "yum",
+// NewDnf creates a new Dnf instance
+func NewDnf(osid string) *Dnf {
+	return &Dnf{
+		name: "dnf",
 		osid: osid,
 	}
 }
 
 // Packages returns the libraries that we need for Wails to compile
 // They will potentially differ on different distributions or versions
-func (y *Yum) Packages() packagemap {
+func (y *Dnf) Packages() packagemap {
 	return packagemap{
 		"libgtk-3": []*Package{
 			{Name: "gtk3-devel", SystemPackage: true, Library: true},
@@ -43,6 +43,9 @@ func (y *Yum) Packages() packagemap {
 		"npm": []*Package{
 			{Name: "npm", SystemPackage: true},
 		},
+		"upx": []*Package{
+			{Name: "upx", SystemPackage: true, Optional: true},
+		},
 		"docker": []*Package{
 			{
 				SystemPackage: false,
@@ -57,16 +60,16 @@ func (y *Yum) Packages() packagemap {
 }
 
 // Name returns the name of the package manager
-func (y *Yum) Name() string {
+func (y *Dnf) Name() string {
 	return y.name
 }
 
 // PackageInstalled tests if the given package name is installed
-func (y *Yum) PackageInstalled(pkg *Package) (bool, error) {
+func (y *Dnf) PackageInstalled(pkg *Package) (bool, error) {
 	if pkg.SystemPackage == false {
 		return false, nil
 	}
-	stdout, _, err := shell.RunCommand(".", "yum", "info", "installed", pkg.Name)
+	stdout, _, err := shell.RunCommand(".", "dnf", "info", "installed", pkg.Name)
 	if err != nil {
 		_, ok := err.(*exec.ExitError)
 		if ok {
@@ -87,11 +90,11 @@ func (y *Yum) PackageInstalled(pkg *Package) (bool, error) {
 }
 
 // PackageAvailable tests if the given package is available for installation
-func (y *Yum) PackageAvailable(pkg *Package) (bool, error) {
+func (y *Dnf) PackageAvailable(pkg *Package) (bool, error) {
 	if pkg.SystemPackage == false {
 		return false, nil
 	}
-	stdout, _, err := shell.RunCommand(".", "yum", "info", pkg.Name)
+	stdout, _, err := shell.RunCommand(".", "dnf", "info", pkg.Name)
 	// We add a space to ensure we get a full match, not partial match
 	if err != nil {
 		_, ok := err.(*exec.ExitError)
@@ -111,14 +114,14 @@ func (y *Yum) PackageAvailable(pkg *Package) (bool, error) {
 }
 
 // InstallCommand returns the package manager specific command to install a package
-func (y *Yum) InstallCommand(pkg *Package) string {
+func (y *Dnf) InstallCommand(pkg *Package) string {
 	if pkg.SystemPackage == false {
 		return pkg.InstallCommand[y.osid]
 	}
-	return "sudo yum install " + pkg.Name
+	return "sudo dnf install " + pkg.Name
 }
 
-func (y *Yum) getPackageVersion(pkg *Package, output string) {
+func (y *Dnf) getPackageVersion(pkg *Package, output string) {
 	splitOutput := strings.Split(output, " ")
 	if len(splitOutput) > 0 {
 		pkg.Version = splitOutput[1]

v2/internal/system/packagemanager/packagemanager.go

@@ -9,12 +9,11 @@ import (
 	"github.com/wailsapp/wails/v2/internal/shell"
 )
 
-
 // A list of package manager commands
 var pmcommands = []string{
 	"eopkg",
 	"apt",
-	"yum",
+	"dnf",
 	"pacman",
 	"emerge",
 	"zypper",
@@ -38,8 +37,8 @@ func newPackageManager(pmname string, osid string) PackageManager {
 		return NewEopkg(osid)
 	case "apt":
 		return NewApt(osid)
-	case "yum":
-		return NewYum(osid)
+	case "dnf":
+		return NewDnf(osid)
 	case "pacman":
 		return NewPacman(osid)
 	case "emerge":
@@ -77,7 +76,7 @@ func Dependancies(p PackageManager) (DependencyList, error) {
 				if installed {
 					dependency.Installed = true
 					dependency.Version = pkg.Version
-					if !pkg.Library {
+					if !pkg.SystemPackage {
 						dependency.Version = AppVersion(name)
 					}
 				} else {

v2/internal/system/packagemanager/pm.go

@@ -21,7 +21,6 @@ type PackageManager interface {
 	InstallCommand(*Package) string
 }
 
-
 // Dependancy represents a system package that we require
 type Dependancy struct {
 	Name           string
@@ -36,20 +35,13 @@ type Dependancy struct {
 // DependencyList is a list of Dependency instances
 type DependencyList []*Dependancy
 
-
 // InstallAllRequiredCommand returns the command you need to use to install all required dependencies
 func (d DependencyList) InstallAllRequiredCommand() string {
 
 	result := ""
 	for _, dependency := range d {
-		if dependency.PackageName != "" {
-			if !dependency.Installed && !dependency.Optional {
-				if result == "" {
-					result = dependency.InstallCommand
-				} else {
-					result += " " + dependency.PackageName
-				}
-			}
+		if !dependency.Installed && !dependency.Optional {
+			result += "  - " + dependency.Name + ": " + dependency.InstallCommand + "\n"
 		}
 	}
 
@@ -61,17 +53,10 @@ func (d DependencyList) InstallAllOptionalCommand() string {
 
 	result := ""
 	for _, dependency := range d {
-		if dependency.PackageName != "" {
-			if !dependency.Installed && dependency.Optional {
-				if result == "" {
-					result = dependency.InstallCommand
-				} else {
-					result += " " + dependency.PackageName
-				}
-			}
+		if !dependency.Installed && dependency.Optional {
+			result += "  - " + dependency.Name + ": " + dependency.InstallCommand + "\n"
 		}
 	}
 
 	return result
 }
-

v2/internal/system/system.go

@@ -3,6 +3,8 @@ package system
 import (
 	"github.com/wailsapp/wails/v2/internal/system/operatingsystem"
 	"github.com/wailsapp/wails/v2/internal/system/packagemanager"
+	"os/exec"
+	"strings"
 )
 
 // Info holds information about the current operating system,
@@ -24,3 +26,82 @@ func GetInfo() (*Info, error) {
 	}
 	return &result, nil
 }
+
+func checkNPM() *packagemanager.Dependancy {
+
+	// Check for npm
+	output, err := exec.Command("npm", "-version").Output()
+	installed := true
+	version := ""
+	if err != nil {
+		installed = false
+	} else {
+		version = strings.TrimSpace(strings.Split(string(output), "\n")[0])
+	}
+	return &packagemanager.Dependancy{
+		Name:           "npm ",
+		PackageName:    "N/A",
+		Installed:      installed,
+		InstallCommand: "Available at https://nodejs.org/en/download/",
+		Version:        version,
+		Optional:       false,
+		External:       false,
+	}
+}
+
+func checkUPX() *packagemanager.Dependancy {
+
+	// Check for npm
+	output, err := exec.Command("upx", "-V").Output()
+	installed := true
+	version := ""
+	if err != nil {
+		installed = false
+	} else {
+		version = strings.TrimSpace(strings.Split(string(output), "\n")[0])
+	}
+	return &packagemanager.Dependancy{
+		Name:           "upx ",
+		PackageName:    "N/A",
+		Installed:      installed,
+		InstallCommand: "Available at https://upx.github.io/",
+		Version:        version,
+		Optional:       true,
+		External:       false,
+	}
+}
+
+func checkDocker() *packagemanager.Dependancy {
+
+	// Check for npm
+	output, err := exec.Command("docker", "version").Output()
+	installed := true
+	version := ""
+
+	// Docker errors if it is not running so check for that
+	if len(output) == 0 && err != nil {
+		installed = false
+	} else {
+		// Version is in a line like: " Version:           20.10.5"
+		versionOutput := strings.Split(string(output), "\n")
+		for _, line := range versionOutput[1:] {
+			splitLine := strings.Split(line, ":")
+			if len(splitLine) > 1 {
+				key := strings.TrimSpace(splitLine[0])
+				if key == "Version" {
+					version = strings.TrimSpace(splitLine[1])
+					break
+				}
+			}
+		}
+	}
+	return &packagemanager.Dependancy{
+		Name:           "docker ",
+		PackageName:    "N/A",
+		Installed:      installed,
+		InstallCommand: "Available at https://www.docker.com/products/docker-desktop",
+		Version:        version,
+		Optional:       true,
+		External:       false,
+	}
+}

v2/internal/system/system_darwin.go

@@ -2,7 +2,14 @@
 
 package system
 
-import "github.com/wailsapp/wails/v2/internal/system/operatingsystem"
+import (
+	"os/exec"
+	"strings"
+
+	"github.com/wailsapp/wails/v2/internal/system/packagemanager"
+
+	"github.com/wailsapp/wails/v2/internal/system/operatingsystem"
+)
 
 func (i *Info) discover() error {
 	var err error
@@ -11,5 +18,29 @@ func (i *Info) discover() error {
 		return err
 	}
 	i.OS = osinfo
+
+	// Check for xcode command line tools
+	output, err := exec.Command("xcode-select", "-v").Output()
+	installed := true
+	version := ""
+	if err != nil {
+		installed = false
+	} else {
+		version = strings.TrimPrefix(string(output), "xcode-select version ")
+		version = strings.TrimSpace(version)
+		version = strings.TrimSuffix(version, ".")
+	}
+	xcodeDep := &packagemanager.Dependancy{
+		Name:           "xcode command line tools ",
+		PackageName:    "N/A",
+		Installed:      installed,
+		InstallCommand: "xcode-select --install",
+		Version:        version,
+		Optional:       false,
+		External:       false,
+	}
+	i.Dependencies = append(i.Dependencies, xcodeDep)
+	i.Dependencies = append(i.Dependencies, checkNPM())
+	i.Dependencies = append(i.Dependencies, checkUPX())
 	return nil
 }

v2/internal/system/system_windows.go

@@ -2,7 +2,12 @@
 
 package system
 
-import "github.com/wailsapp/wails/v2/internal/system/operatingsystem"
+import (
+	"github.com/wailsapp/wails/v2/internal/system/operatingsystem"
+	"github.com/wailsapp/wails/v2/internal/system/packagemanager"
+	"os/exec"
+	"strings"
+)
 
 func (i *Info) discover() error {
 
@@ -12,5 +17,29 @@ func (i *Info) discover() error {
 		return err
 	}
 	i.OS = osinfo
+
+	// Check for gcc
+	output, err := exec.Command("gcc", "--version").Output()
+	installed := true
+	version := ""
+	if err != nil {
+		installed = false
+	} else {
+		version = strings.TrimSpace(strings.Split(string(output), "\n")[0])
+	}
+	gccDependency := &packagemanager.Dependancy{
+		Name:           "gcc ",
+		PackageName:    "N/A",
+		Installed:      installed,
+		InstallCommand: "Available at https://jmeubank.github.io/tdm-gcc/",
+		Version:        version,
+		Optional:       false,
+		External:       false,
+	}
+	i.Dependencies = append(i.Dependencies, gccDependency)
+	i.Dependencies = append(i.Dependencies, checkNPM())
+	i.Dependencies = append(i.Dependencies, checkUPX())
+	i.Dependencies = append(i.Dependencies, checkDocker())
+
 	return nil
 }

v2/pkg/buildassets/build/README.md

@@ -1,9 +1,10 @@
-# Assets Directory
+# Build Directory
 
-The assets directory is used to house all the assets of your application. 
+The build directory is used to house all the build files and assets for your application. 
 
 The structure is:
 
+  * bin - Output directory
   * dialog - Icons for dialogs
   * tray - Icons for the system tray
   * mac - MacOS specific files

v2/pkg/buildassets/build/darwin/Info.tmpl.plist

@@ -0,0 +1,14 @@
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0"><dict>
+	<key>CFBundlePackageType</key><string>APPL</string>
+	<key>CFBundleName</key><string>{{.Name}}</string>
+	<key>CFBundleExecutable</key><string>{{.Name}}</string>
+	<key>CFBundleIdentifier</key><string>com.wails.{{.Name}}</string>
+	<key>CFBundleVersion</key><string>1.0.0</string>
+	<key>CFBundleGetInfoString</key><string>Built using Wails (https://wails.app)</string>
+	<key>CFBundleShortVersionString</key><string>1.0.0</string>
+	<key>CFBundleIconFile</key><string>iconfile</string>
+	<key>LSMinimumSystemVersion</key><string>10.13.0</string>
+	<key>NSHighResolutionCapable</key><string>true</string>
+	<key>NSHumanReadableCopyright</key><string>Copyright.........</string>
+</dict></plist>

v2/pkg/buildassets/build/dialog/README.md

@@ -0,0 +1,3 @@
+# Default Dialog Icons
+
+This directory contains the default dialog icons. These are pre-compiled into a single C file (`defaultDialogIcons.c`) which resides in the `ffenestri` directory. If these icons are ever updated, then there is a need to run: `go run build.go` in this directory. This will generate a new `defaultDialogIcons.c` file in the `ffenestri` directory.