Feature/1.16 (#646)

* Initial support for embed

* Security (#644)

* Bump y18n from 3.2.1 to 3.2.2 in /runtime/js/runtime (#639)

* Create FUNDING.yml

* Update README.md

* Bump y18n from 3.2.1 to 3.2.2 in /runtime/js/runtime

Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: Lea Anthony <lea.anthony@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump elliptic from 6.5.3 to 6.5.4 in /runtime/js (#617)

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump y18n from 4.0.0 to 4.0.1 in /runtime/js (#643)

* Create FUNDING.yml

* Update README.md

* Updated sponsors

* Consistent styling of README.md

* Bump y18n from 4.0.0 to 4.0.1 in /runtime/js (#638)

Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Revert "Bump y18n from 4.0.0 to 4.0.1 in /runtime/js (#638)" (#642)

This reverts commit 17b28a26bd.

* Bump y18n from 4.0.0 to 4.0.1 in /runtime/js

Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: Lea Anthony <lea.anthony@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Support for minimum and maximum window sizes (#612)

* add support for minimum and maximum window sizes

* attempt to fix windows

* bug fixes

* support min/max window sizes on Linux and Windows

* fix min/max window sizes on Linux

* formatting and comments

* fixes Windows DPI issue, clamps width/height values to min/max

* App can't go into full screen when max size is set for Mac

* fixed Linux maximum width/height on window maximize

* Revert "fixed Linux maximum width/height on window maximize"

This reverts commit 3f7ba8b26435392116df3c9fe66ef11536e30c59.

The fix glitches on PopOS

Co-authored-by: Lea Anthony <lea.anthony@gmail.com>

* v1.13.0

* Remove mewn. Update templates. Remove logging.

* Import embed in templates!

* Fix react import path

* Update README.md

* Updated sponsors

* Consistent styling of README.md

* Revert "Bump y18n from 4.0.0 to 4.0.1 in /runtime/js (#638)" (#642)

This reverts commit 17b28a26bd.

* Update actions to use 1.16

* v1.16.0

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: RH12503 <48951973+RH12503@users.noreply.github.com>

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [leaanthony]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/latest-pre.yml

@@ -13,10 +13,10 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
 
-    - name: Set up Go 1.13
+    - name: Set up Go 1.16
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: 1.16
       id: go
 
     - name: Check out code into the Go module directory

.github/workflows/pr.yml

@@ -13,10 +13,10 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
 
-    - name: Set up Go 1.13
+    - name: Set up Go 1.16
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: 1.16
       id: go
 
     - name: Check out code into the Go module directory

.github/workflows/release.yml

@@ -15,10 +15,10 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
 
-    - name: Set up Go 1.13
+    - name: Set up Go 1.16
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: 1.16
       id: go
 
     - name: Check out code into the Go module directory

.gitignore

@@ -17,13 +17,8 @@ cmd/wails/wails
 .DS_Store
 tmp
 node_modules/
-package.json.md5
-v2/test/**/frontend/dist
-v2/test/**/build/
-v2/test/frameless/icon.png
-v2/test/hidden/icon.png
-v2/test/kitchensink/frontend/public/bundle.*
-v2/pkg/parser/testproject/frontend/wails
 v2/test/kitchensink/frontend/public
+v2/internal/ffenestri/runtime.c
+v2/internal/runtime/assets/desktop.js
 v2/test/kitchensink/build/darwin/desktop/kitchensink
 v2/test/kitchensink/frontend/package.json.md5

.vscode/settings.json

@@ -1,8 +1,4 @@
 {
   "go.formatTool": "goimports",
-  "eslint.alwaysShowStatus": true,
-  "files.associations": {
-    "__locale": "c",
-    "ios": "c"
-  }
+  "eslint.alwaysShowStatus": true
 }

CONTRIBUTORS.md

@@ -40,4 +40,9 @@ Wails is what it is because of the time and effort given by these great people.
   * [Balakrishna Prasad Ganne](https://github.com/aayush420)
   * [Charaf Rezrazi](https://github.com/Rezrazi)
   * [misitebao](https://github.com/misitebao)
-  * [Elie Grenon](https://github.com/DrunkenPoney)
+  * [Elie Grenon](https://github.com/DrunkenPoney)
+  * [SophieAu](https://github.com/SophieAu)
+  * [Alexander Matviychuk](https://github.com/alexmat)
+  * [RH12503](https://github.com/RH12503) 
+  * [hi019](https://github.com/hi019)
+  

README.md

@@ -2,7 +2,7 @@
    <img src="logo_cropped.png" width="40%"><br/>
 </p>
 <p align="center">
-   A framework for building desktop applications using Go & Web Technologies.<br/><br/>
+   Build desktop applications using Go & Web Technologies.<br/><br/>
    <a href="https://github.com/wailsapp/wails/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-MIT-blue.svg"></a>
    <a href="https://goreportcard.com/report/github.com/wailsapp/wails"><img src="https://goreportcard.com/badge/github.com/wailsapp/wails"/></a>
    <a href="http://godoc.org/github.com/wailsapp/wails"><img src="https://img.shields.io/badge/godoc-reference-blue.svg"/></a>
@@ -20,7 +20,7 @@ The official docs can be found at [https://wails.app](https://wails.app).
 
 ## Features
 
-- Use standard Go libraries/frameworks for the backend
+- Use standard Go for the backend
 - Use any frontend technology to build your UI
 - Quickly create Vue, Vuetify or React frontends for your Go programs
 - Expose Go methods/functions to the frontend via a single bind command
@@ -30,6 +30,20 @@ The official docs can be found at [https://wails.app](https://wails.app).
 - Powerful cli tool
 - Multiplatform
 
+## Sponsors
+
+This project is supported by these kind people:
+
+<a href="https://pace.dev" style="width:100px"><img src="pace.jpeg" width="100"/></a>
+<a href="https://github.com/tc-hib" style="width:50px;border-radius: 50%">
+  <img src="https://github.com/tc-hib.png?size=50" width="50" style="border-radius: 50%"/>
+</a>
+<a href="https://github.com/picatz" style="width:50px;border-radius: 50%">
+  <img src="https://github.com/picatz.png?size=50" width="50" style="border-radius: 50%"/>
+</a>
+<a href="https://github.com/tylertravisty" style="width:50px;border-radius: 50%">
+  <img src="https://github.com/tylertravisty.png?size=50" width="50" style="border-radius: 50%"/>
+</a>
 
 ## Installation
 
@@ -150,7 +164,8 @@ This project was mainly coded to the following albums:
 ## Special Thanks
 
 <p align="center" style="text-align: center">
-   A *huge* thanks to <a href="https://pace.dev"><img src="pace.jpeg"/> Pace</a> for sponsoring the project and helping the efforts to get Wails ported to Apple Silicon!<br/><br/>
+   <a href="https://pace.dev"><img src="pace.jpeg"/></a><br/>
+   A *huge* thanks to <a href="https://pace.dev">Pace</a> for sponsoring the project and helping the efforts to get Wails ported to Apple Silicon!<br/><br/>
    If you are looking for a Project Management tool that's powerful but quick and easy to use, check them out!<br/><br/>
 </p>
 

cmd/github.go

@@ -24,7 +24,7 @@ func (g *GitHubHelper) GetVersionTags() ([]*SemanticVersion, error) {
 	result := []*SemanticVersion{}
 	var err error
 
-	resp, err := http.Get("https://api.github.com/repos/wailsapp/wails/tags")
+	resp, err := http.Get("https://api.github.com/repos/wailsapp/wails/releases")
 	if err != nil {
 		return result, err
 	}

cmd/helpers.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"os/user"
@@ -12,10 +11,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/leaanthony/mewn"
-	"github.com/leaanthony/mewn/lib"
 	"github.com/leaanthony/slicer"
 	"github.com/leaanthony/spinner"
+	wailsruntime "github.com/wailsapp/wails/runtime"
 )
 
 const xgoVersion = "1.0.1"
@@ -61,30 +59,6 @@ func InstallGoDependencies(verbose bool) error {
 	return nil
 }
 
-// EmbedAssets will embed the built frontend assets via mewn.
-func EmbedAssets() ([]string, error) {
-	mewnFiles := lib.GetMewnFiles([]string{}, false)
-
-	referencedAssets, err := lib.GetReferencedAssets(mewnFiles)
-	if err != nil {
-		return []string{}, err
-	}
-
-	targetFiles := []string{}
-
-	for _, referencedAsset := range referencedAssets {
-		packfileData, err := lib.GeneratePackFileString(referencedAsset, false)
-		if err != nil {
-			return []string{}, err
-		}
-		targetFile := filepath.Join(referencedAsset.BaseDir, referencedAsset.PackageName+"-mewn.go")
-		targetFiles = append(targetFiles, targetFile)
-		ioutil.WriteFile(targetFile, []byte(packfileData), 0644)
-	}
-
-	return targetFiles, nil
-}
-
 func InitializeCrossCompilation(verbose bool) error {
 	// Check Docker
 	if err := CheckIfInstalled("docker"); err != nil {
@@ -127,7 +101,10 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt
 	// Check build directory
 	buildDirectory := filepath.Join(fs.Cwd(), "build")
 	if !fs.DirExists(buildDirectory) {
-		fs.MkDir(buildDirectory)
+		err := fs.MkDir(buildDirectory)
+		if err != nil {
+			return err
+		}
 	}
 
 	buildCommand := slicer.String()
@@ -198,11 +175,6 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt
 // BuildNative builds on the target platform itself.
 func BuildNative(binaryName string, forceRebuild bool, buildMode string, projectOptions *ProjectOptions) error {
 
-	// Check Mewn is installed
-	if err := CheckMewn(projectOptions.Verbose); err != nil {
-		return err
-	}
-
 	if err := CheckWindres(); err != nil {
 		return err
 	}
@@ -275,12 +247,6 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project
 func BuildApplication(binaryName string, forceRebuild bool, buildMode string, packageApp bool, projectOptions *ProjectOptions) error {
 	var err error
 
-	// embed resources
-	targetFiles, err := EmbedAssets()
-	if err != nil {
-		return err
-	}
-
 	if projectOptions.CrossCompile {
 		if err := InitializeCrossCompilation(projectOptions.Verbose); err != nil {
 			return err
@@ -296,20 +262,6 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 		}
 	}
 
-	// cleanup temporary embedded assets
-	defer func() {
-		for _, filename := range targetFiles {
-			if err := os.Remove(filename); err != nil {
-				fmt.Println(err)
-			}
-		}
-		// Removed by popular demand
-		// TODO: Potentially add a flag to cleanup
-		// if projectOptions.Platform == "windows" {
-		// 	helper.CleanWindows(projectOptions)
-		// }
-	}()
-
 	if projectOptions.CrossCompile {
 		err = BuildDocker(binaryName, buildMode, projectOptions)
 	} else {
@@ -374,30 +326,6 @@ func BuildFrontend(projectOptions *ProjectOptions) error {
 	return nil
 }
 
-// CheckMewn checks if mewn is installed and if not, attempts to fetch it
-func CheckMewn(verbose bool) (err error) {
-	programHelper := NewProgramHelper(verbose)
-	if !programHelper.IsInstalled("mewn") {
-		var buildSpinner *spinner.Spinner
-		if !verbose {
-			buildSpinner = spinner.New()
-			buildSpinner.SetSpinSpeed(50)
-			buildSpinner.Start("Installing Mewn asset packer...")
-		}
-		err := programHelper.InstallGoPackage("github.com/leaanthony/mewn/cmd/mewn")
-		if err != nil {
-			if buildSpinner != nil {
-				buildSpinner.Error()
-			}
-			return err
-		}
-		if buildSpinner != nil {
-			buildSpinner.Success()
-		}
-	}
-	return nil
-}
-
 // CheckWindres checks if Windres is installed and if not, aborts
 func CheckWindres() (err error) {
 	if runtime.GOOS != "windows" { // FIXME: Handle windows cross-compile for windows!
@@ -493,11 +421,18 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 		}
 
 		// Update md5sum file
-		ioutil.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
+		err := os.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
+		if err != nil {
+			return err
+		}
 	}
 
 	// Install the runtime
-	err = InstallRuntime(caller, projectDir, projectOptions)
+	if caller == "build" {
+		err = InstallProdRuntime(projectDir, projectOptions)
+	} else {
+		err = InstallBridge(projectDir, projectOptions)
+	}
 	if err != nil {
 		return err
 	}
@@ -510,28 +445,17 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	return nil
 }
 
-// InstallRuntime installs the correct runtime for the type of build
-func InstallRuntime(caller string, projectDir string, projectOptions *ProjectOptions) error {
-	if caller == "build" {
-		return InstallProdRuntime(projectDir, projectOptions)
-	}
-
-	return InstallBridge(projectDir, projectOptions)
-}
-
 // InstallBridge installs the relevant bridge javascript library
 func InstallBridge(projectDir string, projectOptions *ProjectOptions) error {
-	bridgeFileData := mewn.String("../runtime/assets/bridge.js")
 	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
-	err := fs.CreateFile(bridgeFileTarget, []byte(bridgeFileData))
+	err := fs.CreateFile(bridgeFileTarget, wailsruntime.BridgeJS)
 	return err
 }
 
 // InstallProdRuntime installs the production runtime
 func InstallProdRuntime(projectDir string, projectOptions *ProjectOptions) error {
-	prodInit := mewn.String("../runtime/js/runtime/init.js")
 	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
-	err := fs.CreateFile(bridgeFileTarget, []byte(prodInit))
+	err := fs.CreateFile(bridgeFileTarget, wailsruntime.InitJS)
 	return err
 }
 
@@ -595,3 +519,9 @@ func ldFlags(po *ProjectOptions, buildMode string) string {
 	}
 	return ldflags
 }
+
+func getGitConfigValue(key string) (string, error) {
+	output, err := exec.Command("git", "config", "--get", "--null", key).Output()
+	// When using --null git appends a null character (\u0000) to the command output
+	return strings.TrimRight(string(output), "\u0000"), err
+}

cmd/linux.go

@@ -67,6 +67,8 @@ const (
 	Ctlos
 	// EndeavourOS linux distribution
 	EndeavourOS
+	// Crux linux distribution
+	Crux
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -175,6 +177,8 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = Solus
 	case "endeavouros":
 		result.Distribution = EndeavourOS
+	case "crux":
+		result.Distribution = Crux
 	default:
 		result.Distribution = Unknown
 	}
@@ -255,6 +259,17 @@ func RpmInstalled(packageName string) (bool, error) {
 	return exitCode == 0, nil
 }
 
+// PrtGetInstalled uses prt-get to see if a package is installed
+func PrtGetInstalled(packageName string) (bool, error) {
+	program := NewProgramHelper()
+	prtget := program.FindProgram("prt-get")
+	if prtget == nil {
+		return false, fmt.Errorf("cannot check dependencies: prt-get not found")
+	}
+	_, _, exitCode, _ := prtget.Run("isinst", packageName)
+	return exitCode == 0, nil
+}
+
 // RequestSupportForDistribution promts the user to submit a request to support their
 // currently unsupported distribution
 func RequestSupportForDistribution(distroInfo *DistroInfo) error {

cmd/linuxdb.yaml

@@ -307,3 +307,22 @@ distributions:
           gccversioncommand: *gccdumpfullversion
           programs: *opensusedefaultprograms
           libraries: *opensusedefaultlibraries
+  crux:
+      id: crux
+      releases:
+        default:
+          version: default
+          name: Crux Linux
+          gccversioncommand: *gccdumpversion
+          programs:
+            - name: gcc
+              help: Please install with `sudo prt-get depinst gcc-c++ make` and try again
+            - name: pkg-config
+              help: Please install with `sudo prt-get depinst pkg-config` and try again
+            - name: npm
+              help: Please install with `sudo prt-get depinst nodejs` and try again
+          libraries:
+            - name: gtk3
+              help: Please install with `sudo prt-get depinst gtk3` and try again
+            - name: webkitgtk
+              help: Please install with `sudo prt-get depinst webkitgtk` and try again

cmd/system.go

@@ -99,11 +99,16 @@ func (s *SystemHelper) setup() error {
 
 	if config.Name != "" {
 		systemConfig["name"] = PromptRequired("What is your name", config.Name)
+	} else if n, err := getGitConfigValue("user.name"); err == nil && n != "" {
+		systemConfig["name"] = PromptRequired("What is your name", n)
 	} else {
 		systemConfig["name"] = PromptRequired("What is your name")
 	}
+
 	if config.Email != "" {
 		systemConfig["email"] = PromptRequired("What is your email address", config.Email)
+	} else if e, err := getGitConfigValue("user.email"); err == nil && e != "" {
+		systemConfig["email"] = PromptRequired("What is your email address", e)
 	} else {
 		systemConfig["email"] = PromptRequired("What is your email address")
 	}
@@ -180,7 +185,7 @@ func (s *SystemHelper) Initialise() error {
 	return s.setup()
 }
 
-// SystemConfig - Defines system wode configuration data
+// SystemConfig - Defines system wide configuration data
 type SystemConfig struct {
 	Name  string `json:"name"`
 	Email string `json:"email"`
@@ -286,6 +291,8 @@ func CheckDependencies(logger *Logger) (bool, error) {
 			libraryChecker = XbpsInstalled
 		case Solus:
 			libraryChecker = EOpkgInstalled
+		case Crux:
+			libraryChecker = PrtGetInstalled
 		default:
 			return false, RequestSupportForDistribution(distroInfo)
 		}

cmd/templates/angular-template/frontend/package.json.template

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "npx ng",
-    "start": "npx ng serve --poll=2000 --host=0.0.0.0",
+    "serve": "npx ng serve --poll=2000 --host=0.0.0.0",
     "build": "npx ng build --single-bundle true --output-hashing none --prod --bundle-styles false",
     "test": "npx ng test",
     "lint": "npx ng lint",

cmd/templates/angular-template/main.go.template

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/leaanthony/mewn"
+    _ "embed"
 	"github.com/wailsapp/wails"
 )
 
@@ -9,10 +9,13 @@ func basic() string {
 	return "World!"
 }
 
-func main() {
+//go:embed frontend/dist/my-app/main.js
+var js string
 
-	js := mewn.String("./frontend/dist/my-app/main.js")
-	css := mewn.String("./frontend/dist/my-app/styles.css")
+//go:embed frontend/dist/my-app/styles.css
+var css string
+
+func main() {
 
 	app := wails.CreateApp(&wails.AppConfig{
 		Width:  1024,

cmd/templates/angular-template/template.json

@@ -14,7 +14,7 @@
   "author": "bh90210 <ktc@pm.me>",
   "created": "2019-06-15 18:23:48.666414555 +0300 EEST m=+223.934866008",
   "frontenddir": "frontend",
-  "serve": "npx ng serve --poll=2000",
+  "serve": "npm run serve",
   "bridge": "src",
   "wailsdir": ""
 }

cmd/templates/create-react-app/frontend/package.json.template

@@ -12,7 +12,7 @@
     "@wailsapp/runtime": "^1.0.10"
   },
   "scripts": {
-    "start": "react-scripts start",
+    "serve": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"

cmd/templates/create-react-app/main.go.template

@@ -1,7 +1,7 @@
 package main
 
 import (
-  "github.com/leaanthony/mewn"
+  _ "embed"
   "github.com/wailsapp/wails"
 )
 
@@ -9,10 +9,13 @@ func basic() string {
   return "World!"
 }
 
-func main() {
+//go:embed frontend/build/static/js/main.js
+var js string
 
-  js := mewn.String("./frontend/build/static/js/main.js")
-  css := mewn.String("./frontend/build/static/css/main.css")
+//go:embed frontend/build/static/css/main.css
+var css string
+
+func main() {
 
   app := wails.CreateApp(&wails.AppConfig{
     Width:  1024,

cmd/templates/create-react-app/template.json

@@ -8,7 +8,7 @@
   "author": "bh90210 <ktc@pm.me>",
   "created": "2019-06-07 18:23:48.666414555 +0300 EEST m=+223.934866008",
   "frontenddir": "frontend",
-  "serve": "npm run start",
+  "serve": "npm run serve",
   "bridge": "src",
   "wailsdir": ""
 }

cmd/templates/svelte/frontend/package.json.template

@@ -3,7 +3,7 @@
   "author": "{{.Author.Name}}<{{.Author.Email}}>",
   "scripts": {
     "build": "rollup -c",
-    "dev": "rollup -c -w",
+    "serve": "rollup -c -w",
     "start": "sirv public"
   },
   "devDependencies": {

cmd/templates/svelte/frontend/rollup.config.js

@@ -80,7 +80,6 @@ export default {
 				{
 				  targets: '> 0.25%, not dead, IE 11',
 				  modules: false,
-				  spec: true, 
 				  useBuiltIns: 'usage',
 				  forceAllTransforms: true,
 				  corejs: 3,

cmd/templates/svelte/main.go.template

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/leaanthony/mewn"
+    _ "embed"
 	"github.com/wailsapp/wails"
 )
 
@@ -9,9 +9,13 @@ func basic() string {
 	return "World!"
 }
 
+//go:embed frontend/public/build/bundle.js
+var js string
+
+//go:embed frontend/public/build/bundle.css
+var css string
+
 func main() {
-	js := mewn.String("./frontend/public/build/bundle.js")
-	css := mewn.String("./frontend/public/build/bundle.css")
 
 	app := wails.CreateApp(&wails.AppConfig{
 		Width:  1024,

cmd/templates/svelte/template.json

@@ -8,7 +8,7 @@
   "author": "Tim Kipp <timkipp.22.developer@gmail.com>",
   "created": "2020-09-06 13:06:10.469848 -0700 PDT m=+213.578828559",
   "frontenddir": "frontend",
-  "serve": "npm run dev",
+  "serve": "npm run serve",
   "bridge": "src",
   "wailsdir": ""
 }

cmd/templates/vanilla/main.go.template

@@ -1,14 +1,17 @@
 package main
 
 import (
-  "github.com/leaanthony/mewn"
+  _ "embed"
   "github.com/wailsapp/wails"
 )
 
-func main() {
+//go:embed frontend/build/main.js
+var js string
 
-	js := mewn.String("./frontend/build/main.js")
-	css := mewn.String("./frontend/build/main.css")
+//go:embed frontend/build/main.css
+var css string
+
+func main() {
 
   app := wails.CreateApp(&wails.AppConfig{
     Width:  1024,

cmd/templates/vue3-full/main.go.template

@@ -1,7 +1,7 @@
 package main
 
 import (
-  "github.com/leaanthony/mewn"
+  _ "embed"
   "github.com/wailsapp/wails"
 )
 
@@ -9,10 +9,13 @@ func basic() string {
   return "Hello World!"
 }
 
-func main() {
+//go:embed frontend/dist/app.js
+var js string
 
-  js := mewn.String("./frontend/dist/app.js")
-  css := mewn.String("./frontend/dist/app.css")
+//go:embed frontend/dist/app.css
+var css string
+
+func main() {
 
   app := wails.CreateApp(&wails.AppConfig{
     Width:  1024,

cmd/templates/vuebasic/main.go.template

@@ -1,7 +1,7 @@
 package main
 
 import (
-  "github.com/leaanthony/mewn"
+  _ "embed"
   "github.com/wailsapp/wails"
 )
 
@@ -9,10 +9,13 @@ func basic() string {
   return "Hello World!"
 }
 
-func main() {
+//go:embed frontend/dist/app.js
+var js string
 
-  js := mewn.String("./frontend/dist/app.js")
-  css := mewn.String("./frontend/dist/app.css")
+//go:embed frontend/dist/app.css
+var css string
+
+func main() {
 
   app := wails.CreateApp(&wails.AppConfig{
     Width:  1024,

cmd/templates/vuetify-basic/main.go.template

@@ -1,7 +1,7 @@
 package main
 
 import (
-  "github.com/leaanthony/mewn"
+  _ "embed"
   "github.com/wailsapp/wails"
 )
 
@@ -9,10 +9,13 @@ func basic() string {
   return "Hello World!"
 }
 
-func main() {
+//go:embed frontend/dist/app.js
+var js string
 
-  js := mewn.String("./frontend/dist/app.js")
-  css := mewn.String("./frontend/dist/app.css")
+//go:embed frontend/dist/app.css
+var css string
+
+func main() {
 
   app := wails.CreateApp(&wails.AppConfig{
     Width:  1024,

cmd/templates/vuetify2-basic/main.go.template

@@ -1,7 +1,7 @@
 package main
 
 import (
-  "github.com/leaanthony/mewn"
+  _ "embed"
   "github.com/wailsapp/wails"
 )
 
@@ -9,10 +9,13 @@ func basic() string {
   return "Hello World!"
 }
 
-func main() {
+//go:embed frontend/dist/app.js
+var js string
 
-  js := mewn.String("./frontend/dist/app.js")
-  css := mewn.String("./frontend/dist/app.css")
+//go:embed frontend/dist/app.css
+var css string
+
+func main() {
 
   app := wails.CreateApp(&wails.AppConfig{
     Width:  1024,

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v1.11.0"
+const Version = "v1.16.0"

cmd/wails/0_setup.go

@@ -39,12 +39,6 @@ Create your first project by running 'wails init'.`
 			return err
 		}
 
-		// Check Mewn
-		err = cmd.CheckMewn(false)
-		if err != nil {
-			return err
-		}
-
 		// Check for errors
 		// CheckDependencies() returns !errors
 		// so to get the right message in this

cmd/wails/4_build.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"runtime"
 	"strings"
@@ -52,7 +53,10 @@ func init() {
 
 	var b strings.Builder
 	for _, plat := range getSupportedPlatforms() {
-		fmt.Fprintf(&b, " - %s\n", plat)
+		_, err := fmt.Fprintf(&b, " - %s\n", plat)
+		if err != nil {
+			log.Fatal(err)
+		}
 	}
 	initCmd.StringFlag("x",
 		fmt.Sprintf("Cross-compile application to specified platform via xgo\n%s", b.String()),
@@ -80,7 +84,7 @@ func init() {
 		fs := cmd.NewFSHelper()
 		err := projectOptions.LoadConfig(fs.Cwd())
 		if err != nil {
-			return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
+			return fmt.Errorf("unable to find 'project.json'. Please check you are in a Wails project directory")
 		}
 
 		// Set firebug flag
@@ -143,12 +147,6 @@ func init() {
 			if err != nil {
 				return err
 			}
-
-			// Ensure that runtime init.js is the production version
-			err = cmd.InstallProdRuntime(projectDir, projectOptions)
-			if err != nil {
-				return err
-			}
 		}
 
 		// Move to project directory

cmd/wails/6_serve.go

@@ -27,19 +27,13 @@ func init() {
 		logger.PrintSmallBanner(message)
 		fmt.Println()
 
-		// Check Mewn is installed
-		err := cmd.CheckMewn(verbose)
-		if err != nil {
-			return err
-		}
-
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
 
 		// Check we are in project directory
 		// Check project.json loads correctly
 		fs := cmd.NewFSHelper()
-		err = projectOptions.LoadConfig(fs.Cwd())
+		err := projectOptions.LoadConfig(fs.Cwd())
 		if err != nil {
 			return err
 		}

config.go

@@ -31,6 +31,18 @@ type AppConfig struct {
 	// Indicates whether your app should be resizable
 	Resizable bool
 
+	// Minimum width of a resizable window. If set, MinHeight should also be set.
+	MinWidth int
+
+	// Minimum height of a resizable window. If set, MinWidth should also be set.
+	MinHeight int
+
+	// Maximum width of a resizable window. If set, MaxHeight should also be set.
+	MaxWidth int
+
+	// Maximum height of a resizable window. If set, MaxWidth should also be set.
+	MaxHeight int
+
 	// Indicated if the devtools should be disabled
 	DisableInspector bool
 }
@@ -65,6 +77,26 @@ func (a *AppConfig) GetResizable() bool {
 	return a.Resizable
 }
 
+// GetMinWidth returns the minimum width of the window
+func (a *AppConfig) GetMinWidth() int {
+	return a.MinWidth
+}
+
+// GetMinHeight returns the minimum height of the window
+func (a *AppConfig) GetMinHeight() int {
+	return a.MinHeight
+}
+
+// GetMaxWidth returns the maximum width of the window
+func (a *AppConfig) GetMaxWidth() int {
+	return a.MaxWidth
+}
+
+// GetMaxHeight returns the maximum height of the window
+func (a *AppConfig) GetMaxHeight() int {
+	return a.MaxHeight
+}
+
 // GetDisableInspector returns true if the inspector should be disabled
 func (a *AppConfig) GetDisableInspector() bool {
 	return a.DisableInspector
@@ -115,6 +147,23 @@ func (a *AppConfig) merge(in *AppConfig) error {
 	if in.Height != 0 {
 		a.Height = in.Height
 	}
+
+	if in.MinWidth != 0 {
+		a.MinWidth = in.MinWidth
+	}
+
+	if in.MinHeight != 0 {
+		a.MinHeight = in.MinHeight
+	}
+
+	if in.MaxWidth != 0 {
+		a.MaxWidth = in.MaxWidth
+	}
+
+	if in.MaxHeight != 0 {
+		a.MaxHeight = in.MaxHeight
+	}
+
 	a.Resizable = in.Resizable
 	a.DisableInspector = in.DisableInspector
 
@@ -127,6 +176,10 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		Width:     800,
 		Height:    600,
 		Resizable: true,
+		MinWidth:  -1,
+		MinHeight: -1,
+		MaxWidth:  -1,
+		MaxHeight: -1,
 		Title:     "My Wails App",
 		Colour:    "#FFF", // White by default
 		HTML:      defaultHTML,

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/jackmordaunt/icns v1.0.0
 	github.com/kennygrant/sanitize v1.2.4
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/leaanthony/mewn v0.10.7
 	github.com/leaanthony/slicer v1.4.0
 	github.com/leaanthony/spinner v0.5.3
 	github.com/mattn/go-colorable v0.1.1 // indirect
@@ -22,10 +21,10 @@ require (
 	github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba
 	golang.org/x/image v0.0.0-20200430140353-33d19683fad8
 	golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
-	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c
+	golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
 	golang.org/x/text v0.3.0
 	gopkg.in/AlecAivazis/survey.v1 v1.8.4
 	gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
 )
 
-go 1.13
+go 1.16

go.sum

@@ -26,8 +26,6 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/leaanthony/mewn v0.10.7 h1:jCcNJyIUOpwj+I5SuATvCugDjHkoo+j6ubEOxxrxmPA=
-github.com/leaanthony/mewn v0.10.7/go.mod h1:CRkTx8unLiSSilu/Sd7i1LwrdaAL+3eQ3ses99qGMEQ=
 github.com/leaanthony/slicer v1.4.0 h1:Q9u4w+UBU4WHjXnEDdz+eRLMKF/rnyosRBiqULnc1J8=
 github.com/leaanthony/slicer v1.4.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
 github.com/leaanthony/spinner v0.5.3 h1:IMTvgdQCec5QA4qRy0wil4XsRP+QcG1OwLWVK/LPZ5Y=
@@ -66,7 +64,6 @@ github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba h1:2DHfQOxcpWdGf5
 github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba/go.mod h1:iLnlXG2Pakcii2CU0cbY07DRCSvpWNa7nFxtevhOChk=
 golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 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=
@@ -81,8 +78,6 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 gopkg.in/AlecAivazis/survey.v1 v1.8.4 h1:10xXXN3wgIhPheb5NI58zFgZv32Ana7P3Tl4shW+0Qc=

lib/event/manager.go

@@ -18,6 +18,7 @@ type Manager struct {
 	log            *logger.CustomLogger
 	renderer       interfaces.Renderer // Messages will be dispatched to the frontend
 	wg             sync.WaitGroup
+	mu             sync.Mutex
 }
 
 // NewManager creates a new event manager with a 100 event buffer
@@ -42,12 +43,12 @@ func (e *Manager) PushEvent(eventData *messages.EventData) {
 // means it does not expire (default).
 type eventListener struct {
 	callback func(...interface{}) // Function to call with emitted event data
-	counter  int                  // Expire after counter callbacks. 0 = infinite
+	counter  uint                 // Expire after counter callbacks. 0 = infinite
 	expired  bool                 // Indicates if the listener has expired
 }
 
 // Creates a new event listener from the given callback function
-func (e *Manager) addEventListener(eventName string, callback func(...interface{}), counter int) error {
+func (e *Manager) addEventListener(eventName string, callback func(...interface{}), counter uint) error {
 
 	// Sanity check inputs
 	if callback == nil {
@@ -75,7 +76,30 @@ func (e *Manager) addEventListener(eventName string, callback func(...interface{
 // On adds a listener for the given event
 func (e *Manager) On(eventName string, callback func(...interface{})) {
 	// Add a persistent eventListener (counter = 0)
-	e.addEventListener(eventName, callback, 0)
+	err := e.addEventListener(eventName, callback, 0)
+	if err != nil {
+		e.log.Error(err.Error())
+	}
+}
+
+// Once adds a listener for the given event that will auto remove
+// after one callback
+func (e *Manager) Once(eventName string, callback func(...interface{})) {
+	// Add a persistent eventListener (counter = 0)
+	err := e.addEventListener(eventName, callback, 1)
+	if err != nil {
+		e.log.Error(err.Error())
+	}
+}
+
+// OnMultiple adds a listener for the given event that will trigger
+// at most <counter> times.
+func (e *Manager) OnMultiple(eventName string, callback func(...interface{}), counter uint) {
+	// Add a persistent eventListener (counter = 0)
+	err := e.addEventListener(eventName, callback, counter)
+	if err != nil {
+		e.log.Error(err.Error())
+	}
 }
 
 // Emit broadcasts the given event to the subscribed listeners
@@ -108,20 +132,24 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 				})
 
 				// Notify renderer
-				e.renderer.NotifyEvent(event)
+				err := e.renderer.NotifyEvent(event)
+				if err != nil {
+					e.log.Error(err.Error())
+				}
 
-				// Notify Go listeners
-				var listenersToRemove []*eventListener
+				e.mu.Lock()
 
 				// Iterate listeners
 				for _, listener := range e.listeners[event.Name] {
 
-					// Call listener, perhaps with data
-					if event.Data == nil {
-						go listener.callback()
-					} else {
-						unpacked := event.Data.([]interface{})
-						go listener.callback(unpacked...)
+					if !listener.expired {
+						// Call listener, perhaps with data
+						if event.Data == nil {
+							go listener.callback()
+						} else {
+							unpacked := event.Data.([]interface{})
+							go listener.callback(unpacked...)
+						}
 					}
 
 					// Update listen counter
@@ -133,15 +161,8 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 					}
 				}
 
-				// Remove expired listeners in place
-				if len(listenersToRemove) > 0 {
-					listeners := e.listeners[event.Name][:0]
-					for _, listener := range listeners {
-						if !listener.expired {
-							listeners = append(listeners, listener)
-						}
-					}
-				}
+				e.mu.Unlock()
+
 			case <-e.quitChannel:
 				e.running = false
 			}

lib/interfaces/appconfig.go

@@ -5,6 +5,10 @@ type AppConfig interface {
 	GetWidth() int
 	GetHeight() int
 	GetTitle() string
+	GetMinWidth() int
+	GetMinHeight() int
+	GetMaxWidth() int
+	GetMaxHeight() int
 	GetResizable() bool
 	GetHTML() string
 	GetDisableInspector() bool

lib/interfaces/eventmanager.go

@@ -6,6 +6,8 @@ import "github.com/wailsapp/wails/lib/messages"
 type EventManager interface {
 	PushEvent(*messages.EventData)
 	Emit(eventName string, optionalData ...interface{})
+	OnMultiple(eventName string, callback func(...interface{}), counter uint)
+	Once(eventName string, callback func(...interface{}))
 	On(eventName string, callback func(...interface{}))
 	Start(Renderer)
 	Shutdown()

lib/interfaces/renderer.go

@@ -22,6 +22,10 @@ type Renderer interface {
 
 	// Window Runtime
 	SetColour(string) error
+
+	SetMinSize(width, height int)
+	SetMaxSize(width, height int)
+
 	Fullscreen()
 	UnFullscreen()
 	SetTitle(title string)

lib/interfaces/runtime.go

@@ -1,4 +1,4 @@
 package interfaces
 
 // Runtime interface
-type Runtime interface {}
+type Runtime interface{}

lib/renderer/bridge/bridge.go

@@ -186,6 +186,18 @@ func (h *Bridge) SetColour(colour string) error {
 	return nil
 }
 
+// SetMinSize is unsupported for Bridge but required
+// for the Renderer interface
+func (h *Bridge) SetMinSize(width, height int) {
+	h.log.Warn("SetMinSize() unsupported in bridge mode")
+}
+
+// SetMaxSize is unsupported for Bridge but required
+// for the Renderer interface
+func (h *Bridge) SetMaxSize(width, height int) {
+	h.log.Warn("SetMaxSize() unsupported in bridge mode")
+}
+
 // Fullscreen is unsupported for Bridge but required
 // for the Renderer interface
 func (h *Bridge) Fullscreen() {

lib/renderer/bridge/session.go

@@ -3,8 +3,9 @@ package renderer
 import (
 	"time"
 
+	"github.com/wailsapp/wails/runtime"
+
 	"github.com/gorilla/websocket"
-	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/lib/interfaces"
 	"github.com/wailsapp/wails/lib/logger"
 )
@@ -58,8 +59,7 @@ func (s *session) start(firstSession bool) {
 	s.log.Infof("Connected to frontend.")
 	go s.writePump()
 
-	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
-	s.evalJS(wailsRuntime, wailsRuntimeMessage)
+	s.evalJS(runtime.WailsJS, wailsRuntimeMessage)
 
 	// Inject bindings
 	for _, binding := range s.bindingCache {

lib/renderer/webview.go

@@ -8,8 +8,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/wailsapp/wails/runtime"
+
 	"github.com/go-playground/colors"
-	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/lib/interfaces"
 	"github.com/wailsapp/wails/lib/logger"
 	"github.com/wailsapp/wails/lib/messages"
@@ -29,6 +30,7 @@ type WebView struct {
 	config       interfaces.AppConfig
 	eventManager interfaces.EventManager
 	bindingCache []string
+	maximumSizeSet bool
 }
 
 // NewWebView returns a new WebView struct
@@ -52,10 +54,37 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 	// Save the config
 	w.config = config
 
+	width := config.GetWidth()
+	height := config.GetHeight()
+
+	// Clamp width and height
+	minWidth, minHeight := config.GetMinWidth(), config.GetMinHeight()
+	maxWidth, maxHeight := config.GetMaxWidth(), config.GetMaxHeight()
+	setMinSize := minWidth != -1 && minHeight != -1
+	setMaxSize := maxWidth != -1 && maxHeight != -1
+
+	if setMinSize {
+		if width < minWidth {
+			width = minWidth
+		}
+		if height < minHeight {
+			height = minHeight
+		}
+	}
+
+	if setMaxSize {
+		if width > maxWidth {
+			width = maxWidth
+		}
+		if height > maxHeight {
+			height = maxHeight
+		}
+	}
+
 	// Create the WebView instance
 	w.window = wv.NewWebview(wv.Settings{
-		Width:     config.GetWidth(),
-		Height:    config.GetHeight(),
+		Width:     width,
+		Height:    height,
 		Title:     config.GetTitle(),
 		Resizable: config.GetResizable(),
 		URL:       config.GetHTML(),
@@ -64,6 +93,24 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 			w.ipc.Dispatch(message, w.callback)
 		},
 	})
+		fmt.Println("Control")
+
+	// Set minimum and maximum sizes
+	if setMinSize {
+		w.SetMinSize(minWidth, minHeight)
+	}
+	if setMaxSize {
+		w.SetMaxSize(maxWidth, maxHeight)
+		fmt.Println("Max")
+	}
+
+	// Set minimum and maximum sizes
+	if setMinSize {
+		w.SetMinSize(minWidth, minHeight)
+	}
+	if setMaxSize {
+		w.SetMaxSize(maxWidth, maxHeight)
+	}
 
 	// SignalManager.OnExit(w.Exit)
 
@@ -74,6 +121,7 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 	}
 
 	w.log.Info("Initialised")
+
 	return nil
 }
 
@@ -183,8 +231,8 @@ func (w *WebView) Run() error {
 	}
 
 	// Runtime assets
-	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
-	w.evalJS(wailsRuntime)
+	w.log.DebugFields("Injecting wails JS runtime", logger.Fields{"js": runtime.WailsJS})
+	w.evalJS(runtime.WailsJS)
 
 	// Ping the wait channel when the wails runtime is loaded
 	w.eventManager.On("wails:loaded", func(...interface{}) {
@@ -207,10 +255,9 @@ func (w *WebView) Run() error {
 				w.injectCSS(w.config.GetCSS())
 			} else {
 				// Use default wails css
-				w.log.Debug("Injecting Default Wails CSS")
-				defaultCSS := mewn.String("../../runtime/assets/wails.css")
 
-				w.injectCSS(defaultCSS)
+				w.log.Debug("Injecting Default Wails CSS: " + runtime.WailsCSS)
+				w.injectCSS(runtime.WailsCSS)
 			}
 
 			// Inject user JS
@@ -256,6 +303,9 @@ func (w *WebView) SelectFile(title string, filter string) string {
 			wg.Done()
 		})
 	}()
+
+	defer w.focus() // Ensure the main window is put back into focus afterwards
+
 	wg.Wait()
 	return result
 }
@@ -274,6 +324,9 @@ func (w *WebView) SelectDirectory() string {
 			wg.Done()
 		})
 	}()
+
+	defer w.focus() // Ensure the main window is put back into focus afterwards
+
 	wg.Wait()
 	return result
 }
@@ -292,10 +345,20 @@ func (w *WebView) SelectSaveFile(title string, filter string) string {
 			wg.Done()
 		})
 	}()
+
+	defer w.focus() // Ensure the main window is put back into focus afterwards
+
 	wg.Wait()
 	return result
 }
 
+// focus puts the main window into focus
+func (w *WebView) focus() {
+	w.window.Dispatch(func() {
+		w.window.Focus()
+	})
+}
+
 // callback sends a callback to the frontend
 func (w *WebView) callback(data string) error {
 	callbackCMD := fmt.Sprintf("window.wails._.Callback('%s');", data)
@@ -337,11 +400,37 @@ func (w *WebView) NotifyEvent(event *messages.EventData) error {
 	return w.evalJS(message)
 }
 
+// SetMinSize sets the minimum size of a resizable window
+func (w *WebView) SetMinSize(width, height int) {
+	if w.config.GetResizable() == false {
+		w.log.Warn("Cannot call SetMinSize() - App.Resizable = false")
+		return
+	}
+	w.window.Dispatch(func() {
+		w.window.SetMinSize(width, height)
+	})
+}
+
+// SetMaxSize sets the maximum size of a resizable window
+func (w *WebView) SetMaxSize(width, height int) {
+	if w.config.GetResizable() == false {
+		w.log.Warn("Cannot call SetMaxSize() - App.Resizable = false")
+		return
+	}
+	w.maximumSizeSet = true
+	w.window.Dispatch(func() {
+		w.window.SetMaxSize(width, height)
+	})
+}
+
 // Fullscreen makes the main window go fullscreen
 func (w *WebView) Fullscreen() {
 	if w.config.GetResizable() == false {
 		w.log.Warn("Cannot call Fullscreen() - App.Resizable = false")
 		return
+	} else if w.maximumSizeSet {
+		w.log.Warn("Cannot call Fullscreen() - Maximum size of window set")
+		return
 	}
 	w.window.Dispatch(func() {
 		w.window.SetFullscreen(true)

lib/renderer/webview/webview.go

@@ -65,6 +65,18 @@ static inline void CgoWebViewSetTitle(void *w, char *title) {
 	webview_set_title((struct webview *)w, title);
 }
 
+static inline void CgoWebViewFocus(void *w) {
+	webview_focus((struct webview *)w);
+}
+
+static inline void CgoWebViewMinSize(void *w, int width, int height) {
+	webview_minsize((struct webview *)w, width, height);
+}
+
+static inline void CgoWebViewMaxSize(void *w, int width, int height) {
+	webview_maxsize((struct webview *)w, width, height);
+}
+
 static inline void CgoWebViewSetFullscreen(void *w, int fullscreen) {
 	webview_set_fullscreen((struct webview *)w, fullscreen);
 }
@@ -170,6 +182,16 @@ type WebView interface {
 	// SetTitle() changes window title. This method must be called from the main
 	// thread only. See Dispatch() for more details.
 	SetTitle(title string)
+
+	// Focus() puts the main window into focus
+	Focus()
+
+	// SetMinSize() sets the minimum size of the window
+	SetMinSize(width, height int)
+
+	// SetMaxSize() sets the maximum size of the window
+	SetMaxSize(width, height int)
+
 	// SetFullscreen() controls window full-screen mode. This method must be
 	// called from the main thread only. See Dispatch() for more details.
 	SetFullscreen(fullscreen bool)
@@ -307,6 +329,18 @@ func (w *webview) SetColor(r, g, b, a uint8) {
 	C.CgoWebViewSetColor(w.w, C.uint8_t(r), C.uint8_t(g), C.uint8_t(b), C.uint8_t(a))
 }
 
+func (w *webview) Focus() {
+	C.CgoWebViewFocus(w.w)
+}
+
+func (w *webview) SetMinSize(width, height int) {
+	C.CgoWebViewMinSize(w.w, C.int(width), C.int(height))
+}
+
+func (w *webview) SetMaxSize(width, height int) {
+	C.CgoWebViewMaxSize(w.w, C.int(width), C.int(height))
+}
+
 func (w *webview) SetFullscreen(fullscreen bool) {
 	C.CgoWebViewSetFullscreen(w.w, C.int(boolToInt(fullscreen)))
 }
@@ -353,7 +387,9 @@ func _webviewDispatchGoCallback(index unsafe.Pointer) {
 	f = fns[uintptr(index)]
 	delete(fns, uintptr(index))
 	m.Unlock()
-	f()
+	if f != nil {
+		f()
+	}
 }
 
 //export _webviewExternalInvokeCallback
@@ -369,5 +405,7 @@ func _webviewExternalInvokeCallback(w unsafe.Pointer, data unsafe.Pointer) {
 		}
 	}
 	m.Unlock()
-	cb(wv, C.GoString((*C.char)(data)))
+	if cb != nil {
+		cb(wv, C.GoString((*C.char)(data)))
+	}
 }

lib/renderer/webview/webview.h

@@ -54,6 +54,11 @@ extern "C"
     int ready;
     int js_busy;
     int should_exit;
+    
+    int min_width;
+    int min_height;
+    int max_width;
+    int max_height;
   };
 #elif defined(WEBVIEW_WINAPI)
 #define CINTERFACE
@@ -75,6 +80,11 @@ struct webview_priv
   DWORD saved_style;
   DWORD saved_ex_style;
   RECT saved_rect;
+
+  int min_width;
+  int min_height;
+  int max_width;
+  int max_height;
 };
 #elif defined(WEBVIEW_COCOA)
 #import <Cocoa/Cocoa.h>
@@ -168,6 +178,9 @@ struct webview_priv
   WEBVIEW_API int webview_eval(struct webview *w, const char *js);
   WEBVIEW_API int webview_inject_css(struct webview *w, const char *css);
   WEBVIEW_API void webview_set_title(struct webview *w, const char *title);
+  WEBVIEW_API void webview_focus(struct webview *w);
+  WEBVIEW_API void webview_minsize(struct webview *w, int width, int height);  
+  WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height);
   WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen);
   WEBVIEW_API void webview_set_color(struct webview *w, uint8_t r, uint8_t g,
                                      uint8_t b, uint8_t a);
@@ -329,6 +342,12 @@ struct webview_priv
     w->priv.should_exit = 0;
     w->priv.queue = g_async_queue_new();
     w->priv.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    
+    w->priv.min_width = -1;
+    w->priv.min_height = -1;
+    w->priv.max_width = -1;
+    w->priv.max_height = -1;
+    
     gtk_window_set_title(GTK_WINDOW(w->priv.window), w->title);
 
     if (w->resizable)
@@ -396,6 +415,49 @@ struct webview_priv
     gtk_window_set_title(GTK_WINDOW(w->priv.window), title);
   }
 
+  WEBVIEW_API void webview_focus(struct webview *w)
+  {
+    gtk_window_present(GTK_WINDOW(w->priv.window));
+  }
+
+  WEBVIEW_API void webview_minsize(struct webview *w, int width, int height) {
+  
+    w->priv.min_width = width;
+    w->priv.min_height = height;
+
+    GdkGeometry hints;
+    GdkWindowHints usedHints = (GdkWindowHints) GDK_HINT_MIN_SIZE;
+    
+    hints.min_width = w->priv.min_width;
+    hints.min_height = w->priv.min_height;
+    if (w->priv.max_width != -1) {
+      hints.max_width = w->priv.max_width;
+      hints.max_height = w->priv.max_height;
+      usedHints = (GdkWindowHints)(GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
+    }
+    
+    gtk_window_set_geometry_hints(GTK_WINDOW(w->priv.window), w->priv.window, &hints, usedHints);
+  }
+
+  WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height) {
+    
+    w->priv.max_width = width;
+    w->priv.max_height = height;
+  
+    GdkGeometry hints;
+    GdkWindowHints usedHints = (GdkWindowHints) GDK_HINT_MAX_SIZE;
+    
+    if (w->priv.min_width != -1) {
+      hints.min_width = w->priv.min_width;
+      hints.min_height = w->priv.min_height;
+      usedHints = (GdkWindowHints)(GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
+    }
+    hints.max_width = w->priv.max_width;
+    hints.max_height = w->priv.max_height;
+    
+    gtk_window_set_geometry_hints(GTK_WINDOW(w->priv.window), w->priv.window, &hints, usedHints);
+  }
+
   WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
   {
     if (fullscreen)
@@ -1331,7 +1393,39 @@ struct webview_priv
     case WM_CREATE:
       w = (struct webview *)((CREATESTRUCT *)lParam)->lpCreateParams;
       w->priv.hwnd = hwnd;
+
       return EmbedBrowserObject(w);
+    case WM_GETMINMAXINFO:
+    {
+      if (w != NULL) {
+        // 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 lpMMI = (LPMINMAXINFO)lParam;
+      
+        if (w->priv.min_width != -1) {
+          lpMMI->ptMinTrackSize.x = w->priv.min_width * DPIScaleX + widthExtra;
+          lpMMI->ptMinTrackSize.y = w->priv.min_height * DPIScaleY + heightExtra;
+        }
+        if (w->priv.max_width != -1) {
+          lpMMI->ptMaxTrackSize.x = w->priv.max_width * DPIScaleX + widthExtra;
+          lpMMI->ptMaxTrackSize.y = w->priv.max_height * DPIScaleY + heightExtra;
+        }
+      }
+      
+      return 0;
+    }
     case WM_DESTROY:
       UnEmbedBrowserObject(w);
       PostQuitMessage(0);
@@ -1396,6 +1490,9 @@ struct webview_priv
 
   WEBVIEW_API int webview_init(struct webview *w)
   {
+    w->priv.min_width = -1;
+    w->priv.max_width = -1;
+
     WNDCLASSEX wc;
     HINSTANCE hInstance;
     DWORD style;
@@ -1641,6 +1738,21 @@ struct webview_priv
 #endif
   }
 
+  WEBVIEW_API void webview_focus(struct webview *w)
+  {
+    SetFocus(w->priv.hwnd);
+  }
+
+  WEBVIEW_API void webview_minsize(struct webview *w, int width, int height) {
+    w->priv.min_width = width;
+    w->priv.min_height = height;
+  }
+
+  WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height) {
+    w->priv.max_width = width;
+    w->priv.max_height = height;
+  }
+
   WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
   {
     if (w->priv.is_fullscreen == !!fullscreen)
@@ -2208,6 +2320,30 @@ struct webview_priv
     [w->priv.window setTitle:nsTitle];
   }
 
+  WEBVIEW_API void webview_focus(struct webview *w)
+  {
+    [w->priv.window makeKeyWindow];
+  }
+  
+  WEBVIEW_API void webview_minsize(struct webview *w, int width, int height) {
+    NSSize size;
+    size.width = width;
+    size.height = height;
+    [w->priv.window setMinSize:size];
+  }
+  
+  WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height) {
+    NSSize size;
+    size.width = width;
+    size.height = height;
+    [w->priv.window setMaxSize:size];
+    
+    [w->priv.window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary|NSWindowCollectionBehaviorFullScreenNone|NSWindowCollectionBehaviorFullScreenDisallowsTiling];
+       
+    NSButton *button = [w->priv.window standardWindowButton:NSWindowZoomButton];
+    [button setEnabled: NO];
+  }
+  
   WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
   {
     int b = ((([w->priv.window styleMask] & NSWindowStyleMaskFullScreen) ==
@@ -2362,4 +2498,4 @@ struct webview_priv
 }
 #endif
 
-#endif /* WEBVIEW_H */
+#endif /* WEBVIEW_H */

package-lock.json

@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}

runtime/assets.go

@@ -0,0 +1,15 @@
+package runtime
+
+import _ "embed"
+
+//go:embed assets/bridge.js
+var BridgeJS []byte
+
+//go:embed assets/wails.js
+var WailsJS string
+
+//go:embed assets/wails.css
+var WailsCSS string
+
+//go:embed js/runtime/init.js
+var InitJS []byte

runtime/events.go

@@ -19,6 +19,16 @@ func (r *Events) On(eventName string, callback func(optionalData ...interface{})
 	r.eventManager.On(eventName, callback)
 }
 
+// Once pass through
+func (r *Events) Once(eventName string, callback func(optionalData ...interface{})) {
+	r.eventManager.Once(eventName, callback)
+}
+
+// OnMultiple pass through
+func (r *Events) OnMultiple(eventName string, callback func(optionalData ...interface{}), counter uint) {
+	r.eventManager.OnMultiple(eventName, callback, counter)
+}
+
 // Emit pass through
 func (r *Events) Emit(eventName string, optionalData ...interface{}) {
 	r.eventManager.Emit(eventName, optionalData...)

runtime/js/package-lock.json

@@ -2681,26 +2681,18 @@
       "dev": true
     },
     "elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       }
     },
     "emoji-regex": {
@@ -6590,9 +6582,9 @@
       "dev": true
     },
     "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
       "dev": true
     },
     "yallist": {

runtime/js/runtime/package-lock.json

@@ -451,9 +451,9 @@
       }
     },
     "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
       "dev": true
     },
     "yargs": {

runtime/window.go

@@ -67,6 +67,16 @@ func (r *Window) SetColour(colour string) error {
 	return r.renderer.SetColour(colour)
 }
 
+// SetMinSize sets the minimum size of a resizable window
+func (r *Window) SetMinSize(width, height int) {
+	r.renderer.SetMinSize(width, height)
+}
+
+// SetMaxSize sets the maximum size of a resizable window
+func (r *Window) SetMaxSize(width, height int) {
+	r.renderer.SetMaxSize(width, height)
+}
+
 // Fullscreen makes the window fullscreen
 func (r *Window) Fullscreen() {
 	r.renderer.Fullscreen()

scripts/build.go

@@ -8,38 +8,6 @@ import (
 	"path/filepath"
 )
 
-// Default target to run when none is specified
-// If not set, running mage will list available targets
-// var Default = Build
-
-/*
-# Build runtime
-echo "**** Building Runtime ****"
-cd runtime/js
-npm install
-npm run build
-cd ../..
-
-echo "**** Packing Assets ****"
-cd cmd
-mewn
-cd ..
-cd lib/renderer
-mewn
-cd ../..
-
-echo "**** Installing Wails locally ****"
-cd cmd/wails
-go install
-cd ../..
-
-echo "**** Tidying the mods! ****"
-go mod tidy
-
-echo "**** WE ARE DONE! ****"
-
-*/
-
 func runCommand(command string, args ...string) {
 	cmd := exec.Command(command, args...)
 	output, err := cmd.CombinedOutput()
@@ -48,7 +16,6 @@ func runCommand(command string, args ...string) {
 		log.Println(string(output))
 		log.Fatal(err)
 	}
-	cmd.Run()
 	fmt.Println(string(output))
 }
 
@@ -60,26 +27,26 @@ func main() {
 	// Build Runtime
 	fmt.Println("**** Building Runtime ****")
 	runtimeDir, _ := filepath.Abs(filepath.Join(dir, "..", "runtime", "js"))
-	os.Chdir(runtimeDir)
+	err := os.Chdir(runtimeDir)
+	if err != nil {
+		log.Fatal(err)
+	}
 	runCommand("npm", "install")
 	runCommand("npm", "run", "build")
 
-	// Pack assets
-	fmt.Println("**** Packing Assets ****")
-	rendererDir, _ := filepath.Abs(filepath.Join(dir, "..", "lib", "renderer"))
-	os.Chdir(rendererDir)
-	runCommand("mewn")
-	cmdDir, _ := filepath.Abs(filepath.Join(dir, "..", "cmd"))
-	os.Chdir(cmdDir)
-	runCommand("mewn")
-
 	// Install Wails
 	fmt.Println("**** Installing Wails locally ****")
 	execDir, _ := filepath.Abs(filepath.Join(dir, "..", "cmd", "wails"))
-	os.Chdir(execDir)
+	err = os.Chdir(execDir)
+	if err != nil {
+		log.Fatal(err)
+	}
 	runCommand("go", "install")
 
 	baseDir, _ := filepath.Abs(filepath.Join(dir, ".."))
-	os.Chdir(baseDir)
+	err = os.Chdir(baseDir)
+	if err != nil {
+		log.Fatal(err)
+	}
 	runCommand("go", "mod", "tidy")
 }

scripts/build.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 echo "**** Checking if Wails passes unit tests ****"
-if ! go test ./...
+if ! go test ./lib/... ./runtime/... ./cmd/...
 then
     echo ""
     echo "ERROR: Unit tests failed!"
@@ -15,15 +15,6 @@ npm install
 npm run build
 cd ../..
 
-echo "**** Packing Assets ****"
-cd cmd
-mewn
-cd ..
-cd lib/renderer
-mewn
-cd ../..
-
-
 cd cmd/wails
 echo "**** Checking if Wails compiles ****"
 if ! go build .

scripts/updateversion.sh

@@ -16,7 +16,6 @@ cd runtime/js
 npm run build
 
 cd ../..
-mewn
 
 git add cmd/version.go
 git commit cmd/version.go -m "Bump to ${TAG}" 

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/NOTES.md

@@ -1,40 +0,0 @@
-
-# Packing linux
-
-  * create app, app.desktop, app.png (512x512)
-  * chmod +x app!
-  * ./linuxdeploy-x86_64.AppImage --appdir AppDir -i react.png -d react.desktop  -e react --output appimage
-
-
-# Wails Doctor
-
-Tested on:
-
-  * Debian 8
-  * Ubuntu 20.04
-  * Ubuntu 19.10
-  * Solus 4.1
-  * Centos 8
-  * Gentoo
-  * OpenSUSE/leap
-  * Fedora 31
-
-### Development
-
-Add a new package manager processor here: `v2/internal/system/packagemanager/`. IsAvailable should work even if the package is installed.
-Add your new package manager to the list of package managers in `v2/internal/system/packagemanager/packagemanager.go`:
-
-```
-var db = map[string]PackageManager{
-	"eopkg":  NewEopkg(),
-	"apt":    NewApt(),
-	"yum":    NewYum(),
-	"pacman": NewPacman(),
-	"emerge": NewEmerge(),
-	"zypper": NewZypper(),
-}
-```
-
-## Gentoo
-
-  * Setup docker image using: emerge-webrsync -x -v

v2/README.md

@@ -1,5 +0,0 @@
-# Wails v2 ALPHA
-
-This branch contains WORK IN PROGRESS! There are no guarantees. Use at your peril! 
-
-This document will be updated as progress is made.

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

@@ -1,119 +0,0 @@
-package build
-
-import (
-	"fmt"
-	"io"
-	"runtime"
-	"strings"
-	"time"
-
-	"github.com/leaanthony/clir"
-	"github.com/leaanthony/slicer"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-	"github.com/wailsapp/wails/v2/pkg/commands/build"
-)
-
-// AddBuildSubcommand adds the `build` command for the Wails application
-func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
-
-	outputType := "desktop"
-
-	validTargetTypes := slicer.String([]string{"desktop", "hybrid", "server"})
-
-	command := app.NewSubCommand("build", "Builds the application")
-
-	// Setup target type flag
-	description := "Type of application to build. Valid types: " + validTargetTypes.Join(",")
-	command.StringFlag("t", description, &outputType)
-
-	// Setup production flag
-	production := false
-	command.BoolFlag("production", "Build in production mode", &production)
-
-	// Setup pack flag
-	pack := false
-	command.BoolFlag("package", "Create a platform specific package", &pack)
-
-	compilerCommand := "go"
-	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
-
-	// Setup Platform flag
-	platform := runtime.GOOS
-	command.StringFlag("platform", "Platform to target", &platform)
-
-	// Quiet Build
-	quiet := false
-	command.BoolFlag("q", "Suppress output to console", &quiet)
-
-	// ldflags to pass to `go`
-	ldflags := ""
-	command.StringFlag("ldflags", "optional ldflags", &ldflags)
-
-	// Log to file
-	logFile := ""
-	command.StringFlag("l", "Log to file", &logFile)
-
-	// Retain assets
-	keepAssets := false
-	command.BoolFlag("k", "Keep generated assets", &keepAssets)
-
-	command.Action(func() error {
-
-		// Create logger
-		logger := clilogger.New(w)
-		logger.Mute(quiet)
-
-		// Validate output type
-		if !validTargetTypes.Contains(outputType) {
-			return fmt.Errorf("output type '%s' is not valid", outputType)
-		}
-
-		if !quiet {
-			app.PrintBanner()
-		}
-
-		task := fmt.Sprintf("Building %s Application", strings.Title(outputType))
-		logger.Println(task)
-		logger.Println(strings.Repeat("-", len(task)))
-
-		// Setup mode
-		mode := build.Debug
-		if production {
-			mode = build.Production
-		}
-
-		// Create BuildOptions
-		buildOptions := &build.Options{
-			Logger:     logger,
-			OutputType: outputType,
-			Mode:       mode,
-			Pack:       pack,
-			Platform:   platform,
-			LDFlags:    ldflags,
-			Compiler:   compilerCommand,
-			KeepAssets: keepAssets,
-		}
-
-		return doBuild(buildOptions)
-	})
-}
-
-// doBuild is our main build command
-func doBuild(buildOptions *build.Options) error {
-
-	// Start Time
-	start := time.Now()
-
-	outputFilename, err := build.Build(buildOptions)
-	if err != nil {
-		return err
-	}
-
-	// Output stats
-	elapsed := time.Since(start)
-	buildOptions.Logger.Println("")
-	buildOptions.Logger.Println(fmt.Sprintf("Built '%s' in %s.", outputFilename, elapsed.Round(time.Millisecond).String()))
-	buildOptions.Logger.Println("")
-
-	return nil
-}

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

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

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

@@ -1,270 +0,0 @@
-package dev
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"os/signal"
-	"runtime"
-	"strings"
-	"syscall"
-	"time"
-
-	"github.com/fsnotify/fsnotify"
-	"github.com/leaanthony/clir"
-	"github.com/leaanthony/slicer"
-	"github.com/wailsapp/wails/v2/internal/fs"
-	"github.com/wailsapp/wails/v2/internal/process"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-	"github.com/wailsapp/wails/v2/pkg/commands/build"
-)
-
-// AddSubcommand adds the `dev` command for the Wails application
-func AddSubcommand(app *clir.Cli, w io.Writer) error {
-
-	command := app.NewSubCommand("dev", "Development mode")
-
-	outputType := "desktop"
-
-	validTargetTypes := slicer.String([]string{"desktop", "hybrid", "server"})
-
-	// Setup target type flag
-	description := "Type of application to develop. Valid types: " + validTargetTypes.Join(",")
-	command.StringFlag("t", description, &outputType)
-
-	// Passthrough ldflags
-	ldflags := ""
-	command.StringFlag("ldflags", "optional ldflags", &ldflags)
-
-	// compiler command
-	compilerCommand := "go"
-	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
-
-	// extensions to trigger rebuilds
-	extensions := "go"
-	command.StringFlag("m", "Extensions to trigger rebuilds (comma separated) eg go,js,css,html", &extensions)
-
-	command.Action(func() error {
-
-		// Validate inputs
-		if !validTargetTypes.Contains(outputType) {
-			return fmt.Errorf("output type '%s' is not valid", outputType)
-		}
-
-		// Create logger
-		logger := clilogger.New(w)
-		app.PrintBanner()
-
-		// TODO: Check you are in a project directory
-
-		watcher, err := fsnotify.NewWatcher()
-		if err != nil {
-			return err
-		}
-		defer watcher.Close()
-
-		var debugBinaryProcess *process.Process = nil
-		var buildFrontend bool = true
-		var extensionsThatTriggerARebuild = strings.Split(extensions, ",")
-
-		// Setup signal handler
-		quitChannel := make(chan os.Signal, 1)
-		signal.Notify(quitChannel, os.Interrupt, os.Kill, syscall.SIGTERM)
-
-		debounceQuit := make(chan bool, 1)
-
-		// Do initial build
-		logger.Println("Building application for development...")
-		debugBinaryProcess = restartApp(logger, outputType, ldflags, compilerCommand, buildFrontend, debugBinaryProcess)
-
-		go debounce(100*time.Millisecond, watcher.Events, debounceQuit, func(event fsnotify.Event) {
-			// logger.Println("event: %+v", event)
-
-			// Check for new directories
-			if event.Op&fsnotify.Create == fsnotify.Create {
-				// If this is a folder, add it to our watch list
-				if fs.DirExists(event.Name) {
-					if !strings.Contains(event.Name, "node_modules") {
-						err := watcher.Add(event.Name)
-						if err != nil {
-							logger.Fatal("%s", err.Error())
-						}
-						logger.Println("Watching directory: %s", event.Name)
-					}
-				}
-				return
-			}
-
-			// Check for file writes
-			if event.Op&fsnotify.Write == fsnotify.Write {
-
-				// logger.Println("modified file: %s", event.Name)
-				var rebuild bool = false
-
-				// Iterate all file patterns
-				for _, pattern := range extensionsThatTriggerARebuild {
-					rebuild = strings.HasSuffix(event.Name, pattern)
-					if err != nil {
-						logger.Fatal(err.Error())
-					}
-					if rebuild {
-						// Only build frontend when the file isn't a Go file
-						buildFrontend = !strings.HasSuffix(event.Name, "go")
-						break
-					}
-				}
-
-				if !rebuild {
-					logger.Println("Filename change: %s did not match extension list %s", event.Name, extensions)
-					return
-				}
-
-				if buildFrontend {
-					logger.Println("Full rebuild triggered: %s updated", event.Name)
-				} else {
-					logger.Println("Partial build triggered: %s updated", event.Name)
-				}
-
-				// Do a rebuild
-
-				// Try and build the app
-				newBinaryProcess := restartApp(logger, outputType, ldflags, compilerCommand, buildFrontend, debugBinaryProcess)
-
-				// If we have a new process, save it
-				if newBinaryProcess != nil {
-					debugBinaryProcess = newBinaryProcess
-				}
-
-			}
-		})
-
-		// Get project dir
-		dir, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-
-		// Get all subdirectories
-		dirs, err := fs.GetSubdirectories(dir)
-		if err != nil {
-			return err
-		}
-
-		// Setup a watcher for non-node_modules directories
-		dirs.Each(func(dir string) {
-			if strings.Contains(dir, "node_modules") {
-				return
-			}
-			logger.Println("Watching directory: %s", dir)
-			err = watcher.Add(dir)
-			if err != nil {
-				logger.Fatal(err.Error())
-			}
-		})
-
-		// Wait until we get a quit signal
-		quit := false
-		for quit == false {
-			select {
-			case <-quitChannel:
-				println()
-				// Notify debouncer to quit
-				debounceQuit <- true
-				quit = true
-			}
-		}
-
-		// Kill the current program if running
-		if debugBinaryProcess != nil {
-			err := debugBinaryProcess.Kill()
-			if err != nil {
-				return err
-			}
-		}
-
-		logger.Println("Development mode exited")
-
-		return nil
-	})
-
-	return nil
-}
-
-// Credit: https://drailing.net/2018/01/debounce-function-for-golang/
-func debounce(interval time.Duration, input chan fsnotify.Event, quitChannel chan bool, cb func(arg fsnotify.Event)) {
-	var item fsnotify.Event
-	timer := time.NewTimer(interval)
-exit:
-	for {
-		select {
-		case item = <-input:
-			timer.Reset(interval)
-		case <-timer.C:
-			if item.Name != "" {
-				cb(item)
-			}
-		case <-quitChannel:
-			break exit
-		}
-	}
-}
-
-func restartApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string, buildFrontend bool, debugBinaryProcess *process.Process) *process.Process {
-
-	appBinary, err := buildApp(logger, outputType, ldflags, compilerCommand, buildFrontend)
-	println()
-	if err != nil {
-		logger.Println("[ERROR] Build Failed: %s", err.Error())
-		return nil
-	}
-	logger.Println("Build new binary: %s", appBinary)
-
-	// Kill existing binary if need be
-	if debugBinaryProcess != nil {
-		killError := debugBinaryProcess.Kill()
-
-		if killError != nil {
-			logger.Fatal("Unable to kill debug binary (PID: %d)!", debugBinaryProcess.PID())
-		}
-
-		debugBinaryProcess = nil
-	}
-
-	// TODO: Generate `backend.js`
-
-	// Start up new binary
-	newProcess := process.NewProcess(logger, appBinary)
-	err = newProcess.Start()
-	if err != nil {
-		// Remove binary
-		deleteError := fs.DeleteFile(appBinary)
-		if deleteError != nil {
-			logger.Fatal("Unable to delete app binary: " + appBinary)
-		}
-		logger.Fatal("Unable to start application: %s", err.Error())
-	}
-
-	return newProcess
-}
-
-func buildApp(logger *clilogger.CLILogger, outputType string, ldflags string, compilerCommand string, buildFrontend bool) (string, error) {
-
-	// Create random output file
-	outputFile := fmt.Sprintf("debug-%d", time.Now().Unix())
-
-	// Create BuildOptions
-	buildOptions := &build.Options{
-		Logger:         logger,
-		OutputType:     outputType,
-		Mode:           build.Debug,
-		Pack:           false,
-		Platform:       runtime.GOOS,
-		LDFlags:        ldflags,
-		Compiler:       compilerCommand,
-		OutputFile:     outputFile,
-		IgnoreFrontend: !buildFrontend,
-	}
-
-	return build.Build(buildOptions)
-
-}

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

@@ -1,154 +0,0 @@
-package doctor
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"runtime"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/leaanthony/clir"
-	"github.com/wailsapp/wails/v2/internal/system"
-	"github.com/wailsapp/wails/v2/internal/system/packagemanager"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-)
-
-// AddSubcommand adds the `doctor` command for the Wails application
-func AddSubcommand(app *clir.Cli, w io.Writer) error {
-
-	command := app.NewSubCommand("doctor", "Diagnose your environment")
-
-	command.Action(func() error {
-
-		logger := clilogger.New(w)
-
-		app.PrintBanner()
-		logger.Print("Scanning system - please wait...")
-
-		// Get system info
-		info, err := system.GetInfo()
-		if err != nil {
-			return err
-		}
-		logger.Println("Done.")
-
-		// Start a new tabwriter
-		w := new(tabwriter.Writer)
-		w.Init(os.Stdout, 8, 8, 0, '\t', 0)
-
-		// Write out the system information
-		fmt.Fprintf(w, "\n")
-		fmt.Fprintf(w, "System\n")
-		fmt.Fprintf(w, "------\n")
-		fmt.Fprintf(w, "%s\t%s\n", "OS:", info.OS.Name)
-		fmt.Fprintf(w, "%s\t%s\n", "Version: ", info.OS.Version)
-		fmt.Fprintf(w, "%s\t%s\n", "ID:", info.OS.ID)
-
-		// Exit early if PM not found
-		if info.PM == nil {
-			fmt.Fprintf(w, "\n%s\t%s", "Package Manager:", "Not Found")
-			w.Flush()
-			println()
-			return nil
-		}
-		fmt.Fprintf(w, "%s\t%s\n", "Package Manager: ", info.PM.Name())
-
-		// Output Go Information
-		fmt.Fprintf(w, "%s\t%s\n", "Go Version:", runtime.Version())
-		fmt.Fprintf(w, "%s\t%s\n", "Platform:", runtime.GOOS)
-		fmt.Fprintf(w, "%s\t%s\n", "Architecture:", runtime.GOARCH)
-
-		// Output Dependencies Status
-		var dependenciesMissing = []string{}
-		var externalPackages = []*packagemanager.Dependancy{}
-		var dependenciesAvailableRequired = 0
-		var dependenciesAvailableOptional = 0
-		fmt.Fprintf(w, "\n")
-		fmt.Fprintf(w, "Dependency\tPackage Name\tStatus\tVersion\n")
-		fmt.Fprintf(w, "----------\t------------\t------\t-------\n")
-
-		// Loop over dependencies
-		for _, dependency := range info.Dependencies {
-
-			name := dependency.Name
-			if dependency.Optional {
-				name += "*"
-			}
-			packageName := "Unknown"
-			status := "Not Found"
-
-			// If we found the package
-			if dependency.PackageName != "" {
-
-				packageName = dependency.PackageName
-
-				// If it's installed, update the status
-				if dependency.Installed {
-					status = "Installed"
-				} else {
-					// Generate meaningful status text
-					status = "Available"
-
-					if dependency.Optional {
-						dependenciesAvailableOptional++
-					} else {
-						dependenciesAvailableRequired++
-					}
-				}
-			} else {
-				if !dependency.Optional {
-					dependenciesMissing = append(dependenciesMissing, dependency.Name)
-				}
-
-				if dependency.External {
-					externalPackages = append(externalPackages, dependency)
-				}
-			}
-
-			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")
-		w.Flush()
-		logger.Println("")
-		logger.Println("Diagnosis")
-		logger.Println("---------\n")
-
-		// Generate an appropriate diagnosis
-
-		if len(dependenciesMissing) == 0 && dependenciesAvailableRequired == 0 {
-			logger.Println("Your system is ready for Wails development!")
-		}
-
-		if dependenciesAvailableRequired != 0 {
-			log.Println("Install required packages using: " + 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)
-			}
-		}
-
-		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")
-		}
-
-		log.Println("")
-		return nil
-	})
-
-	return nil
-}

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

@@ -1,91 +0,0 @@
-package generate
-
-import (
-	"io"
-	"time"
-
-	"github.com/leaanthony/clir"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-	"github.com/wailsapp/wails/v2/pkg/parser"
-)
-
-// AddSubcommand adds the `dev` command for the Wails application
-func AddSubcommand(app *clir.Cli, w io.Writer) error {
-
-	command := app.NewSubCommand("generate", "Code Generation Tools")
-
-	// Backend API
-	backendAPI := command.NewSubCommand("module", "Generates a JS module for the frontend to interface with the backend")
-
-	// Quiet Init
-	quiet := false
-	backendAPI.BoolFlag("q", "Supress output to console", &quiet)
-
-	backendAPI.Action(func() error {
-
-		// Create logger
-		logger := clilogger.New(w)
-		logger.Mute(quiet)
-
-		app.PrintBanner()
-
-		logger.Print("Generating Javascript module for Go code...")
-
-		// Start Time
-		start := time.Now()
-
-		p, err := parser.GenerateWailsFrontendPackage()
-		if err != nil {
-			return err
-		}
-
-		logger.Println("done.")
-		logger.Println("")
-
-		elapsed := time.Since(start)
-		packages := p.Packages
-
-		// Print report
-		for _, pkg := range p.Packages {
-			if pkg.ShouldGenerate() {
-				logPackage(pkg, logger)
-			}
-
-		}
-
-		logger.Println("%d packages parsed in %s.", len(packages), elapsed)
-
-		return nil
-
-	})
-	return nil
-}
-
-func logPackage(pkg *parser.Package, logger *clilogger.CLILogger) {
-
-	logger.Println("Processed Go package '" + pkg.Gopackage.Name + "' as '" + pkg.Name + "'")
-	for _, strct := range pkg.Structs() {
-		logger.Println("")
-		logger.Println("  Processed struct '" + strct.Name + "'")
-		if strct.IsBound {
-			for _, method := range strct.Methods {
-				logger.Println("    Bound method '" + method.Name + "'")
-			}
-		}
-		if strct.IsUsedAsData {
-			for _, field := range strct.Fields {
-				if !field.Ignored {
-					logger.Print("    Processed ")
-					if field.IsOptional {
-						logger.Print("optional ")
-					}
-					logger.Println("field '" + field.Name + "' as '" + field.JSName() + "'")
-				}
-			}
-		}
-	}
-	logger.Println("")
-
-	// logger.Println("  Original Go Package Path:", pkg.Gopackage.PkgPath)
-	// logger.Println("  Original Go Package Path:", pkg.Gopackage.PkgPath)
-}

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

@@ -1,182 +0,0 @@
-package initialise
-
-import (
-	"fmt"
-	"io"
-	"strings"
-	"time"
-
-	"github.com/leaanthony/clir"
-	"github.com/pkg/errors"
-	"github.com/wailsapp/wails/v2/internal/templates"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-	"github.com/wailsapp/wails/v2/pkg/git"
-)
-
-// AddSubcommand adds the `init` command for the Wails application
-func AddSubcommand(app *clir.Cli, w io.Writer) error {
-
-	// Load the template shortnames
-	validShortNames, err := templates.TemplateShortNames()
-	if err != nil {
-		return err
-	}
-
-	command := app.NewSubCommand("init", "Initialise a new Wails project")
-
-	// Setup template name flag
-	templateName := "vanilla"
-	description := "Name of template to use. Valid tempates: " + validShortNames.Join(" ")
-	command.StringFlag("t", description, &templateName)
-
-	// Setup project name
-	projectName := ""
-	command.StringFlag("n", "Name of project", &projectName)
-
-	// Setup project directory
-	projectDirectory := ""
-	command.StringFlag("d", "Project directory", &projectDirectory)
-
-	// Quiet Init
-	quiet := false
-	command.BoolFlag("q", "Supress output to console", &quiet)
-
-	initGit := false
-	gitInstalled := git.IsInstalled()
-	if gitInstalled {
-		// Git Init
-		command.BoolFlag("g", "Initialise git repository", &initGit)
-	}
-
-	// VSCode project files
-	vscode := false
-	command.BoolFlag("vscode", "Generate VSCode project files", &vscode)
-
-	// List templates
-	list := false
-	command.BoolFlag("l", "List templates", &list)
-
-	command.Action(func() error {
-
-		// Create logger
-		logger := clilogger.New(w)
-		logger.Mute(quiet)
-
-		// Are we listing templates?
-		if list {
-			app.PrintBanner()
-			err := templates.OutputList(logger)
-			logger.Println("")
-			return err
-		}
-
-		// Validate output type
-		if !validShortNames.Contains(templateName) {
-			logger.Print(fmt.Sprintf("[ERROR] Template '%s' is not valid", templateName))
-			logger.Println("")
-			command.PrintHelp()
-			return nil
-		}
-
-		// Validate name
-		if len(projectName) == 0 {
-			logger.Println("ERROR: Project name required")
-			logger.Println("")
-			command.PrintHelp()
-			return nil
-		}
-
-		if !quiet {
-			app.PrintBanner()
-		}
-
-		task := fmt.Sprintf("Initialising Project %s", strings.Title(projectName))
-		logger.Println(task)
-		logger.Println(strings.Repeat("-", len(task)))
-
-		// Create Template Options
-		options := &templates.Options{
-			ProjectName:    projectName,
-			TargetDir:      projectDirectory,
-			TemplateName:   templateName,
-			Logger:         logger,
-			GenerateVSCode: vscode,
-			InitGit:        initGit,
-		}
-
-		// Try to discover author details from git config
-		err := findAuthorDetails(options)
-		if err != nil {
-			return err
-		}
-
-		return initProject(options)
-	})
-
-	return nil
-}
-
-// initProject is our main init command
-func initProject(options *templates.Options) error {
-
-	// Start Time
-	start := time.Now()
-
-	// Install the template
-	err := templates.Install(options)
-	if err != nil {
-		return err
-	}
-
-	if options.InitGit {
-		err = initGit(options)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Output stats
-	elapsed := time.Since(start)
-	options.Logger.Println("")
-	options.Logger.Println("Project Name:      " + options.ProjectName)
-	options.Logger.Println("Project Directory: " + options.TargetDir)
-	options.Logger.Println("Project Template:  " + options.TemplateName)
-	if options.GenerateVSCode {
-		options.Logger.Println("VSCode config files generated.")
-	}
-	if options.InitGit {
-		options.Logger.Println("Git repository initialised.")
-	}
-	options.Logger.Println("")
-	options.Logger.Println(fmt.Sprintf("Initialised project '%s' in %s.", options.ProjectName, elapsed.Round(time.Millisecond).String()))
-	options.Logger.Println("")
-
-	return nil
-}
-
-func initGit(options *templates.Options) error {
-	err := git.InitRepo(options.TargetDir)
-	if err != nil {
-		return errors.Wrap(err, "Unable to initialise git repository:")
-	}
-
-	return nil
-}
-
-func findAuthorDetails(options *templates.Options) error {
-	if git.IsInstalled() {
-		name, err := git.Name()
-		if err != nil {
-			return err
-		}
-		options.AuthorName = strings.TrimSpace(name)
-
-		email, err := git.Email()
-		if err != nil {
-			return err
-		}
-		options.AuthorEmail = strings.TrimSpace(email)
-	}
-
-	return nil
-}

v2/cmd/wails/main.go

@@ -1,55 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"github.com/leaanthony/clir"
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/build"
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/debug"
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/dev"
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/doctor"
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/generate"
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/initialise"
-)
-
-func fatal(message string) {
-	println(message)
-	os.Exit(1)
-}
-
-func main() {
-
-	var err error
-
-	app := clir.NewCli("Wails", "Go/HTML Application Framework", version)
-
-	build.AddBuildSubcommand(app, os.Stdout)
-	err = initialise.AddSubcommand(app, os.Stdout)
-	if err != nil {
-		fatal(err.Error())
-	}
-
-	err = debug.AddSubcommand(app, os.Stdout)
-	if err != nil {
-		fatal(err.Error())
-	}
-	err = doctor.AddSubcommand(app, os.Stdout)
-	if err != nil {
-		fatal(err.Error())
-	}
-
-	err = dev.AddSubcommand(app, os.Stdout)
-	if err != nil {
-		fatal(err.Error())
-	}
-
-	err = generate.AddSubcommand(app, os.Stdout)
-	if err != nil {
-		fatal(err.Error())
-	}
-
-	err = app.Run()
-	if err != nil {
-		println("\n\nERROR: " + err.Error())
-	}
-}

v2/cmd/wails/version.go

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

v2/go.mod

@@ -1,28 +0,0 @@
-module github.com/wailsapp/wails/v2
-
-go 1.15
-
-require (
-	github.com/davecgh/go-spew v1.1.1
-	github.com/fatih/structtag v1.2.0
-	github.com/fsnotify/fsnotify v1.4.9
-	github.com/imdario/mergo v0.3.11
-	github.com/jackmordaunt/icns v1.0.0
-	github.com/leaanthony/clir v1.0.4
-	github.com/leaanthony/gosod v0.0.4
-	github.com/leaanthony/slicer v1.5.0
-	github.com/matryer/is v1.4.0
-	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/olekukonko/tablewriter v0.0.4
-	github.com/pkg/errors v0.9.1
-	github.com/tdewolff/minify v2.3.6+incompatible
-	github.com/tdewolff/parse v2.3.4+incompatible // indirect
-	github.com/tdewolff/test v1.0.6 // indirect
-	github.com/xyproto/xpm v1.2.1
-	golang.org/x/net v0.0.0-20200822124328-c89045814202
-	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c
-	golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82
-	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
-	nhooyr.io/websocket v1.8.6
-)

v2/go.sum

@@ -1,134 +0,0 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
-github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
-github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
-github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
-github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
-github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
-github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
-github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/jackmordaunt/icns v1.0.0 h1:RYSxplerf/l/DUd09AHtITwckkv/mqjVv4DjYdPmAMQ=
-github.com/jackmordaunt/icns v1.0.0/go.mod h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo=
-github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8=
-github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/leaanthony/clir v1.0.4 h1:Dov2y9zWJmZr7CjaCe86lKa4b5CSxskGAt2yBkoDyiU=
-github.com/leaanthony/clir v1.0.4/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0=
-github.com/leaanthony/gosod v0.0.4 h1:v4hepo4IyL8E8c9qzDsvYcA0KGh7Npf8As74K5ibQpI=
-github.com/leaanthony/gosod v0.0.4/go.mod h1:nGMCb1PJfXwBDbOAike78jEYlpqge+xUKFf0iBKjKxU=
-github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY=
-github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
-github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
-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=
-github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
-github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
-github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
-github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/tdewolff/minify v2.3.6+incompatible h1:2hw5/9ZvxhWLvBUnHE06gElGYz+Jv9R4Eys0XUzItYo=
-github.com/tdewolff/minify v2.3.6+incompatible/go.mod h1:9Ov578KJUmAWpS6NeZwRZyT56Uf6o3Mcz9CEsg8USYs=
-github.com/tdewolff/parse v2.3.4+incompatible h1:x05/cnGwIMf4ceLuDMBOdQ1qGniMoxpP46ghf0Qzh38=
-github.com/tdewolff/parse v2.3.4+incompatible/go.mod h1:8oBwCsVmUkgHO8M5iCzSIDtpzXOT0WXX9cWhz+bIzJQ=
-github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4=
-github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
-github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/xyproto/xpm v1.2.1 h1:trdvGjjWBsOOKzBBUPT6JvaIQM3acJEEYfbxN7M96wg=
-github.com/xyproto/xpm v1.2.1/go.mod h1:cMnesLsD0PBXLgjDfTDEaKr8XyTFsnP1QycSqRw7BiY=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9 h1:L2auWcuQIvxz9xSEqzESnV/QN/gNRXNApHi3fYwl2w0=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e h1:FDhOuMEY4JVRztM/gsbk+IKUQ8kj74bxZrgw87eMMVc=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82 h1:shxDsb9Dz27xzk3A0DxP0JuJnZMpKrdg8+E14eiUAX4=
-golang.org/x/tools v0.0.0-20200902012652-d1954cc86c82/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
-gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k=
-nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=

v2/internal/app/debug.go

@@ -1,12 +0,0 @@
-// +build debug
-
-package app
-
-// Init initialises the application for a debug environment
-func (a *App) Init() error {
-	// Indicate debug mode
-	a.debug = true
-	// Enable dev tools
-	a.options.DevTools = true
-	return nil
-}

v2/internal/app/default.go

@@ -1,44 +0,0 @@
-// +build !desktop,!hybrid,!server
-
-package app
-
-// This is the default application that will get run if the user compiles using `go build`.
-// The reason we want to prevent that is that the `wails build` command does a lot of behind
-// the scenes work such as asset compilation. If we allow `go build`, the state of these assets
-// will be unknown and the application will not work as expected.
-
-import (
-	"github.com/wailsapp/wails/v2/internal/logger"
-	"os"
-
-	"github.com/wailsapp/wails/v2/pkg/options"
-)
-
-// App defines a Wails application structure
-type App struct {
-	Title     string
-	Width     int
-	Height    int
-	Resizable bool
-
-	// Indicates if the app is running in debug mode
-	debug bool
-
-	logger *logger.Logger
-}
-
-// CreateApp returns a null application
-func CreateApp(_ *options.App) (*App, error) {
-	return &App{}, nil
-}
-
-// Run the application
-func (a *App) Run() error {
-	println(`FATAL: This application was built using "go build". This is unsupported. Please compile using "wails build".`)
-	os.Exit(1)
-	return nil
-}
-
-// Bind the dummy interface
-func (a *App) Bind(_ interface{}) {
-}

v2/internal/app/desktop.go

@@ -1,220 +0,0 @@
-// +build desktop,!server
-
-package app
-
-import (
-	"github.com/wailsapp/wails/v2/internal/binding"
-	"github.com/wailsapp/wails/v2/internal/ffenestri"
-	"github.com/wailsapp/wails/v2/internal/logger"
-	"github.com/wailsapp/wails/v2/internal/menumanager"
-	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-	"github.com/wailsapp/wails/v2/internal/runtime"
-	"github.com/wailsapp/wails/v2/internal/servicebus"
-	"github.com/wailsapp/wails/v2/internal/signal"
-	"github.com/wailsapp/wails/v2/internal/subsystem"
-	"github.com/wailsapp/wails/v2/pkg/options"
-)
-
-// App defines a Wails application structure
-type App struct {
-	window     *ffenestri.Application
-	servicebus *servicebus.ServiceBus
-	logger     *logger.Logger
-	signal     *signal.Manager
-	options    *options.App
-
-	// Subsystems
-	log        *subsystem.Log
-	runtime    *subsystem.Runtime
-	event      *subsystem.Event
-	binding    *subsystem.Binding
-	call       *subsystem.Call
-	menu       *subsystem.Menu
-	dispatcher *messagedispatcher.Dispatcher
-
-	menuManager *menumanager.Manager
-
-	// Indicates if the app is in debug mode
-	debug bool
-
-	// This is our binding DB
-	bindings *binding.Bindings
-
-	// Application Stores
-	loglevelStore  *runtime.Store
-	appconfigStore *runtime.Store
-}
-
-// Create App
-func CreateApp(appoptions *options.App) (*App, error) {
-
-	// Merge default options
-	options.MergeDefaults(appoptions)
-
-	// Set up logger
-	myLogger := logger.New(appoptions.Logger)
-	myLogger.SetLogLevel(appoptions.LogLevel)
-
-	// Create the menu manager
-	menuManager := menumanager.NewManager()
-
-	// Process the application menu
-	menuManager.SetApplicationMenu(options.GetApplicationMenu(appoptions))
-
-	// Process context menus
-	contextMenus := options.GetContextMenus(appoptions)
-	for _, contextMenu := range contextMenus {
-		menuManager.AddContextMenu(contextMenu)
-	}
-
-	// Process tray menus
-	trayMenus := options.GetTrayMenus(appoptions)
-	for _, trayMenu := range trayMenus {
-		menuManager.AddTrayMenu(trayMenu)
-	}
-
-	window := ffenestri.NewApplicationWithConfig(appoptions, myLogger, menuManager)
-
-	result := &App{
-		window:      window,
-		servicebus:  servicebus.New(myLogger),
-		logger:      myLogger,
-		bindings:    binding.NewBindings(myLogger),
-		menuManager: menuManager,
-	}
-
-	result.options = appoptions
-
-	// Initialise the app
-	err := result.Init()
-
-	return result, err
-
-}
-
-// Run the application
-func (a *App) Run() error {
-
-	var err error
-
-	// Setup signal handler
-	signalsubsystem, err := signal.NewManager(a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.signal = signalsubsystem
-	a.signal.Start()
-
-	// Start the service bus
-	a.servicebus.Debug()
-	err = a.servicebus.Start()
-	if err != nil {
-		return err
-	}
-
-	runtimesubsystem, err := subsystem.NewRuntime(a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.runtime = runtimesubsystem
-	err = a.runtime.Start()
-	if err != nil {
-		return err
-	}
-
-	// Application Stores
-	a.loglevelStore = a.runtime.GoRuntime().Store.New("wails:loglevel", a.options.LogLevel)
-	a.appconfigStore = a.runtime.GoRuntime().Store.New("wails:appconfig", a.options)
-
-	// Start the binding subsystem
-	bindingsubsystem, err := subsystem.NewBinding(a.servicebus, a.logger, a.bindings, a.runtime.GoRuntime())
-	if err != nil {
-		return err
-	}
-	a.binding = bindingsubsystem
-	err = a.binding.Start()
-	if err != nil {
-		return err
-	}
-
-	// Start the logging subsystem
-	log, err := subsystem.NewLog(a.servicebus, a.logger, a.loglevelStore)
-	if err != nil {
-		return err
-	}
-	a.log = log
-	err = a.log.Start()
-	if err != nil {
-		return err
-	}
-
-	// create the dispatcher
-	dispatcher, err := messagedispatcher.New(a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.dispatcher = dispatcher
-	err = dispatcher.Start()
-	if err != nil {
-		return err
-	}
-
-	// Start the eventing subsystem
-	event, err := subsystem.NewEvent(a.servicebus, a.logger)
-	if err != nil {
-		return err
-	}
-	a.event = event
-	err = a.event.Start()
-	if err != nil {
-		return err
-	}
-
-	// Start the menu subsystem
-	menusubsystem, err := subsystem.NewMenu(a.servicebus, a.logger, a.menuManager)
-	if err != nil {
-		return err
-	}
-	a.menu = menusubsystem
-	err = a.menu.Start()
-	if err != nil {
-		return err
-	}
-
-	// Start the call subsystem
-	call, err := subsystem.NewCall(a.servicebus, a.logger, a.bindings.DB(), a.runtime.GoRuntime())
-	if err != nil {
-		return err
-	}
-	a.call = call
-	err = a.call.Start()
-	if err != nil {
-		return err
-	}
-
-	// Dump bindings as a debug
-	bindingDump, err := a.bindings.ToJSON()
-	if err != nil {
-		return err
-	}
-
-	result := a.window.Run(dispatcher, bindingDump, a.debug)
-	a.logger.Trace("Ffenestri.Run() exited")
-	err = a.servicebus.Stop()
-	if err != nil {
-		return err
-	}
-
-	return result
-}
-
-// Bind a struct to the application by passing in
-// a pointer to it
-func (a *App) Bind(structPtr interface{}) {
-
-	// Add the struct to the bindings
-	err := a.bindings.Add(structPtr)
-	if err != nil {
-		a.logger.Fatal("Error during binding: " + err.Error())
-	}
-}

v2/internal/app/hybrid.go

@@ -1,205 +0,0 @@
-// +build !server,!desktop,hybrid
-
-package app
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/leaanthony/clir"
-	"github.com/wailsapp/wails/v2/internal/binding"
-	"github.com/wailsapp/wails/v2/internal/ffenestri"
-	"github.com/wailsapp/wails/v2/internal/logger"
-	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-	"github.com/wailsapp/wails/v2/internal/servicebus"
-	"github.com/wailsapp/wails/v2/internal/subsystem"
-	"github.com/wailsapp/wails/v2/internal/webserver"
-)
-
-// Config defines the Application's configuration
-type Config struct {
-	Title         string // Title is the value to be displayed in the title bar
-	Width         int    // Width is the desired window width
-	Height        int    // Height is the desired window height
-	DevTools      bool   // DevTools enables or disables the browser development tools
-	Resizable     bool   // Resizable when False prevents window resizing
-	ServerEnabled bool   // ServerEnabled when True allows remote connections
-}
-
-// App defines a Wails application structure
-type App struct {
-	config    Config
-	window    *ffenestri.Application
-	webserver *webserver.WebServer
-	binding   *subsystem.Binding
-	call      *subsystem.Call
-	event     *subsystem.Event
-	log       *subsystem.Log
-	runtime   *subsystem.Runtime
-
-	bindings   *binding.Bindings
-	logger     *logger.Logger
-	dispatcher *messagedispatcher.Dispatcher
-	servicebus *servicebus.ServiceBus
-
-	debug bool
-}
-
-// Create App
-func CreateApp(options *Options) *App {
-
-	// Merge default options
-	options.mergeDefaults()
-
-	// Set up logger
-	myLogger := logger.New(os.Stdout)
-	myLogger.SetLogLevel(logger.INFO)
-
-	window := ffenestri.NewApplicationWithConfig(&ffenestri.Config{
-		Title:       options.Title,
-		Width:       options.Width,
-		Height:      options.Height,
-		MinWidth:    options.MinWidth,
-		MinHeight:   options.MinHeight,
-		MaxWidth:    options.MaxWidth,
-		MaxHeight:   options.MaxHeight,
-		StartHidden: options.StartHidden,
-		DevTools:    options.DevTools,
-
-		Resizable:  !options.DisableResize,
-		Fullscreen: options.Fullscreen,
-	}, myLogger)
-
-	app := &App{
-		window:     window,
-		webserver:  webserver.NewWebServer(myLogger),
-		servicebus: servicebus.New(myLogger),
-		logger:     myLogger,
-		bindings:   binding.NewBindings(myLogger),
-	}
-
-	// Initialise the app
-	app.Init()
-
-	return app
-}
-
-// Run the application
-func (a *App) Run() error {
-
-	// Default app options
-	var port = 8080
-	var ip = "localhost"
-	var suppressLogging = false
-
-	// Create CLI
-	cli := clir.NewCli(filepath.Base(os.Args[0]), "Desktop/Server Build", "")
-
-	// Setup flags
-	cli.IntFlag("p", "Port to serve on", &port)
-	cli.StringFlag("i", "IP to serve on", &ip)
-	cli.BoolFlag("q", "Suppress logging", &suppressLogging)
-
-	// Setup main action
-	cli.Action(func() error {
-
-		// Set IP + Port
-		a.webserver.SetPort(port)
-		a.webserver.SetIP(ip)
-		a.webserver.SetBindings(a.bindings)
-		// Log information (if we aren't suppressing it)
-		if !suppressLogging {
-			cli.PrintBanner()
-			a.logger.Info("Running server at %s", a.webserver.URL())
-		}
-
-		a.servicebus.Start()
-		log, err := subsystem.NewLog(a.servicebus, a.logger)
-		if err != nil {
-			return err
-		}
-		a.log = log
-		a.log.Start()
-		dispatcher, err := messagedispatcher.New(a.servicebus, a.logger)
-		if err != nil {
-			return err
-		}
-		a.dispatcher = dispatcher
-		a.dispatcher.Start()
-
-		// Start the runtime
-		runtime, err := subsystem.NewRuntime(a.servicebus, a.logger)
-		if err != nil {
-			return err
-		}
-		a.runtime = runtime
-		a.runtime.Start()
-
-		// Start the binding subsystem
-		binding, err := subsystem.NewBinding(a.servicebus, a.logger, a.bindings, runtime.GoRuntime())
-		if err != nil {
-			return err
-		}
-		a.binding = binding
-		a.binding.Start()
-
-		// Start the eventing subsystem
-		event, err := subsystem.NewEvent(a.servicebus, a.logger)
-		if err != nil {
-			return err
-		}
-		a.event = event
-		a.event.Start()
-
-		// Start the call subsystem
-		call, err := subsystem.NewCall(a.servicebus, a.logger, a.bindings.DB())
-		if err != nil {
-			return err
-		}
-		a.call = call
-		a.call.Start()
-
-		// Required so that the WailsInit functions are fired!
-		runtime.GoRuntime().Events.Emit("wails:loaded")
-
-		// Set IP + Port
-		a.webserver.SetPort(port)
-		a.webserver.SetIP(ip)
-
-		// Log information (if we aren't suppressing it)
-		if !suppressLogging {
-			cli.PrintBanner()
-			println("Running server at " + a.webserver.URL())
-		}
-
-		// Dump bindings as a debug
-		bindingDump, err := a.bindings.ToJSON()
-		if err != nil {
-			return err
-		}
-
-		go func() {
-			if err := a.webserver.Start(dispatcher, event); err != nil {
-				a.logger.Error("Webserver failed to start %s", err)
-			}
-		}()
-
-		result := a.window.Run(dispatcher, bindingDump)
-		a.servicebus.Stop()
-
-		return result
-	})
-
-	return cli.Run()
-}
-
-// Bind a struct to the application by passing in
-// a pointer to it
-func (a *App) Bind(structPtr interface{}) {
-
-	// Add the struct to the bindings
-	err := a.bindings.Add(structPtr)
-	if err != nil {
-		a.logger.Fatal("Error during binding: " + err.Error())
-	}
-}

v2/internal/app/production.go

@@ -1,11 +0,0 @@
-// +build !debug
-
-package app
-
-import "github.com/wailsapp/wails/v2/pkg/logger"
-
-// Init initialises the application for a production environment
-func (a *App) Init() error {
-	a.logger.SetLogLevel(logger.ERROR)
-	return nil
-}

v2/internal/app/server.go

@@ -1,160 +0,0 @@
-// +build server,!desktop
-
-package app
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/leaanthony/clir"
-	"github.com/wailsapp/wails/v2/internal/binding"
-	"github.com/wailsapp/wails/v2/internal/logger"
-	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-	"github.com/wailsapp/wails/v2/internal/servicebus"
-	"github.com/wailsapp/wails/v2/internal/subsystem"
-	"github.com/wailsapp/wails/v2/internal/webserver"
-)
-
-// App defines a Wails application structure
-type App struct {
-	binding *subsystem.Binding
-	call    *subsystem.Call
-	event   *subsystem.Event
-	log     *subsystem.Log
-	runtime *subsystem.Runtime
-
-	bindings   *binding.Bindings
-	logger     *logger.Logger
-	dispatcher *messagedispatcher.Dispatcher
-	servicebus *servicebus.ServiceBus
-	webserver  *webserver.WebServer
-
-	debug bool
-}
-
-// Create App
-func CreateApp(options *Options) *App {
-	options.mergeDefaults()
-	// We ignore the inputs (for now)
-
-	// TODO: Allow logger output override on CLI
-	myLogger := logger.New(os.Stdout)
-	myLogger.SetLogLevel(logger.TRACE)
-
-	result := &App{
-		bindings:   binding.NewBindings(myLogger),
-		logger:     myLogger,
-		servicebus: servicebus.New(myLogger),
-		webserver:  webserver.NewWebServer(myLogger),
-	}
-
-	// Initialise app
-	result.Init()
-
-	return result
-}
-
-// Run the application
-func (a *App) Run() error {
-
-	// Default app options
-	var port = 8080
-	var ip = "localhost"
-	var supressLogging = false
-	var debugMode = false
-
-	// Create CLI
-	cli := clir.NewCli(filepath.Base(os.Args[0]), "Server Build", "")
-
-	// Setup flags
-	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)
-
-	// Setup main action
-	cli.Action(func() error {
-
-		// Set IP + Port
-		a.webserver.SetPort(port)
-		a.webserver.SetIP(ip)
-		a.webserver.SetBindings(a.bindings)
-		// Log information (if we aren't supressing it)
-		if !supressLogging {
-			cli.PrintBanner()
-			a.logger.Info("Running server at %s", a.webserver.URL())
-		}
-
-		if debugMode {
-			a.servicebus.Debug()
-		}
-		a.servicebus.Start()
-		log, err := subsystem.NewLog(a.servicebus, a.logger)
-		if err != nil {
-			return err
-		}
-		a.log = log
-		a.log.Start()
-		dispatcher, err := messagedispatcher.New(a.servicebus, a.logger)
-		if err != nil {
-			return err
-		}
-		a.dispatcher = dispatcher
-		a.dispatcher.Start()
-
-		// Start the runtime
-		runtime, err := subsystem.NewRuntime(a.servicebus, a.logger)
-		if err != nil {
-			return err
-		}
-		a.runtime = runtime
-		a.runtime.Start()
-
-		// Start the binding subsystem
-		binding, err := subsystem.NewBinding(a.servicebus, a.logger, a.bindings, runtime.GoRuntime())
-		if err != nil {
-			return err
-		}
-		a.binding = binding
-		a.binding.Start()
-
-		// Start the eventing subsystem
-		event, err := subsystem.NewEvent(a.servicebus, a.logger)
-		if err != nil {
-			return err
-		}
-		a.event = event
-		a.event.Start()
-
-		// Start the call subsystem
-		call, err := subsystem.NewCall(a.servicebus, a.logger, a.bindings.DB())
-		if err != nil {
-			return err
-		}
-		a.call = call
-		a.call.Start()
-
-		// Required so that the WailsInit functions are fired!
-		runtime.GoRuntime().Events.Emit("wails:loaded")
-
-		if err := a.webserver.Start(dispatcher, event); err != nil {
-			a.logger.Error("Webserver failed to start %s", err)
-			return err
-		}
-
-		return nil
-	})
-
-	return cli.Run()
-}
-
-// Bind a struct to the application by passing in
-// a pointer to it
-func (a *App) Bind(structPtr interface{}) {
-
-	// Add the struct to the bindings
-	err := a.bindings.Add(structPtr)
-	if err != nil {
-		a.logger.Fatal("Error during binding: " + err.Error())
-	}
-}

v2/internal/assetdb/assetdb.go

@@ -1,112 +0,0 @@
-package assetdb
-
-import (
-	"fmt"
-	"strings"
-	"unsafe"
-)
-
-// AssetDB is a database for assets encoded as byte slices
-type AssetDB struct {
-	db map[string][]byte
-}
-
-// NewAssetDB creates a new AssetDB and initialises a blank db
-func NewAssetDB() *AssetDB {
-	return &AssetDB{
-		db: make(map[string][]byte),
-	}
-}
-
-// AddAsset saves the given byte slice under the given name
-func (a *AssetDB) AddAsset(name string, data []byte) {
-	a.db[name] = data
-}
-
-// Remove removes the named asset
-func (a *AssetDB) Remove(name string) {
-	delete(a.db, name)
-}
-
-// Asset retrieves the byte slice for the given name
-func (a *AssetDB) Read(name string) ([]byte, error) {
-	result := a.db[name]
-	if result == nil {
-		return nil, fmt.Errorf("asset '%s' not found", name)
-	}
-	return result, nil
-}
-
-// AssetAsString returns the asset as a string.
-// It also returns a boolean indicating whether the asset existed or not.
-func (a *AssetDB) String(name string) (string, error) {
-	asset, err := a.Read(name)
-	if err != nil {
-		return "", err
-	}
-	return *(*string)(unsafe.Pointer(&asset)), nil
-}
-
-func (a *AssetDB) Dump() {
-	fmt.Printf("Assets:\n")
-	for k, _ := range a.db {
-		fmt.Println(k)
-	}
-}
-
-// Serialize converts the entire database to a file that when compiled will
-// reconstruct the AssetDB during init()
-// name: name of the asset.AssetDB instance
-// pkg:  package name placed at the top of the file
-func (a *AssetDB) Serialize(name, pkg string) string {
-	var cdata strings.Builder
-	// Set buffer size to 4k
-	cdata.Grow(4096)
-
-	// Write header
-	header := `// DO NOT EDIT - Generated automatically
-package %s
-
-import "github.com/wailsapp/wails/v2/internal/assetdb"
-
-var (
-	%s *assetdb.AssetDB = assetdb.NewAssetDB()
-)
-
-// AssetsDB is a clean interface to the assetdb.AssetDB struct
-type AssetsDB interface {
-	Read(string) ([]byte, error)
-	String(string) (string, error)
-}
-
-// Assets returns the asset database
-func Assets() AssetsDB {
-	return %s
-}
-
-func init() {
-`
-	cdata.WriteString(fmt.Sprintf(header, pkg, name, name))
-
-	for aname, bytes := range a.db {
-		cdata.WriteString(fmt.Sprintf("\t%s.AddAsset(\"%s\", []byte{",
-			name,
-			aname))
-
-		l := len(bytes)
-		if l == 0 {
-			cdata.WriteString("0x00})\n")
-			continue
-		}
-
-		// Convert each byte to hex
-		for _, b := range bytes[:l-1] {
-			cdata.WriteString(fmt.Sprintf("0x%x, ", b))
-		}
-		cdata.WriteString(fmt.Sprintf("0x%x})\n", bytes[l-1]))
-	}
-
-	cdata.WriteString(`}`)
-
-	return cdata.String()
-}

v2/internal/assetdb/assetdb_test.go

@@ -1,70 +0,0 @@
-package assetdb
-
-import "testing"
-import "github.com/matryer/is"
-
-func TestExistsAsBytes(t *testing.T) {
-
-	is := is.New(t)
-
-	var helloworld = []byte{72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33}
-
-	db := NewAssetDB()
-	db.AddAsset("hello", helloworld)
-
-	result, err := db.Read("hello")
-
-	is.True(err == nil)
-	is.Equal(result, helloworld)
-}
-
-func TestNotExistsAsBytes(t *testing.T) {
-
-	is := is.New(t)
-
-	var helloworld = []byte{72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33}
-
-	db := NewAssetDB()
-	db.AddAsset("hello4", helloworld)
-
-	result, err := db.Read("hello")
-
-	is.True(err != nil)
-	is.True(result == nil)
-}
-
-func TestExistsAsString(t *testing.T) {
-
-	is := is.New(t)
-
-	var helloworld = []byte{72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33}
-
-	db := NewAssetDB()
-	db.AddAsset("hello", helloworld)
-
-	result, err := db.String("hello")
-
-	// Ensure it exists
-	is.True(err == nil)
-
-	// Ensure the string is the same as the byte slice
-	is.Equal(result, "Hello, World!")
-}
-
-func TestNotExistsAsString(t *testing.T) {
-
-	is := is.New(t)
-
-	var helloworld = []byte{72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33}
-
-	db := NewAssetDB()
-	db.AddAsset("hello", helloworld)
-
-	result, err := db.String("help")
-
-	// Ensure it doesn't exist
-	is.True(err != nil)
-
-	// Ensure the string is blank
-	is.Equal(result, "")
-}

v2/internal/assetdb/filesystem.go

@@ -1,176 +0,0 @@
-// +build !desktop
-package assetdb
-
-import (
-	"errors"
-	"io"
-	"net/http"
-	"os"
-	"path"
-	"sort"
-	"strings"
-	"time"
-)
-
-var errWhence = errors.New("Seek: invalid whence")
-var errOffset = errors.New("Seek: invalid offset")
-
-// Open implements the http.FileSystem interface for the AssetDB
-func (a *AssetDB) Open(name string) (http.File, error) {
-	if name == "/" || name == "" {
-		return &Entry{name: "/", dir: true, db: a}, nil
-	}
-
-	if data, ok := a.db[name]; ok {
-		return &Entry{name: name, data: data, size: len(data)}, nil
-	} else {
-		for n, _ := range a.db {
-			if strings.HasPrefix(n, name+"/") {
-				return &Entry{name: name, db: a, dir: true}, nil
-			}
-		}
-	}
-	return &Entry{}, os.ErrNotExist
-}
-
-// readdir returns the directory entries for the requested directory
-func (a *AssetDB) readdir(name string) ([]os.FileInfo, error) {
-	dir := name
-	var ents []string
-
-	fim := make(map[string]os.FileInfo)
-	for fn, data := range a.db {
-		if strings.HasPrefix(fn, dir) {
-			pieces := strings.Split(fn[len(dir)+1:], "/")
-			if len(pieces) == 1 {
-				fim[pieces[0]] = FI{name: pieces[0], dir: false, size: len(data)}
-				ents = append(ents, pieces[0])
-			} else {
-				fim[pieces[0]] = FI{name: pieces[0], dir: true, size: -1}
-				ents = append(ents, pieces[0])
-			}
-		}
-	}
-
-	if len(ents) == 0 {
-		return nil, os.ErrNotExist
-	}
-
-	sort.Strings(ents)
-	var list []os.FileInfo
-	for _, dir := range ents {
-		list = append(list, fim[dir])
-	}
-	return list, nil
-}
-
-// Entry implements the http.File interface to allow for
-// use in the http.FileSystem implementation of AssetDB
-type Entry struct {
-	name string
-	data []byte
-	dir  bool
-	size int
-	db   *AssetDB
-	off  int
-}
-
-// Close is a noop
-func (e Entry) Close() error {
-	return nil
-}
-
-// Read fills the slice provided returning how many bytes were written
-// and any errors encountered
-func (e *Entry) Read(p []byte) (n int, err error) {
-	if e.off >= e.size {
-		return 0, io.EOF
-	}
-	numout := len(p)
-	if numout > e.size {
-		numout = e.size
-	}
-	for i := 0; i < numout; i++ {
-		p[i] = e.data[e.off+i]
-	}
-	e.off += numout
-	n = int(numout)
-	err = nil
-	return
-}
-
-// Seek seeks to the specified offset from the location specified by whence
-func (e *Entry) Seek(offset int64, whence int) (int64, error) {
-	switch whence {
-	default:
-		return 0, errWhence
-	case io.SeekStart:
-		offset += 0
-	case io.SeekCurrent:
-		offset += int64(e.off)
-	case io.SeekEnd:
-		offset += int64(e.size)
-	}
-
-	if offset < 0 {
-		return 0, errOffset
-	}
-	e.off = int(offset)
-	return offset, nil
-}
-
-// Readdir returns the directory entries inside this entry if it is a directory
-func (e Entry) Readdir(count int) ([]os.FileInfo, error) {
-	ents := []os.FileInfo{}
-	if !e.dir {
-		return ents, errors.New("Not a directory")
-	}
-	return e.db.readdir(e.name)
-}
-
-// Stat returns information about this directory entry
-func (e Entry) Stat() (os.FileInfo, error) {
-	return FI{e.name, e.size, e.dir}, nil
-}
-
-// FI is the AssetDB implementation of os.FileInfo.
-type FI struct {
-	name string
-	size int
-	dir  bool
-}
-
-// IsDir returns true if this is a directory
-func (fi FI) IsDir() bool {
-	return fi.dir
-}
-
-// ModTime always returns now
-func (fi FI) ModTime() time.Time {
-	return time.Time{}
-}
-
-// Mode returns the file as readonly and directories
-// as world writeable and executable
-func (fi FI) Mode() os.FileMode {
-	if fi.IsDir() {
-		return 0755 | os.ModeDir
-	}
-	return 0444
-}
-
-// Name returns the name of this object without
-// any leading slashes
-func (fi FI) Name() string {
-	return path.Base(fi.name)
-}
-
-// Size returns the size of this item
-func (fi FI) Size() int64 {
-	return int64(fi.size)
-}
-
-// Sys returns nil
-func (fi FI) Sys() interface{} {
-	return nil
-}

v2/internal/assetdb/filesystem_test.go

@@ -1,108 +0,0 @@
-package assetdb
-
-import (
-	"fmt"
-	"os"
-	"testing"
-
-	"github.com/matryer/is"
-)
-
-func TestOpenLeadingSlash(t *testing.T) {
-	is := is.New(t)
-
-	var helloworld = []byte{72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33}
-
-	db := NewAssetDB()
-	db.AddAsset("/hello", helloworld)
-
-	file, err := db.Open("/hello")
-	// Ensure it does exist
-	is.True(err == nil)
-
-	buff := make([]byte, len(helloworld))
-	n, err := file.Read(buff)
-	fmt.Printf("Error %v\n", err)
-	is.True(err == nil)
-	is.Equal(n, len(helloworld))
-	result := string(buff)
-
-	// Ensure the string is blank
-	is.Equal(result, string(helloworld))
-}
-
-func TestOpen(t *testing.T) {
-	is := is.New(t)
-
-	var helloworld = []byte{72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33}
-
-	db := NewAssetDB()
-	db.AddAsset("/hello", helloworld)
-
-	file, err := db.Open("/hello")
-
-	// Ensure it does exist
-	is.True(err == nil)
-
-	buff := make([]byte, len(helloworld))
-	n, err := file.Read(buff)
-	is.True(err == nil)
-	is.Equal(n, len(helloworld))
-	result := string(buff)
-
-	// Ensure the string is blank
-	is.Equal(result, string(helloworld))
-}
-
-func TestReaddir(t *testing.T) {
-	is := is.New(t)
-
-	var helloworld = []byte{72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33}
-
-	db := NewAssetDB()
-	db.AddAsset("/hello", helloworld)
-	db.AddAsset("/directory/hello", helloworld)
-	db.AddAsset("/directory/subdirectory/hello", helloworld)
-
-	dir, err := db.Open("/doesntexist")
-	is.True(err == os.ErrNotExist)
-	ents, err := dir.Readdir(-1)
-	is.Equal([]os.FileInfo{}, ents)
-
-	dir, err = db.Open("/")
-	is.True(dir != nil)
-	is.True(err == nil)
-	ents, err = dir.Readdir(-1)
-	is.True(err == nil)
-	is.Equal(3, len(ents))
-}
-
-func TestReaddirSubdirectory(t *testing.T) {
-	is := is.New(t)
-
-	var helloworld = []byte{72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33}
-
-	db := NewAssetDB()
-	db.AddAsset("/hello", helloworld)
-	db.AddAsset("/directory/hello", helloworld)
-	db.AddAsset("/directory/subdirectory/hello", helloworld)
-
-	expected := []os.FileInfo{
-		FI{name: "hello", dir: false, size: len(helloworld)},
-		FI{name: "subdirectory", dir: true, size: -1},
-	}
-
-	dir, err := db.Open("/directory")
-	is.True(dir != nil)
-	is.True(err == nil)
-	ents, err := dir.Readdir(-1)
-	is.Equal(expected, ents)
-
-	// Check sub-subdirectory
-	dir, err = db.Open("/directory/subdirectory")
-	is.True(dir != nil)
-	is.True(err == nil)
-	ents, err = dir.Readdir(-1)
-	is.True(err == nil)
-	is.Equal([]os.FileInfo{FI{name: "hello", size: len(helloworld)}}, ents)
-}

v2/internal/bind/bind.go

@@ -1,9 +0,0 @@
-package bind
-
-func IsStructPointer(value interface{}) bool {
-	switch t := value.(type) {
-	default:
-		println(t)
-	}
-	return false
-}

v2/internal/binding/binding.go

@@ -1,70 +0,0 @@
-package binding
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/wailsapp/wails/v2/internal/logger"
-)
-
-type Bindings struct {
-	db     *DB
-	logger logger.CustomLogger
-}
-
-// NewBindings returns a new Bindings object
-func NewBindings(logger *logger.Logger) *Bindings {
-	return &Bindings{
-		db:     newDB(),
-		logger: logger.CustomLogger("Bindings"),
-	}
-}
-
-// Add the given struct methods to the Bindings
-func (b *Bindings) Add(structPtr interface{}) error {
-
-	methods, err := getMethods(structPtr)
-	if err != nil {
-		return fmt.Errorf("cannot bind value to app: %s", err.Error())
-	}
-
-	for _, method := range methods {
-		splitName := strings.Split(method.Name, ".")
-		packageName := splitName[0]
-		structName := splitName[1]
-		methodName := splitName[2]
-
-		// Is this WailsInit?
-		if method.IsWailsInit() {
-			err := b.db.AddWailsInit(method)
-			if err != nil {
-				return err
-			}
-			b.logger.Trace("Registered WailsInit method: %s", method.Name)
-			continue
-		}
-
-		// Is this WailsShutdown?
-		if method.IsWailsShutdown() {
-			err := b.db.AddWailsShutdown(method)
-			if err != nil {
-				return err
-			}
-			b.logger.Trace("Registered WailsShutdown method: %s", method.Name)
-			continue
-		}
-
-		// Add it as a regular method
-		b.db.AddMethod(packageName, structName, methodName, method)
-
-	}
-	return nil
-}
-
-func (b *Bindings) DB() *DB {
-	return b.db
-}
-
-func (b *Bindings) ToJSON() (string, error) {
-	return b.db.ToJSON()
-}

v2/internal/binding/boundMethod.go

@@ -1,150 +0,0 @@
-package binding
-
-import (
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-// BoundMethod defines all the data related to a Go method that is
-// bound to the Wails application
-type BoundMethod struct {
-	Name     string        `json:"name"`
-	Inputs   []*Parameter  `json:"inputs,omitempty"`
-	Outputs  []*Parameter  `json:"outputs,omitempty"`
-	Comments string        `json:"comments,omitempty"`
-	Method   reflect.Value `json:"-"`
-}
-
-// IsWailsInit returns true if the method name is "WailsInit"
-func (b *BoundMethod) IsWailsInit() bool {
-	return strings.HasSuffix(b.Name, "WailsInit")
-}
-
-// IsWailsShutdown returns true if the method name is "WailsShutdown"
-func (b *BoundMethod) IsWailsShutdown() bool {
-	return strings.HasSuffix(b.Name, "WailsShutdown")
-}
-
-// VerifyWailsInit checks if the WailsInit signature is correct
-func (b *BoundMethod) VerifyWailsInit() error {
-	// Must only have 1 input
-	if b.InputCount() != 1 {
-		return fmt.Errorf("invalid method signature for %s: expected `WailsInit(*wails.Runtime) error`", b.Name)
-	}
-
-	// Check input type
-	if !b.Inputs[0].IsType("*runtime.Runtime") {
-		return fmt.Errorf("invalid method signature for %s: expected `WailsInit(*wails.Runtime) error`", b.Name)
-	}
-
-	// Must only have 1 output
-	if b.OutputCount() != 1 {
-		return fmt.Errorf("invalid method signature for %s: expected `WailsInit(*wails.Runtime) error`", b.Name)
-	}
-
-	// Check output type
-	if !b.Outputs[0].IsError() {
-		return fmt.Errorf("invalid method signature for %s: expected `WailsInit(*wails.Runtime) error`", b.Name)
-	}
-
-	// Input must be of type Runtime
-	return nil
-}
-
-// VerifyWailsShutdown checks if the WailsShutdown signature is correct
-func (b *BoundMethod) VerifyWailsShutdown() error {
-	// Must have no inputs
-	if b.InputCount() != 0 {
-		return fmt.Errorf("invalid method signature for WailsShutdown: expected `WailsShutdown()`")
-	}
-
-	// Must have no outputs
-	if b.OutputCount() != 0 {
-		return fmt.Errorf("invalid method signature for WailsShutdown: expected `WailsShutdown()`")
-	}
-
-	// Input must be of type Runtime
-	return nil
-}
-
-// InputCount returns the number of inputs this bound method has
-func (b *BoundMethod) InputCount() int {
-	return len(b.Inputs)
-}
-
-// OutputCount returns the number of outputs this bound method has
-func (b *BoundMethod) OutputCount() int {
-	return len(b.Outputs)
-}
-
-// ParseArgs method converts the input json into the types expected by the method
-func (b *BoundMethod) ParseArgs(args []json.RawMessage) ([]interface{}, error) {
-
-	result := make([]interface{}, b.InputCount())
-	for index, arg := range args {
-		typ := b.Inputs[index].reflectType
-		inputValue := reflect.New(typ).Interface()
-		err := json.Unmarshal(arg, inputValue)
-		if err != nil {
-			return nil, err
-		}
-		if inputValue == nil {
-			result[index] = reflect.Zero(typ).Interface()
-		} else {
-			result[index] = reflect.ValueOf(inputValue).Elem().Interface()
-		}
-	}
-	return result, nil
-}
-
-// Call will attempt to call this bound method with the given args
-func (b *BoundMethod) Call(args []interface{}) (interface{}, error) {
-	// Check inputs
-	expectedInputLength := len(b.Inputs)
-	actualInputLength := len(args)
-	if expectedInputLength != actualInputLength {
-		return nil, fmt.Errorf("%s takes %d inputs. Received %d", b.Name, expectedInputLength, actualInputLength)
-	}
-
-	/** Convert inputs to reflect values **/
-
-	// Create slice for the input arguments to the method call
-	callArgs := make([]reflect.Value, expectedInputLength)
-
-	// Iterate over given arguments
-	for index, arg := range args {
-		// Save the converted argument
-		callArgs[index] = reflect.ValueOf(arg)
-	}
-
-	// Do the call
-	callResults := b.Method.Call(callArgs)
-
-	//** Check results **//
-	var returnValue interface{}
-	var err error
-
-	switch b.OutputCount() {
-	case 1:
-		// Loop over results and determine if the result
-		// is an error or not
-		for _, result := range callResults {
-			interfac := result.Interface()
-			temp, ok := interfac.(error)
-			if ok {
-				err = temp
-			} else {
-				returnValue = interfac
-			}
-		}
-	case 2:
-		returnValue = callResults[0].Interface()
-		if temp, ok := callResults[1].Interface().(error); ok {
-			err = temp
-		}
-	}
-
-	return returnValue, err
-}

v2/internal/binding/db.go

@@ -1,150 +0,0 @@
-package binding
-
-import (
-	"encoding/json"
-	"sync"
-	"unsafe"
-)
-
-// DB is our database of method bindings
-type DB struct {
-	//  map[packagename] -> map[structname] -> map[methodname]*method
-	store map[string]map[string]map[string]*BoundMethod
-
-	// This uses fully qualified method names as a shortcut for store traversal.
-	// It used for performance gains at runtime
-	methodMap map[string]*BoundMethod
-
-	// These are slices of methods registered using WailsInit and WailsShutdown
-	wailsInitMethods     []*BoundMethod
-	wailsShutdownMethods []*BoundMethod
-
-	// Lock to ensure sync access to the data
-	lock sync.RWMutex
-}
-
-func newDB() *DB {
-	return &DB{
-		store:     make(map[string]map[string]map[string]*BoundMethod),
-		methodMap: make(map[string]*BoundMethod),
-	}
-}
-
-// GetMethodFromStore returns the method for the given package/struct/method names
-// nil is returned if any one of those does not exist
-func (d *DB) GetMethodFromStore(packageName string, structName string, methodName string) *BoundMethod {
-
-	// Lock the db whilst processing and unlock on return
-	d.lock.RLock()
-	defer d.lock.RUnlock()
-
-	structMap, exists := d.store[packageName]
-	if !exists {
-		return nil
-	}
-	methodMap, exists := structMap[structName]
-	if !exists {
-		return nil
-	}
-	return methodMap[methodName]
-}
-
-// GetMethod returns the method for the given qualified method name
-// qualifiedMethodName is "packagename.structname.methodname"
-func (d *DB) GetMethod(qualifiedMethodName string) *BoundMethod {
-
-	// Lock the db whilst processing and unlock on return
-	d.lock.RLock()
-	defer d.lock.RUnlock()
-
-	return d.methodMap[qualifiedMethodName]
-}
-
-// AddMethod adds the given method definition to the db using the given qualified path: packageName.structName.methodName
-func (d *DB) AddMethod(packageName string, structName string, methodName string, methodDefinition *BoundMethod) {
-
-	// TODO: Validate inputs?
-
-	// Lock the db whilst processing and unlock on return
-	d.lock.Lock()
-	defer d.lock.Unlock()
-
-	// Get the map associated with the package name
-	structMap, exists := d.store[packageName]
-	if !exists {
-		// Create a new map for this packagename
-		d.store[packageName] = make(map[string]map[string]*BoundMethod)
-		structMap = d.store[packageName]
-	}
-
-	// Get the map associated with the struct name
-	methodMap, exists := structMap[structName]
-	if !exists {
-		// Create a new map for this packagename
-		structMap[structName] = make(map[string]*BoundMethod)
-		methodMap = structMap[structName]
-	}
-
-	// Store the method definition
-	methodMap[methodName] = methodDefinition
-
-	// Store in the methodMap
-	key := packageName + "." + structName + "." + methodName
-	d.methodMap[key] = methodDefinition
-
-}
-
-// AddWailsInit checks the given method is a WailsInit method and if it
-// is, adds it to the list of WailsInit methods
-func (d *DB) AddWailsInit(method *BoundMethod) error {
-	err := method.VerifyWailsInit()
-	if err != nil {
-		return err
-	}
-
-	// Lock the db whilst processing and unlock on return
-	d.lock.Lock()
-	defer d.lock.Unlock()
-
-	d.wailsInitMethods = append(d.wailsInitMethods, method)
-	return nil
-}
-
-// AddWailsShutdown checks the given method is a WailsInit method and if it
-// is, adds it to the list of WailsShutdown methods
-func (d *DB) AddWailsShutdown(method *BoundMethod) error {
-	err := method.VerifyWailsShutdown()
-	if err != nil {
-		return err
-	}
-
-	// Lock the db whilst processing and unlock on return
-	d.lock.Lock()
-	defer d.lock.Unlock()
-
-	d.wailsShutdownMethods = append(d.wailsShutdownMethods, method)
-	return nil
-}
-
-// ToJSON converts the method map to JSON
-func (d *DB) ToJSON() (string, error) {
-
-	// Lock the db whilst processing and unlock on return
-	d.lock.RLock()
-	defer d.lock.RUnlock()
-
-	bytes, err := json.Marshal(&d.store)
-
-	// Return zero copy string as this string will be read only
-	return *(*string)(unsafe.Pointer(&bytes)), err
-}
-
-// WailsInitMethods returns the list of registered WailsInit methods
-func (d *DB) WailsInitMethods() []*BoundMethod {
-	return d.wailsInitMethods
-}
-
-// WailsShutdownMethods returns the list of registered WailsInit methods
-func (d *DB) WailsShutdownMethods() []*BoundMethod {
-	return d.wailsShutdownMethods
-}

v2/internal/binding/parameter.go

@@ -1,28 +0,0 @@
-package binding
-
-import "reflect"
-
-// Parameter defines a Go method parameter
-type Parameter struct {
-	Name        string `json:"name,omitempty"`
-	TypeName    string `json:"type"`
-	reflectType reflect.Type
-}
-
-func newParameter(Name string, Type reflect.Type) *Parameter {
-	return &Parameter{
-		Name:        Name,
-		TypeName:    Type.String(),
-		reflectType: Type,
-	}
-}
-
-// IsType returns true if the given
-func (p *Parameter) IsType(typename string) bool {
-	return p.TypeName == typename
-}
-
-// IsError returns true if the parameter type is an error
-func (p *Parameter) IsError() bool {
-	return p.IsType("error")
-}

v2/internal/binding/reflect.go

@@ -1,97 +0,0 @@
-package binding
-
-import (
-	"fmt"
-	"reflect"
-	"runtime"
-)
-
-// isStructPtr returns true if the value given is a
-// pointer to a struct
-func isStructPtr(value interface{}) bool {
-	return reflect.ValueOf(value).Kind() == reflect.Ptr &&
-		reflect.ValueOf(value).Elem().Kind() == reflect.Struct
-}
-
-// isFunction returns true if the given value is a function
-func isFunction(value interface{}) bool {
-	return reflect.ValueOf(value).Kind() == reflect.Func
-}
-
-// isStructPtr returns true if the value given is a struct
-func isStruct(value interface{}) bool {
-	return reflect.ValueOf(value).Kind() == reflect.Struct
-}
-
-func getMethods(value interface{}) ([]*BoundMethod, error) {
-
-	// Create result placeholder
-	var result []*BoundMethod
-
-	// Check type
-	if !isStructPtr(value) {
-
-		if isStruct(value) {
-			name := reflect.ValueOf(value).Type().Name()
-			return nil, fmt.Errorf("%s is a struct, not a pointer to a struct", name)
-		}
-
-		if isFunction(value) {
-			name := runtime.FuncForPC(reflect.ValueOf(value).Pointer()).Name()
-			return nil, fmt.Errorf("%s is a function, not a pointer to a struct. Wails v2 has deprecated the binding of functions. Please wrap your functions up in a struct and bind a pointer to that struct.", name)
-		}
-
-		return nil, fmt.Errorf("not a pointer to a struct.")
-	}
-
-	// Process Struct
-	structType := reflect.TypeOf(value)
-	structValue := reflect.ValueOf(value)
-	baseName := structType.String()[1:]
-
-	// Process Methods
-	for i := 0; i < structType.NumMethod(); i++ {
-		methodDef := structType.Method(i)
-		methodName := methodDef.Name
-		fullMethodName := baseName + "." + methodName
-		method := structValue.MethodByName(methodName)
-
-		// Create new method
-		boundMethod := &BoundMethod{
-			Name:     fullMethodName,
-			Inputs:   nil,
-			Outputs:  nil,
-			Comments: "",
-			Method:   method,
-		}
-
-		// Iterate inputs
-		methodType := method.Type()
-		inputParamCount := methodType.NumIn()
-		var inputs []*Parameter
-		for inputIndex := 0; inputIndex < inputParamCount; inputIndex++ {
-			input := methodType.In(inputIndex)
-			thisParam := newParameter("", input)
-			inputs = append(inputs, thisParam)
-		}
-
-		boundMethod.Inputs = inputs
-
-		// Iterate outputs
-		// TODO: Determine what to do about limiting return types
-		//       especially around errors.
-		outputParamCount := methodType.NumOut()
-		var outputs []*Parameter
-		for outputIndex := 0; outputIndex < outputParamCount; outputIndex++ {
-			output := methodType.Out(outputIndex)
-			thisParam := newParameter("", output)
-			outputs = append(outputs, thisParam)
-		}
-		boundMethod.Outputs = outputs
-
-		// Save method in result
-		result = append(result, boundMethod)
-
-	}
-	return result, nil
-}

v2/internal/crypto/crypto.go

@@ -1,17 +0,0 @@
-package crypto
-
-import (
-	"crypto/rand"
-	"fmt"
-	"log"
-)
-
-// RandomID returns a random ID as a string
-func RandomID() string {
-	b := make([]byte, 16)
-	_, err := rand.Read(b)
-	if err != nil {
-		log.Fatal(err)
-	}
-	return fmt.Sprintf("%x", b)
-}

v2/internal/ffenestri/LICENCES.md

@@ -1,13 +0,0 @@
-# 3rd Party Licenses
-
-## vec
-Homepage: https://github.com/rxi/vec
-License: https://github.com/rxi/vec/blob/master/LICENSE
-
-## json
-Homepage: http://git.ozlabs.org/?p=ccan;a=tree;f=ccan/json;hb=HEAD
-License: http://git.ozlabs.org/?p=ccan;a=blob;f=licenses/BSD-MIT;h=89de354795ec7a7cdab07c091029653d3618540d;hb=HEAD
-
-## hashmap
-Homepage: https://github.com/sheredom/hashmap.h
-License: https://github.com/sheredom/hashmap.h/blob/master/LICENSE

v2/internal/ffenestri/common.c

@@ -1,88 +0,0 @@
-//
-// Created by Lea Anthony on 6/1/21.
-//
-
-#include "common.h"
-
-// Credit: https://stackoverflow.com/a/8465083
-char* concat(const char *string1, const char *string2)
-{
-    const size_t len1 = strlen(string1);
-    const size_t len2 = strlen(string2);
-    char *result = malloc(len1 + len2 + 1);
-    strcpy(result, string1);
-    memcpy(result + len1, string2, len2 + 1);
-    return result;
-}
-
-// 10k is more than enough for a log message
-#define MAXMESSAGE 1024*10
-char abortbuffer[MAXMESSAGE];
-
-void ABORT(const char *message, ...) {
-    const char *temp = concat("FATAL: ", message);
-    va_list args;
-    va_start(args, message);
-    vsnprintf(abortbuffer, MAXMESSAGE, temp, args);
-    printf("%s\n", &abortbuffer[0]);
-    MEMFREE(temp);
-    va_end(args);
-    exit(1);
-}
-
-int freeHashmapItem(void *const context, struct hashmap_element_s *const e) {
-    free(e->data);
-    return -1;
-}
-
-const char* getJSONString(JsonNode *item, const char* key) {
-    // Get key
-    JsonNode *node = json_find_member(item, key);
-    const char *result = "";
-    if ( node != NULL && node->tag == JSON_STRING) {
-        result = node->string_;
-    }
-    return result;
-}
-
-void ABORT_JSON(JsonNode *node, const char* key) {
-    ABORT("Unable to read required key '%s' from JSON: %s\n", key, json_encode(node));
-}
-
-const char* mustJSONString(JsonNode *node, const char* key) {
-    const char* result = getJSONString(node, key);
-    if ( result == NULL ) {
-        ABORT_JSON(node, key);
-    }
-    return result;
-}
-JsonNode* mustJSONObject(JsonNode *node, const char* key) {
-    struct JsonNode* result = getJSONObject(node, key);
-    if ( result == NULL ) {
-        ABORT_JSON(node, key);
-    }
-    return result;
-}
-
-JsonNode* getJSONObject(JsonNode* node, const char* key) {
-    return json_find_member(node, key);
-}
-
-bool getJSONBool(JsonNode *item, const char* key, bool *result) {
-    JsonNode *node = json_find_member(item, key);
-    if ( node != NULL && node->tag == JSON_BOOL) {
-        *result = node->bool_;
-        return true;
-    }
-    return false;
-}
-
-bool getJSONInt(JsonNode *item, const char* key, int *result) {
-    JsonNode *node = json_find_member(item, key);
-    if ( node != NULL && node->tag == JSON_NUMBER) {
-        *result = (int) node->number_;
-        return true;
-    }
-    return false;
-}
-

v2/internal/ffenestri/common.h

@@ -1,38 +0,0 @@
-//
-// Created by Lea Anthony on 6/1/21.
-//
-
-#ifndef COMMON_H
-#define COMMON_H
-
-#define OBJC_OLD_DISPATCH_PROTOTYPES 1
-#include <objc/objc-runtime.h>
-#include <CoreGraphics/CoreGraphics.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-#include "string.h"
-#include "hashmap.h"
-#include "vec.h"
-#include "json.h"
-
-#define STREQ(a,b) strcmp(a, b) == 0
-#define STREMPTY(string) strlen(string) == 0
-#define STRCOPY(a) concat(a, "")
-#define STR_HAS_CHARS(input) input != NULL && strlen(input) > 0
-#define MEMFREE(input) free((void*)input); input = NULL;
-#define FREE_AND_SET(variable, value) if( variable != NULL ) { MEMFREE(variable); } variable = value
-
-// Credit: https://stackoverflow.com/a/8465083
-char* concat(const char *string1, const char *string2);
-void ABORT(const char *message, ...);
-int freeHashmapItem(void *const context, struct hashmap_element_s *const e);
-const char* getJSONString(JsonNode *item, const char* key);
-const char* mustJSONString(JsonNode *node, const char* key);
-JsonNode* getJSONObject(JsonNode* node, const char* key);
-JsonNode* mustJSONObject(JsonNode *node, const char* key);
-
-bool getJSONBool(JsonNode *item, const char* key, bool *result);
-bool getJSONInt(JsonNode *item, const char* key, int *result);
-
-#endif //ASSETS_C_COMMON_H

v2/internal/ffenestri/contextmenus_darwin.c

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

v2/internal/ffenestri/contextmenus_darwin.h

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

v2/internal/ffenestri/contextmenustore_darwin.c

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

v2/internal/ffenestri/contextmenustore_darwin.h

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

v2/internal/ffenestri/ffenestri.go

@@ -1,185 +0,0 @@
-package ffenestri
-
-import (
-	"github.com/wailsapp/wails/v2/internal/menumanager"
-	"runtime"
-	"strings"
-	"unsafe"
-
-	"github.com/wailsapp/wails/v2/internal/logger"
-	"github.com/wailsapp/wails/v2/internal/messagedispatcher"
-	"github.com/wailsapp/wails/v2/pkg/options"
-)
-
-/*
-
-#cgo linux CFLAGS: -DFFENESTRI_LINUX=1
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
-
-#cgo darwin CFLAGS: -DFFENESTRI_DARWIN=1
-#cgo darwin LDFLAGS: -framework WebKit -lobjc
-
-#include <stdlib.h>
-#include "ffenestri.h"
-
-
-*/
-import "C"
-
-// Application is our main application object
-type Application struct {
-	config *options.App
-	memory []unsafe.Pointer
-
-	// This is the main app pointer
-	app *C.struct_Application
-
-	// Manages menus
-	menuManager *menumanager.Manager
-
-	// Logger
-	logger logger.CustomLogger
-}
-
-func (a *Application) saveMemoryReference(mem unsafe.Pointer) {
-	a.memory = append(a.memory, mem)
-}
-
-func (a *Application) string2CString(str string) *C.char {
-	result := C.CString(str)
-	a.saveMemoryReference(unsafe.Pointer(result))
-	return result
-}
-
-func init() {
-	runtime.LockOSThread()
-}
-
-// NewApplicationWithConfig creates a new application based on the given config
-func NewApplicationWithConfig(config *options.App, logger *logger.Logger, menuManager *menumanager.Manager) *Application {
-	return &Application{
-		config:      config,
-		logger:      logger.CustomLogger("Ffenestri"),
-		menuManager: menuManager,
-	}
-}
-
-// 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)
-		C.free(mem)
-	}
-}
-
-// bool2Cint converts a Go boolean to a C integer
-func (a *Application) bool2Cint(value bool) C.int {
-	if value {
-		return C.int(1)
-	}
-	return C.int(0)
-}
-
-// dispatcher is the interface to send messages to
-var dispatcher *messagedispatcher.DispatchClient
-
-// Dispatcher is what we register out client with
-type Dispatcher interface {
-	RegisterClient(client messagedispatcher.Client) *messagedispatcher.DispatchClient
-}
-
-// DispatchClient is the means for passing messages to the backend
-type DispatchClient interface {
-	SendMessage(string)
-}
-
-func intToColour(colour int) (C.int, C.int, C.int, C.int) {
-	var alpha = C.int(colour & 0xFF)
-	var blue = C.int((colour >> 8) & 0xFF)
-	var green = C.int((colour >> 16) & 0xFF)
-	var red = C.int((colour >> 24) & 0xFF)
-	return red, green, blue, alpha
-}
-
-// Run the application
-func (a *Application) Run(incomingDispatcher Dispatcher, bindings string, debug bool) error {
-	title := a.string2CString(a.config.Title)
-	width := C.int(a.config.Width)
-	height := C.int(a.config.Height)
-	resizable := a.bool2Cint(!a.config.DisableResize)
-	devtools := a.bool2Cint(a.config.DevTools)
-	fullscreen := a.bool2Cint(a.config.Fullscreen)
-	startHidden := a.bool2Cint(a.config.StartHidden)
-	logLevel := C.int(a.config.LogLevel)
-	app := C.NewApplication(title, width, height, resizable, devtools, fullscreen, startHidden, logLevel)
-
-	// Save app reference
-	a.app = (*C.struct_Application)(app)
-
-	// Set Min Window Size
-	minWidth := C.int(a.config.MinWidth)
-	minHeight := C.int(a.config.MinHeight)
-	C.SetMinWindowSize(a.app, minWidth, minHeight)
-
-	// Set Max Window Size
-	maxWidth := C.int(a.config.MaxWidth)
-	maxHeight := C.int(a.config.MaxHeight)
-	C.SetMaxWindowSize(a.app, maxWidth, maxHeight)
-
-	// Set debug if needed
-	C.SetDebug(app, a.bool2Cint(debug))
-
-	// TODO: Move frameless to Linux options
-	// if a.config.Frameless {
-	// 	C.DisableFrame(a.app)
-	// }
-
-	if a.config.RGBA != 0 {
-		r, g, b, alpha := intToColour(a.config.RGBA)
-		C.SetColour(a.app, r, g, b, alpha)
-	}
-
-	// Escape bindings so C doesn't freak out
-	bindings = strings.ReplaceAll(bindings, `"`, `\"`)
-
-	// Set bindings
-	C.SetBindings(app, a.string2CString(bindings))
-
-	// save the dispatcher in a package variable so that the C callbacks
-	// can access it
-	dispatcher = incomingDispatcher.RegisterClient(newClient(a))
-
-	// Process platform settings
-	err := a.processPlatformSettings()
-	if err != nil {
-		return err
-	}
-
-	// Check we could initialise the application
-	if app != nil {
-		// Yes - Save memory reference and run app, cleaning up afterwards
-		a.saveMemoryReference(unsafe.Pointer(app))
-		C.Run(app, 0, nil)
-	} else {
-		// Oh no! We couldn't initialise the application
-		a.logger.Fatal("Cannot initialise Application.")
-	}
-
-	a.freeMemory()
-	return nil
-}
-
-// messageFromWindowCallback is called by any messages sent in
-// webkit to window.external.invoke. It relays the message on to
-// the dispatcher.
-//export messageFromWindowCallback
-func messageFromWindowCallback(data *C.char) {
-	dispatcher.DispatchMessage(C.GoString(data))
-}

v2/internal/ffenestri/ffenestri.h

@@ -1,43 +0,0 @@
-#ifndef __FFENESTRI_H__
-#define __FFENESTRI_H__
-
-#include <stdio.h>
-struct Application;
-
-extern struct Application *NewApplication(const char *title, int width, int height, int resizable, int devtools, int fullscreen, int startHidden, int logLevel);
-extern void SetMinWindowSize(struct Application*, int minWidth, int minHeight);
-extern void SetMaxWindowSize(struct Application*, int maxWidth, int maxHeight);
-extern void Run(struct Application*, int argc, char **argv);
-extern void DestroyApplication(struct Application*);
-extern void SetDebug(struct Application*, int flag);
-extern void SetBindings(struct Application*, const char *bindings);
-extern void ExecJS(struct Application*, const char *script);
-extern void Hide(struct Application*);
-extern void Show(struct Application*);
-extern void Center(struct Application*);
-extern void Maximise(struct Application*);
-extern void Unmaximise(struct Application*);
-extern void ToggleMaximise(struct Application*);
-extern void Minimise(struct Application*);
-extern void Unminimise(struct Application*);
-extern void ToggleMinimise(struct Application*);
-extern void SetColour(struct Application*, int red, int green, int blue, int alpha);
-extern void SetSize(struct Application*, int width, int height);
-extern void SetPosition(struct Application*, int x, int y);
-extern void Quit(struct Application*);
-extern void SetTitle(struct Application*, const char *title);
-extern void Fullscreen(struct Application*);
-extern void UnFullscreen(struct Application*);
-extern void ToggleFullscreen(struct Application*);
-extern void DisableFrame(struct Application*);
-extern void OpenDialog(struct Application*, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int allowFiles, int allowDirs, int allowMultiple, int showHiddenFiles, int canCreateDirectories, int resolvesAliases, int treatPackagesAsDirectories);
-extern void SaveDialog(struct Application*, char *callbackID, char *title, char *filters, char *defaultFilename, char *defaultDir, int showHiddenFiles, int canCreateDirectories, int treatPackagesAsDirectories);
-extern void MessageDialog(struct Application*, char *callbackID, char *type, char *title, char *message, char *icon, char *button1, char *button2, char *button3, char *button4, char *defaultButton, char *cancelButton);
-extern void DarkModeEnabled(struct Application*, char *callbackID);
-extern void SetApplicationMenu(struct Application*, const char *);
-extern void AddTrayMenu(struct Application*, const char *menuTrayJSON);
-extern void UpdateTrayMenu(struct Application*, const char *menuTrayJSON);
-extern void AddContextMenu(struct Application*, char *contextMenuJSON);
-extern void UpdateContextMenu(struct Application*, char *contextMenuJSON);
-
-#endif

v2/internal/ffenestri/ffenestri_client.go

@@ -1,197 +0,0 @@
-package ffenestri
-
-/*
-
-#cgo linux CFLAGS: -DFFENESTRI_LINUX=1
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
-
-#include <stdlib.h>
-#include "ffenestri.h"
-
-*/
-import "C"
-
-import (
-	"strconv"
-
-	"github.com/wailsapp/wails/v2/internal/logger"
-	"github.com/wailsapp/wails/v2/pkg/options"
-)
-
-// Client is our implentation of messageDispatcher.Client
-type Client struct {
-	app    *Application
-	logger logger.CustomLogger
-}
-
-func newClient(app *Application) *Client {
-	return &Client{
-		app:    app,
-		logger: app.logger,
-	}
-}
-
-// Quit the application
-func (c *Client) Quit() {
-	c.app.logger.Trace("Got shutdown message")
-	C.Quit(c.app.app)
-}
-
-// NotifyEvent will pass on the event message to the frontend
-func (c *Client) NotifyEvent(message string) {
-	eventMessage := `window.wails._.Notify(` + strconv.Quote(message) + `);`
-	c.app.logger.Trace("eventMessage = %+v", eventMessage)
-	C.ExecJS(c.app.app, c.app.string2CString(eventMessage))
-}
-
-// CallResult contains the result of the call from JS
-func (c *Client) CallResult(message string) {
-	callbackMessage := `window.wails._.Callback(` + strconv.Quote(message) + `);`
-	c.app.logger.Trace("callbackMessage = %+v", callbackMessage)
-	C.ExecJS(c.app.app, c.app.string2CString(callbackMessage))
-}
-
-// WindowSetTitle sets the window title to the given string
-func (c *Client) WindowSetTitle(title string) {
-	C.SetTitle(c.app.app, c.app.string2CString(title))
-}
-
-// WindowFullscreen will set the window to be fullscreen
-func (c *Client) WindowFullscreen() {
-	C.Fullscreen(c.app.app)
-}
-
-// WindowUnFullscreen will unfullscreen the window
-func (c *Client) WindowUnFullscreen() {
-	C.UnFullscreen(c.app.app)
-}
-
-// WindowShow will show the window
-func (c *Client) WindowShow() {
-	C.Show(c.app.app)
-}
-
-// WindowHide will hide the window
-func (c *Client) WindowHide() {
-	C.Hide(c.app.app)
-}
-
-// WindowCenter will hide the window
-func (c *Client) WindowCenter() {
-	C.Center(c.app.app)
-}
-
-// WindowMaximise will maximise the window
-func (c *Client) WindowMaximise() {
-	C.Maximise(c.app.app)
-}
-
-// WindowMinimise will minimise the window
-func (c *Client) WindowMinimise() {
-	C.Minimise(c.app.app)
-}
-
-// WindowUnmaximise will unmaximise the window
-func (c *Client) WindowUnmaximise() {
-	C.Unmaximise(c.app.app)
-}
-
-// WindowUnminimise will unminimise the window
-func (c *Client) WindowUnminimise() {
-	C.Unminimise(c.app.app)
-}
-
-// WindowPosition will position the window to x,y on the
-// monitor that the window is mostly on
-func (c *Client) WindowPosition(x int, y int) {
-	C.SetPosition(c.app.app, C.int(x), C.int(y))
-}
-
-// WindowSize will resize the window to the given
-// width and height
-func (c *Client) WindowSize(width int, height int) {
-	C.SetSize(c.app.app, C.int(width), C.int(height))
-}
-
-// WindowSetColour sets the window colour
-func (c *Client) WindowSetColour(colour int) {
-	r, g, b, a := intToColour(colour)
-	C.SetColour(c.app.app, r, g, b, a)
-}
-
-// OpenDialog will open a dialog with the given title and filter
-func (c *Client) OpenDialog(dialogOptions *options.OpenDialog, callbackID string) {
-	C.OpenDialog(c.app.app,
-		c.app.string2CString(callbackID),
-		c.app.string2CString(dialogOptions.Title),
-		c.app.string2CString(dialogOptions.Filters),
-		c.app.string2CString(dialogOptions.DefaultFilename),
-		c.app.string2CString(dialogOptions.DefaultDirectory),
-		c.app.bool2Cint(dialogOptions.AllowFiles),
-		c.app.bool2Cint(dialogOptions.AllowDirectories),
-		c.app.bool2Cint(dialogOptions.AllowMultiple),
-		c.app.bool2Cint(dialogOptions.ShowHiddenFiles),
-		c.app.bool2Cint(dialogOptions.CanCreateDirectories),
-		c.app.bool2Cint(dialogOptions.ResolvesAliases),
-		c.app.bool2Cint(dialogOptions.TreatPackagesAsDirectories),
-	)
-}
-
-// SaveDialog will open a dialog with the given title and filter
-func (c *Client) SaveDialog(dialogOptions *options.SaveDialog, callbackID string) {
-	C.SaveDialog(c.app.app,
-		c.app.string2CString(callbackID),
-		c.app.string2CString(dialogOptions.Title),
-		c.app.string2CString(dialogOptions.Filters),
-		c.app.string2CString(dialogOptions.DefaultFilename),
-		c.app.string2CString(dialogOptions.DefaultDirectory),
-		c.app.bool2Cint(dialogOptions.ShowHiddenFiles),
-		c.app.bool2Cint(dialogOptions.CanCreateDirectories),
-		c.app.bool2Cint(dialogOptions.TreatPackagesAsDirectories),
-	)
-}
-
-// MessageDialog will open a message dialog with the given options
-func (c *Client) MessageDialog(dialogOptions *options.MessageDialog, callbackID string) {
-
-	// Sanity check button length
-	if len(dialogOptions.Buttons) > 4 {
-		c.app.logger.Error("Given %d message dialog buttons. Maximum is 4", len(dialogOptions.Buttons))
-		return
-	}
-
-	// Process buttons
-	buttons := []string{"", "", "", ""}
-	for i, button := range dialogOptions.Buttons {
-		buttons[i] = button
-	}
-
-	C.MessageDialog(c.app.app,
-		c.app.string2CString(callbackID),
-		c.app.string2CString(string(dialogOptions.Type)),
-		c.app.string2CString(dialogOptions.Title),
-		c.app.string2CString(dialogOptions.Message),
-		c.app.string2CString(dialogOptions.Icon),
-		c.app.string2CString(buttons[0]),
-		c.app.string2CString(buttons[1]),
-		c.app.string2CString(buttons[2]),
-		c.app.string2CString(buttons[3]),
-		c.app.string2CString(dialogOptions.DefaultButton),
-		c.app.string2CString(dialogOptions.CancelButton))
-}
-
-func (c *Client) DarkModeEnabled(callbackID string) {
-	C.DarkModeEnabled(c.app.app, c.app.string2CString(callbackID))
-}
-
-func (c *Client) SetApplicationMenu(applicationMenuJSON string) {
-	C.SetApplicationMenu(c.app.app, c.app.string2CString(applicationMenuJSON))
-}
-
-func (c *Client) UpdateTrayMenu(trayMenuJSON string) {
-	C.UpdateTrayMenu(c.app.app, c.app.string2CString(trayMenuJSON))
-}
-
-func (c *Client) UpdateContextMenu(contextMenuJSON string) {
-	C.UpdateContextMenu(c.app.app, c.app.string2CString(contextMenuJSON))
-}

v2/internal/ffenestri/ffenestri_darwin.go

@@ -1,91 +0,0 @@
-package ffenestri
-
-/*
-#cgo darwin CFLAGS: -DFFENESTRI_DARWIN=1
-#cgo darwin LDFLAGS: -framework WebKit -lobjc
-
-#include "ffenestri.h"
-#include "ffenestri_darwin.h"
-
-*/
-import "C"
-
-func (a *Application) processPlatformSettings() error {
-
-	mac := a.config.Mac
-	titlebar := mac.TitleBar
-
-	// HideTitle
-	if titlebar.HideTitle {
-		C.HideTitle(a.app)
-	}
-
-	// HideTitleBar
-	if titlebar.HideTitleBar {
-		C.HideTitleBar(a.app)
-	}
-
-	// Full Size Content
-	if titlebar.FullSizeContent {
-		C.FullSizeContent(a.app)
-	}
-
-	// Toolbar
-	if titlebar.UseToolbar {
-		C.UseToolbar(a.app)
-	}
-
-	if titlebar.HideToolbarSeparator {
-		C.HideToolbarSeparator(a.app)
-	}
-
-	if titlebar.TitlebarAppearsTransparent {
-		C.TitlebarAppearsTransparent(a.app)
-	}
-
-	// Process window Appearance
-	if mac.Appearance != "" {
-		C.SetAppearance(a.app, a.string2CString(string(mac.Appearance)))
-	}
-
-	// Check if the webview should be transparent
-	if mac.WebviewIsTransparent {
-		C.WebviewIsTransparent(a.app)
-	}
-
-	// Check if window should be translucent
-	if mac.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))
-		}
-	}
-
-	return nil
-}