Merge pull request #807 from Baiyuetribe/v2-alpha

Add commonly used shortcut keys

.github/FUNDING.yml

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

@@ -1,8 +1,10 @@
 name: latest pre-release
 on:
   push:
+    branches:
+      - develop
     tags:
-    - '**-pre**'
+      - '**-pre**'
 jobs:
 
   build:
@@ -13,10 +15,10 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
 
-    - name: Set up Go 1.16
+    - name: Set up Go 1.13
       uses: actions/setup-go@v1
       with:
-        go-version: 1.16
+        go-version: 1.13
       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.16
+    - name: Set up Go 1.13
       uses: actions/setup-go@v1
       with:
-        go-version: 1.16
+        go-version: 1.13
       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.16
+    - name: Set up Go 1.13
       uses: actions/setup-go@v1
       with:
-        go-version: 1.16
+        go-version: 1.13
       id: go
 
     - name: Check out code into the Go module directory

.github/workflows/runtime.yml

@@ -0,0 +1,29 @@
+name: Runtime
+on:
+  push:
+    branches:
+      - v2-alpha
+    paths:
+      - 'v2/internal/frontend/runtime/**'
+jobs:
+  rebuild-runtime:
+    name: Rebuild the runtime
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14.17.6
+          cache: 'npm'
+          cache-dependency-path: v2/internal/frontend/runtime/package-lock.json
+      - run: npm install
+        working-directory: v2/internal/frontend/runtime
+      - run: npm run build
+        working-directory: v2/internal/frontend/runtime
+
+      - name: Commit changes
+        uses: devops-infra/action-commit-push@master
+        with:
+          github_token: "${{ secrets.GITHUB_TOKEN }}"
+          commit_prefix: "[AUTO]"
+          commit_message: "The runtime was rebuilt"

.gitignore

@@ -17,8 +17,17 @@ 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
+/v2/internal/ffenestri/windows/test/cmake-build-debug/
+!v2/internal/ffenestri/windows/x64/webview2.dll
+!v2/internal/ffenestri/windows/x64/WebView2Loader.dll
+.idea/

.vscode/settings.json

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

CONTRIBUTORS.md

@@ -41,8 +41,4 @@ Wails is what it is because of the time and effort given by these great people.
   * [Charaf Rezrazi](https://github.com/Rezrazi)
   * [misitebao](https://github.com/misitebao)
   * [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)
-  
+  * [Amaury Tobias Quiroz](https://github.com/amaury-tobias)

README.md

@@ -2,7 +2,7 @@
    <img src="logo_cropped.png" width="40%"><br/>
 </p>
 <p align="center">
-   Build desktop applications using Go & Web Technologies.<br/><br/>
+   A framework for building 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 for the backend
+- Use standard Go libraries/frameworks 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,21 +30,6 @@ 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 / companies:
-
-<a href="https://www.jetbrains.com?from=Wails" style="width:100px"><img src="jetbrains-grayscale.png" width="100"/></a>
-<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
 
@@ -129,59 +114,17 @@ It is recommended at this stage to read the comprehensive documentation at [http
 
    When I saw WebView, I thought "What I really want is tooling around building a WebView app, a bit like Rails is to Ruby". So initially it was a play on words (Webview on Rails). It just so happened to also be a homophone of the English name for the [Country](https://en.wikipedia.org/wiki/Wales) I am from. So it stuck.
 
-## Contributors
-
-<a href="https://github.com/qaisjp"><img src="https://github.com/qaisjp.png?size=40" width="40"/></a>
-<a href="https://github.com/alee792"><img src="https://github.com/alee792.png?size=40" width="40"/></a>
-<a href="https://github.com/lanzafame"><img src="https://github.com/lanzafame.png?size=40" width="40"/></a>
-<a href="https://github.com/mattn"><img src="https://github.com/mattn.png?size=40" width="40"/></a>
-<a href="https://github.com/0xflotus"><img src="https://github.com/0xflotus.png?size=40" width="40"/></a>
-<a href="https://github.com/mdhender"><img src="https://github.com/mdhender.png?size=40" width="40"/></a>
-<a href="https://github.com/fishfishfish2104"><img src="https://github.com/fishfishfish2104.png?size=40" width="40"/></a>
-<a href="https://github.com/intelwalk"><img src="https://github.com/intelwalk.png?size=40" width="40"/></a>
-<a href="https://github.com/ocelotsloth"><img src="https://github.com/ocelotsloth.png?size=40" width="40"/></a>
-<a href="https://github.com/bh90210"><img src="https://github.com/bh90210.png?size=40" width="40"/></a>
-<a href="https://github.com/iceleo-com"><img src="https://github.com/iceleo-com.png?size=40" width="40"/></a>
-<a href="https://github.com/fallendusk"><img src="https://github.com/fallendusk.png?size=40" width="40"/></a>
-<a href="https://github.com/Chronophylos"><img src="https://github.com/Chronophylos.png?size=40" width="40"/></a>
-<a href="https://github.com/Vaelatern"><img src="https://github.com/Vaelatern.png?size=40" width="40"/></a>
-<a href="https://github.com/mewmew"><img src="https://github.com/mewmew.png?size=40" width="40"/></a>
-<a href="https://github.com/kraney"><img src="https://github.com/kraney.png?size=40" width="40"/></a>
-<a href="https://github.com/JackMordaunt"><img src="https://github.com/JackMordaunt.png?size=40" width="40"/></a>
-<a href="https://github.com/MichaelHipp"><img src="https://github.com/MichaelHipp.png?size=40" width="40"/></a>
-<a href="https://github.com/tmclane"><img src="https://github.com/tmclane.png?size=40" width="40"/></a>
-<a href="https://github.com/Rested"><img src="https://github.com/Rested.png?size=40" width="40"/></a>
-<a href="https://github.com/Jarek-SRT"><img src="https://github.com/Jarek-SRT.png?size=40" width="40"/></a>
-<a href="https://github.com/konez2k"><img src="https://github.com/konez2k.png?size=40" width="40"/></a>
-<a href="https://github.com/sayuthisobri"><img src="https://github.com/sayuthisobri.png?size=40" width="40"/></a>
-<a href="https://github.com/dedo1911"><img src="https://github.com/dedo1911.png?size=40" width="40"/></a>
-<a href="https://github.com/fdidron"><img src="https://github.com/fdidron.png?size=40" width="40"/></a>
-<a href="https://github.com/Splode"><img src="https://github.com/Splode.png?size=40" width="40"/></a>
-<a href="https://github.com/Lyimmi"><img src="https://github.com/Lyimmi.png?size=40" width="40"/></a>
-<a href="https://github.com/Unix4ever"><img src="https://github.com/Unix4ever.png?size=40" width="40"/></a>
-<a href="https://github.com/timkippdev"><img src="https://github.com/timkippdev.png?size=40" width="40"/></a>
-<a href="https://github.com/kyoto44"><img src="https://github.com/kyoto44.png?size=40" width="40"/></a>
-<a href="https://github.com/artooro"><img src="https://github.com/artooro.png?size=40" width="40"/></a>
-<a href="https://github.com/ilgityildirim"><img src="https://github.com/ilgityildirim.png?size=40" width="40"/></a>
-<a href="https://github.com/gelleson"><img src="https://github.com/gelleson.png?size=40" width="40"/></a>
-<a href="https://github.com/kmuchmore"><img src="https://github.com/kmuchmore.png?size=40" width="40"/></a>
-<a href="https://github.com/aayush420"><img src="https://github.com/aayush420.png?size=40" width="40"/></a>
-<a href="https://github.com/Rezrazi"><img src="https://github.com/Rezrazi.png?size=40" width="40"/></a>
-<a href="https://github.com/misitebao"><img src="https://github.com/misitebao.png?size=40" width="40"/></a>
-<a href="https://github.com/DrunkenPoney"><img src="https://github.com/DrunkenPoney.png?size=40" width="40"/></a>
-<a href="https://github.com/SophieAu"><img src="https://github.com/SophieAu.png?size=40" width="40"/></a>
-<a href="https://github.com/alexmat"><img src="https://github.com/alexmat.png?size=40" width="40"/></a>
-<a href="https://github.com/RH12503"><img src="https://github.com/RH12503.png?size=40" width="40"/></a>
-<a href="https://github.com/hi019"><img src="https://github.com/hi019.png?size=40" width="40"/></a></a>
-<a href="https://github.com/Igogrek"><img src="https://github.com/Igogrek.png?size=40" width="40"/></a></a>
-
-
-## Special Mentions
+## Shoulders of Giants
 
 Without the following people, this project would never have existed:
 
   * [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot) - His support and feedback has been immense. More patience than you can throw a stick at (Not long now Dustin!).
   * [Serge Zaitsev](https://github.com/zserge) - Creator of [Webview](https://github.com/zserge/webview) which Wails uses for the windowing.
+
+And without [these people](CONTRIBUTORS.md), it wouldn't be what it is today. A huge thank you to each and every one of you!
+
+Special Mentions:
+
   * [Byron](https://github.com/bh90210) - At times, Byron has single handedly kept this project alive. Without his incredible input, we never would have got to v1.
 
 This project was mainly coded to the following albums:
@@ -207,8 +150,7 @@ This project was mainly coded to the following albums:
 ## Special Thanks
 
 <p align="center" style="text-align: center">
-   <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/>
+   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/>
    If you are looking for a Project Management tool that's powerful but quick and easy to use, check them out!<br/><br/>
 </p>
 

app_other.go

@@ -1,3 +1,4 @@
+//go:build linux || darwin || !windows
 // +build linux darwin !windows
 
 package wails

app_windows.go

@@ -1,3 +1,4 @@
+//go:build windows || !linux || !darwin
 // +build windows !linux !darwin
 
 package wails

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/releases")
+	resp, err := http.Get("https://api.github.com/repos/wailsapp/wails/tags")
 	if err != nil {
 		return result, err
 	}

cmd/helpers.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"os/user"
@@ -11,12 +12,13 @@ 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.16.2"
+const xgoVersion = "1.0.1"
 
 var fs = NewFSHelper()
 
@@ -59,6 +61,30 @@ 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 {
@@ -101,10 +127,7 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt
 	// Check build directory
 	buildDirectory := filepath.Join(fs.Cwd(), "build")
 	if !fs.DirExists(buildDirectory) {
-		err := fs.MkDir(buildDirectory)
-		if err != nil {
-			return err
-		}
+		fs.MkDir(buildDirectory)
 	}
 
 	buildCommand := slicer.String()
@@ -175,6 +198,11 @@ 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
 	}
@@ -247,6 +275,12 @@ 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
@@ -262,6 +296,20 @@ 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 {
@@ -326,6 +374,30 @@ 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!
@@ -421,18 +493,11 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 		}
 
 		// Update md5sum file
-		err := os.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
-		if err != nil {
-			return err
-		}
+		ioutil.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
 	}
 
 	// Install the runtime
-	if caller == "build" {
-		err = InstallProdRuntime(projectDir, projectOptions)
-	} else {
-		err = InstallBridge(projectDir, projectOptions)
-	}
+	err = InstallRuntime(caller, projectDir, projectOptions)
 	if err != nil {
 		return err
 	}
@@ -445,17 +510,28 @@ 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, wailsruntime.BridgeJS)
+	err := fs.CreateFile(bridgeFileTarget, []byte(bridgeFileData))
 	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, wailsruntime.InitJS)
+	err := fs.CreateFile(bridgeFileTarget, []byte(prodInit))
 	return err
 }
 
@@ -519,9 +595,3 @@ 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,10 +67,6 @@ const (
 	Ctlos
 	// EndeavourOS linux distribution
 	EndeavourOS
-	// Crux linux distribution
-	Crux
-	// RHEL distribution
-	RHEL
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -133,8 +129,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = Fedora
 	case "centos":
 		result.Distribution = CentOS
-	case "rhel":
-		result.Distribution = RHEL
 	case "arch":
 		result.Distribution = Arch
 	case "archlabs":
@@ -181,8 +175,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = Solus
 	case "endeavouros":
 		result.Distribution = EndeavourOS
-	case "crux":
-		result.Distribution = Crux
 	default:
 		result.Distribution = Unknown
 	}
@@ -263,17 +255,6 @@ 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

@@ -138,25 +138,6 @@ distributions:
             help: Please install with `sudo yum install gtk3-devel` and try again
           - name: webkitgtk3-devel
             help: Please install with `sudo yum install webkitgtk3-devel` and try again
-  rhel:
-    id: rhel
-    releases:
-      default:
-        version: default
-        name: Red Hat Enterprise Linux
-        gccversioncommand: *gccdumpversion
-        programs:
-          - name: gcc
-            help: Please install with `sudo yum install gcc-c++ make` and try again
-          - name: pkg-config
-            help: Please install with `sudo yum install pkgconf-pkg-config` and try again
-          - name: npm
-            help: Please install with `sudo yum install epel-release && sudo yum install nodejs` and try again
-        libraries:
-          - name: gtk3-devel
-            help: Please install with `sudo yum install gtk3-devel` and try again
-          - name: webkitgtk3-devel
-            help: Please install with `sudo yum install webkitgtk3-devel` and try again
   fedora:
     id: fedora
     releases:
@@ -326,22 +307,3 @@ 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/package.go

@@ -354,7 +354,7 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 			"docker", "run", "--rm",
 			"-v", outputDir + ":/build",
 			"--entrypoint", "/bin/sh",
-			"wailsapp/xgo:1.16.2",
+			"wailsapp/xgo:latest",
 			"-c", "/usr/bin/x86_64-w64-mingw32-windres -o /build/" + basename + "-res.syso /build/" + basename + ".rc",
 		}
 		if err := NewProgramHelper().RunCommandArray(args); err != nil {

cmd/system.go

@@ -99,16 +99,11 @@ 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")
 	}
@@ -185,7 +180,7 @@ func (s *SystemHelper) Initialise() error {
 	return s.setup()
 }
 
-// SystemConfig - Defines system wide configuration data
+// SystemConfig - Defines system wode configuration data
 type SystemConfig struct {
 	Name  string `json:"name"`
 	Email string `json:"email"`
@@ -283,7 +278,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 			libraryChecker = DpkgInstalled
 		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS:
 			libraryChecker = PacmanInstalled
-		case CentOS, Fedora, Tumbleweed, Leap, RHEL:
+		case CentOS, Fedora, Tumbleweed, Leap:
 			libraryChecker = RpmInstalled
 		case Gentoo:
 			libraryChecker = EqueryInstalled
@@ -291,8 +286,6 @@ 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",
-    "serve": "npx ng serve --poll=2000 --host=0.0.0.0",
+    "start": "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 (
-    _ "embed"
+	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails"
 )
 
@@ -9,14 +9,11 @@ func basic() string {
 	return "World!"
 }
 
-//go:embed frontend/dist/my-app/main.js
-var js string
-
-//go:embed frontend/dist/my-app/styles.css
-var css string
-
 func main() {
 
+	js := mewn.String("./frontend/dist/my-app/main.js")
+	css := mewn.String("./frontend/dist/my-app/styles.css")
+
 	app := wails.CreateApp(&wails.AppConfig{
 		Width:  1024,
 		Height: 768,

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": "npm run serve",
+  "serve": "npx ng serve --poll=2000",
   "bridge": "src",
   "wailsdir": ""
 }

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

@@ -12,7 +12,7 @@
     "@wailsapp/runtime": "^1.0.10"
   },
   "scripts": {
-    "serve": "react-scripts start",
+    "start": "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 (
-  _ "embed"
+  "github.com/leaanthony/mewn"
   "github.com/wailsapp/wails"
 )
 
@@ -9,14 +9,11 @@ func basic() string {
   return "World!"
 }
 
-//go:embed frontend/build/static/js/main.js
-var js string
-
-//go:embed frontend/build/static/css/main.css
-var css string
-
 func main() {
 
+  js := mewn.String("./frontend/build/static/js/main.js")
+  css := mewn.String("./frontend/build/static/css/main.css")
+
   app := wails.CreateApp(&wails.AppConfig{
     Width:  1024,
     Height: 768,

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 serve",
+  "serve": "npm run start",
   "bridge": "src",
   "wailsdir": ""
 }

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

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

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

@@ -80,6 +80,7 @@ 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 (
-    _ "embed"
+	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails"
 )
 
@@ -9,13 +9,9 @@ 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 serve",
+  "serve": "npm run dev",
   "bridge": "src",
   "wailsdir": ""
 }

cmd/templates/vanilla/main.go.template

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

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

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

cmd/templates/vuebasic/main.go.template

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

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

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

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

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

cmd/version.go

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

cmd/wails/0_setup.go

@@ -39,6 +39,12 @@ 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/10.1_dev_newtemplate.go

@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package main

cmd/wails/10_dev.go

@@ -1,3 +1,4 @@
+//go:build dev
 // +build dev
 
 package main

cmd/wails/4_build.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"log"
 	"os"
 	"runtime"
 	"strings"
@@ -53,10 +52,7 @@ func init() {
 
 	var b strings.Builder
 	for _, plat := range getSupportedPlatforms() {
-		_, err := fmt.Fprintf(&b, " - %s\n", plat)
-		if err != nil {
-			log.Fatal(err)
-		}
+		fmt.Fprintf(&b, " - %s\n", plat)
 	}
 	initCmd.StringFlag("x",
 		fmt.Sprintf("Cross-compile application to specified platform via xgo\n%s", b.String()),
@@ -84,7 +80,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
@@ -147,6 +143,12 @@ 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,13 +27,19 @@ 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
 		}

cmd/windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package cmd

config.go

@@ -31,18 +31,6 @@ 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
 }
@@ -77,26 +65,6 @@ 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
@@ -147,23 +115,6 @@ 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
 
@@ -176,10 +127,6 @@ 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,6 +9,7 @@ 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
@@ -21,10 +22,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-20200323222414-85ca7c5b95cd
+	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c
 	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.16
+go 1.13

go.sum

@@ -26,6 +26,8 @@ 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=
@@ -64,6 +66,7 @@ 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=
@@ -76,8 +79,9 @@ golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/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-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/binding/manager.go

@@ -115,15 +115,15 @@ func (b *Manager) generateTypescriptDefinitions() error {
 
 	for structname, methodList := range b.structList {
 		structname = strings.SplitN(structname, ".", 2)[1]
-		output.WriteString(fmt.Sprintf("interface %s {\n", structname))
+		output.WriteString(fmt.Sprintf("Interface %s {\n", structname))
 		for _, method := range methodList {
-			output.WriteString(fmt.Sprintf("\t%s(...args : any[]):Promise<any>\n", method))
+			output.WriteString(fmt.Sprintf("\t%s: (...args : any[]) => Promise\n", method))
 		}
 		output.WriteString("}\n")
 	}
 
 	output.WriteString("\n")
-	output.WriteString("interface Backend {\n")
+	output.WriteString("Interface Backend {\n")
 
 	for structname := range b.structList {
 		structname = strings.SplitN(structname, ".", 2)[1]
@@ -136,8 +136,7 @@ declare global {
 	interface Window {
 		backend: Backend;
 	}
-}
-export {};`
+}`
 	output.WriteString(globals)
 
 	b.log.Info("Written Typescript file: " + typescriptDefinitionFilename)

lib/event/manager.go

@@ -18,7 +18,6 @@ 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
@@ -43,12 +42,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  uint                 // Expire after counter callbacks. 0 = infinite
+	counter  int                  // 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 uint) error {
+func (e *Manager) addEventListener(eventName string, callback func(...interface{}), counter int) error {
 
 	// Sanity check inputs
 	if callback == nil {
@@ -76,30 +75,7 @@ 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)
-	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())
-	}
+	e.addEventListener(eventName, callback, 0)
 }
 
 // Emit broadcasts the given event to the subscribed listeners
@@ -132,24 +108,20 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 				})
 
 				// Notify renderer
-				err := e.renderer.NotifyEvent(event)
-				if err != nil {
-					e.log.Error(err.Error())
-				}
+				e.renderer.NotifyEvent(event)
 
-				e.mu.Lock()
+				// Notify Go listeners
+				var listenersToRemove []*eventListener
 
 				// Iterate listeners
 				for _, listener := range e.listeners[event.Name] {
 
-					if !listener.expired {
-						// Call listener, perhaps with data
-						if event.Data == nil {
-							go listener.callback()
-						} else {
-							unpacked := event.Data.([]interface{})
-							go listener.callback(unpacked...)
-						}
+					// Call listener, perhaps with data
+					if event.Data == nil {
+						go listener.callback()
+					} else {
+						unpacked := event.Data.([]interface{})
+						go listener.callback(unpacked...)
 					}
 
 					// Update listen counter
@@ -161,8 +133,15 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 					}
 				}
 
-				e.mu.Unlock()
-
+				// 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)
+						}
+					}
+				}
 			case <-e.quitChannel:
 				e.running = false
 			}

lib/interfaces/appconfig.go

@@ -5,10 +5,6 @@ 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,8 +6,6 @@ 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,10 +22,6 @@ type Renderer interface {
 
 	// Window Runtime
 	SetColour(string) error
-
-	SetMinSize(width, height int)
-	SetMaxSize(width, height int)
-
 	Fullscreen()
 	UnFullscreen()
 	SetTitle(title string)

lib/renderer/bridge/bridge.go

@@ -186,18 +186,6 @@ 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,9 +3,8 @@ 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"
 )
@@ -59,7 +58,8 @@ func (s *session) start(firstSession bool) {
 	s.log.Infof("Connected to frontend.")
 	go s.writePump()
 
-	s.evalJS(runtime.WailsJS, wailsRuntimeMessage)
+	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
+	s.evalJS(wailsRuntime, wailsRuntimeMessage)
 
 	// Inject bindings
 	for _, binding := range s.bindingCache {

lib/renderer/webview.go

@@ -8,9 +8,8 @@ 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"
@@ -30,7 +29,6 @@ type WebView struct {
 	config       interfaces.AppConfig
 	eventManager interfaces.EventManager
 	bindingCache []string
-	maximumSizeSet bool
 }
 
 // NewWebView returns a new WebView struct
@@ -54,37 +52,10 @@ 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:     width,
-		Height:    height,
+		Width:     config.GetWidth(),
+		Height:    config.GetHeight(),
 		Title:     config.GetTitle(),
 		Resizable: config.GetResizable(),
 		URL:       config.GetHTML(),
@@ -93,24 +64,6 @@ 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)
 
@@ -121,7 +74,6 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 	}
 
 	w.log.Info("Initialised")
-
 	return nil
 }
 
@@ -231,8 +183,8 @@ func (w *WebView) Run() error {
 	}
 
 	// Runtime assets
-	w.log.DebugFields("Injecting wails JS runtime", logger.Fields{"js": runtime.WailsJS})
-	w.evalJS(runtime.WailsJS)
+	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
+	w.evalJS(wailsRuntime)
 
 	// Ping the wait channel when the wails runtime is loaded
 	w.eventManager.On("wails:loaded", func(...interface{}) {
@@ -255,9 +207,10 @@ 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.log.Debug("Injecting Default Wails CSS: " + runtime.WailsCSS)
-				w.injectCSS(runtime.WailsCSS)
+				w.injectCSS(defaultCSS)
 			}
 
 			// Inject user JS
@@ -303,9 +256,6 @@ 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
 }
@@ -324,9 +274,6 @@ func (w *WebView) SelectDirectory() string {
 			wg.Done()
 		})
 	}()
-
-	defer w.focus() // Ensure the main window is put back into focus afterwards
-
 	wg.Wait()
 	return result
 }
@@ -345,20 +292,10 @@ 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)
@@ -400,37 +337,11 @@ 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,18 +65,6 @@ 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);
 }
@@ -182,16 +170,6 @@ 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)
@@ -329,18 +307,6 @@ 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)))
 }
@@ -387,9 +353,7 @@ func _webviewDispatchGoCallback(index unsafe.Pointer) {
 	f = fns[uintptr(index)]
 	delete(fns, uintptr(index))
 	m.Unlock()
-	if f != nil {
-		f()
-	}
+	f()
 }
 
 //export _webviewExternalInvokeCallback
@@ -405,7 +369,5 @@ func _webviewExternalInvokeCallback(w unsafe.Pointer, data unsafe.Pointer) {
 		}
 	}
 	m.Unlock()
-	if cb != nil {
-		cb(wv, C.GoString((*C.char)(data)))
-	}
+	cb(wv, C.GoString((*C.char)(data)))
 }

lib/renderer/webview/webview.h

@@ -54,11 +54,6 @@ 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
@@ -80,11 +75,6 @@ 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>
@@ -178,9 +168,6 @@ 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);
@@ -342,12 +329,6 @@ 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)
@@ -415,49 +396,6 @@ 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)
@@ -1393,39 +1331,7 @@ 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);
@@ -1490,9 +1396,6 @@ 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;
@@ -1738,21 +1641,6 @@ 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)
@@ -2320,29 +2208,6 @@ 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];
-    
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [[w->priv.window standardWindowButton:NSWindowZoomButton] setEnabled: NO];
-    });
-  }
-  
   WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
   {
     int b = ((([w->priv.window styleMask] & NSWindowStyleMaskFullScreen) ==
@@ -2497,4 +2362,4 @@ struct webview_priv
 }
 #endif
 
-#endif /* WEBVIEW_H */
+#endif /* WEBVIEW_H */

package-lock.json

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

runtime/assets.go

@@ -1,15 +0,0 @@
-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,16 +19,6 @@ 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/.eslintrc

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

runtime/js/core/browser.js

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

runtime/js/core/calls.js

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

runtime/js/core/ipc.js

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

runtime/js/package-lock.json

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

runtime/js/runtime/.npmignore

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

runtime/js/runtime/package-lock.json

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

runtime/window.go

@@ -67,16 +67,6 @@ 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,6 +8,38 @@ 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()
@@ -16,6 +48,7 @@ func runCommand(command string, args ...string) {
 		log.Println(string(output))
 		log.Fatal(err)
 	}
+	cmd.Run()
 	fmt.Println(string(output))
 }
 
@@ -27,26 +60,26 @@ func main() {
 	// Build Runtime
 	fmt.Println("**** Building Runtime ****")
 	runtimeDir, _ := filepath.Abs(filepath.Join(dir, "..", "runtime", "js"))
-	err := os.Chdir(runtimeDir)
-	if err != nil {
-		log.Fatal(err)
-	}
+	os.Chdir(runtimeDir)
 	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"))
-	err = os.Chdir(execDir)
-	if err != nil {
-		log.Fatal(err)
-	}
+	os.Chdir(execDir)
 	runCommand("go", "install")
 
 	baseDir, _ := filepath.Abs(filepath.Join(dir, ".."))
-	err = os.Chdir(baseDir)
-	if err != nil {
-		log.Fatal(err)
-	}
+	os.Chdir(baseDir)
 	runCommand("go", "mod", "tidy")
 }

scripts/build.sh

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

v2/NOTES.md

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

@@ -0,0 +1,6 @@
+# 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/README.md

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

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

@@ -0,0 +1,222 @@
+package build
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"runtime"
+	"strings"
+	"text/tabwriter"
+	"time"
+
+	"github.com/wailsapp/wails/v2/internal/system"
+
+	"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 noPackage flag
+	noPackage := false
+	command.BoolFlag("noPackage", "Skips platform specific packaging", &noPackage)
+
+	compilerCommand := "go"
+	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
+
+	compress := false
+	command.BoolFlag("upx", "Compress final binary with UPX (if installed)", &compress)
+
+	compressFlags := ""
+	command.StringFlag("upxflags", "Flags to pass to upx", &compressFlags)
+
+	// Setup Platform flag
+	platform := runtime.GOOS
+	command.StringFlag("platform", "Platform to target", &platform)
+
+	// Verbosity
+	verbosity := 1
+	command.IntFlag("v", "Verbosity level (0 - silent, 1 - default, 2 - verbose)", &verbosity)
+
+	// ldflags to pass to `go`
+	ldflags := ""
+	command.StringFlag("ldflags", "optional ldflags", &ldflags)
+
+	// tags to pass to `go`
+	tags := ""
+	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &tags)
+
+	outputFilename := ""
+	command.StringFlag("o", "Output filename", &outputFilename)
+
+	// Clean build directory
+	cleanBuildDirectory := false
+	command.BoolFlag("clean", "Clean the build directory before building", &cleanBuildDirectory)
+
+	webview2 := "download"
+	command.StringFlag("webview2", "WebView2 installer strategy: download,embed,browser,error.", &webview2)
+
+	skipFrontend := false
+	command.BoolFlag("s", "Skips building the frontend", &skipFrontend)
+
+	forceBuild := false
+	command.BoolFlag("f", "Force build application", &forceBuild)
+
+	command.Action(func() error {
+
+		quiet := verbosity == 0
+
+		// 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()
+		}
+
+		// Check platform
+		validPlatformArch := slicer.String([]string{
+			"darwin",
+			"darwin/amd64",
+			"darwin/arm64",
+			"darwin/universal",
+			"linux",
+			//"linux/amd64",
+			//"linux/arm-7",
+			"windows",
+			"windows/amd64",
+		})
+		if !validPlatformArch.Contains(platform) {
+			return fmt.Errorf("platform %s is not supported", platform)
+		}
+
+		if compress && platform == "darwin/universal" {
+			println("Warning: compress flag unsupported for universal binaries. Ignoring.")
+			compress = false
+		}
+
+		// Lookup compiler path
+		compilerPath, err := exec.LookPath(compilerCommand)
+		if err != nil {
+			return fmt.Errorf("unable to find compiler: %s", compilerCommand)
+		}
+
+		// Tags
+		userTags := []string{}
+		for _, tag := range strings.Split(tags, " ") {
+			thisTag := strings.TrimSpace(tag)
+			if thisTag != "" {
+				userTags = append(userTags, thisTag)
+			}
+		}
+
+		// Webview2 installer strategy (download by default)
+		wv2rtstrategy := ""
+		webview2 = strings.ToLower(webview2)
+		if webview2 != "" {
+			validWV2Runtime := slicer.String([]string{"download", "embed", "browser", "error"})
+			if !validWV2Runtime.Contains(webview2) {
+				return fmt.Errorf("invalid option for flag 'webview2': %s", webview2)
+			}
+			// These are the build tags associated with the strategies
+			switch webview2 {
+			case "embed":
+				wv2rtstrategy = "wv2runtime.embed"
+			case "error":
+				wv2rtstrategy = "wv2runtime.error"
+			case "browser":
+				wv2rtstrategy = "wv2runtime.browser"
+			}
+		}
+
+		// Create BuildOptions
+		buildOptions := &build.Options{
+			Logger:              logger,
+			OutputType:          outputType,
+			OutputFile:          outputFilename,
+			CleanBuildDirectory: cleanBuildDirectory,
+			Mode:                build.Production,
+			Pack:                !noPackage,
+			LDFlags:             ldflags,
+			Compiler:            compilerCommand,
+			Verbosity:           verbosity,
+			ForceBuild:          forceBuild,
+			IgnoreFrontend:      skipFrontend,
+			Compress:            compress,
+			CompressFlags:       compressFlags,
+			UserTags:            userTags,
+			WebView2Strategy:    wv2rtstrategy,
+		}
+
+		// Calculate platform and arch
+		platformSplit := strings.Split(platform, "/")
+		buildOptions.Platform = platformSplit[0]
+		if system.IsAppleSilicon {
+			buildOptions.Arch = "arm64"
+		} else {
+			buildOptions.Arch = runtime.GOARCH
+		}
+		if len(platformSplit) == 2 {
+			buildOptions.Arch = platformSplit[1]
+		}
+
+		// 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, "App Type: \t%s\n", buildOptions.OutputType)
+		fmt.Fprintf(w, "Platform: \t%s\n", buildOptions.Platform)
+		fmt.Fprintf(w, "Arch: \t%s\n", buildOptions.Arch)
+		fmt.Fprintf(w, "Compiler: \t%s\n", compilerPath)
+		fmt.Fprintf(w, "Skip Frontend: \t%t\n", skipFrontend)
+		fmt.Fprintf(w, "Compress: \t%t\n", buildOptions.Compress)
+		fmt.Fprintf(w, "Package: \t%t\n", buildOptions.Pack)
+		fmt.Fprintf(w, "Clean Build Dir: \t%t\n", buildOptions.CleanBuildDirectory)
+		fmt.Fprintf(w, "LDFlags: \t\"%s\"\n", buildOptions.LDFlags)
+		fmt.Fprintf(w, "Tags: \t[%s]\n", strings.Join(buildOptions.UserTags, ","))
+		if len(buildOptions.OutputFile) > 0 {
+			fmt.Fprintf(w, "Output File: \t%s\n", buildOptions.OutputFile)
+		}
+		fmt.Fprintf(w, "\n")
+		w.Flush()
+
+		return doBuild(buildOptions)
+	})
+}
+
+// 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/dev/README.md

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

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

@@ -0,0 +1,385 @@
+package dev
+
+import (
+	"fmt"
+	"github.com/leaanthony/slicer"
+	"github.com/wailsapp/wails/v2/internal/project"
+	"io"
+	"log"
+	"net/http"
+	"os"
+	"os/signal"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"syscall"
+	"time"
+
+	"github.com/pkg/browser"
+	"github.com/wailsapp/wails/v2/internal/colour"
+
+	"github.com/fsnotify/fsnotify"
+	"github.com/leaanthony/clir"
+	"github.com/wailsapp/wails/v2/internal/fs"
+	"github.com/wailsapp/wails/v2/internal/process"
+	"github.com/wailsapp/wails/v2/pkg/clilogger"
+	"github.com/wailsapp/wails/v2/pkg/commands/build"
+)
+
+func LogGreen(message string, args ...interface{}) {
+	text := fmt.Sprintf(message, args...)
+	println(colour.Green(text))
+}
+
+func LogRed(message string, args ...interface{}) {
+	text := fmt.Sprintf(message, args...)
+	println(colour.Red(text))
+}
+
+func LogDarkYellow(message string, args ...interface{}) {
+	text := fmt.Sprintf(message, args...)
+	println(colour.DarkYellow(text))
+}
+
+func sliceToMap(input []string) map[string]struct{} {
+	result := map[string]struct{}{}
+	for _, value := range input {
+		result[value] = struct{}{}
+	}
+	return result
+}
+
+// AddSubcommand adds the `dev` command for the Wails application
+func AddSubcommand(app *clir.Cli, w io.Writer) error {
+
+	command := app.NewSubCommand("dev", "Development mode")
+
+	// 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)
+
+	assetDir := ""
+	command.StringFlag("assetdir", "Serve assets from the given directory", &assetDir)
+
+	// extensions to trigger rebuilds of application
+	extensions := "go"
+	command.StringFlag("e", "Extensions to trigger rebuilds (comma separated) eg go", &extensions)
+
+	openBrowser := false
+	command.BoolFlag("browser", "Open application in browser", &openBrowser)
+
+	noreload := false
+	command.BoolFlag("noreload", "Disable reload on asset change", &noreload)
+
+	wailsjsdir := ""
+	command.StringFlag("wailsjsdir", "Directory to generate the Wails JS modules", &wailsjsdir)
+
+	// tags to pass to `go`
+	tags := ""
+	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &tags)
+
+	// Verbosity
+	verbosity := 1
+	command.IntFlag("v", "Verbosity level (0 - silent, 1 - standard, 2 - verbose)", &verbosity)
+
+	loglevel := ""
+	command.StringFlag("loglevel", "Loglevel to use - Trace, Dev, Info, Warning, Error", &loglevel)
+
+	forceBuild := false
+	command.BoolFlag("f", "Force build application", &forceBuild)
+
+	command.Action(func() error {
+
+		// Create logger
+		logger := clilogger.New(w)
+		app.PrintBanner()
+
+		cwd, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+		projectConfig, err := project.Load(cwd)
+		if err != nil {
+			return err
+		}
+
+		if projectConfig.AssetDirectory == "" && assetDir == "" {
+			return fmt.Errorf("No asset directory provided. Please use -assetdir to indicate which directory contains your built assets.")
+		}
+
+		if assetDir == "" && projectConfig.AssetDirectory != "" {
+			assetDir = projectConfig.AssetDirectory
+		}
+
+		if assetDir != projectConfig.AssetDirectory {
+			projectConfig.AssetDirectory = filepath.ToSlash(assetDir)
+			err := projectConfig.Save()
+			if err != nil {
+				return err
+			}
+		}
+
+		if err != nil {
+			return err
+		}
+
+		if wailsjsdir == "" && projectConfig.WailsJSDir != "" {
+			wailsjsdir = projectConfig.WailsJSDir
+		}
+
+		if wailsjsdir == "" {
+			wailsjsdir = "./frontend"
+		}
+
+		if wailsjsdir != projectConfig.WailsJSDir {
+			projectConfig.WailsJSDir = filepath.ToSlash(wailsjsdir)
+			err := projectConfig.Save()
+			if err != nil {
+				return err
+			}
+		}
+
+		buildOptions := &build.Options{
+			Logger:         logger,
+			OutputType:     "dev",
+			Mode:           build.Dev,
+			Arch:           runtime.GOARCH,
+			Pack:           true,
+			Platform:       runtime.GOOS,
+			LDFlags:        ldflags,
+			Compiler:       compilerCommand,
+			ForceBuild:     forceBuild,
+			IgnoreFrontend: false,
+			Verbosity:      verbosity,
+			WailsJSDir:     wailsjsdir,
+		}
+
+		watcher, err := fsnotify.NewWatcher()
+		if err != nil {
+			return err
+		}
+		defer func(watcher *fsnotify.Watcher) {
+			err := watcher.Close()
+			if err != nil {
+				log.Fatal(err)
+			}
+		}(watcher)
+
+		var debugBinaryProcess *process.Process = nil
+		var extensionsThatTriggerARebuild = sliceToMap(strings.Split(extensions, ","))
+
+		// Setup signal handler
+		quitChannel := make(chan os.Signal, 1)
+		signal.Notify(quitChannel, os.Interrupt, os.Kill, syscall.SIGTERM)
+		exitCodeChannel := make(chan int, 1)
+
+		var passthruArgs []string
+		//if len(os.Args) > 2 {
+		//	passthruArgs = os.Args[2:]
+		//}
+
+		// Do initial build
+		logger.Println("Building application for development...")
+		newProcess, appBinary, err := restartApp(logger, buildOptions, debugBinaryProcess, loglevel, passthruArgs, assetDir, false, exitCodeChannel)
+		if err != nil {
+			return err
+		}
+		if newProcess != nil {
+			debugBinaryProcess = newProcess
+		}
+
+		// open browser
+		if openBrowser {
+			err = browser.OpenURL("http://localhost:34115")
+			if err != nil {
+				return err
+			}
+		}
+
+		if err != nil {
+			return err
+		}
+		var newBinaryProcess *process.Process
+
+		// Get project dir
+		projectDir, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+
+		// Get all subdirectories
+		dirs, err := fs.GetSubdirectories(projectDir)
+		if err != nil {
+			return err
+		}
+
+		LogGreen("Watching (sub)/directory: %s", projectDir)
+
+		// Setup a watcher for non-node_modules directories
+		dirs.Each(func(dir string) {
+			if strings.Contains(dir, "node_modules") {
+				return
+			}
+			// Ignore build directory
+			if strings.HasPrefix(dir, filepath.Join(projectDir, "build")) {
+				return
+			}
+			//println("Watching", dir)
+			err = watcher.Add(dir)
+			if err != nil {
+				logger.Fatal(err.Error())
+			}
+		})
+
+		// Main Loop
+		quit := false
+		// Use 100ms debounce
+		interval := 100 * time.Millisecond
+		timer := time.NewTimer(interval)
+		rebuild := false
+		reload := false
+		for quit == false {
+			//reload := false
+			select {
+			case exitCode := <-exitCodeChannel:
+				if exitCode == 0 {
+					quit = true
+				}
+			case item := <-watcher.Events:
+				// Check for file writes
+				if item.Op&fsnotify.Write == fsnotify.Write {
+					// Ignore directories
+					if fs.DirExists(item.Name) {
+						continue
+					}
+
+					// Iterate all file patterns
+					ext := filepath.Ext(item.Name)
+					if ext != "" {
+						ext = ext[1:]
+						if _, exists := extensionsThatTriggerARebuild[ext]; exists {
+							rebuild = true
+							continue
+						}
+					}
+
+					if strings.HasPrefix(item.Name, assetDir) {
+						reload = true
+					}
+					timer.Reset(interval)
+				}
+				// Check for new directories
+				if item.Op&fsnotify.Create == fsnotify.Create {
+					// If this is a folder, add it to our watch list
+					if fs.DirExists(item.Name) {
+						//node_modules is BANNED!
+						if !strings.Contains(item.Name, "node_modules") {
+							err := watcher.Add(item.Name)
+							if err != nil {
+								logger.Fatal("%s", err.Error())
+							}
+							LogGreen("Added new directory to watcher: %s", item.Name)
+						}
+					}
+				}
+			case <-timer.C:
+				if rebuild {
+					rebuild = false
+					LogGreen("[Rebuild triggered] files updated")
+					// Try and build the app
+					newBinaryProcess, _, err = restartApp(logger, buildOptions, debugBinaryProcess, loglevel, passthruArgs, assetDir, false, exitCodeChannel)
+					if err != nil {
+						LogRed("Error during build: %s", err.Error())
+						continue
+					}
+					// If we have a new process, save it
+					if newBinaryProcess != nil {
+						debugBinaryProcess = newBinaryProcess
+					}
+				}
+				if reload {
+					reload = false
+					_, err = http.Get("http://localhost:34115/wails/reload")
+					if err != nil {
+						LogRed("Error during refresh: %s", err.Error())
+					}
+				}
+			case <-quitChannel:
+				LogGreen("\nCaught quit")
+				quit = true
+			}
+		}
+
+		// Kill the current program if running
+		if debugBinaryProcess != nil {
+			err := debugBinaryProcess.Kill()
+			if err != nil {
+				return err
+			}
+		}
+
+		// Remove dev binary
+		err = os.Remove(appBinary)
+		if err != nil {
+			return err
+		}
+
+		LogGreen("Development mode exited")
+
+		return nil
+	})
+
+	return nil
+}
+
+func restartApp(logger *clilogger.CLILogger, buildOptions *build.Options, debugBinaryProcess *process.Process, loglevel string, passthruArgs []string, assetDir string, firstRun bool, exitCodeChannel chan int) (*process.Process, string, error) {
+
+	appBinary, err := build.Build(buildOptions)
+	println()
+	if err != nil {
+		if firstRun {
+			return nil, "", err
+		}
+		LogRed("Build error - continuing to run current version")
+		LogDarkYellow(err.Error())
+		return nil, "", nil
+	}
+
+	// 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
+	}
+
+	// Start up new binary with correct args
+	args := slicer.StringSlicer{}
+	args.Add("-loglevel", loglevel)
+	if assetDir != "" {
+		args.Add("-assetdir", assetDir)
+	}
+
+	if len(passthruArgs) > 0 {
+		args.AddSlice(passthruArgs)
+	}
+	newProcess := process.NewProcess(appBinary, args.AsSlice()...)
+	err = newProcess.Start(exitCodeChannel)
+	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, appBinary, nil
+}

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

@@ -0,0 +1,158 @@
+package doctor
+
+import (
+	"fmt"
+	"io"
+	"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 (this may take a long time)...")
+
+		// Get system info
+		info, err := system.GetInfo()
+		if err != nil {
+			logger.Println("Failed.")
+			return err
+		}
+		logger.Println("Done.")
+
+		logger.Println("")
+
+		// 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, "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)
+
+		// Output Go Information
+		fmt.Fprintf(w, "%s\t%s\n", "Go Version:", runtime.Version())
+		fmt.Fprintf(w, "%s\t%s\n", "Platform:", runtime.GOOS)
+		fmt.Fprintf(w, "%s\t%s\n", "Architecture:", runtime.GOARCH)
+
+		// Exit early if PM not found
+		if info.PM != nil {
+			fmt.Fprintf(w, "%s\t%s\n", "Package Manager: ", info.PM.Name())
+		}
+
+		// Output Dependencies Status
+		var dependenciesMissing = []string{}
+		var externalPackages = []*packagemanager.Dependancy{}
+		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")
+
+		hasOptionalDependencies := false
+		// Loop over dependencies
+		for _, dependency := range info.Dependencies {
+
+			name := dependency.Name
+			if dependency.Optional {
+				name = "*" + name
+				hasOptionalDependencies = true
+			}
+			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)
+		}
+		if hasOptionalDependencies {
+			fmt.Fprintf(w, "\n")
+			fmt.Fprintf(w, "* - Optional Dependency\n")
+		}
+		w.Flush()
+		logger.Println("")
+		logger.Println("Diagnosis")
+		logger.Println("---------")
+
+		// Generate an appropriate diagnosis
+
+		if len(dependenciesMissing) == 0 && dependenciesAvailableRequired == 0 {
+			logger.Println("Your system is ready for Wails development!")
+		} else {
+			logger.Println("Your system has missing dependencies!\n")
+		}
+
+		if dependenciesAvailableRequired != 0 {
+			logger.Println("Required package(s) installation details: \n" + info.Dependencies.InstallAllRequiredCommand())
+		}
+
+		if dependenciesAvailableOptional != 0 {
+			logger.Println("Optional package(s) installation details: \n" + info.Dependencies.InstallAllOptionalCommand())
+		}
+		//
+		//if len(externalPackages) > 0 {
+		//	for _, p := range externalPackages {
+		//		if p.Optional {
+		//			print("[Optional] ")
+		//		}
+		//		logger.Println("Install " + p.Name + ": " + p.InstallCommand)
+		//	}
+		//}
+
+		if len(dependenciesMissing) != 0 {
+			// TODO: Check if apps are available locally and if so, adjust the diagnosis
+			logger.Println("Fatal:")
+			logger.Println("Required dependencies missing: " + strings.Join(dependenciesMissing, " "))
+			logger.Println("Please read this article on how to resolve this: https://wails.app/guides/resolving-missing-packages")
+		}
+
+		logger.Println("")
+		return nil
+	})
+
+	return nil
+}

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

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

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

@@ -0,0 +1,48 @@
+package generate
+
+import (
+	"io"
+
+	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/generate/template"
+
+	"github.com/leaanthony/clir"
+	"github.com/wailsapp/wails/v2/pkg/clilogger"
+	"github.com/wailsapp/wails/v2/pkg/parser"
+)
+
+// AddSubcommand adds the `generate` command for the Wails application
+func AddSubcommand(app *clir.Cli, w io.Writer) error {
+
+	command := app.NewSubCommand("generate", "Code Generation Tools")
+
+	//AddModuleCommand(app, command, w)
+	template.AddSubCommand(app, command, w)
+
+	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("")
+}

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

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

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

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

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

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

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

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"context"
+	"fmt"
+)
+
+// App struct
+type App struct {
+	runtime context.Context
+}
+
+// NewApp creates a new App application struct
+func NewApp() *App {
+	return &App{}
+}
+
+// startup is called at application startup
+func (b *App) startup(ctx context.Context) {
+	// Perform your setup here
+	//TODO: move to new runtime layout
+
+	//b.runtime = runtime
+	//runtime.Window.SetTitle("{{.ProjectName}}")
+}
+
+// shutdown is called at application termination
+func (b *App) shutdown(ctx context.Context) {
+	// Perform your teardown here
+}
+
+// Greet returns a greeting for the given name
+func (b *App) Greet(name string) string {
+	return fmt.Sprintf("Hello %s!", name)
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,47 @@
+package main
+
+import (
+	"log"
+
+	"github.com/wailsapp/wails/v2/pkg/options/windows"
+
+	"github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2/pkg/logger"
+	"github.com/wailsapp/wails/v2/pkg/options"
+)
+
+func main() {
+
+	// Create application with options
+	app := NewApp()
+
+	err := wails.Run(&options.App{
+		Title:             "{{.ProjectName}}",
+		Width:             800,
+		Height:            600,
+		MinWidth:          400,
+		MinHeight:         400,
+		MaxWidth:          1280,
+		MaxHeight:         1024,
+		DisableResize:     false,
+		Fullscreen:        false,
+		Frameless:         false,
+		StartHidden:       false,
+		HideWindowOnClose: false,
+		RGBA:              &options.RGBA{0, 0, 0, 255},
+		Windows: &windows.Options{
+			WebviewIsTransparent: true,
+			WindowIsTranslucent:  true,
+			DisableWindowIcon:    true,
+		},
+		LogLevel:   logger.DEBUG,
+		OnStartup:  app.startup,
+		OnShutdown: app.shutdown,
+		Bind: []interface{}{
+			app,
+		},
+	})
+	if err != nil {
+		log.Fatal(err)
+	}
+}

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

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

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

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

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

@@ -0,0 +1,188 @@
+package template
+
+import (
+	"embed"
+	"io"
+	"os"
+	"path/filepath"
+
+	"github.com/leaanthony/debme"
+
+	"github.com/leaanthony/gosod"
+	"github.com/wailsapp/wails/v2/internal/fs"
+
+	"github.com/leaanthony/clir"
+	"github.com/tidwall/sjson"
+)
+
+//go:embed base
+var base embed.FS
+
+func AddSubCommand(app *clir.Cli, parent *clir.Command, w io.Writer) {
+
+	// command
+	command := parent.NewSubCommand("template", "Generates a wails template")
+
+	name := ""
+	command.StringFlag("name", "The name of the template", &name)
+
+	migrate := false
+	command.BoolFlag("migrate", "This indicates that the current directory is a frontend project and should be used by the template", &migrate)
+
+	// Quiet Init
+	quiet := false
+	command.BoolFlag("q", "Suppress output to console", &quiet)
+
+	command.Action(func() error {
+
+		// If the current directory is not empty, we create a new directory
+		cwd, err := os.Getwd()
+		if err != nil {
+			return err
+		}
+		templateDir := cwd
+		empty, err := fs.DirIsEmpty(templateDir)
+		if err != nil {
+			return err
+		}
+		if !empty {
+			templateDir = filepath.Join(cwd, name)
+			println("Creating new template directory:", name)
+			err = fs.Mkdir(templateDir)
+			if err != nil {
+				return err
+			}
+		}
+
+		// Create base template
+		baseTemplate, err := debme.FS(base, "base")
+		if err != nil {
+			return err
+		}
+		g := gosod.New(baseTemplate)
+		g.SetTemplateFilters([]string{".template"})
+
+		err = os.Chdir(templateDir)
+		if err != nil {
+			return err
+		}
+
+		type templateData struct {
+			Name        string
+			Description string
+			TemplateDir string
+		}
+
+		println("Extracting base template files...")
+
+		err = g.Extract(templateDir, &templateData{
+			Name:        name,
+			TemplateDir: templateDir,
+		})
+		if err != nil {
+			return err
+		}
+
+		// If we aren't migrating the files, just exit
+		if migrate == false {
+			return nil
+		}
+
+		// Remove frontend directory
+		frontendDir := filepath.Join(templateDir, "frontend")
+		err = os.RemoveAll(frontendDir)
+		if err != nil {
+			return err
+		}
+
+		// Move the files into a new frontend directory
+		println("Migrating files to frontend directory...")
+		err = fs.MoveDirExtended(cwd, frontendDir, []string{name})
+		if err != nil {
+			return err
+		}
+
+		// Process package.json
+		err = processPackageJSON(frontendDir)
+		if err != nil {
+			return err
+		}
+
+		// Process package-lock.json
+		err = processPackageLockJSON(frontendDir)
+		if err != nil {
+			return err
+		}
+
+		// Remove node_modules - ignore error, eg it doesn't exist
+		_ = os.RemoveAll(filepath.Join(frontendDir, "node_modules"))
+
+		return nil
+
+	})
+}
+
+func processPackageJSON(frontendDir string) error {
+	var err error
+
+	packageJSON := filepath.Join(frontendDir, "package.json")
+	if !fs.FileExists(packageJSON) {
+		println("No package.json found - cannot process.")
+		return nil
+	}
+
+	data, err := os.ReadFile(packageJSON)
+	if err != nil {
+		return err
+	}
+	json := string(data)
+
+	// We will ignore these errors - it's not critical
+	println("Updating package.json data...")
+	json, _ = sjson.Set(json, "name", "{{.ProjectName}}")
+	json, _ = sjson.Set(json, "author", "{{.AuthorName}}")
+
+	err = os.WriteFile(packageJSON, []byte(json), 0644)
+	if err != nil {
+		return err
+	}
+	baseDir := filepath.Dir(packageJSON)
+	println("Renaming package.json -> package.tmpl.json...")
+	err = os.Rename(packageJSON, filepath.Join(baseDir, "package.tmpl.json"))
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func processPackageLockJSON(frontendDir string) error {
+	var err error
+
+	filename := filepath.Join(frontendDir, "package-lock.json")
+	if !fs.FileExists(filename) {
+		println("No package-lock.json found - cannot process.")
+		return nil
+	}
+
+	data, err := os.ReadFile(filename)
+	if err != nil {
+		return err
+	}
+	json := string(data)
+
+	// We will ignore these errors - it's not critical
+	println("Updating package-lock.json data...")
+	json, _ = sjson.Set(json, "name", "{{.ProjectName}}")
+
+	err = os.WriteFile(filename, []byte(json), 0644)
+	if err != nil {
+		return err
+	}
+	baseDir := filepath.Dir(filename)
+	println("Renaming package-lock.json -> package-lock.tmpl.json...")
+	err = os.Rename(filename, filepath.Join(baseDir, "package-lock.tmpl.json"))
+	if err != nil {
+		return err
+	}
+	return nil
+}

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

@@ -0,0 +1,177 @@
+package initialise
+
+import (
+	"fmt"
+	"io"
+	"strings"
+	"time"
+
+	"github.com/wailsapp/wails/v2/pkg/buildassets"
+
+	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/initialise/templates"
+
+	"github.com/leaanthony/clir"
+	"github.com/pkg/errors"
+	"github.com/wailsapp/wails/v2/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 {
+
+	command := app.NewSubCommand("init", "Initialise a new Wails project")
+
+	// Setup template name flag
+	templateName := "vanilla"
+	description := "Name of built-in template to use, path to template or template url."
+	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", "Suppress 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 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
+		findAuthorDetails(options)
+
+		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
+	remote, err := templates.Install(options)
+	if err != nil {
+		return err
+	}
+
+	// Install the default assets
+	err = buildassets.Install(options.TargetDir, options.ProjectName)
+	if err != nil {
+		return err
+	}
+
+	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.")
+	}
+
+	if remote {
+		options.Logger.Println("\nNOTE: You have created a project using a remote template. The Wails project takes no responsibility for 3rd party templates. Only use remote templates that you trust.")
+	}
+
+	options.Logger.Println("")
+	options.Logger.Println(fmt.Sprintf("Initialised project '%s' in %s.", options.ProjectName, elapsed.Round(time.Millisecond).String()))
+	options.Logger.Println("")
+
+	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
+}
+
+// findAuthorDetails tries to find the user's name and email
+// from gitconfig. If it finds them, it stores them in the project options
+func findAuthorDetails(options *templates.Options) {
+	if git.IsInstalled() {
+		name, err := git.Name()
+		if err == nil {
+			options.AuthorName = strings.TrimSpace(name)
+		}
+
+		email, err := git.Email()
+		if err == nil {
+			options.AuthorEmail = strings.TrimSpace(email)
+		}
+	}
+}

v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/launch.json.tmpl

@@ -0,0 +1,27 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+      {
+        "name": "Wails: Debug {{.ProjectName}} (Desktop)",
+        "type": "go",
+        "request": "launch",
+        "mode": "exec",
+        "program": "${workspaceFolder}/{{.PathToDesktopBinary}}",
+        "preLaunchTask": "build_desktop",
+        "cwd": "",
+        "env": {},
+        "args": []
+      },
+      {
+        "name": "Wails: Debug {{.ProjectName}} (Server)",
+        "type": "go",
+        "request": "launch",
+        "mode": "exec",
+        "program": "${workspaceFolder}/{{.PathToServerBinary}}",
+        "preLaunchTask": "build_server",
+        "cwd": "",
+        "env": {},
+        "args": []
+      },
+    ]
+  }

v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/tasks.json.tmpl

@@ -0,0 +1,23 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+      {
+        "label": "build_desktop",
+        "type": "shell",
+        "options": {
+            "cwd": "{{.TargetDir}}"
+        },
+        "command": "wails build"
+      },
+      {
+        "label": "build_server",
+        "type": "shell",
+        "options": {
+            "cwd": "{{.TargetDir}}"
+        },
+        "command": "wails build -t server"
+      },
+
+    ]
+  }
+  

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

@@ -0,0 +1,366 @@
+package templates
+
+import (
+	"embed"
+	"encoding/json"
+	"fmt"
+	gofs "io/fs"
+	"io/ioutil"
+	"log"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+
+	"github.com/go-git/go-git/v5"
+
+	"github.com/pkg/errors"
+
+	"github.com/leaanthony/debme"
+	"github.com/leaanthony/gosod"
+	"github.com/olekukonko/tablewriter"
+	"github.com/wailsapp/wails/v2/internal/fs"
+	"github.com/wailsapp/wails/v2/pkg/clilogger"
+)
+
+//go:embed templates
+var templates embed.FS
+
+//go:embed ides/*
+var ides embed.FS
+
+// Cahce for the templates
+// We use this because we need different views of the same data
+var templateCache []Template = nil
+
+// Data contains the data we wish to embed during template installation
+type Data struct {
+	ProjectName        string
+	BinaryName         string
+	WailsVersion       string
+	NPMProjectName     string
+	AuthorName         string
+	AuthorEmail        string
+	AuthorNameAndEmail string
+	WailsDirectory     string
+}
+
+// Options for installing a template
+type Options struct {
+	ProjectName         string
+	TemplateName        string
+	BinaryName          string
+	TargetDir           string
+	Logger              *clilogger.CLILogger
+	GenerateVSCode      bool
+	PathToDesktopBinary string
+	PathToServerBinary  string
+	InitGit             bool
+	AuthorName          string
+	AuthorEmail         string
+}
+
+// Template holds data relating to a template
+// including the metadata stored in template.json
+type Template struct {
+
+	// Template details
+	Name        string `json:"name"`
+	ShortName   string `json:"shortname"`
+	Author      string `json:"author"`
+	Description string `json:"description"`
+	HelpURL     string `json:"helpurl"`
+
+	// Other data
+	FS gofs.FS `json:"-"`
+}
+
+func parseTemplate(template gofs.FS) (Template, error) {
+	var result Template
+	data, err := gofs.ReadFile(template, "template.json")
+	if err != nil {
+		return result, errors.Wrap(err, "Error parsing template")
+	}
+	err = json.Unmarshal(data, &result)
+	if err != nil {
+		return result, err
+	}
+	result.FS = template
+	return result, nil
+}
+
+// List returns the list of available templates
+func List() ([]Template, error) {
+
+	// If the cache isn't loaded, load it
+	if templateCache == nil {
+		err := loadTemplateCache()
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return templateCache, nil
+}
+
+// getTemplateByShortname returns the template with the given short name
+func getTemplateByShortname(shortname string) (Template, error) {
+
+	var result Template
+
+	// If the cache isn't loaded, load it
+	if templateCache == nil {
+		err := loadTemplateCache()
+		if err != nil {
+			return result, err
+		}
+	}
+
+	for _, template := range templateCache {
+		if template.ShortName == shortname {
+			return template, nil
+		}
+	}
+
+	return result, fmt.Errorf("shortname '%s' is not a valid template shortname", shortname)
+}
+
+// Loads the template cache
+func loadTemplateCache() error {
+
+	templatesFS, err := debme.FS(templates, "templates")
+	if err != nil {
+		return err
+	}
+
+	// Get directories
+	files, err := templatesFS.ReadDir(".")
+	if err != nil {
+		return err
+	}
+
+	// Reset cache
+	templateCache = []Template{}
+
+	for _, file := range files {
+		if file.IsDir() {
+			templateFS, err := templatesFS.FS(file.Name())
+			if err != nil {
+				return err
+			}
+			template, err := parseTemplate(templateFS)
+			if err != nil {
+				// Cannot parse this template, continue
+				continue
+			}
+			templateCache = append(templateCache, template)
+		}
+	}
+
+	return nil
+}
+
+// Install the given template. Returns true if the template is remote.
+func Install(options *Options) (bool, error) {
+	// Get cwd
+	cwd, err := os.Getwd()
+	if err != nil {
+		return false, err
+	}
+
+	// Did the user want to install in current directory?
+	if options.TargetDir == "" {
+
+		// If the current directory is empty, use it
+		isEmpty, err := fs.DirIsEmpty(cwd)
+		if err != nil {
+			return false, err
+		}
+
+		if isEmpty {
+			// Yes - use cwd
+			options.TargetDir = cwd
+		} else {
+			options.TargetDir = filepath.Join(cwd, options.ProjectName)
+			if fs.DirExists(options.TargetDir) {
+				return false, fmt.Errorf("cannot create project directory. Dir exists: %s", options.TargetDir)
+			}
+		}
+
+	} else {
+		// Get the absolute path of the given directory
+		targetDir, err := filepath.Abs(filepath.Join(cwd, options.TargetDir))
+		if err != nil {
+			return false, err
+		}
+		options.TargetDir = targetDir
+		if !fs.DirExists(options.TargetDir) {
+			err := fs.Mkdir(options.TargetDir)
+			if err != nil {
+				return false, err
+			}
+		}
+	}
+
+	// Flag to indicate remote template
+	remoteTemplate := false
+
+	// Is this a shortname?
+	template, err := getTemplateByShortname(options.TemplateName)
+	if err != nil {
+		// Is this a filepath?
+		templatePath, err := filepath.Abs(options.TemplateName)
+		if fs.DirExists(templatePath) {
+			templateFS := os.DirFS(templatePath)
+			template, err = parseTemplate(templateFS)
+			if err != nil {
+				return false, errors.Wrap(err, "Error installing template")
+			}
+		} else {
+			// git clone to temporary dir
+			tempdir, err := gitclone(options)
+			defer func(path string) {
+				err := os.RemoveAll(path)
+				if err != nil {
+					log.Fatal(err)
+				}
+			}(tempdir)
+			if err != nil {
+				return false, err
+			}
+			// Remove the .git directory
+			err = os.RemoveAll(filepath.Join(tempdir, ".git"))
+			if err != nil {
+				return false, err
+			}
+
+			templateFS := os.DirFS(tempdir)
+			template, err = parseTemplate(templateFS)
+			if err != nil {
+				return false, err
+			}
+			remoteTemplate = true
+		}
+	}
+
+	// Use Gosod to install the template
+	installer := gosod.New(template.FS)
+
+	// Ignore template.json files
+	installer.IgnoreFile("template.json")
+
+	// Setup the data.
+	// We use the directory name for the binary name, like Go
+	BinaryName := filepath.Base(options.TargetDir)
+	NPMProjectName := strings.ToLower(strings.ReplaceAll(BinaryName, " ", ""))
+	localWailsDirectory := fs.RelativePath("../../../../../..")
+	templateData := &Data{
+		ProjectName:    options.ProjectName,
+		BinaryName:     filepath.Base(options.TargetDir),
+		NPMProjectName: NPMProjectName,
+		WailsDirectory: localWailsDirectory,
+		AuthorEmail:    options.AuthorEmail,
+		AuthorName:     options.AuthorName,
+	}
+
+	// Create a formatted name and email combo.
+	if options.AuthorName != "" {
+		templateData.AuthorNameAndEmail = options.AuthorName + " "
+	}
+	if options.AuthorEmail != "" {
+		templateData.AuthorNameAndEmail += "<" + options.AuthorEmail + ">"
+	}
+	templateData.AuthorNameAndEmail = strings.TrimSpace(templateData.AuthorNameAndEmail)
+
+	// Extract the template
+	err = installer.Extract(options.TargetDir, templateData)
+	if err != nil {
+		return false, err
+	}
+
+	err = generateIDEFiles(options)
+	if err != nil {
+		return false, err
+	}
+
+	return remoteTemplate, nil
+}
+
+// Clones the given uri and returns the temporary cloned directory
+func gitclone(options *Options) (string, error) {
+	// Create temporary directory
+	dirname, err := ioutil.TempDir("", "wails-template-*")
+	if err != nil {
+		return "", err
+	}
+	_, err = git.PlainClone(dirname, false, &git.CloneOptions{
+		URL: options.TemplateName,
+	})
+
+	return dirname, err
+
+}
+
+// OutputList prints the list of available tempaltes to the given logger
+func OutputList(logger *clilogger.CLILogger) error {
+	templates, err := List()
+	if err != nil {
+		return err
+	}
+
+	table := tablewriter.NewWriter(logger.Writer)
+	table.SetHeader([]string{"Template", "Short Name", "Description"})
+	table.SetAutoWrapText(false)
+	table.SetAutoFormatHeaders(true)
+	table.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
+	table.SetAlignment(tablewriter.ALIGN_LEFT)
+	table.SetCenterSeparator("")
+	table.SetColumnSeparator("")
+	table.SetRowSeparator("")
+	table.SetHeaderLine(false)
+	table.SetBorder(false)
+	table.SetTablePadding("\t") // pad with tabs
+	table.SetNoWhiteSpace(true)
+	for _, template := range templates {
+		table.Append([]string{template.Name, template.ShortName, template.Description})
+	}
+	table.Render()
+	return nil
+}
+
+func generateIDEFiles(options *Options) error {
+
+	if options.GenerateVSCode {
+		return generateVSCodeFiles(options)
+	}
+
+	return nil
+}
+
+func generateVSCodeFiles(options *Options) error {
+
+	targetDir := filepath.Join(options.TargetDir, ".vscode")
+	source, err := debme.FS(ides, "ides/vscode")
+	if err != nil {
+		return err
+	}
+
+	// Use gosod to install the template
+	installer := gosod.New(source)
+
+	binaryName := filepath.Base(options.TargetDir)
+	if runtime.GOOS == "windows" {
+		// yay windows
+		binaryName += ".exe"
+	}
+
+	options.PathToDesktopBinary = filepath.Join("build", runtime.GOOS, "desktop", binaryName)
+	options.PathToServerBinary = filepath.Join("build", runtime.GOOS, "server", binaryName)
+
+	err = installer.Extract(targetDir, options)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

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

@@ -0,0 +1,24 @@
+# README
+
+## About
+
+This is a basic Svelte template, using rollup to bundle the assets into a single JS file.
+Rollup is configured to do the following:
+
+  - Convert imported images to base64 strings
+  - Convert `url()` in `@font-face` declarations to base64 strings
+  - Bundle all css into the JS bundle
+  - Copy `index.html` from `frontend/src/` to `frontend/dist/`
+
+Clicking the button will call the backend 
+
+## Building 
+
+To build this project in debug mode, use `wails build`. For production, use `wails build -production`.
+To generate a platform native package, add the `-package` flag.
+
+## Live Development
+
+To run in live development mode, run `wails dev` in the project directory. In another terminal, go into the `frontend` 
+directory and run `npm run dev`. The frontend dev server will run on http://localhost:5000. Connect to this
+in your browser and connect to your application. 

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

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

v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/.gitignore

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