v2.0.0-beta.24

Add Svelte template

README.md

@@ -183,9 +183,6 @@ This project is supported by these kind people / companies:
 <a href="https://github.com/ilgityildirim" style="width:50px">
   <img src="https://github.com/ilgityildirim.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/ondoki" style="width:65px">
-  <img src="https://github.com/ondoki.png?size=65" width="65"/>
-</a>
 <a href="https://github.com/questrail" style="width:50px">
   <img src="https://github.com/questrail.png?size=50" width="50"/>
 </a>
@@ -198,6 +195,15 @@ This project is supported by these kind people / companies:
 <a href="https://github.com/charlie-dee" style="width:55px">
   <img src="https://github.com/charlie-dee.png?size=55" width="55"/>
 </a>
+<a href="https://github.com/EdenNetworkItalia" style="width:65px">
+  <img src="https://github.com/EdenNetworkItalia.png?size=65" width="65"/>
+</a>
+<a href="https://github.com/michaelolson1996" style="width:55px">
+  <img src="https://github.com/michaelolson1996.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/GargantuaX" style="width:45px">
+  <img src="https://github.com/GargantuaX.png?size=45" width="45"/>
+</a>
 
 <span id="nav-6"></span>
 

README.zh-Hans.md

@@ -186,9 +186,6 @@
 <a href="https://github.com/ilgityildirim" style="width:50px">
   <img src="https://github.com/ilgityildirim.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/ondoki" style="width:65px">
-  <img src="https://github.com/ondoki.png?size=65" width="65"/>
-</a>
 <a href="https://github.com/questrail" style="width:50px">
   <img src="https://github.com/questrail.png?size=50" width="50"/>
 </a>
@@ -201,6 +198,15 @@
 <a href="https://github.com/charlie-dee" style="width:55px">
   <img src="https://github.com/charlie-dee.png?size=55" width="55"/>
 </a>
+<a href="https://github.com/EdenNetworkItalia" style="width:65px">
+  <img src="https://github.com/EdenNetworkItalia.png?size=65" width="65"/>
+</a>
+<a href="https://github.com/michaelolson1996" style="width:55px">
+  <img src="https://github.com/michaelolson1996.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/GargantuaX" style="width:45px">
+  <img src="https://github.com/GargantuaX.png?size=45" width="45"/>
+</a>
 
 <span id="nav-6"></span>
 

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

@@ -15,8 +15,6 @@ The build command processes the Wails project and generates an application binar
 | -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 | |
@@ -36,13 +34,13 @@ The build process is as follows:
   - 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.
+  - 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.
+  - The platform assets in the `build/<platform>` directory are processed: manifest + icons compiled to a `.syso` file (
+    deleted after compilation), `info.plist` copied to `.app` on Mac.
+  - 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/generate/generate.go

@@ -1,9 +1,8 @@
 package generate
 
 import (
-	"io"
-
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/generate/template"
+	"io"
 
 	"github.com/leaanthony/clir"
 )
@@ -17,6 +16,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 	if err != nil {
 		return err
 	}
+
 	template.AddSubCommand(app, command, w)
 
 	return nil

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

@@ -4,13 +4,12 @@
 
 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:34115. Connect to this
-in your browser and connect to your application. 
+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:34115. Connect to this in your
+browser and connect to your application.
+
+## Building
+
+To build a redistributable, production mode package, use `wails build`.

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

@@ -22,7 +22,6 @@ github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
 github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934 // indirect
 github.com/leaanthony/slicer v1.5.0 // indirect
 github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-github.com/leaanthony/webview2runtime v1.1.0 // indirect
 github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 github.com/pkg/errors v0.9.1 // indirect

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

@@ -90,8 +90,6 @@ github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0H
 github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
 github.com/leaanthony/typescriptify-golang-structs v0.1.7 h1:yoznzWzyxkO/iWdlpq+aPcuJ5Y/hpjq/lmgMFmpjwl0=
 github.com/leaanthony/typescriptify-golang-structs v0.1.7/go.mod h1:cWtOkiVhMF77e6phAXUcfNwYmMwCJ67Sij24lfvi9Js=
-github.com/leaanthony/webview2runtime v1.1.0 h1:N0pv55ift8XtqozIp4PNOtRCJ/Qdd/qzx80lUpalS4c=
-github.com/leaanthony/webview2runtime v1.1.0/go.mod h1:hH9GnWCve3DYzNaPOcPbhHQ7fodXR1QJNsnwixid4Tk=
 github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 h1:5iOd93PZbpH4Iir8QkC4coFD+zEQEZSIRcjwjTFZkr0=
 github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18/go.mod h1:KEbMsKoznsebyGHwLk5LqkFOxL5uXSRdvpP4+avmAMs=
 github.com/leaanthony/winicon v1.0.0/go.mod h1:en5xhijl92aphrJdmRPlh4NI1L6wq3gEm0LpXAPghjU=

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

@@ -22,7 +22,6 @@ github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
 github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934 // indirect
 github.com/leaanthony/slicer v1.5.0 // indirect
 github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-github.com/leaanthony/webview2runtime v1.1.0 // indirect
 github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 github.com/pkg/errors v0.9.1 // indirect

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

@@ -91,8 +91,6 @@ github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0H
 github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
 github.com/leaanthony/typescriptify-golang-structs v0.1.7 h1:yoznzWzyxkO/iWdlpq+aPcuJ5Y/hpjq/lmgMFmpjwl0=
 github.com/leaanthony/typescriptify-golang-structs v0.1.7/go.mod h1:cWtOkiVhMF77e6phAXUcfNwYmMwCJ67Sij24lfvi9Js=
-github.com/leaanthony/webview2runtime v1.1.0 h1:N0pv55ift8XtqozIp4PNOtRCJ/Qdd/qzx80lUpalS4c=
-github.com/leaanthony/webview2runtime v1.1.0/go.mod h1:hH9GnWCve3DYzNaPOcPbhHQ7fodXR1QJNsnwixid4Tk=
 github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 h1:5iOd93PZbpH4Iir8QkC4coFD+zEQEZSIRcjwjTFZkr0=
 github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18/go.mod h1:KEbMsKoznsebyGHwLk5LqkFOxL5uXSRdvpP4+avmAMs=
 github.com/leaanthony/winicon v1.0.0/go.mod h1:en5xhijl92aphrJdmRPlh4NI1L6wq3gEm0LpXAPghjU=

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

@@ -22,7 +22,6 @@ github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
 github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934 // indirect
 github.com/leaanthony/slicer v1.5.0 // indirect
 github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-github.com/leaanthony/webview2runtime v1.1.0 // indirect
 github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 github.com/pkg/errors v0.9.1 // indirect

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

@@ -91,8 +91,6 @@ github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0H
 github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
 github.com/leaanthony/typescriptify-golang-structs v0.1.7 h1:yoznzWzyxkO/iWdlpq+aPcuJ5Y/hpjq/lmgMFmpjwl0=
 github.com/leaanthony/typescriptify-golang-structs v0.1.7/go.mod h1:cWtOkiVhMF77e6phAXUcfNwYmMwCJ67Sij24lfvi9Js=
-github.com/leaanthony/webview2runtime v1.1.0 h1:N0pv55ift8XtqozIp4PNOtRCJ/Qdd/qzx80lUpalS4c=
-github.com/leaanthony/webview2runtime v1.1.0/go.mod h1:hH9GnWCve3DYzNaPOcPbhHQ7fodXR1QJNsnwixid4Tk=
 github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 h1:5iOd93PZbpH4Iir8QkC4coFD+zEQEZSIRcjwjTFZkr0=
 github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18/go.mod h1:KEbMsKoznsebyGHwLk5LqkFOxL5uXSRdvpP4+avmAMs=
 github.com/leaanthony/winicon v1.0.0/go.mod h1:en5xhijl92aphrJdmRPlh4NI1L6wq3gEm0LpXAPghjU=

v2/cmd/wails/internal/version.go

@@ -1,3 +1,3 @@
 package internal
 
-var Version = "v2.0.0-beta.23"
+var Version = "v2.0.0-beta.24"

v2/go.mod

@@ -22,12 +22,11 @@ require (
 	github.com/leaanthony/debme v1.2.1
 	github.com/leaanthony/go-ansi-parser v1.0.1
 	github.com/leaanthony/go-common-file-dialog v1.0.3
-	github.com/leaanthony/go-webview2 v0.0.0-20211202091502-64deee9a37e3
+	github.com/leaanthony/go-webview2 v1.0.2
 	github.com/leaanthony/gosod v1.0.3
 	github.com/leaanthony/idgen v1.0.0
 	github.com/leaanthony/slicer v1.5.0
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7
-	github.com/leaanthony/webview2runtime v1.1.0
 	github.com/leaanthony/winc v0.0.0-20211202091710-9931d43181ff
 	github.com/leaanthony/winicon v1.0.0
 	github.com/matryer/is v1.4.0
@@ -43,7 +42,7 @@ require (
 	github.com/ztrue/tracerr v0.3.0
 	golang.org/x/mod v0.4.1
 	golang.org/x/net v0.0.0-20210510120150-4163338589ed
-	golang.org/x/sys v0.0.0-20211020174200-9d6173849985
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e
 	golang.org/x/tools v0.1.0
 	nhooyr.io/websocket v1.8.6
 )
@@ -81,3 +80,5 @@ require (
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
+
+replace github.com/leaanthony/go-webview2 => C:\Users\leaan\Documents\wails-v2-beta\go-webview2

v2/go.sum

@@ -118,8 +118,6 @@ github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQ
 github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM=
 github.com/leaanthony/go-common-file-dialog v1.0.3 h1:O0uGjKnWtdEADGrkg+TyAAbZylykMwwx/MNEXn9fp+Y=
 github.com/leaanthony/go-common-file-dialog v1.0.3/go.mod h1:TGhEc9eSJgRsupZ+iH1ZgAOnEo9zp05cRH2j08RPrF0=
-github.com/leaanthony/go-webview2 v0.0.0-20211202091502-64deee9a37e3 h1:vKdQzUWiq5wtVBLTTeYuikcgQbF/HtYaOmxGzbfkcT0=
-github.com/leaanthony/go-webview2 v0.0.0-20211202091502-64deee9a37e3/go.mod h1:iX54IaVk1FnDqMuHJ47VYLPQOcVqQiOe9SJACt9CAbU=
 github.com/leaanthony/gosod v1.0.3 h1:Fnt+/B6NjQOVuCWOKYRREZnjGyvg+mEhd1nkkA04aTQ=
 github.com/leaanthony/gosod v1.0.3/go.mod h1:BJ2J+oHsQIyIQpnLPjnqFGTMnOZXDbvWtRCSG7jGxs4=
 github.com/leaanthony/idgen v1.0.0 h1:IZreR+JGEzFV4yeVuBZA25gM0keUoFy+RDUldncQ+Jw=
@@ -128,8 +126,6 @@ github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0H
 github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
 github.com/leaanthony/typescriptify-golang-structs v0.1.7 h1:yoznzWzyxkO/iWdlpq+aPcuJ5Y/hpjq/lmgMFmpjwl0=
 github.com/leaanthony/typescriptify-golang-structs v0.1.7/go.mod h1:cWtOkiVhMF77e6phAXUcfNwYmMwCJ67Sij24lfvi9Js=
-github.com/leaanthony/webview2runtime v1.1.0 h1:N0pv55ift8XtqozIp4PNOtRCJ/Qdd/qzx80lUpalS4c=
-github.com/leaanthony/webview2runtime v1.1.0/go.mod h1:hH9GnWCve3DYzNaPOcPbhHQ7fodXR1QJNsnwixid4Tk=
 github.com/leaanthony/winc v0.0.0-20211202091710-9931d43181ff h1:FwGObElCr/T/xy8S9IKDjWsNcfJHGxgjRl/GIbcseoQ=
 github.com/leaanthony/winc v0.0.0-20211202091710-9931d43181ff/go.mod h1:KEbMsKoznsebyGHwLk5LqkFOxL5uXSRdvpP4+avmAMs=
 github.com/leaanthony/winicon v1.0.0 h1:ZNt5U5dY71oEoKZ97UVwJRT4e+5xo5o/ieKuHuk8NqQ=
@@ -258,10 +254,9 @@ golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211020174200-9d6173849985 h1:LOlKVhfDyahgmqa97awczplwkjzNaELFg3zRIJ13RYo=
-golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

v2/internal/appng/app_windows.go

@@ -15,9 +15,9 @@ func PreflightChecks(options *options.App, logger *logger.Logger) error {
 	// Process the webview2 runtime situation. We can pass a strategy in via the `webview2` flag for `wails build`.
 	// This will determine how wv2runtime.Process will handle a lack of valid runtime.
 	installedVersion, err := wv2runtime.Process()
-	if installedVersion != nil {
-		logger.Debug("WebView2 Runtime installed: Name: '%s' Version:'%s' Location:'%s'. Minimum version required: %s.",
-			installedVersion.Name, installedVersion.Version, installedVersion.Location, wv2runtime.MinimumRuntimeVersion)
+	if installedVersion != "" {
+		logger.Debug("WebView2 Runtime Version '%s' installed. Minimum version required: %s.",
+			installedVersion, wv2runtime.MinimumRuntimeVersion)
 	}
 	if err != nil {
 		return err

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

@@ -5,7 +5,7 @@ package wv2runtime
 
 import (
 	"fmt"
-	"github.com/leaanthony/webview2runtime"
+	"github.com/wailsapp/wails/v2/internal/webview2runtime"
 )
 
 func doInstallationStrategy(installStatus installationStatus) error {

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

@@ -5,7 +5,7 @@ package wv2runtime
 
 import (
 	"fmt"
-	"github.com/leaanthony/webview2runtime"
+	"github.com/wailsapp/wails/v2/internal/webview2runtime"
 )
 
 func doInstallationStrategy(installStatus installationStatus) error {

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

@@ -5,7 +5,7 @@ package wv2runtime
 
 import (
 	"fmt"
-	"github.com/leaanthony/webview2runtime"
+	"github.com/wailsapp/wails/v2/internal/webview2runtime"
 )
 
 func doInstallationStrategy(installStatus installationStatus) error {

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

@@ -5,7 +5,7 @@ package wv2runtime
 
 import (
 	"fmt"
-	"github.com/leaanthony/webview2runtime"
+	"github.com/wailsapp/wails/v2/internal/webview2runtime"
 )
 
 func doInstallationStrategy(installStatus installationStatus) error {

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

@@ -2,7 +2,6 @@ package wv2runtime
 
 import (
 	"github.com/leaanthony/go-webview2/webviewloader"
-	"github.com/leaanthony/webview2runtime"
 )
 
 const MinimumRuntimeVersion string = "91.0.992.28"
@@ -15,14 +14,17 @@ const (
 	installed
 )
 
-func Process() (*webview2runtime.Info, error) {
+func Process() (string, error) {
 	installStatus := needsInstalling
-	installedVersion := webview2runtime.GetInstalledVersion()
-	if installedVersion != nil {
+	installedVersion, err := webviewloader.GetInstalledVersion()
+	if err != nil {
+		return "", err
+	}
+	if installedVersion != "" {
 		installStatus = installed
-		compareResult, err := webviewloader.CompareBrowserVersions(installedVersion.Version, MinimumRuntimeVersion)
+		compareResult, err := webviewloader.CompareBrowserVersions(installedVersion, MinimumRuntimeVersion)
 		if err != nil {
-			return nil, err
+			return "", err
 		}
 		updateRequired := compareResult == -1
 		// Installed and does not require updating

v2/internal/frontend/desktop/darwin/WailsMenu.m

@@ -43,14 +43,16 @@
 - (WailsMenu*) initWithNSTitle:(NSString *)title {
     if( title != nil ) {
         [super initWithTitle:title];
+    } else {
+        [self init];
     }
     [self setAutoenablesItems:NO];
-    return [self init];
+    return self;
 }
 
 - (void) appendSubmenu :(WailsMenu*)child {
     NSMenuItem *childMenuItem = [[NSMenuItem new] autorelease];
-    [childMenuItem setTitle:[child title]];
+    [childMenuItem setTitle:child.title];
     [self addItem:childMenuItem];
     [childMenuItem setSubmenu:child];
 }

v2/internal/frontend/runtime/wrapper/runtime.d.ts

@@ -1,14 +1,14 @@
-interface Position {
+export interface Position {
     x: number;
     y: number;
 }
 
-interface Size {
+export interface Size {
     w: number;
     h: number;
 }
 
-interface RGBA {
+export interface RGBA {
     r: number;
     g: number;
     b: number;
@@ -16,7 +16,7 @@ interface RGBA {
 }
 
 
-interface runtime {
+export interface runtime {
     EventsEmit(eventName: string, data?: any): void;
 
     EventsOn(eventName: string, callback: (data?: any) => void): void;
@@ -83,5 +83,3 @@ declare global {
         runtime: runtime;
     }
 }
-
-export { };

v2/internal/gomod/gomod_test.go

@@ -33,7 +33,6 @@ require (
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.5.0 // indirect
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-	github.com/leaanthony/webview2runtime v1.1.0 // indirect
 	github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -97,7 +96,6 @@ require (
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.5.0 // indirect
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-	github.com/leaanthony/webview2runtime v1.1.0 // indirect
 	github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -139,7 +137,6 @@ require (
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.5.0 // indirect
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-	github.com/leaanthony/webview2runtime v1.1.0 // indirect
 	github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -180,7 +177,6 @@ require (
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.5.0 // indirect
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-	github.com/leaanthony/webview2runtime v1.1.0 // indirect
 	github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -222,7 +218,6 @@ require (
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.5.0 // indirect
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-	github.com/leaanthony/webview2runtime v1.1.0 // indirect
 	github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -264,7 +259,6 @@ require (
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.5.0 // indirect
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-	github.com/leaanthony/webview2runtime v1.1.0 // indirect
 	github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -308,7 +302,6 @@ require (
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.5.0 // indirect
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-	github.com/leaanthony/webview2runtime v1.1.0 // indirect
 	github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -353,7 +346,6 @@ require (
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.5.0 // indirect
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-	github.com/leaanthony/webview2runtime v1.1.0 // indirect
 	github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -456,7 +448,6 @@ require (
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.5.0 // indirect
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-	github.com/leaanthony/webview2runtime v1.1.0 // indirect
 	github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -498,7 +489,6 @@ require (
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.5.0 // indirect
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-	github.com/leaanthony/webview2runtime v1.1.0 // indirect
 	github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -540,7 +530,6 @@ require (
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.5.0 // indirect
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-	github.com/leaanthony/webview2runtime v1.1.0 // indirect
 	github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -585,7 +574,6 @@ require (
 	github.com/leaanthony/gosod v1.0.3 // indirect
 	github.com/leaanthony/slicer v1.5.0 // indirect
 	github.com/leaanthony/typescriptify-golang-structs v0.1.7 // indirect
-	github.com/leaanthony/webview2runtime v1.1.0 // indirect
 	github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 // indirect
 	github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect

v2/internal/system/system_windows.go

@@ -4,7 +4,7 @@
 package system
 
 import (
-	"github.com/leaanthony/webview2runtime"
+	"github.com/leaanthony/go-webview2/webviewloader"
 	"github.com/wailsapp/wails/v2/internal/system/operatingsystem"
 	"github.com/wailsapp/wails/v2/internal/system/packagemanager"
 )
@@ -28,11 +28,7 @@ func (i *Info) discover() error {
 
 func checkWebView2() *packagemanager.Dependancy {
 
-	info := webview2runtime.GetInstalledVersion()
-	version := ""
-	if info != nil {
-		version = info.Version
-	}
+	version, _ := webviewloader.GetInstalledVersion()
 	installed := version != ""
 
 	return &packagemanager.Dependancy{

v2/pkg/runtime/runtime.go

@@ -8,6 +8,9 @@ import (
 	goruntime "runtime"
 )
 
+const contextError = `An invalid context was passed. This method requires the specific context given in the lifecycle hooks:
+https://wails.io/docs/reference/runtime/intro`
+
 func getFrontend(ctx context.Context) frontend.Frontend {
 	if ctx == nil {
 		pc, _, _, _ := goruntime.Caller(1)
@@ -20,7 +23,7 @@ func getFrontend(ctx context.Context) frontend.Frontend {
 	}
 	pc, _, _, _ := goruntime.Caller(1)
 	funcName := goruntime.FuncForPC(pc).Name()
-	log.Fatalf("cannot call '%s': Application not initialised", funcName)
+	log.Fatalf("cannot call '%s': %s", funcName, contextError)
 	return nil
 }
 func getLogger(ctx context.Context) *logger.Logger {
@@ -35,7 +38,7 @@ func getLogger(ctx context.Context) *logger.Logger {
 	}
 	pc, _, _, _ := goruntime.Caller(1)
 	funcName := goruntime.FuncForPC(pc).Name()
-	log.Fatalf("cannot call '%s': Application not initialised", funcName)
+	log.Fatalf("cannot call '%s': %s", funcName, contextError)
 	return nil
 }
 
@@ -51,7 +54,7 @@ func getEvents(ctx context.Context) frontend.Events {
 	}
 	pc, _, _, _ := goruntime.Caller(1)
 	funcName := goruntime.FuncForPC(pc).Name()
-	log.Fatalf("cannot call '%s': Application not initialised", funcName)
+	log.Fatalf("cannot call '%s': %s", funcName, contextError)
 	return nil
 }
 

website/docs/community/templates.mdx

@@ -28,3 +28,11 @@ Example: `wails init -n "Your Project Name" -t https://github.com/misitebao/wail
 ## Angular
 
 - [wails-angular-template](https://github.com/TAINCER/wails-angular-template) - Angular with TypeScript, Sass, Hot-Reload, Code-Splitting and i18n
+
+## React
+
+- [wails-react-template](https://github.com/AlienRecall/wails-react-template) - A template using reactjs
+
+## Svelte
+
+- [wails-svelte-template](https://github.com/raitonoberu/wails-svelte-template) - A template using Svelte

website/docs/credits.mdx

@@ -91,9 +91,6 @@ sidebar_position: 99
 <a href="https://github.com/ilgityildirim" style="width:50px">
   <img src="https://github.com/ilgityildirim.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/ondoki" style="width:65px">
-  <img src="https://github.com/ondoki.png?size=65" width="65"/>
-</a>
 <a href="https://github.com/questrail" style="width:50px">
   <img src="https://github.com/questrail.png?size=50" width="50"/>
 </a>
@@ -106,6 +103,15 @@ sidebar_position: 99
 <a href="https://github.com/charlie-dee" style="width:55px">
   <img src="https://github.com/charlie-dee.png?size=55" width="55"/>
 </a>
+<a href="https://github.com/EdenNetworkItalia" style="width:65px">
+  <img src="https://github.com/EdenNetworkItalia.png?size=65" width="65"/>
+</a>
+<a href="https://github.com/michaelolson1996" style="width:55px">
+  <img src="https://github.com/michaelolson1996.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/GargantuaX" style="width:45px">
+  <img src="https://github.com/GargantuaX.png?size=45" width="45"/>
+</a>
 `,
   }}
 />

website/docs/reference/options.mdx

@@ -284,6 +284,7 @@ func (b *App) beforeClose(ctx context.Context) (prevent bool) {
 		return false
 	}
 	return dialog != "Yes"
+}
 ```
 
 ### WindowStartState

website/docs/reference/runtime/intro.mdx

@@ -8,7 +8,7 @@ The runtime is a library that provides utility methods for your application. The
 and the aim is to try and keep them at parity where possible.
 
 The Go Runtime is available through importing `github.com/wailsapp/wails/v2/pkg/runtime`. All methods in this package
-take a context as the first parameter. This context can be obtained from the [OnStartup](/docs/reference/options#onstartup)
+take a context as the first parameter. This context should be obtained from the [OnStartup](/docs/reference/options#onstartup)
 or [OnDomReady](/docs/reference/options#ondomready) hooks.
 
 :::info Note