Merge pull request #1059 from GargantuaX/master

update zh-hans docs
2026-04-03 21:52:45 -07:00 · 2022-01-06 06:28:35 +11:00 · 2022-01-05 16:01:48 +08:00 · 2022-01-05 17:13:48 +11:00 · 2022-01-05 11:13:34 +08:00 · 2021-12-31 06:58:05 +11:00
99 changed files with 1179 additions and 1206 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,7 +8,7 @@ assignees: ''
 ---

 #####################################################
-     **If you have a technical issue, please do not open a bug this way!** 
+     **V1 users: If you have a technical issue, please do not open a bug this way!** 
                      Please use the `wails issue` command!
          If you do not do this then the issue may be closed automatically.                      

@@ -33,7 +33,7 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.

 **System Details**
-Please provide your platform, GO version and variables, etc
+V2 users: Please add the output of `wails doctor`.

 **Additional context**
 Add any other context about the problem here.
--- a/README.md
+++ b/README.md
@@ -106,6 +106,13 @@ Click [here](https://wails.io) if you are interested in trying out v2 Beta for W

 This project is supported by these kind people / companies:

+<p align="center">
+  <a href="https://www.easywebadv.it/" style="width:150px;">
+    <img src="website/static/img/easyweb.png" width="150"/>
+  </a>
+</p>
+<br/>
+<br/>
 <a href="https://github.com/sponsors/leaanthony" style="width:100px;">
  <img src="sponsors/silver%20sponsor.png" width="100"/>
 </a>
@@ -176,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>
@@ -188,6 +192,18 @@ This project is supported by these kind people / companies:
 <a href="https://github.com/taigrr" style="width:45px">
  <img src="https://github.com/taigrr.png?size=45" width="45"/>
 </a>
+<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>

--- a/README.zh-Hans.md
+++ b/README.zh-Hans.md
@@ -109,6 +109,13 @@

 这个项目由以下这些人或者公司支持：

+<p align="center">
+  <a href="https://www.easywebadv.it/" style="width:100px;">
+    <img src="website/static/img/easyweb.png" width="120"/>
+  </a>
+</p>
+<br/>
+<br/>
 <a href="https://github.com/sponsors/leaanthony" style="width:100px;">
  <img src="sponsors/silver%20sponsor.png" width="100"/>
 </a>
@@ -179,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>
@@ -191,6 +195,18 @@
 <a href="https://github.com/taigrr" style="width:45px">
  <img src="https://github.com/taigrr.png?size=45" width="45"/>
 </a>
+<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>

--- a/cmd/fs.go
+++ b/cmd/fs.go
@@ -148,16 +148,6 @@ func (fs *FSHelper) LocalDir(dir string) (*Dir, error) {
 	}, err
 }

-// LoadRelativeFile loads the given file relative to the caller's directory
-func (fs *FSHelper) LoadRelativeFile(relativePath string) ([]byte, error) {
-	_, filename, _, _ := runtime.Caller(0)
-	fullPath, err := filepath.Abs(filepath.Join(path.Dir(filename), relativePath))
-	if err != nil {
-		return nil, err
-	}
-	return os.ReadFile(fullPath)
-}
-
 // GetSubdirs will return a list of FQPs to subdirectories in the given directory
 func (d *Dir) GetSubdirs() (map[string]string, error) {

--- a/cmd/linux.go
+++ b/cmd/linux.go
@@ -74,6 +74,8 @@ const (
 	NixOS
 	// Artix linux distribution
 	ArtixLinux
+	//Uos distribution
+	Uos
 )

 // DistroInfo contains all the information relating to a linux distribution
@@ -190,6 +192,8 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = NixOS
 	case "artix":
 		result.Distribution = ArtixLinux
+	case "uos":
+		result.Distribution = Uos
 	default:
 		result.Distribution = Unknown
 	}
--- a/cmd/linuxdb.go
+++ b/cmd/linuxdb.go
@@ -1,11 +1,15 @@
 package cmd

 import (
+	_ "embed"
 	"log"

 	"gopkg.in/yaml.v3"
 )

+//go:embed linuxdb.yaml
+var LinuxDBYaml []byte
+
 // LinuxDB is the database for linux distribution data.
 type LinuxDB struct {
 	Distributions map[string]*Distribution `yaml:"distributions"`
@@ -78,14 +82,10 @@ func (l *LinuxDB) GetDistro(distro string) *Distribution {
 // NewLinuxDB creates a new LinuxDB instance from the bundled
 // linuxdb.yaml file.
 func NewLinuxDB() *LinuxDB {
-	data, err := fs.LoadRelativeFile("./linuxdb.yaml")
-	if err != nil {
-		log.Fatal("Could not load linuxdb.yaml")
-	}
 	result := LinuxDB{
 		Distributions: make(map[string]*Distribution),
 	}
-	err = result.ImportData(data)
+	err := result.ImportData(LinuxDBYaml)
 	if err != nil {
 		log.Fatal(err)
 	}
--- a/cmd/linuxdb.yaml
+++ b/cmd/linuxdb.yaml
@@ -100,6 +100,15 @@ distributions:
        gccversioncommand: *gccdumpfullversion
        programs: *debiandefaultprograms
        libraries: *debiandefaultlibraries
+  uos:
+    id: uos
+    releases:
+      default:
+        version: default
+        name: Uos
+        gccversioncommand: *gccdumpfullversion
+        programs: *debiandefaultprograms
+        libraries: *debiandefaultlibraries
  void:
    id: void
    releases:
--- a/cmd/package.go
+++ b/cmd/package.go
@@ -313,10 +313,12 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 		return err
 	}

-	// Generate icon from PNG
-	err = generateWindowsIcon(icon, basename+".ico")
-	if err != nil {
-		return err
+	// Generate icon from PNG if it doesn't exist
+	if !fs.FileExists(basename + ".ico") {
+		err = generateWindowsIcon(icon, basename+".ico")
+		if err != nil {
+			return err
+		}
 	}

 	// Copy manifest
--- a/cmd/system.go
+++ b/cmd/system.go
@@ -278,7 +278,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		distroInfo := GetLinuxDistroInfo()

 		switch distroInfo.Distribution {
-		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
+		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS, Uos:
 			libraryChecker = DpkgInstalled
 		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS, ArtixLinux:
 			libraryChecker = PacmanInstalled
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.16.8"
+const Version = "v1.16.9"
--- a/lib/event/manager.go
+++ b/lib/event/manager.go
@@ -55,20 +55,20 @@ func (e *Manager) addEventListener(eventName string, callback func(...interface{
 		return fmt.Errorf("nil callback bassed to addEventListener")
 	}

-	// Check event has been registered before
-	if e.listeners[eventName] == nil {
-		e.listeners[eventName] = []*eventListener{}
-	}
-
 	// Create the callback
 	listener := &eventListener{
 		callback: callback,
 		counter:  counter,
 	}
+	e.mu.Lock()
+	// Check event has been registered before
+	if e.listeners[eventName] == nil {
+		e.listeners[eventName] = []*eventListener{}
+	}

 	// Register listener
 	e.listeners[eventName] = append(e.listeners[eventName], listener)
-
+	e.mu.Unlock()
 	// All good mate
 	return nil
 }
--- a/v2/cmd/wails/internal/commands/build/README.md
+++ b/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.


--- a/v2/cmd/wails/internal/commands/build/build.go
+++ b/v2/cmd/wails/internal/commands/build/build.go
@@ -2,6 +2,7 @@ package build

 import (
 	"fmt"
+	"github.com/wailsapp/wails/v2/internal/colour"
 	"io"
 	"os"
 	"os/exec"
@@ -38,6 +39,9 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	compilerCommand := "go"
 	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)

+	skipModTidy := false
+	command.BoolFlag("m", "Skip mod tidy before compile", &skipModTidy)
+
 	compress := false
 	command.BoolFlag("upx", "Compress final binary with UPX (if installed)", &compress)

@@ -76,6 +80,12 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	forceBuild := false
 	command.BoolFlag("f", "Force build application", &forceBuild)

+	updateGoMod := false
+	command.BoolFlag("u", "Updates go.mod to use the same Wails version as the CLI", &updateGoMod)
+
+	debug := false
+	command.BoolFlag("debug", "Retains debug data in the compiled application", &debug)
+
 	command.Action(func() error {

 		quiet := verbosity == 0
@@ -157,16 +167,24 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			}
 		}

+		mode := build.Production
+		modeString := "Production"
+		if debug {
+			mode = build.Debug
+			modeString = "Debug"
+		}
+
 		// Create BuildOptions
 		buildOptions := &build.Options{
 			Logger:              logger,
 			OutputType:          outputType,
 			OutputFile:          outputFilename,
 			CleanBuildDirectory: cleanBuildDirectory,
-			Mode:                build.Production,
+			Mode:                mode,
 			Pack:                !noPackage,
 			LDFlags:             ldflags,
 			Compiler:            compilerCommand,
+			SkipModTidy:         skipModTidy,
 			Verbosity:           verbosity,
 			ForceBuild:          forceBuild,
 			IgnoreFrontend:      skipFrontend,
@@ -198,6 +216,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 		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, "Build Mode: \t%s\n", modeString)
 		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)
@@ -210,7 +229,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 		fmt.Fprintf(w, "\n")
 		w.Flush()

-		err = checkGoModVersion(logger)
+		err = checkGoModVersion(logger, updateGoMod)
 		if err != nil {
 			return err
 		}
@@ -239,7 +258,7 @@ func doBuild(buildOptions *build.Options) error {
 	return nil
 }

-func checkGoModVersion(logger *clilogger.CLILogger) error {
+func checkGoModVersion(logger *clilogger.CLILogger, updateGoMod bool) error {
 	cwd, err := os.Getwd()
 	if err != nil {
 		return err
@@ -261,6 +280,36 @@ func checkGoModVersion(logger *clilogger.CLILogger) error {
 		return err
 	}

-	logger.Println("Warning: go.mod is using Wails '%s' but the CLI is '%s'. Consider updating it.\n", gomodversion.String(), internal.Version)
+	if updateGoMod {
+		return syncGoModVersion(cwd)
+	}
+
+	logger.Println("Warning: go.mod is using Wails '%s' but the CLI is '%s'. Consider updating your project's `go.mod` file.\n", gomodversion.String(), internal.Version)
 	return nil
 }
+
+func LogGreen(message string, args ...interface{}) {
+	text := fmt.Sprintf(message, args...)
+	println(colour.Green(text))
+}
+
+func syncGoModVersion(cwd string) error {
+	gomodFilename := filepath.Join(cwd, "go.mod")
+	gomodData, err := os.ReadFile(gomodFilename)
+	if err != nil {
+		return err
+	}
+	outOfSync, err := gomod.GoModOutOfSync(gomodData, internal.Version)
+	if err != nil {
+		return err
+	}
+	if !outOfSync {
+		return nil
+	}
+	LogGreen("Updating go.mod to use Wails '%s'", internal.Version)
+	newGoData, err := gomod.UpdateGoModVersion(gomodData, internal.Version)
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(gomodFilename, newGoData, 0755)
+}
--- a/v2/cmd/wails/internal/commands/dev/dev.go
+++ b/v2/cmd/wails/internal/commands/dev/dev.go
@@ -63,6 +63,7 @@ type devFlags struct {
 	compilerCommand string
 	assetDir        string
 	extensions      string
+	reloadDirs      string
 	openBrowser     bool
 	noReload        bool
 	wailsjsdir      string
@@ -83,8 +84,9 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 	flags := defaultDevFlags()
 	command.StringFlag("ldflags", "optional ldflags", &flags.ldflags)
 	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &flags.compilerCommand)
-	command.StringFlag("assetdir", "Serve assets from the given directory", &flags.assetDir)
+	command.StringFlag("assetdir", "Serve assets from the given directory instead of using the provided asset FS", &flags.assetDir)
 	command.StringFlag("e", "Extensions to trigger rebuilds (comma separated) eg go", &flags.extensions)
+	command.StringFlag("reloaddirs", "Additional directories to trigger reloads (comma separated)", &flags.reloadDirs)
 	command.BoolFlag("browser", "Open application in browser", &flags.openBrowser)
 	command.BoolFlag("noreload", "Disable reload on asset change", &flags.noReload)
 	command.StringFlag("wailsjsdir", "Directory to generate the Wails JS modules", &flags.wailsjsdir)
@@ -301,21 +303,29 @@ func loadAndMergeProjectConfig(cwd string, flags *devFlags) (*project.Project, e

 	var shouldSaveConfig bool

-	if projectConfig.AssetDirectory == "" && flags.assetDir == "" {
-		return nil, fmt.Errorf("No asset directory provided. Please use -assetdir to indicate which directory contains your built assets.")
-	}
-
 	if flags.assetDir == "" && projectConfig.AssetDirectory != "" {
 		flags.assetDir = projectConfig.AssetDirectory
 	}

 	if flags.assetDir != projectConfig.AssetDirectory {
 		projectConfig.AssetDirectory = filepath.ToSlash(flags.assetDir)
+		shouldSaveConfig = true
 	}

-	flags.assetDir, err = filepath.Abs(flags.assetDir)
-	if err != nil {
-		return nil, err
+	if flags.assetDir != "" {
+		flags.assetDir, err = filepath.Abs(flags.assetDir)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if flags.reloadDirs == "" && projectConfig.ReloadDirectories != "" {
+		flags.reloadDirs = projectConfig.ReloadDirectories
+	}
+
+	if flags.reloadDirs != projectConfig.ReloadDirectories {
+		projectConfig.ReloadDirectories = filepath.ToSlash(flags.reloadDirs)
+		shouldSaveConfig = true
 	}

 	if flags.devServerURL == defaultDevServerURL && projectConfig.DevServerURL != defaultDevServerURL && projectConfig.DevServerURL != "" {
@@ -503,11 +513,26 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc
 		newBinaryProcess *process.Process
 	)
 	var extensionsThatTriggerARebuild = sliceToMap(strings.Split(flags.extensions, ","))
+	var dirsThatTriggerAReload []string
+	for _, dir := range strings.Split(flags.reloadDirs, ",") {
+		if dir == "" {
+			continue
+		}
+		path, err := filepath.Abs(dir)
+		if err != nil {
+			LogRed("Unable to expand reloadDir '%s': %s", dir, err)
+			continue
+		}
+		dirsThatTriggerAReload = append(dirsThatTriggerAReload, path)
+	}
+
 	quit := false
 	interval := time.Duration(flags.debounceMS) * time.Millisecond
 	timer := time.NewTimer(interval)
 	rebuild := false
 	reload := false
+	assetDir := ""
+	changedPaths := map[string]struct{}{}
 	for quit == false {
 		//reload := false
 		select {
@@ -519,12 +544,13 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc
 			// Check for file writes
 			if item.Op&fsnotify.Write == fsnotify.Write {
 				// Ignore directories
-				if fs.DirExists(item.Name) {
+				itemName := item.Name
+				if fs.DirExists(itemName) {
 					continue
 				}

 				// Iterate all file patterns
-				ext := filepath.Ext(item.Name)
+				ext := filepath.Ext(itemName)
 				if ext != "" {
 					ext = ext[1:]
 					if _, exists := extensionsThatTriggerARebuild[ext]; exists {
@@ -534,9 +560,17 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc
 					}
 				}

-				if strings.HasPrefix(item.Name, flags.assetDir) {
-					reload = true
+				for _, reloadDir := range dirsThatTriggerAReload {
+					if strings.HasPrefix(itemName, reloadDir) {
+						reload = true
+						break
+					}
 				}
+
+				if !reload {
+					changedPaths[filepath.Dir(itemName)] = struct{}{}
+				}
+
 				timer.Reset(interval)
 			}
 			// Check for new directories
@@ -568,6 +602,35 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc
 					debugBinaryProcess = newBinaryProcess
 				}
 			}
+			if len(changedPaths) != 0 {
+				if assetDir == "" {
+					resp, err := http.Get("http://localhost:34115/wails/assetdir")
+					if err != nil {
+						LogRed("Error during retrieving assetdir: %s", err.Error())
+					} else {
+						content, err := io.ReadAll(resp.Body)
+						if err != nil {
+							LogRed("Error reading assetdir from devserver: %s", err.Error())
+						} else {
+							assetDir = string(content)
+						}
+						resp.Body.Close()
+					}
+				}
+
+				if assetDir != "" {
+					for path := range changedPaths {
+						if strings.HasPrefix(path, assetDir) {
+							reload = true
+							break
+						}
+					}
+				} else if len(dirsThatTriggerAReload) == 0 {
+					LogRed("Reloading couldn't be triggered: Please specify -assetdir or -reloaddirs")
+				}
+
+				changedPaths = map[string]struct{}{}
+			}
 			if reload {
 				reload = false
 				_, err = http.Get("http://localhost:34115/wails/reload")
--- a/v2/cmd/wails/internal/commands/generate/generate.go
+++ b/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
--- a/v2/cmd/wails/internal/commands/generate/template/base/NEXTSTEPS.md.template
+++ b/v2/cmd/wails/internal/commands/generate/template/base/NEXTSTEPS.md.template
@@ -10,7 +10,6 @@ The next steps to complete the template are:
     - It is really important to ensure `helpurl` is valid as this is where users of the template will be directed for help.
  2. Update `README.md`.
  3. Edit `wails.json` and ensure all fields are correct, especially:
-     - `assetdir` - path to your assets
     - `wailsjsdir` - path to generate wailsjs modules
     - `frontend:install` - The command to install your frontend dependencies
     - `frontend:build` - The command to build your frontend
--- a/v2/cmd/wails/internal/commands/generate/template/base/README.md
+++ b/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`.
--- a/v2/cmd/wails/internal/commands/generate/template/base/go.mod.tmpl
+++ b/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
--- a/v2/cmd/wails/internal/commands/generate/template/base/go.sum
+++ b/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=
--- a/v2/cmd/wails/internal/commands/generate/template/base/wails.tmpl.json
+++ b/v2/cmd/wails/internal/commands/generate/template/base/wails.tmpl.json
@@ -1,7 +1,6 @@
 {
  "name": "{{.ProjectName}}",
  "outputfilename": "{{.BinaryName}}",
-  "assetdir": "frontend/dist",
  "frontend:install": "npm install",
  "frontend:build": "npm run build",
  "author": {
--- a/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/workspace.tmpl.xml
+++ b/v2/cmd/wails/internal/commands/initialise/templates/ides/goland/workspace.tmpl.xml
@@ -36,7 +36,6 @@
            <working_directory value="$PROJECT_DIR$"/>
            <go_parameters value="-gcflags &quot;all=-N -l&quot; -tags dev -o {{.PathToDesktopBinary}}"/>
            <useCustomBuildTags value="true"/>
-            <parameters value="-assetdir {{.AssetDir}}"/>
            <envs>
                <env name="CGO_ENABLED" value="&quot;{{.CGOEnabled}}&quot;"/>
            </envs>
--- a/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/launch.tmpl.json
+++ b/v2/cmd/wails/internal/commands/initialise/templates/ides/vscode/launch.tmpl.json
@@ -9,11 +9,7 @@
      "program": "${workspaceFolder}/{{.PathToDesktopBinary}}",
      "preLaunchTask": "build",
      "cwd": "${workspaceFolder}",
-      "env": {},
-      "args": [
-        "-assetdir",
-        "{{.AssetDir}}"
-      ]
+      "env": {}
    }
  ]
 }
--- a/v2/cmd/wails/internal/commands/initialise/templates/templates.go
+++ b/v2/cmd/wails/internal/commands/initialise/templates/templates.go
@@ -42,7 +42,6 @@ type Data struct {
 	AuthorNameAndEmail string
 	WailsDirectory     string
 	GoSDKPath          string
-	AssetDir           string
 	WindowsFlags       string
 	CGOEnabled         string
 	OutputFile         string
@@ -60,7 +59,6 @@ type Options struct {
 	InitGit             bool
 	AuthorName          string
 	AuthorEmail         string
-	AssetDir            string
 	IDE                 string
 	ProjectNameFilename string // The project name but as a valid filename
 	WailsVersion        string
@@ -261,7 +259,6 @@ func Install(options *Options) (bool, *Template, error) {
 		AuthorName:     options.AuthorName,
 		WailsVersion:   options.WailsVersion,
 		GoSDKPath:      options.GoSDKPath,
-		AssetDir:       options.AssetDir,
 	}

 	// Create a formatted name and email combo.
@@ -408,22 +405,6 @@ func installIDEFiles(o ideOptions) error {
 		binaryName += ".exe"
 	}

-	// Parse wails.json for assetdir
-	wailsJSONBytes, err := os.ReadFile(filepath.Join(o.options.TargetDir, "wails.json"))
-	if err != nil {
-		return err
-	}
-	var wailsJSON map[string]interface{}
-	err = json.Unmarshal(wailsJSONBytes, &wailsJSON)
-	if err != nil {
-		return err
-	}
-	assetDir := wailsJSON["assetdir"]
-	if assetDir == "" {
-		return fmt.Errorf("Unable to find 'assetdir' in 'wails.json' ")
-	}
-
-	o.options.AssetDir = assetDir.(string)
 	o.options.PathToDesktopBinary = filepath.ToSlash(filepath.Join("build", "bin", binaryName))

 	o.options.WindowsFlags = ""
--- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/go.mod.tmpl
+++ b/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
--- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/go.sum
+++ b/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=
--- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/wails.tmpl.json
+++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/wails.tmpl.json
@@ -1,7 +1,6 @@
 {
  "name": "{{.ProjectName}}",
  "outputfilename": "{{.BinaryName}}",
-  "assetdir": "frontend/dist",
  "frontend:install": "npm install",
  "frontend:build": "npm run build",
  "wailsjsdir": "./frontend",
--- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/go.mod.tmpl
+++ b/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
--- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/go.sum
+++ b/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=
--- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/wails.tmpl.json
+++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/wails.tmpl.json
@@ -1,7 +1,6 @@
 {
  "name": "{{.ProjectName}}",
  "outputfilename": "{{.BinaryName}}",
-  "assetdir": "frontend/src",
  "wailsjsdir": "./frontend",
  "author": {
    "name": "{{.AuthorName}}",
--- a/v2/cmd/wails/internal/version.go
+++ b/v2/cmd/wails/internal/version.go
@@ -1,3 +1,3 @@
 package internal

-var Version = "v2.0.0-beta.21"
+var Version = "v2.0.0-beta.27"
--- a/v2/go.mod
+++ b/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
 )
--- a/v2/go.sum
+++ b/v2/go.sum
@@ -118,8 +118,8 @@ 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/go-webview2 v1.0.2 h1:IjTbpAXUig33G3LUqf+8EClZutg2Z/C1cbxqhHKPxbU=
+github.com/leaanthony/go-webview2 v1.0.2/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 +128,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 +256,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=
--- a/v2/internal/appng/app_dev.go
+++ b/v2/internal/appng/app_dev.go
@@ -5,7 +5,10 @@ package appng

 import (
 	"context"
+	"embed"
 	"flag"
+	"fmt"
+	iofs "io/fs"
 	"os"
 	"path/filepath"

@@ -91,12 +94,30 @@ func CreateApp(appoptions *options.App) (*App, error) {
 		}
 	}

+	if assetdir == "" {
+		// If no assetdir has been defined, let's try to infer it from the project root and the asset FS.
+		assetdir, err = tryInferAssetDirFromFS(appoptions.Assets)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if assetdir != "" {
+		// Let's override the assets to serve from on disk, if needed
+		absdir, err := filepath.Abs(assetdir)
+		if err != nil {
+			return nil, err
+		}
+
+		myLogger.Info("Serving assets from disk: %s", absdir)
+		appoptions.Assets = os.DirFS(absdir)
+
+		ctx = context.WithValue(ctx, "assetdir", assetdir)
+	}
+
 	if devServerURL != "" {
 		ctx = context.WithValue(ctx, "devserverurl", devServerURL)
 	}
-	if assetdir != "" {
-		ctx = context.WithValue(ctx, "assetdir", assetdir)
-	}

 	if loglevel != "" {
 		level, err := pkglogger.StringToLogLevel(loglevel)
@@ -203,3 +224,32 @@ func generateBindings(bindings *binding.Bindings) error {
 	return nil

 }
+
+func tryInferAssetDirFromFS(assets iofs.FS) (string, error) {
+	if _, isEmbedFs := assets.(embed.FS); !isEmbedFs {
+		// We only infer the assetdir for embed.FS assets
+		return "", nil
+	}
+
+	path, err := fs.FindPathToFile(assets, "index.html")
+	if err != nil {
+		return "", err
+	}
+
+	path, err = filepath.Abs(path)
+	if err != nil {
+		return "", err
+	}
+
+	if _, err := os.Stat(filepath.Join(path, "index.html")); err != nil {
+		if os.IsNotExist(err) {
+			err = fmt.Errorf(
+				"inferred assetdir '%s' does not exist or does not contain an 'index.html' file, "+
+					"please specify it with -assetdir or set it in wails.json",
+				path)
+		}
+		return "", err
+	}
+
+	return path, nil
+}
--- a/v2/internal/appng/app_windows.go
+++ b/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
--- a/v2/internal/ffenestri/windows/wv2runtime/browser.go
+++ b/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 {
--- a/v2/internal/ffenestri/windows/wv2runtime/download.go
+++ b/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 {
--- a/v2/internal/ffenestri/windows/wv2runtime/embed.go
+++ b/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 {
--- a/v2/internal/ffenestri/windows/wv2runtime/error.go
+++ b/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 {
--- a/v2/internal/ffenestri/windows/wv2runtime/wv2runtime.go
+++ b/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
--- a/v2/internal/frontend/assetserver/assetserver_browser_dev.go
+++ b/v2/internal/frontend/assetserver/assetserver_browser_dev.go
@@ -5,11 +5,13 @@ package assetserver

 import (
 	"bytes"
-	"github.com/wailsapp/wails/v2/internal/frontend/runtime"
-	"github.com/wailsapp/wails/v2/pkg/options"
-	"golang.org/x/net/html"
-	"path/filepath"
+	"context"
+	"io/fs"
 	"strings"
+
+	"github.com/wailsapp/wails/v2/internal/frontend/runtime"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"golang.org/x/net/html"
 )

 /*
@@ -19,35 +21,41 @@ It injects a websocket based IPC script into `index.html`.

 */

-import (
-	"os"
-)
-
 type BrowserAssetServer struct {
-	runtimeJS  []byte
-	assetdir   string
-	appOptions *options.App
+	assets    fs.FS
+	runtimeJS []byte
+	logger    *logger.Logger
 }

-func NewBrowserAssetServer(assetdir string, bindingsJSON string, appOptions *options.App) (*BrowserAssetServer, error) {
-	result := &BrowserAssetServer{
-		assetdir:   assetdir,
-		appOptions: appOptions,
+func NewBrowserAssetServer(ctx context.Context, assets fs.FS, bindingsJSON string) (*BrowserAssetServer, error) {
+	result := &BrowserAssetServer{}
+	_logger := ctx.Value("logger")
+	if _logger != nil {
+		result.logger = _logger.(*logger.Logger)
+	}
+
+	var err error
+	result.assets, err = prepareAssetsForServing(assets)
+	if err != nil {
+		return nil, err
 	}

 	var buffer bytes.Buffer
 	buffer.WriteString(`window.wailsbindings='` + bindingsJSON + `';` + "\n")
 	buffer.Write(runtime.RuntimeDesktopJS)
 	result.runtimeJS = buffer.Bytes()
+
 	return result, nil
 }

-func (a *BrowserAssetServer) loadFileFromDisk(filename string) ([]byte, error) {
-	return os.ReadFile(filepath.Join(a.assetdir, filename))
+func (d *BrowserAssetServer) LogDebug(message string, args ...interface{}) {
+	if d.logger != nil {
+		d.logger.Debug("[BrowserAssetServer] "+message, args...)
+	}
 }

 func (a *BrowserAssetServer) processIndexHTML() ([]byte, error) {
-	indexHTML, err := a.loadFileFromDisk("index.html")
+	indexHTML, err := fs.ReadFile(a.assets, "index.html")
 	if err != nil {
 		return nil, err
 	}
@@ -97,15 +105,9 @@ func (a *BrowserAssetServer) Load(filename string) ([]byte, string, error) {
 	case "/wails/ipc.js":
 		content = runtime.WebsocketIPC
 	default:
-		content, err = a.loadFileFromDisk(filename)
-		if strings.HasSuffix(filename, ".js") {
-			var buffer bytes.Buffer
-			buffer.WriteString("window.awaitIPC('" + filename + "', ()=>{")
-			buffer.Write(content)
-			buffer.WriteString(`
-});`)
-			content = buffer.Bytes()
-		}
+		filename = strings.TrimPrefix(filename, "/")
+		a.LogDebug("Loading file: %s", filename)
+		content, err = fs.ReadFile(a.assets, filename)
 	}
 	if err != nil {
 		return nil, "", err
--- a/v2/internal/frontend/assetserver/assetserver_common.go
+++ b/v2/internal/frontend/assetserver/assetserver_common.go
@@ -0,0 +1,25 @@
+package assetserver
+
+import (
+	iofs "io/fs"
+	"path"
+
+	"github.com/wailsapp/wails/v2/internal/fs"
+)
+
+func prepareAssetsForServing(assets iofs.FS) (iofs.FS, error) {
+	if _, err := assets.Open("."); err != nil {
+		return nil, err
+	}
+
+	subDir, err := fs.FindPathToFile(assets, "index.html")
+	if err != nil {
+		return nil, err
+	}
+
+	assets, err = iofs.Sub(assets, path.Clean(subDir))
+	if err != nil {
+		return nil, err
+	}
+	return assets, nil
+}
--- a/v2/internal/frontend/assetserver/assetserver_desktop.go
+++ b/v2/internal/frontend/assetserver/assetserver_desktop.go
@@ -3,26 +3,21 @@ package assetserver
 import (
 	"bytes"
 	"context"
-	"embed"
-	"fmt"
-	"github.com/leaanthony/debme"
-	"github.com/leaanthony/slicer"
-	"github.com/wailsapp/wails/v2/internal/frontend/runtime"
-	"github.com/wailsapp/wails/v2/internal/logger"
 	"io/fs"
 	"log"
-	"path/filepath"
 	"strings"
+
+	"github.com/wailsapp/wails/v2/internal/frontend/runtime"
+	"github.com/wailsapp/wails/v2/internal/logger"
 )

 type DesktopAssetServer struct {
-	assets    debme.Debme
+	assets    fs.FS
 	runtimeJS []byte
-	assetdir  string
 	logger    *logger.Logger
 }

-func NewDesktopAssetServer(ctx context.Context, assets embed.FS, bindingsJSON string) (*DesktopAssetServer, error) {
+func NewDesktopAssetServer(ctx context.Context, assets fs.FS, bindingsJSON string) (*DesktopAssetServer, error) {
 	result := &DesktopAssetServer{}

 	_logger := ctx.Value("logger")
@@ -30,22 +25,18 @@ func NewDesktopAssetServer(ctx context.Context, assets embed.FS, bindingsJSON st
 		result.logger = _logger.(*logger.Logger)
 	}

-	_assetdir := ctx.Value("assetdir")
-	if _assetdir != nil {
-		result.assetdir = _assetdir.(string)
-		absdir, err := filepath.Abs(result.assetdir)
-		if err != nil {
-			return nil, err
-		}
-		result.LogDebug("Loading assets from: %s", absdir)
+	var err error
+	result.assets, err = prepareAssetsForServing(assets)
+	if err != nil {
+		return nil, err
 	}

 	var buffer bytes.Buffer
 	buffer.WriteString(`window.wailsbindings='` + bindingsJSON + `';` + "\n")
 	buffer.Write(runtime.RuntimeDesktopJS)
 	result.runtimeJS = buffer.Bytes()
-	err := result.init(assets)
-	return result, err
+
+	return result, nil
 }

 func (d *DesktopAssetServer) LogDebug(message string, args ...interface{}) {
@@ -54,63 +45,8 @@ func (d *DesktopAssetServer) LogDebug(message string, args ...interface{}) {
 	}
 }

-func (d *DesktopAssetServer) SetAssetDir(assetdir string) {
-	d.assetdir = assetdir
-}
-
-func PathToIndexHTML(assets embed.FS) (string, error) {
-	stat, err := fs.Stat(assets, "index.html")
-	if stat != nil {
-		return ".", nil
-	}
-	var indexFiles slicer.StringSlicer
-	err = fs.WalkDir(assets, ".", func(path string, d fs.DirEntry, err error) error {
-		if err != nil {
-			return err
-		}
-		if strings.HasSuffix(path, "index.html") {
-			indexFiles.Add(path)
-		}
-		return nil
-	})
-	if err != nil {
-		return "", err
-	}
-
-	if indexFiles.Length() > 1 {
-		return "", fmt.Errorf("multiple 'index.html' files found in assets")
-	}
-
-	path, _ := filepath.Split(indexFiles.AsSlice()[0])
-	return path, nil
-}
-
-func processAssets(assets embed.FS) (debme.Debme, error) {
-
-	result, err := debme.FS(assets, ".")
-	if err != nil {
-		return result, err
-	}
-	// Find index.html
-	path, err := PathToIndexHTML(assets)
-	if err != nil {
-		return debme.Debme{}, err
-	}
-	return debme.FS(assets, path)
-}
-
-func (a *DesktopAssetServer) init(assets embed.FS) error {
-
-	var err error
-	a.assets, err = processAssets(assets)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func (a *DesktopAssetServer) processIndexHTML() ([]byte, error) {
-	indexHTML, err := a.ReadFile("index.html")
+	indexHTML, err := fs.ReadFile(a.assets, "index.html")
 	if err != nil {
 		return nil, err
 	}
@@ -146,7 +82,9 @@ func (a *DesktopAssetServer) Load(filename string) ([]byte, string, error) {
 	case "/wails/ipc.js":
 		content = runtime.DesktopIPC
 	default:
-		content, err = a.ReadFile(filename)
+		filename = strings.TrimPrefix(filename, "/")
+		a.LogDebug("Loading file: %s", filename)
+		content, err = fs.ReadFile(a.assets, filename)
 	}
 	if err != nil {
 		return nil, "", err
--- a/v2/internal/frontend/assetserver/assetserver_desktop_dev.go
+++ b/v2/internal/frontend/assetserver/assetserver_desktop_dev.go
@@ -1,13 +0,0 @@
-//go:build dev
-
-package assetserver
-
-import (
-	"os"
-	"path/filepath"
-)
-
-func (a *DesktopAssetServer) ReadFile(filename string) ([]byte, error) {
-	a.LogDebug("Loading file from disk: %s", filename)
-	return os.ReadFile(filepath.Join(a.assetdir, filename))
-}
--- a/v2/internal/frontend/assetserver/assetserver_desktop_production.go
+++ b/v2/internal/frontend/assetserver/assetserver_desktop_production.go
@@ -1,7 +0,0 @@
-//go:build production
-
-package assetserver
-
-func (a *DesktopAssetServer) ReadFile(filename string) ([]byte, error) {
-	return a.assets.ReadFile(filename)
-}
--- a/v2/internal/frontend/desktop/darwin/WailsContext.h
+++ b/v2/internal/frontend/desktop/darwin/WailsContext.h
@@ -12,6 +12,7 @@
 #import <WebKit/WebKit.h>

 #if __has_include(<UniformTypeIdentifiers/UTType.h>)
+#define USE_NEW_FILTERS
 #import <UniformTypeIdentifiers/UTType.h>
 #endif

--- a/v2/internal/frontend/desktop/darwin/WailsContext.m
+++ b/v2/internal/frontend/desktop/darwin/WailsContext.m
@@ -497,16 +497,20 @@
            filters = [filters stringByReplacingOccurrencesOfString:@"*." withString:@""];
            filters = [filters stringByReplacingOccurrencesOfString:@" " withString:@""];
            NSArray *filterList = [filters componentsSeparatedByString:@";"];
-            if (@available(macOS 10.16, *)) {
+#ifdef USE_NEW_FILTERS
                NSMutableArray *contentTypes = [[NSMutableArray new] autorelease];
                for (NSString *filter in filterList) {
-                    UTType *t = [UTType typeWithFilenameExtension:filter];
-                    [contentTypes addObject:t];
+                    if (@available(macOS 11.0, *)) {
+                        UTType *t = [UTType typeWithFilenameExtension:filter];
+                        [contentTypes addObject:t];
+                    }
                }
+            if (@available(macOS 11.0, *)) {
                [dialog setAllowedContentTypes:contentTypes];
-            } else {
-                [dialog setAllowedFileTypes:filterList];
            }
+#else
+                [dialog setAllowedFileTypes:filterList];
+#endif
        } else {
            [dialog setAllowsOtherFileTypes:true];
        }
@@ -536,6 +540,10 @@

    // Setup callback handler
    [dialog beginSheetModalForWindow:self.mainWindow completionHandler:^(NSModalResponse returnCode) {
+        if ( returnCode != NSModalResponseOK) {
+            processOpenFileDialogResponse("[]");
+            return;
+        }
        NSMutableArray *arr = [NSMutableArray new];
        for (NSURL *url in [dialog URLs]) {
            [arr addObject:[url path]];
@@ -554,7 +562,7 @@
    
    
    // Create the dialog
-    NSSavePanel *dialog = [NSOpenPanel savePanel];
+    NSSavePanel *dialog = [NSSavePanel savePanel];

    // Valid but appears to do nothing.... :/
    if( title != nil ) {
@@ -562,7 +570,7 @@
    }

    // Filters - semicolon delimited list of file extensions
-    if( filters != nil ) {
+    if( filters != nil && [filters length] > 0) {
        filters = [filters stringByReplacingOccurrencesOfString:@"*." withString:@""];
        filters = [filters stringByReplacingOccurrencesOfString:@" " withString:@""];
        NSArray *filterList = [filters componentsSeparatedByString:@";"];
@@ -588,10 +596,12 @@

    // Setup callback handler
    [dialog beginSheetModalForWindow:self.mainWindow completionHandler:^(NSModalResponse returnCode) {
-        NSURL *url = [dialog URL];
-        if ( url != nil ) {
-            processSaveFileDialogResponse([url.path UTF8String]);
-            return;
+        if ( returnCode == NSModalResponseOK ) {
+            NSURL *url = [dialog URL];
+            if ( url != nil ) {
+                processSaveFileDialogResponse([url.path UTF8String]);
+                return;
+            }
        }
        processSaveFileDialogResponse("");
    }];
--- a/v2/internal/frontend/desktop/darwin/WailsMenu.m
+++ b/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];
 }
--- a/v2/internal/frontend/desktop/darwin/dialog.go
+++ b/v2/internal/frontend/desktop/darwin/dialog.go
@@ -84,7 +84,7 @@ func (f *Frontend) openDialog(options *frontend.OpenDialogOptions, multiple bool

 // OpenFileDialog prompts the user to select a file
 func (f *Frontend) OpenFileDialog(options frontend.OpenDialogOptions) (string, error) {
-	results, err := f.openDialog(&options, false, options.AllowFiles, options.AllowDirectories)
+	results, err := f.openDialog(&options, false, true, false)
 	if err != nil {
 		return "", err
 	}
@@ -97,7 +97,7 @@ func (f *Frontend) OpenFileDialog(options frontend.OpenDialogOptions) (string, e

 // OpenMultipleFilesDialog prompts the user to select a file
 func (f *Frontend) OpenMultipleFilesDialog(options frontend.OpenDialogOptions) ([]string, error) {
-	return f.openDialog(&options, true, options.AllowFiles, options.AllowDirectories)
+	return f.openDialog(&options, true, true, false)
 }

 // SaveFileDialog prompts the user to select a file
--- a/v2/internal/frontend/desktop/darwin/frontend.go
+++ b/v2/internal/frontend/desktop/darwin/frontend.go
@@ -5,7 +5,7 @@ package darwin

 /*
 #cgo CFLAGS: -x objective-c
-#cgo LDFLAGS: -framework Foundation -framework Cocoa -framework WebKit -framework UniformTypeIdentifiers
+#cgo LDFLAGS: -framework Foundation -framework Cocoa -framework WebKit
 #import <Foundation/Foundation.h>
 #import "Application.h"
 #import "WailsContext.h"
--- a/v2/internal/frontend/desktop/darwin/main.m
+++ b/v2/internal/frontend/desktop/darwin/main.m
@@ -32,7 +32,8 @@ void processCallback(int callbackID) {
 void processURLRequest(void *ctx, const char* url) {
    NSLog(@"processURLRequest called");
    const char myByteArray[] = { 0x3c,0x68,0x31,0x3e,0x48,0x65,0x6c,0x6c,0x6f,0x20,0x57,0x6f,0x72,0x6c,0x64,0x21,0x3c,0x2f,0x68,0x31,0x3e };
-    ProcessURLResponse(ctx, url, "text/html", (void*)myByteArray, 21);
+    // void *inctx, const char *url, int statusCode, const char *contentType, void* data, int datalength
+    ProcessURLResponse(ctx, url, 200, "text/html", (void*)myByteArray, 21);
 }

 unsigned char _Users_username_Pictures_SaltBae_png[] = {
--- a/v2/internal/frontend/desktop/linux/window.go
+++ b/v2/internal/frontend/desktop/linux/window.go
@@ -83,7 +83,7 @@ extern void processMessage(char*);

 static void sendMessageToBackend(WebKitUserContentManager *contentManager,
                                 WebKitJavascriptResult *result,
-                                 void*)
+                                 void* data)
 {
 #if WEBKIT_MAJOR_VERSION >= 2 && WEBKIT_MINOR_VERSION >= 22
    JSCValue *value = webkit_javascript_result_get_js_value(result);
@@ -145,7 +145,7 @@ void connectButtons(void* webview) {
 extern void processURLRequest(WebKitURISchemeRequest *request);

 // This is called when the close button on the window is pressed
-gboolean close_button_pressed(GtkWidget *widget, GdkEvent *event, void*)
+gboolean close_button_pressed(GtkWidget *widget, GdkEvent *event, void* data)
 {
   	processMessage("Q");
    return FALSE;
--- a/v2/internal/frontend/desktop/windows/window.go
+++ b/v2/internal/frontend/desktop/windows/window.go
@@ -57,10 +57,10 @@ func NewWindow(parent winc.Controller, appoptions *options.App) *Window {
 	result.SetText(appoptions.Title)
 	if appoptions.Frameless == false && !appoptions.Fullscreen {
 		result.EnableMaxButton(!appoptions.DisableResize)
-		result.EnableSizable(!appoptions.DisableResize)
 		result.SetMinSize(appoptions.MinWidth, appoptions.MinHeight)
 		result.SetMaxSize(appoptions.MaxWidth, appoptions.MaxHeight)
 	}
+	result.EnableSizable(!appoptions.DisableResize)

 	if appoptions.Windows != nil {
 		if appoptions.Windows.WindowIsTranslucent {
--- a/v2/internal/frontend/devserver/devserver.go
+++ b/v2/internal/frontend/devserver/devserver.go
@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"io/fs"
 	"log"
-	"path/filepath"
 	"strings"
 	"sync"
 	"time"
@@ -50,6 +49,11 @@ func (d *DevWebServer) WindowReload() {
 func (d *DevWebServer) Run(ctx context.Context) error {
 	d.ctx = ctx

+	assetdir, _ := ctx.Value("assetdir").(string)
+	d.server.Get("/wails/assetdir", func(fctx *fiber.Ctx) error {
+		return fctx.SendString(assetdir)
+	})
+
 	d.server.Get("/wails/reload", func(fctx *fiber.Ctx) error {
 		d.WindowReload()
 		d.desktopFrontend.WindowReload()
@@ -100,25 +104,14 @@ func (d *DevWebServer) Run(ctx context.Context) error {
 	_devServerURL := ctx.Value("devserverurl")
 	if _devServerURL == "http://localhost:34115" {
 		// Setup internal dev server
-		_assetdir := ctx.Value("assetdir")
-		if _assetdir == nil {
-			return fmt.Errorf("no assetdir provided")
+		bindingsJSON, err := d.appBindings.ToJSON()
+		if err != nil {
+			log.Fatal(err)
 		}
-		if _assetdir != nil {
-			assetdir := _assetdir.(string)
-			bindingsJSON, err := d.appBindings.ToJSON()
-			if err != nil {
-				log.Fatal(err)
-			}
-			d.assetServer, err = assetserver.NewBrowserAssetServer(assetdir, bindingsJSON, d.appoptions)
-			if err != nil {
-				log.Fatal(err)
-			}
-			absdir, err := filepath.Abs(assetdir)
-			if err != nil {
-				return err
-			}
-			d.LogDebug("Serving assets from: %s", absdir)
+
+		d.assetServer, err = assetserver.NewBrowserAssetServer(ctx, d.appoptions.Assets, bindingsJSON)
+		if err != nil {
+			log.Fatal(err)
 		}

 		d.server.Get("*", d.loadAsset)
--- a/v2/internal/frontend/frontend.go
+++ b/v2/internal/frontend/frontend.go
@@ -19,8 +19,6 @@ type OpenDialogOptions struct {
 	DefaultFilename            string
 	Title                      string
 	Filters                    []FileFilter
-	AllowFiles                 bool
-	AllowDirectories           bool
 	ShowHiddenFiles            bool
 	CanCreateDirectories       bool
 	ResolvesAliases            bool
--- a/v2/internal/frontend/runtime/desktop/events.js
+++ b/v2/internal/frontend/runtime/desktop/events.js
@@ -152,7 +152,7 @@ export function EventsEmit(eventName) {

 export function EventsOff(eventName) {
    // Remove local listeners
-    eventListeners.delete(eventName);
+    delete eventListeners[eventName];

    // Notify Go listeners
    window.WailsInvoke('EX' + eventName);
--- a/v2/internal/frontend/runtime/dev/main.js
+++ b/v2/internal/frontend/runtime/dev/main.js
@@ -14,14 +14,17 @@ import Overlay from "./Overlay.svelte";
 import {hideOverlay, showOverlay} from "./store";

 let components = {};
-window.ipcCallbacks = [];
-window.ipcCallbackNames = [];

-window.awaitIPC = (name, callback) => {
-    if (!window.ipcCallbacks) return callback;
-    log("Queuing '" + name + "' for execution once ipc ready.");
-    window.ipcCallbackNames.push(name);
-    window.ipcCallbacks.push(callback);
+let wailsInvokeInternal = null;
+let messageQueue = [];
+
+window.WailsInvoke = (message) => {
+    if (!wailsInvokeInternal) {
+        console.log("Queueing: " + message);
+        messageQueue.push(message);
+        return;
+    }
+    wailsInvokeInternal(message);
 };

 window.addEventListener('DOMContentLoaded', () => {
@@ -47,15 +50,14 @@ window.onbeforeunload = function () {
 connect();

 function setupIPCBridge() {
-    window.WailsInvoke = (message) => {
+    wailsInvokeInternal = (message) => {
        websocket.send(message);
    };
-    for (let i = 0; i < window.ipcCallbacks.length; i++) {
-        log("Executing JS: " + window.ipcCallbackNames[i]);
-        window.ipcCallbacks[i]();
+    for (let i = 0; i < messageQueue.length; i++) {
+        console.log("sending queued message: " + messageQueue[i]);
+        window.WailsInvoke(messageQueue[i]);
    }
-    delete window.ipcCallbacks;
-    delete window.ipcCallbackNames;
+    messageQueue = [];
 }

 // Handles incoming websocket connections
--- a/v2/internal/frontend/runtime/dev/package-lock.json
+++ b/v2/internal/frontend/runtime/dev/package-lock.json
@@ -1,812 +1,8 @@
 {
  "name": "dev",
  "version": "2.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
  "requires": true,
-  "packages": {
-    "": {
-      "version": "2.0.0",
-      "license": "ISC",
-      "devDependencies": {
-        "esbuild": "^0.12.17",
-        "esbuild-svelte": "^0.5.6",
-        "npm-run-all": "^4.1.5",
-        "svelte": "^3.42.2"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.18.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
-      "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.3",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
-        "object-inspect": "^1.11.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/esbuild": {
-      "version": "0.12.21",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.21.tgz",
-      "integrity": "sha512-7hyXbU3g94aREufI/5nls7Xcc+RGQeZWZApm6hoBaFvt2BPtpT4TjFMQ9Tb1jU8XyBGz00ShmiyflCogphMHFQ==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      }
-    },
-    "node_modules/esbuild-svelte": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/esbuild-svelte/-/esbuild-svelte-0.5.6.tgz",
-      "integrity": "sha512-Bz8nU45FrT6sP/Tf3M2rQUuBGxnDSNSPZNIoYwSNt5H+wjSyo/t+zm94tgnOZsR6GgpDMbNQgo4jGbK0NLvEfw==",
-      "dev": true,
-      "dependencies": {
-        "svelte": "^3.42.6"
-      }
-    },
-    "node_modules/esbuild-svelte/node_modules/svelte": {
-      "version": "3.43.1",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.43.1.tgz",
-      "integrity": "sha512-nvPIaKx4HLzYlSdquISZpgG1Kqr2VAWQjZOt3Iwm3UhbqmA0LnSx4k1YpRMEhjQYW3ZCqQoK8Egto9tv4YewMA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "dev": true
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
-      "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "node_modules/load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/memorystream": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
-      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
-    },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/npm-run-all": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
-      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
-        "memorystream": "^0.3.1",
-        "minimatch": "^3.0.4",
-        "pidtree": "^0.3.0",
-        "read-pkg": "^3.0.0",
-        "shell-quote": "^1.6.1",
-        "string.prototype.padend": "^3.0.0"
-      },
-      "bin": {
-        "npm-run-all": "bin/npm-run-all/index.js",
-        "run-p": "bin/run-p/index.js",
-        "run-s": "bin/run-s/index.js"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
-      "dev": true
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pidtree": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
-      "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
-      "dev": true,
-      "bin": {
-        "pidtree": "bin/pidtree.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      }
-    },
-    "node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
-      "dev": true
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz",
-      "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==",
-      "dev": true
-    },
-    "node_modules/string.prototype.padend": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.2.tgz",
-      "integrity": "sha512-/AQFLdYvePENU3W5rgurfWSMU6n+Ww8n/3cUt7E+vPBB/D7YDG8x+qjoFs4M/alR2bW7Qg6xMjVwWUOvuQ0XpQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/svelte": {
-      "version": "3.42.2",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.42.2.tgz",
-      "integrity": "sha512-FOyNYKXb8wdE0Ot+Ctt2/OyDLsNBP8+V6PUE9ag6ZKeLslIou0LnMu1fhtWUA+HjzKTbAM1yj+4PFLtg/3pMJA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    }
-  },
  "dependencies": {
    "ansi-styles": {
      "version": "3.2.1",
--- a/v2/internal/frontend/runtime/ipc_websocket.js
+++ b/v2/internal/frontend/runtime/ipc_websocket.js
--- a/v2/internal/frontend/runtime/runtime_dev_desktop.js
+++ b/v2/internal/frontend/runtime/runtime_dev_desktop.js
--- a/v2/internal/frontend/runtime/runtime_prod_desktop.js
+++ b/v2/internal/frontend/runtime/runtime_prod_desktop.js
--- a/v2/internal/frontend/runtime/wrapper/runtime.d.ts
+++ b/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 { };
--- a/v2/internal/fs/fs.go
+++ b/v2/internal/fs/fs.go
@@ -4,9 +4,11 @@ import (
 	"crypto/md5"
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"unsafe"

 	"github.com/leaanthony/slicer"
@@ -394,3 +396,30 @@ func MoveDirExtended(src string, dst string, ignore []string) (err error) {

 	return
 }
+
+func FindPathToFile(fsys fs.FS, file string) (string, error) {
+	stat, _ := fs.Stat(fsys, file)
+	if stat != nil {
+		return ".", nil
+	}
+	var indexFiles slicer.StringSlicer
+	err := fs.WalkDir(fsys, ".", func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+		if strings.HasSuffix(path, file) {
+			indexFiles.Add(path)
+		}
+		return nil
+	})
+	if err != nil {
+		return "", err
+	}
+
+	if indexFiles.Length() > 1 {
+		return "", fmt.Errorf("multiple '%s' files found in assets", file)
+	}
+
+	path, _ := filepath.Split(indexFiles.AsSlice()[0])
+	return path, nil
+}
--- a/v2/internal/gomod/gomod_test.go
+++ b/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
--- a/v2/internal/project/project.go
+++ b/v2/internal/project/project.go
@@ -13,7 +13,9 @@ type Project struct {

 	/*** Application Data ***/
 	Name           string `json:"name"`
-	AssetDirectory string `json:"assetdir"`
+	AssetDirectory string `json:"assetdir,omitempty"`
+
+	ReloadDirectories string `json:"reloaddirs,omitempty"`

 	BuildCommand   string `json:"frontend:build"`
 	InstallCommand string `json:"frontend:install"`
--- a/v2/internal/system/system_windows.go
+++ b/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{
--- a/v2/internal/webview2runtime/MicrosoftEdgeWebview2Setup.exe
+++ b/v2/internal/webview2runtime/MicrosoftEdgeWebview2Setup.exe
--- a/v2/internal/webview2runtime/sudo_mattn.go
+++ b/v2/internal/webview2runtime/sudo_mattn.go
@@ -0,0 +1,232 @@
+//go:build windows
+// +build windows
+
+// Original File (c) 2017 Yasuhiro Matsumoto: https://github.com/mattn/sudo/blob/master/win32.go
+// License: https://github.com/mattn/sudo/blob/master/LICENSE
+
+package webview2runtime
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"syscall"
+	"unsafe"
+)
+
+var (
+	modshell32         = syscall.NewLazyDLL("shell32.dll")
+	procShellExecuteEx = modshell32.NewProc("ShellExecuteExW")
+)
+
+const (
+	_SEE_MASK_DEFAULT            = 0x00000000
+	_SEE_MASK_CLASSNAME          = 0x00000001
+	_SEE_MASK_CLASSKEY           = 0x00000003
+	_SEE_MASK_IDLIST             = 0x00000004
+	_SEE_MASK_INVOKEIDLIST       = 0x0000000C
+	_SEE_MASK_ICON               = 0x00000010
+	_SEE_MASK_HOTKEY             = 0x00000020
+	_SEE_MASK_NOCLOSEPROCESS     = 0x00000040
+	_SEE_MASK_CONNECTNETDRV      = 0x00000080
+	_SEE_MASK_NOASYNC            = 0x00000100
+	_SEE_MASK_FLAG_DDEWAIT       = 0x00000100
+	_SEE_MASK_DOENVSUBST         = 0x00000200
+	_SEE_MASK_FLAG_NO_UI         = 0x00000400
+	_SEE_MASK_UNICODE            = 0x00004000
+	_SEE_MASK_NO_CONSOLE         = 0x00008000
+	_SEE_MASK_ASYNCOK            = 0x00100000
+	_SEE_MASK_NOQUERYCLASSSTORE  = 0x01000000
+	_SEE_MASK_HMONITOR           = 0x00200000
+	_SEE_MASK_NOZONECHECKS       = 0x00800000
+	_SEE_MASK_WAITFORINPUTIDLE   = 0x02000000
+	_SEE_MASK_FLAG_LOG_USAGE     = 0x04000000
+	_SEE_MASK_FLAG_HINST_IS_SITE = 0x08000000
+)
+
+const (
+	_ERROR_BAD_FORMAT = 11
+)
+
+const (
+	_SE_ERR_FNF             = 2
+	_SE_ERR_PNF             = 3
+	_SE_ERR_ACCESSDENIED    = 5
+	_SE_ERR_OOM             = 8
+	_SE_ERR_DLLNOTFOUND     = 32
+	_SE_ERR_SHARE           = 26
+	_SE_ERR_ASSOCINCOMPLETE = 27
+	_SE_ERR_DDETIMEOUT      = 28
+	_SE_ERR_DDEFAIL         = 29
+	_SE_ERR_DDEBUSY         = 30
+	_SE_ERR_NOASSOC         = 31
+)
+
+type (
+	dword     uint32
+	hinstance syscall.Handle
+	hkey      syscall.Handle
+	hwnd      syscall.Handle
+	ulong     uint32
+	lpctstr   uintptr
+	lpvoid    uintptr
+)
+
+// SHELLEXECUTEINFO struct
+type _SHELLEXECUTEINFO struct {
+	cbSize         dword
+	fMask          ulong
+	hwnd           hwnd
+	lpVerb         lpctstr
+	lpFile         lpctstr
+	lpParameters   lpctstr
+	lpDirectory    lpctstr
+	nShow          int
+	hInstApp       hinstance
+	lpIDList       lpvoid
+	lpClass        lpctstr
+	hkeyClass      hkey
+	dwHotKey       dword
+	hIconOrMonitor syscall.Handle
+	hProcess       syscall.Handle
+}
+
+// ShellExecuteAndWait is version of ShellExecuteEx which want process
+func ShellExecuteAndWait(hwnd hwnd, lpOperation, lpFile, lpParameters, lpDirectory string, nShowCmd int) error {
+	var lpctstrVerb, lpctstrParameters, lpctstrDirectory, lpctstrFile lpctstr
+	var err error
+	if len(lpOperation) != 0 {
+		lpctstrVerb, err = toUTF16(lpOperation)
+		if err != nil {
+			return err
+		}
+	}
+	if len(lpParameters) != 0 {
+		lpctstrParameters, err = toUTF16(lpParameters)
+		if err != nil {
+			return err
+		}
+	}
+	if len(lpDirectory) != 0 {
+		lpctstrDirectory, err = toUTF16(lpDirectory)
+		if err != nil {
+			return err
+		}
+	}
+	if len(lpDirectory) != 0 {
+		lpctstrFile, err = toUTF16(lpFile)
+		if err != nil {
+			return err
+		}
+	}
+	i := &_SHELLEXECUTEINFO{
+		fMask:        _SEE_MASK_NOCLOSEPROCESS,
+		hwnd:         hwnd,
+		lpVerb:       lpctstrVerb,
+		lpFile:       lpctstrFile,
+		lpParameters: lpctstrParameters,
+		lpDirectory:  lpctstrDirectory,
+		nShow:        nShowCmd,
+	}
+	i.cbSize = dword(unsafe.Sizeof(*i))
+	return ShellExecuteEx(i)
+}
+
+func toUTF16(lpOperation string) (lpctstr, error) {
+	result, err := syscall.UTF16PtrFromString(lpOperation)
+	if err != nil {
+		return 0, err
+	}
+	return lpctstr(unsafe.Pointer(result)), nil
+}
+
+// ShellExecuteNoWait is version of ShellExecuteEx which don't want process
+func ShellExecuteNowait(hwnd hwnd, lpOperation, lpFile, lpParameters, lpDirectory string, nShowCmd int) error {
+	var lpctstrVerb, lpctstrParameters, lpctstrDirectory, lpctstrFile lpctstr
+	var err error
+	if len(lpOperation) != 0 {
+		lpctstrVerb, err = toUTF16(lpOperation)
+		if err != nil {
+			return err
+		}
+	}
+	if len(lpParameters) != 0 {
+		lpctstrParameters, err = toUTF16(lpParameters)
+		if err != nil {
+			return err
+		}
+	}
+	if len(lpDirectory) != 0 {
+		lpctstrDirectory, err = toUTF16(lpDirectory)
+		if err != nil {
+			return err
+		}
+	}
+	if len(lpDirectory) != 0 {
+		lpctstrFile, err = toUTF16(lpFile)
+		if err != nil {
+			return err
+		}
+	}
+	i := &_SHELLEXECUTEINFO{
+		fMask:        _SEE_MASK_DEFAULT,
+		hwnd:         hwnd,
+		lpVerb:       lpctstrVerb,
+		lpFile:       lpctstrFile,
+		lpParameters: lpctstrParameters,
+		lpDirectory:  lpctstrDirectory,
+		nShow:        nShowCmd,
+	}
+	i.cbSize = dword(unsafe.Sizeof(*i))
+	return ShellExecuteEx(i)
+}
+
+// ShellExecuteEx is Windows API
+func ShellExecuteEx(pExecInfo *_SHELLEXECUTEINFO) error {
+	ret, _, _ := procShellExecuteEx.Call(uintptr(unsafe.Pointer(pExecInfo)))
+	if ret == 1 && pExecInfo.fMask&_SEE_MASK_NOCLOSEPROCESS != 0 {
+		s, e := syscall.WaitForSingleObject(pExecInfo.hProcess, syscall.INFINITE)
+		switch s {
+		case syscall.WAIT_OBJECT_0:
+			break
+		case syscall.WAIT_FAILED:
+			return os.NewSyscallError("WaitForSingleObject", e)
+		default:
+			return errors.New("Unexpected result from WaitForSingleObject")
+		}
+	}
+	errorMsg := ""
+	if pExecInfo.hInstApp != 0 && pExecInfo.hInstApp <= 32 {
+		switch int(pExecInfo.hInstApp) {
+		case _SE_ERR_FNF:
+			errorMsg = "The specified file was not found"
+		case _SE_ERR_PNF:
+			errorMsg = "The specified path was not found"
+		case _ERROR_BAD_FORMAT:
+			errorMsg = "The .exe file is invalid (non-Win32 .exe or error in .exe image)"
+		case _SE_ERR_ACCESSDENIED:
+			errorMsg = "The operating system denied access to the specified file"
+		case _SE_ERR_ASSOCINCOMPLETE:
+			errorMsg = "The file name association is incomplete or invalid"
+		case _SE_ERR_DDEBUSY:
+			errorMsg = "The DDE transaction could not be completed because other DDE transactions were being processed"
+		case _SE_ERR_DDEFAIL:
+			errorMsg = "The DDE transaction failed"
+		case _SE_ERR_DDETIMEOUT:
+			errorMsg = "The DDE transaction could not be completed because the request timed out"
+		case _SE_ERR_DLLNOTFOUND:
+			errorMsg = "The specified DLL was not found"
+		case _SE_ERR_NOASSOC:
+			errorMsg = "There is no application associated with the given file name extension"
+		case _SE_ERR_OOM:
+			errorMsg = "There was not enough memory to complete the operation"
+		case _SE_ERR_SHARE:
+			errorMsg = "A sharing violation occurred"
+		default:
+			errorMsg = fmt.Sprintf("Unknown error occurred with error code %v", pExecInfo.hInstApp)
+		}
+	} else {
+		return nil
+	}
+	return errors.New(errorMsg)
+}
--- a/v2/internal/webview2runtime/webview2runtime.go
+++ b/v2/internal/webview2runtime/webview2runtime.go
@@ -0,0 +1,168 @@
+//go:build windows
+// +build windows
+
+package webview2runtime
+
+import (
+	_ "embed"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"syscall"
+	"unsafe"
+)
+
+//go:embed MicrosoftEdgeWebview2Setup.exe
+var setupexe []byte
+
+// Info contains all the information about an installation of the webview2 runtime.
+type Info struct {
+	Location        string
+	Name            string
+	Version         string
+	SilentUninstall string
+}
+
+// IsOlderThan returns true if the installed version is older than the given required version.
+// Returns error if something goes wrong.
+func (i *Info) IsOlderThan(requiredVersion string) (bool, error) {
+	var mod = syscall.NewLazyDLL("WebView2Loader.dll")
+	var CompareBrowserVersions = mod.NewProc("CompareBrowserVersions")
+	v1, err := syscall.UTF16PtrFromString(i.Version)
+	if err != nil {
+		return false, err
+	}
+	v2, err := syscall.UTF16PtrFromString(requiredVersion)
+	if err != nil {
+		return false, err
+	}
+	var result int = 9
+	_, _, err = CompareBrowserVersions.Call(uintptr(unsafe.Pointer(v1)), uintptr(unsafe.Pointer(v2)), uintptr(unsafe.Pointer(&result)))
+	if result < -1 || result > 1 {
+		return false, err
+	}
+	return result == -1, nil
+}
+
+func downloadBootstrapper() (string, error) {
+	bootstrapperURL := `https://go.microsoft.com/fwlink/p/?LinkId=2124703`
+	installer := filepath.Join(os.TempDir(), `MicrosoftEdgeWebview2Setup.exe`)
+
+	// Download installer
+	out, err := os.Create(installer)
+	defer out.Close()
+	if err != nil {
+		return "", err
+	}
+	resp, err := http.Get(bootstrapperURL)
+	defer resp.Body.Close()
+	if err != nil {
+		err = out.Close()
+		return "", err
+	}
+	_, err = io.Copy(out, resp.Body)
+	if err != nil {
+		return "", err
+	}
+
+	return installer, nil
+}
+
+// InstallUsingEmbeddedBootstrapper will download the bootstrapper from Microsoft and run it to install
+// the latest version of the runtime.
+// Returns true if the installer ran successfully.
+// Returns an error if something goes wrong
+func InstallUsingEmbeddedBootstrapper() (bool, error) {
+
+	installer := filepath.Join(os.TempDir(), `MicrosoftEdgeWebview2Setup.exe`)
+	err := os.WriteFile(installer, setupexe, 0755)
+	if err != nil {
+		return false, err
+	}
+	result, err := runInstaller(installer)
+	if err != nil {
+		return false, err
+	}
+
+	return result, os.Remove(installer)
+
+}
+
+// InstallUsingBootstrapper will extract the embedded bootstrapper from Microsoft and run it to install
+// the latest version of the runtime.
+// Returns true if the installer ran successfully.
+// Returns an error if something goes wrong
+func InstallUsingBootstrapper() (bool, error) {
+
+	installer, err := downloadBootstrapper()
+	if err != nil {
+		return false, err
+	}
+
+	result, err := runInstaller(installer)
+	if err != nil {
+		return false, err
+	}
+
+	return result, os.Remove(installer)
+
+}
+
+func runInstaller(installer string) (bool, error) {
+	err := ShellExecuteAndWait(0, "runas", installer, "", os.Getenv("TMP"), syscall.SW_NORMAL)
+	if err != nil {
+		fmt.Println(err)
+		return false, err
+	}
+	return true, nil
+}
+
+// Confirm will prompt the user with a message and OK / CANCEL buttons.
+// Returns true if OK is selected by the user.
+// Returns an error if something went wrong.
+func Confirm(caption string, title string) (bool, error) {
+	var flags uint = 0x00000001 // MB_OKCANCEL
+	result, err := MessageBox(caption, title, flags)
+	if err != nil {
+		return false, err
+	}
+	return result == 1, nil
+}
+
+// Error will an error message to the user.
+// Returns an error if something went wrong.
+func Error(caption string, title string) error {
+	var flags uint = 0x00000010 // MB_ICONERROR
+	_, err := MessageBox(caption, title, flags)
+	return err
+}
+
+// MessageBox prompts the user with the given caption and title.
+// Flags may be provided to customise the dialog.
+// Returns an error if something went wrong.
+func MessageBox(caption string, title string, flags uint) (int, error) {
+	captionUTF16, err := syscall.UTF16PtrFromString(caption)
+	if err != nil {
+		return -1, err
+	}
+	titleUTF16, err := syscall.UTF16PtrFromString(title)
+	if err != nil {
+		return -1, err
+	}
+	ret, _, _ := syscall.NewLazyDLL("user32.dll").NewProc("MessageBoxW").Call(
+		uintptr(0),
+		uintptr(unsafe.Pointer(captionUTF16)),
+		uintptr(unsafe.Pointer(titleUTF16)),
+		uintptr(flags))
+
+	return int(ret), nil
+}
+
+// OpenInstallerDownloadWebpage will open the browser on the WebView2 download page
+func OpenInstallerDownloadWebpage() error {
+	cmd := exec.Command("rundll32", "url.dll,FileProtocolHandler", "https://developer.microsoft.com/en-us/microsoft-edge/webview2/")
+	return cmd.Run()
+}
--- a/v2/pkg/commands/build/base.go
+++ b/v2/pkg/commands/build/base.go
@@ -7,8 +7,11 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
+	"strconv"
 	"strings"

+	"github.com/wailsapp/wails/v2/internal/system"
+
 	"github.com/leaanthony/gosod"
 	wailsRuntime "github.com/wailsapp/wails/v2/internal/frontend/runtime"
 	"github.com/wailsapp/wails/v2/internal/frontend/runtime/wrapper"
@@ -195,22 +198,24 @@ func (b *BaseBuilder) CompileProject(options *Options) error {

 	verbose := options.Verbosity == VERBOSE
 	// Run go mod tidy first
-	cmd := exec.Command(options.Compiler, "mod", "tidy")
-	cmd.Stderr = os.Stderr
-	if verbose {
-		println("")
-		cmd.Stdout = os.Stdout
-	}
-	err = cmd.Run()
-	if err != nil {
-		return err
+	if !options.SkipModTidy {
+		cmd := exec.Command(options.Compiler, "mod", "tidy")
+		cmd.Stderr = os.Stderr
+		if verbose {
+			println("")
+			cmd.Stdout = os.Stdout
+		}
+		err = cmd.Run()
+		if err != nil {
+			return err
+		}
 	}

 	// Default go build command
 	commands := slicer.String([]string{"build"})

 	// Add better debugging flags
-	if options.Mode == Dev {
+	if options.Mode == Dev || options.Mode == Debug {
 		commands.Add("-gcflags")
 		commands.Add(`"all=-N -l"`)
 	}
@@ -228,7 +233,7 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 		tags.Add(options.WebView2Strategy)
 	}

-	if options.Mode == Production {
+	if options.Mode == Production || options.Mode == Debug {
 		tags.Add("production")
 	}

@@ -277,7 +282,7 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 	options.CompiledBinary = compiledBinary

 	// Create the command
-	cmd = exec.Command(options.Compiler, commands.AsSlice()...)
+	cmd := exec.Command(options.Compiler, commands.AsSlice()...)
 	cmd.Stderr = os.Stderr
 	if verbose {
 		println("  Build command:", commands.Join(" "))
@@ -319,11 +324,26 @@ func (b *BaseBuilder) CompileProject(options *Options) error {
 			return "1"
 		})
 		if options.Platform == "darwin" {
+			// Determine version so we can link to newer frameworks
+			// Why doesn't CGO have this option?!?!
+			info, err := system.GetInfo()
+			if err != nil {
+				return err
+			}
+			versionSplit := strings.Split(info.OS.Version, ".")
+			majorVersion, err := strconv.Atoi(versionSplit[0])
+			if err != nil {
+				return err
+			}
+			addUTIFramework := majorVersion >= 11
 			// Set the minimum Mac SDK to 10.13
 			cmd.Env = upsertEnv(cmd.Env, "CGO_LDFLAGS", func(v string) string {
 				if v != "" {
 					v += " "
 				}
+				if addUTIFramework {
+					v += "-framework UniformTypeIdentifiers "
+				}
 				v += "-mmacosx-version-min=10.13"

 				return v
--- a/v2/pkg/commands/build/build.go
+++ b/v2/pkg/commands/build/build.go
@@ -23,6 +23,8 @@ const (
 	Dev Mode = iota
 	// Production mode
 	Production
+	// Debug build
+	Debug
 )

 // Options contains all the build options as well as the project data
@@ -37,6 +39,7 @@ type Options struct {
 	Platform            string               // The platform to build for
 	Arch                string               // The architecture to build for
 	Compiler            string               // The compiler command to use
+	SkipModTidy         bool                 //  Skip mod tidy before compile
 	IgnoreFrontend      bool                 // Indicates if the frontend does not need building
 	OutputFile          string               // Override the output filename
 	BuildDirectory      string               // Directory to use for building the application
--- a/v2/pkg/options/options.go
+++ b/v2/pkg/options/options.go
@@ -2,11 +2,11 @@ package options

 import (
 	"context"
-	"embed"
-	"github.com/wailsapp/wails/v2/pkg/options/linux"
+	"io/fs"
 	"log"
 	"runtime"

+	"github.com/wailsapp/wails/v2/pkg/options/linux"
 	"github.com/wailsapp/wails/v2/pkg/options/mac"
 	"github.com/wailsapp/wails/v2/pkg/options/windows"

@@ -41,7 +41,7 @@ type App struct {
 	HideWindowOnClose bool
 	AlwaysOnTop       bool
 	RGBA              *RGBA
-	Assets            embed.FS
+	Assets            fs.FS
 	Menu              *menu.Menu
 	Logger            logger.Logger `json:"-"`
 	LogLevel          logger.LogLevel
--- a/v2/pkg/runtime/dialog.go
+++ b/v2/pkg/runtime/dialog.go
@@ -2,7 +2,9 @@ package runtime

 import (
 	"context"
+	"fmt"
 	"github.com/wailsapp/wails/v2/internal/frontend"
+	"github.com/wailsapp/wails/v2/internal/fs"
 )

 // FileFilter defines a filter for dialog boxes
@@ -29,24 +31,44 @@ type MessageDialogOptions = frontend.MessageDialogOptions
 // OpenDirectoryDialog prompts the user to select a directory
 func OpenDirectoryDialog(ctx context.Context, dialogOptions OpenDialogOptions) (string, error) {
 	appFrontend := getFrontend(ctx)
+	if dialogOptions.DefaultDirectory != "" {
+		if !fs.DirExists(dialogOptions.DefaultDirectory) {
+			return "", fmt.Errorf("default directory '%s' does not exist", dialogOptions.DefaultDirectory)
+		}
+	}
 	return appFrontend.OpenDirectoryDialog(dialogOptions)
 }

 // OpenFileDialog prompts the user to select a file
 func OpenFileDialog(ctx context.Context, dialogOptions OpenDialogOptions) (string, error) {
 	appFrontend := getFrontend(ctx)
+	if dialogOptions.DefaultDirectory != "" {
+		if !fs.DirExists(dialogOptions.DefaultDirectory) {
+			return "", fmt.Errorf("default directory '%s' does not exist", dialogOptions.DefaultDirectory)
+		}
+	}
 	return appFrontend.OpenFileDialog(dialogOptions)
 }

 // OpenMultipleFilesDialog prompts the user to select a file
 func OpenMultipleFilesDialog(ctx context.Context, dialogOptions OpenDialogOptions) ([]string, error) {
 	appFrontend := getFrontend(ctx)
+	if dialogOptions.DefaultDirectory != "" {
+		if !fs.DirExists(dialogOptions.DefaultDirectory) {
+			return nil, fmt.Errorf("default directory '%s' does not exist", dialogOptions.DefaultDirectory)
+		}
+	}
 	return appFrontend.OpenMultipleFilesDialog(dialogOptions)
 }

 // SaveFileDialog prompts the user to select a file
 func SaveFileDialog(ctx context.Context, dialogOptions SaveDialogOptions) (string, error) {
 	appFrontend := getFrontend(ctx)
+	if dialogOptions.DefaultDirectory != "" {
+		if !fs.DirExists(dialogOptions.DefaultDirectory) {
+			return "", fmt.Errorf("default directory '%s' does not exist", dialogOptions.DefaultDirectory)
+		}
+	}
 	return appFrontend.SaveFileDialog(dialogOptions)
 }

--- a/v2/pkg/runtime/runtime.go
+++ b/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
 }

--- a/website/docs/community/links.mdx
+++ b/website/docs/community/links.mdx
@@ -7,13 +7,18 @@ sidebar_position: 2
 This page serves as a list for community related links. Please submit a PR (click `Edit this page` at the bottom)
 to submit links.

+## Awesome Wails
+
+The [definitive list](https://github.com/wailsapp/awesome-wails) of links related to Wails.
+
 ## Support Channels

- - [Gophers Slack Channel](https://gophers.slack.com/messages/CJ4P9F7MZ/)
- - [Gophers Slack Channel Invite](https://invite.slack.golangbridge.org/)
- - [Github Issues](https://github.com/wailsapp/wails/issues)
- - [v2 Beta Discussion Board](https://github.com/wailsapp/wails/discussions/828)
+- [Gophers Slack Channel](https://gophers.slack.com/messages/CJ4P9F7MZ/)
+- [Gophers Slack Channel Invite](https://invite.slack.golangbridge.org/)
+- [Github Issues](https://github.com/wailsapp/wails/issues)
+- [v2 Beta Discussion Board](https://github.com/wailsapp/wails/discussions/828)

 ## Social Media

- - [Twitter](https://twitter.com/wailsapp)
+- [Twitter](https://twitter.com/wailsapp)
+- [Wails Chinese Community QQ Group](https://qm.qq.com/cgi-bin/qm/qr?k=PmIURne5hFGNd7QWzW5qd6FV-INEjNJv&jump_from=webapi) - Group number: 1067173054
--- a/website/docs/community/showcase/riftshare.mdx
+++ b/website/docs/community/showcase/riftshare.mdx
@@ -0,0 +1,19 @@
+
+# RiftShare
+
+<p style={{"text-align": "center"}}>
+   <img src="/img/showcase/riftshare-main.webp"></img><br/>
+</p>
+
+Easy, Secure, and Free file sharing for everyone. Learn more at [Riftshare.app](https://riftshare.app)
+
+## Features
+
+* Easy secure file sharing between computers both in the local network and through the internet
+* Supports sending files or directories securely through the [magic wormhole protocol](https://magic-wormhole.readthedocs.io/en/latest/)
+* Compatible with all other apps using magic wormhole (magic-wormhole or wormhole-william CLI, wormhole-gui, etc.)
+* Automatic zipping of multiple selected files to send at once
+* Full animations, progress bar, and cancellation support for sending and receiving
+* Native OS File Selection
+* Open files in one click once received
+* Auto Update - don't worry about having the latest release!
--- a/website/docs/community/templates.mdx
+++ b/website/docs/community/templates.mdx
@@ -28,3 +28,12 @@ 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
+- [wails-react-template](https://github.com/flin7/wails-react-template) - A minimal template for React that supports live development
+
+## Svelte
+
+- [wails-svelte-template](https://github.com/raitonoberu/wails-svelte-template) - A template using Svelte
--- a/website/docs/credits.mdx
+++ b/website/docs/credits.mdx
@@ -14,6 +14,13 @@ sidebar_position: 99
 <div
  dangerouslySetInnerHTML={{
    __html: `
+<p align="center">
+  <a href="https://www.easywebadv.it/" style="width:100px;">
+    <img src="/img/easyweb.png" width="200"/>
+  </a>
+</p>
+<br/>
+<br/>
 <a href="https://github.com/sponsors/leaanthony" style="width:100px;">
  <img src="/img/silver%20sponsor.png" width="100"/>
 </a>
@@ -84,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>
@@ -96,6 +100,18 @@ sidebar_position: 99
 <a href="https://github.com/taigrr" style="width:45px">
  <img src="https://github.com/taigrr.png?size=45" width="45"/>
 </a>
+<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>
 `,
  }}
 />
--- a/website/docs/gettingstarted/installation.mdx
+++ b/website/docs/gettingstarted/installation.mdx
@@ -6,9 +6,9 @@ sidebar_position: 1

 ## Supported Platforms

- Windows 10
- MacOS 10.13+ (amd64)
- MacOS 11.0+ (arm64)
+- Windows 10 AMD64/ARM64
+- MacOS 10.13+ AMD64
+- MacOS 11.0+ ARM64
 - Linux (due Jan '22)

 ## Dependencies
--- a/website/docs/guides/application-development.mdx
+++ b/website/docs/guides/application-development.mdx
@@ -165,7 +165,7 @@ If these 2 keys aren't given, then Wails does absolutely nothing with the fronte

 Running `wails dev` will start the built in dev server which will start a file watcher in your project directory. By
 default, if any file changes, wails checks if it was an application file (default: `.go`, configurable with `-e` flag).
-If it was, then it will rebuild your application and relaunch it. If the changed file was in the `assetdir` directory,
+If it was, then it will rebuild your application and relaunch it. If the changed file was in the assets,
 it will issue a reload after a short amount of time.

 The dev server uses a technique called "debouncing" which means it doesn't reload straight away,
--- a/website/docs/guides/ides.mdx
+++ b/website/docs/guides/ides.mdx
@@ -46,8 +46,7 @@ The 2 files generated are `tasks.json` and `launch.json`. Below are the files ge
            "program": "${workspaceFolder}/build/bin/myproject.exe",
            "preLaunchTask": "build",
            "cwd": "${workspaceFolder}",
-            "env": {},
-            "args": ["-assetdir", "frontend/src"]
+            "env": {}
        },
    ]
 }
--- a/website/docs/guides/migrating.mdx
+++ b/website/docs/guides/migrating.mdx
@@ -199,7 +199,8 @@ The format of the file is slightly different. Here is a comparison:
 | frontend / serve   |                  | Removed                                             |
 | tags               |                  | Removed                                             |
 |                    | wailsjsdir       | The directory to generate wailsjs modules           |
-|                    | assetdir         | The directory of the compiled frontend assets for `dev` mode |
+|                    | assetdir         | The directory of the compiled frontend assets for `dev` mode. This is normally inferred and could be left empty. |
+|                    | reloaddirs       | Comma separated list of additional directories to watch for changes and to trigger reloads in `dev` mode. This is only needed for some more advanced asset configurations. |

 </p>

--- a/website/docs/guides/routing.mdx
+++ b/website/docs/guides/routing.mdx
@@ -0,0 +1,27 @@
+
+# Routing
+
+Routing is a popular way to switch views in an application. This page offers some guidance around how to do that.
+
+## Vue
+
+The recommended approach for routing in Vue is [Hash Mode](https://next.router.vuejs.org/guide/essentials/history-mode.html#hash-mode):
+
+```js
+import { createRouter, createWebHashHistory } from 'vue-router'
+
+const router = createRouter({
+  history: createWebHashHistory(),
+  routes: [
+    //...
+  ],
+})
+```
+
+## Angular
+
+The recommended approach for routing in Angular is [HashLocationStrategy](https://codecraft.tv/courses/angular/routing/routing-strategies/#_hashlocationstrategy):
+
+```ts
+RouterModule.forRoot(routes, {useHash: true})
+```
--- a/website/docs/howdoesitwork.mdx
+++ b/website/docs/howdoesitwork.mdx
@@ -106,9 +106,7 @@ As production binaries use the files contained in `embed.FS`, there are no exter
 the application.

 When running in development mode using the `wails dev` command, the assets are loaded off disk, and any changes result
-in a "live reload". The location of the assets needs to be passed to the `wails dev` command using the `-assetdir` flag
-and is likely to be the same as the embed path. It is hoped that in the future we can calculate this from the `embed.FS`
-itself.
+in a "live reload". The location of the assets will be inferred from the `embed.FS`.

 More details can be found in the [Application Development Guide](/docs/guides/application-development).

--- a/website/docs/reference/cli.mdx
+++ b/website/docs/reference/cli.mdx
@@ -66,6 +66,8 @@ A list of community maintained templates can be found [here](/docs/community/tem
 |  -upxflags           | Flags to pass to upx                    |                            |
 |  -v int              | Verbosity level (0 - silent, 1 - default, 2 - verbose) | 1           |
 |  -webview2           | WebView2 installer strategy: download,embed,browser,error | download |
+|  -u                  | Updates your project's `go.mod` to use the same version of Wails as the CLI | |
+|  -debug              | Retains debug information in the application | false |

 For a detailed description of the `webview2` flag, please refer to the [Windows](/docs/guides/windows) Guide.

@@ -82,6 +84,12 @@ Example:

 :::

+:::info UPX on Windows
+
+  Some Antivirus vendors false positively mark `upx` compressed binaries as virus, see [issue](https://github.com/upx/upx/issues/437).
+
+:::
+
 ## doctor

 `wails doctor` will run diagnostics to ensure that your system is ready for development.
@@ -130,10 +138,11 @@ Your system is ready for Wails development!

 |  Flag                |  Description                            |  Default                   |
 | :------------------- | :-------------------------------------- | :------------------------- |
-|  -assetdir "./path/to/assets" | The path to your compiled assets  | Value in `wails.json` |
+|  -assetdir "./path/to/assets" | Serve assets from the given directory instead of using the provided asset FS | Value in `wails.json` |
 |  -browser | Opens a browser to `http://localhost:34115` on startup | |
 |  -compiler "compiler"| Use a different go compiler to build, eg go1.15beta1 | go            |
 |  -e                  | Extensions to trigger rebuilds (comma separated)  | go |
+|  -reloaddirs         | Additional directories to trigger reloads (comma separated) | Value in `wails.json` |
 |  -ldflags "flags"    | Additional ldflags to pass to the compiler |                         |
 |  -tags "extra tags"  | Build tags to pass to compiler (quoted and space separated) |        |
 |  -loglevel "loglevel"| Loglevel to use - Trace, Debug, Info, Warning, Error | Debug         |
@@ -145,7 +154,7 @@ Your system is ready for Wails development!
 |  -appargs "args"         | Arguments passed to the application in shell style  | |
 |  -platform "platform"    | Platform/Arch to target | `runtime.GOOS` |

-If the `assetdir`, `wailsjsdir`, `debounce` or `devserverurl` flags are provided on the command line, they are saved in
+If the `assetdir`, `reloaddirs`, `wailsjsdir`, `debounce` or `devserverurl` flags are provided on the command line, they are saved in
 `wails.json`, and become the defaults for subsequent invocations.

 Example:
--- a/website/docs/reference/options.mdx
+++ b/website/docs/reference/options.mdx
@@ -36,6 +36,7 @@ func main() {
        OnStartup:         app.startup,
        OnDomReady:        app.domready,
        OnShutdown:        app.shutdown,
+        OnBeforeClose:     app.beforeClose,
        WindowStartState:  options.Maximised,
        Bind: []interface{}{
            app,
@@ -283,6 +284,7 @@ func (b *App) beforeClose(ctx context.Context) (prevent bool) {
 		return false
 	}
 	return dialog != "Yes"
+}
 ```

 ### WindowStartState
@@ -315,6 +317,14 @@ Type: \*windows.Options

 This defines [Windows specific options](#windows-specific-options).

+### Mac
+
+Name: Mac
+
+Type: \*mac.Options
+
+This defines [Mac specific options](#mac-specific-options).
+
 ## Windows Specific Options

 ### WebviewIsTransparent
--- a/website/docs/reference/project-config.mdx
+++ b/website/docs/reference/project-config.mdx
@@ -9,7 +9,8 @@ The project config resides in the `wails.json` file in the project directory. Th
 ```json
 {
    "name": "[The project name]",
-	"assetdir": "[Relative path to the directory containing the compiled assets]",
+	"assetdir": "[Relative path to the directory containing the compiled assets, this is normally inferred and could be left empty]",
+	"reloaddirs": "[Additional directories to trigger reloads (comma separated), this is only used for some advanced asset configurations]",
 	"frontend:install": "[The command to install node dependencies, run in the frontend directory - often `npm install`]",
 	"frontend:build": "[The command to build the assets, run in the frontend directory - often `npm run build`]",
 	"frontend:dev": "[This command is run in a separate process on `wails dev`. Useful for 3rd party watchers]",
@@ -25,5 +26,5 @@ The project config resides in the `wails.json` file in the project directory. Th

 This file is read by the Wails CLI when running `wails build` or `wails dev`.

-The `assetdir`, `wailsjsdir`, `debounceMS` and `devserverurl` flags in `wails build/dev` will update the project config
+The `assetdir`, `reloaddirs`, `wailsjsdir`, `debounceMS` and `devserverurl` flags in `wails build/dev` will update the project config
 and thus become defaults for subsequent runs.
--- a/website/docs/reference/runtime/dialog.mdx
+++ b/website/docs/reference/runtime/dialog.mdx
@@ -69,8 +69,6 @@ type OpenDialogOptions struct {
 	DefaultFilename            string
 	Title                      string
 	Filters                    []FileFilter
-	AllowFiles                 bool
-	AllowDirectories           bool
 	ShowHiddenFiles            bool
 	CanCreateDirectories       bool
 	ResolvesAliases            bool
@@ -83,8 +81,6 @@ type OpenDialogOptions struct {
 | DefaultFilename            | The default filename                           | ✅  | ✅  |
 | Title                      | Title for the dialog                           | ✅  | ✅  |
 | [Filters](#filefilter)     | A list of file filters                         | ✅  | ✅  |
-| AllowFiles                 | Allow files to be selected                     |     | ✅  |
-| AllowDirectories           | Allow directories to be selected               |     | ✅  |
 | ShowHiddenFiles            | Show files hidden by the system                |     | ✅  |
 | CanCreateDirectories       | Allow user to create directories               |     | ✅  |
 | ResolvesAliases            | If true, returns the file not the alias        |     | ✅  |
--- a/website/docs/reference/runtime/intro.mdx
+++ b/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
--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/links.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/links.mdx
@@ -6,6 +6,10 @@ sidebar_position: 2

 此页面用于列出社区相关的链接。请提交 PR（点击页面底部的`编辑此页`）增加链接。

+## 了不起的 Wails
+
+Wails 相关的[优秀列表](https://github.com/wailsapp/awesome-wails)。
+
 ## 支持的通道

 - [Gophers Slack Channel](https://gophers.slack.com/messages/CJ4P9F7MZ/)
--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/showcase/ytd.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/showcase/ytd.mdx
@@ -0,0 +1,10 @@
+
+# Ytd
+
+<p>
+   <img src="/img/showcase/ytd.png"></img><br/>
+</p>
+
+
+[Ytd](https://github.com/marcio199226/ytd/tree/v2-wails) is an app for downloading tracks from youtube, creating offline playlists and share them with your friends, your friends will be able to playback your playlists or download them for offline listening, has an built-in player.
+
--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/templates.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/community/templates.mdx
@@ -27,3 +27,13 @@ sidebar_position: 1
 ## Angular

 - [wails-angular-template](https://github.com/TAINCER/wails-angular-template) - 带有 TypeScript, Sass, 热重载, 代码拆分和 i18n 的 Angular
+
+## React
+
+- [wails-react-template](https://github.com/AlienRecall/wails-react-template) - 基于 reactjs 的模板
+- [wails-react-template](https://github.com/flin7/wails-react-template) - 基于 React 并支持实时开发模式的轻量级模板
+
+## Svelte
+
+- [wails-svelte-template](https://github.com/raitonoberu/wails-svelte-template) - 基于 Svelte 的模板
+
--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/credits.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/credits.mdx
@@ -96,6 +96,9 @@ sidebar_position: 99
 <a href="https://github.com/taigrr" style="width:45px">
  <img src="https://github.com/taigrr.png?size=45" width="45"/>
 </a>
+<a href="https://github.com/charlie-dee" style="width:55px">
+  <img src="https://github.com/charlie-dee.png?size=55" width="55"/>
+</a>
 `,
  }}
 />
--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/bleeding-edge.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/bleeding-edge.mdx
@@ -0,0 +1,27 @@
+# 前沿风险技术
+
+## 概述
+
+Wails 一直在开发中，新版本会定期“标记”。这通常发生在`master`分支上所有较新的代码都经过测试并确认有效时。如果您需要尚未发布的错误修复或功能，可以通过以下步骤使用最新的“前沿风险”版本：
+
+- `git clone https://github.com/wailsapp/wails`
+- `cd wails/v2/cmd/wails`
+- `go install`
+
+注意：您将项目克隆到的目录现在将被称为“clonedir”。
+
+Wails CLI 现在将是最新版本。要更新项目以使用最新版本，请更新项目并确保以下行位于`go.mod`文件底部：
+
+`replace github.com/wailsapp/wails/v2 => <clonedir>`
+
+示例：
+
+在 Windows 上：
+`replace github.com/wailsapp/wails/v2 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2`
+
+在'nix 上：
+`replace github.com/wailsapp/wails/v2 => /home/me/projects/wails/v2`
+
+要恢复到稳定版本，请运行：
+
+`go install github.com/wailsapp/wails/v2/cmd/wails@latest`
--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/routing.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/guides/routing.mdx
@@ -0,0 +1,26 @@
+# 路由
+
+路由是一种在应用程序中切换视图的流行方式。此页面提供了有关如何执行此操作的一些指导。
+
+## Vue
+
+在 Vue 中推荐的路由方法是[Hash 模式](https://next.router.vuejs.org/guide/essentials/history-mode.html#hash-mode):
+
+```js
+import { createRouter, createWebHashHistory } from "vue-router";
+
+const router = createRouter({
+  history: createWebHashHistory(),
+  routes: [
+    //...
+  ],
+});
+```
+
+## Angular
+
+在 Angular 中推荐的路由方法是[HashLocationStrategy](https://codecraft.tv/courses/angular/routing/routing-strategies/#_hashlocationstrategy):
+
+```ts
+RouterModule.forRoot(routes, { useHash: true });
+```
--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/howdoesitwork.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/howdoesitwork.mdx
@@ -106,7 +106,7 @@ var assets embed.FS

 在即将加载前端`index.html`之前，对 [应用启动回调](/docs/reference/options#应用启动回调) 中提供的函数进行回调。一个标准的 Go 上下文被传递给这个方法。
 调用运行时需要此上下文，因此标准模式是保存此时对它的引用。在应用程序关闭之前，以同样的方式调用 [应用退出回调](/docs/reference/options#应用退出回调) 回调，
-再次使用上下文。当前端完成加载`index.html`中所有资源时，还有一个 [前端 Dom 加载完成回调](/docs/reference/options#前端-dom-加载完成回调) 回调，相当于 Javascript 中的`body onload`事件。
+再次使用上下文。当前端完成加载`index.html`中所有资源时，还有一个 [前端 Dom 加载完成回调](/docs/reference/options#前端-dom-加载完成回调) 回调，相当于 Javascript 中的`body onload`事件。还可以通过设置[关闭应用程序之前回调](/docs/reference/options#关闭应用程序之前回调)选项来控制窗口关闭（或应用程序退出）事件。

 #### 方法绑定

--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/reference/options.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/reference/options.mdx
@@ -34,7 +34,8 @@ func main() {
        LogLevel:          logger.DEBUG,
        OnStartup:         app.startup,
        OnDomReady:        app.domready,
-        OnShutdown:        app.shutdown,,
+        OnShutdown:        app.shutdown,
+        OnBeforeClose:     app.beforeClose,
        WindowStartState:  options.Maximised,
        Bind: []interface{}{
            app,
@@ -245,6 +246,30 @@ func main() {

 在前端被销毁之后，就在应用程序终止之前，调用此回调。它给出了应用程序上下文。

+### 关闭应用程序之前回调
+
+名称：OnBeforeClose
+
+类型：func(ctx context.Context) bool
+
+如果设置了此回调，它将在通过单击窗口关闭按钮或调用`runtime.Quit`即将退出应用程序时被调用. 返回 `true` 将导致应用程序继续，`false` 将继续正常关闭。这有助于与用户确认他们希望退出程序。
+
+示例：
+
+```go title=windowsapp.go
+func (b *App) beforeClose(ctx context.Context) (prevent bool) {
+	dialog, err := runtime.MessageDialog(ctx, runtime.MessageDialogOptions{
+		Type:          runtime.QuestionDialog,
+		Title:         "Quit?",
+		Message:       "Are you sure you want to quit?",
+	})
+
+	if err != nil {
+		return false
+	}
+	return dialog != "Yes"
+```
+
 ### 窗口启动状态

 名称：WindowStartState
@@ -273,7 +298,15 @@ func main() {

 类型：\*windows.Options

-这定义了[Windows 特定的选项](#windows-特定选项).。
+这定义了[Windows 特定的选项](#windows-特定选项)。
+
+### Mac
+
+名称：Mac
+
+类型：\*mac.Options
+
+这定义了[Mac 特定的选项](#mac-特定选项)。

 ## Windows 特定选项

@@ -301,6 +334,14 @@ func main() {

 将此设置为 `true` 将删除标题栏左上角的图标。

+### 启用无边框模式的外边框
+
+名称：EnableFramelessBorder
+
+类型：bool
+
+如果已激活[无边框](#无边框)，则将此设置为`true`将在窗口周围添加边框。这允许隐藏标题栏但仍然在窗口周围有边框。
+
 ## Mac 特定选项

 ### 标题栏
--- a/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/reference/runtime/dialog.mdx
+++ b/website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/reference/runtime/dialog.mdx
@@ -63,8 +63,6 @@ type OpenDialogOptions struct {
 	DefaultFilename            string
 	Title                      string
 	Filters                    []FileFilter
-	AllowFiles                 bool
-	AllowDirectories           bool
 	ShowHiddenFiles            bool
 	CanCreateDirectories       bool
 	ResolvesAliases            bool
@@ -78,8 +76,6 @@ type OpenDialogOptions struct {
 | DefaultFilename            | 默认文件名                        | ✅  | ✅  |
 | Title                      | 对话框的标题                      | ✅  | ✅  |
 | [Filters](#文件过滤)       | 文件过滤器列表                    | ✅  | ✅  |
-| AllowFiles                 | 允许选择文件                      |     | ✅  |
-| AllowDirectories           | 允许选择目录                      |     | ✅  |
 | ShowHiddenFiles            | 显示系统隐藏的文件                |     | ✅  |
 | CanCreateDirectories       | 允许用户创建目录                  |     | ✅  |
 | ResolvesAliases            | 如果为 true，则返回文件而不是别名 |     | ✅  |
--- a/website/static/img/easyweb.png
+++ b/website/static/img/easyweb.png
--- a/website/static/img/showcase/riftshare-main.webp
+++ b/website/static/img/showcase/riftshare-main.webp
Author	SHA1	Message	Date
Lea Anthony	f6d7ec3d50	Merge pull request #1059 from GargantuaX/master update zh-hans docs	2022-01-06 06:28:35 +11:00
GargantuaX	d2a116fe55	update zh-hans docs	2022-01-05 16:01:48 +08:00
Lea Anthony	eb3cf9d130	Merge pull request #1058 from yesgs/master add uos linux distro	2022-01-05 17:13:48 +11:00
king	7e2258be7d	add uos linux distro	2022-01-05 11:13:34 +08:00
Lea Anthony	bb5d446001	Merge pull request #1053 from pierrejoye/master Allow window resizing regardless of frameless or other options (#1049)	2021-12-31 06:58:05 +11:00
Pierre Joye	e9aba4795f	Allow window resizing regardless of frameless or other options Fix bug on Windows where the disableResize option depends on the frameless option.	2021-12-30 16:55:47 +07:00
$Lea\Anthony$ Lea\Anthony	c16bb9715f	Fix for bad default directories in dialog options. Fixes #1052	2021-12-30 17:34:06 +11:00
$Lea\Anthony$ Lea\Anthony	0f09e8d433	Fix signatures	2021-12-30 11:17:29 +11:00
$Lea\Anthony$ Lea\Anthony	f338dff171	Fix EventsOff in JS runtime	2021-12-29 09:11:12 +11:00
$Lea\Anthony$ Lea\Anthony	3c6ed12637	New build flag: `-debug`	2021-12-29 06:54:52 +11:00
Lea Anthony	e2f3a11a33	[mac] Fix for cancelling Dialogs. Fixes #1047	2021-12-28 20:04:30 +11:00
Lea Anthony	0571deb290	Merge pull request #1046 from buddyabaddon/master Make linuxdb.yaml an embedded resource	2021-12-28 17:27:59 +11:00
Matt McKenzie	451b357e40	Make linuxdb.yaml an embedded resource	2021-12-27 18:22:03 -08:00
$Lea\Anthony$ Lea\Anthony	84b67a8f53	Add -u flag to sync project go.mod with CLI version	2021-12-28 06:40:44 +11:00
Lea Anthony	448cf731bb	[mac] Fix for Save Dialog	2021-12-27 20:09:03 +11:00
$Lea\Anthony$ Lea\Anthony	9cb480f0f0	v2.0.0-beta.27	2021-12-27 19:40:56 +11:00
$Lea\Anthony$ Lea\Anthony	6825a631f5	Commit MicrosoftEdgeWebview2Setup.exe	2021-12-27 19:40:19 +11:00
$Lea\Anthony$ Lea\Anthony	39f91a030f	v2.0.0-beta.26	2021-12-27 18:12:48 +11:00
$Lea\Anthony$ Lea\Anthony	202e4d5be8	Actually commit sudo_mattn	2021-12-27 18:11:12 +11:00
$Lea\Anthony$ Lea\Anthony	045e58778a	Actually commit webview2runtime	2021-12-27 18:09:41 +11:00
$Lea\Anthony$ Lea\Anthony	e375d60c67	Updated modules	2021-12-27 05:23:18 +11:00
$Lea\Anthony$ Lea\Anthony	fcb5499d3a	v2.0.0-beta.25	2021-12-27 05:21:17 +11:00
$Lea\Anthony$ Lea\Anthony	dd5a54a8e0	Remove replace line	2021-12-27 05:21:17 +11:00
Lea Anthony	9f24a46b8a	Merge pull request #1042 from flin7/patch-1 Add template for React	2021-12-26 21:19:53 +11:00
flin7	d7eaab97dd	Add template for React	2021-12-26 17:21:19 +08:00
$Lea\Anthony$ Lea\Anthony	a03d1e5ac5	v2.0.0-beta.24	2021-12-26 20:13:42 +11:00
$Lea\Anthony$ Lea\Anthony	d5d4d88481	[v2] Fix webview2 runtime detection. Fixes #1038	2021-12-26 19:24:59 +11:00
$Lea\Anthony$ Lea\Anthony	1c823b09c4	[v2] Fix compile issue	2021-12-25 08:54:23 +11:00
$Lea\Anthony$ Lea\Anthony	e5732bcee1	[v2] Update to webview2runtime v1.3.0	2021-12-25 08:51:43 +11:00
Lea Anthony	c0f283335a	[mac] Fix for submenu titles. Fixes #1026 .	2021-12-24 08:00:37 +11:00
$Lea\Anthony$ Lea\Anthony	64cdf64751	[v2] export interfaces in runtime.d.ts	2021-12-23 06:27:49 +11:00
Lea Anthony	609bfc35c0	Update options.mdx	2021-12-22 21:17:46 +11:00
$Lea\Anthony$ Lea\Anthony	121d11db55	[v2] Update sponsors	2021-12-22 06:36:18 +11:00
$Lea\Anthony$ Lea\Anthony	5c357f012d	[v2] Update context error	2021-12-22 06:28:47 +11:00
$Lea\Anthony$ Lea\Anthony	56285f8637	[v2] Update docs	2021-12-21 08:53:48 +11:00
Lea Anthony	b61158d329	Merge pull request #1030 from raitonoberu/patch-1 Add Svelte template	2021-12-21 08:04:23 +11:00
Denis	0233197073	Add wails-svelte-template	2021-12-20 20:40:42 +07:00
$Lea\Anthony$ Lea\Anthony	d883397d75	Update sponsors	2021-12-20 20:24:22 +11:00
$Lea\Anthony$ Lea\Anthony	5bd82c4637	Update sponsors	2021-12-16 07:41:33 +11:00
$Lea\Anthony$ Lea\Anthony	e942867635	Update sponsors	2021-12-16 07:41:14 +11:00
Lea Anthony	29749ed7cb	Merge pull request #1025 from AlienRecall/patch-1 Added react template	2021-12-16 07:35:22 +11:00
AlienRecall	0288f33556	Added react template	2021-12-15 13:53:25 +01:00
$Lea\Anthony$ Lea\Anthony	ddeac08991	v2.0.0-beta.23	2021-12-15 19:36:45 +11:00
Lea Anthony	30e12d681c	[mac] Fix for save dialog	2021-12-15 19:16:43 +11:00
Lea Anthony	f9fce9f2a7	Merge pull request #1024 from achhabra2/patch-1 Add Riftshare to community showcase	2021-12-15 06:15:16 +11:00
Aman Chhabra	9c5bb8c6eb	Add Riftshare to community showcase	2021-12-14 07:22:35 -08:00
Lea Anthony	f2ab409284	Update README.md	2021-12-13 20:40:50 +11:00
$Lea\Anthony$ Lea\Anthony	7c190810fd	Update easyweb logo	2021-12-13 20:40:03 +11:00
$Lea\Anthony$ Lea\Anthony	2b2cd21674	Update sponsors	2021-12-13 20:32:55 +11:00
Lea Anthony	f025234c85	Merge pull request #1021 from dedo1911/master [v2] feature / Add flag to skip mod tidy	2021-12-13 05:58:53 +11:00
Dario Emerson	44035637f7	Add flag to skip mod tidy	2021-12-12 15:01:16 +01:00
Lea Anthony	008a5c70b9	[mac] Fix linking issue. Removed warnings.	2021-12-11 20:06:42 +11:00
$Lea\Anthony$ Lea\Anthony	24eaef1604	[mac] fix dynamically linking UTIFramework during cgo build	2021-12-11 19:43:21 +11:00
$Lea\Anthony$ Lea\Anthony	62adcab722	[mac] try dynamically linking UTIFramework during cgo build	2021-12-11 19:36:17 +11:00
Lea Anthony	e12b630dfb	[mac] Attempt to fix 10.14 compilation issue	2021-12-11 07:29:47 +11:00
$Lea\Anthony$ Lea\Anthony	81b3ecb056	v1.16.9	2021-12-10 19:04:22 +11:00
$Lea\Anthony$ Lea\Anthony	b4d14644ee	Only generate ico if not there	2021-12-10 19:04:10 +11:00
$Lea\Anthony$ Lea\Anthony	69fd584c32	Update sponsors	2021-12-10 19:00:26 +11:00
Lea Anthony	3444ec50a7	Merge pull request #1017 from stffabi/feature/add-upx-info-windows [docs] Add info about upx and antivirus vendors	2021-12-09 21:55:52 +11:00
stffabi	02d4c65e01	[docs] Add info about upx and antivirus vendors	2021-12-09 11:03:53 +01:00
Lea Anthony	efdcfe9985	[v2] Remove `AllowFiles` & `AllowDirectories`	2021-12-09 08:16:45 +11:00
Lea Anthony	5884b7a87c	Update supported platforms	2021-12-08 19:50:11 +11:00
$Lea\Anthony$ Lea\Anthony	7229446ce7	v2.0.0-beta.22	2021-12-08 19:17:45 +11:00
Lea Anthony	c355d63768	Update bug_report.md	2021-12-08 18:44:36 +11:00
Lea Anthony	eb0030adeb	Merge pull request #1012 from meatherly/fix_for_950 Fix for #950	2021-12-08 07:36:10 +11:00
Lea Anthony	fe224d9ecd	Merge pull request #1013 from stffabi/feature/fsfs-docs-improvements [v2] Update docs with new assetdir management and add reloaddirs	2021-12-07 17:08:45 +11:00
stffabi	a98d55db58	[v2] Update wails.json with updated reloaddirs from `wails dev`	2021-12-07 03:34:51 +01:00
stffabi	f034163da5	[v2] Update wails.json with updated assetdir from `wails dev` Makes the code consistent with the docs	2021-12-07 03:34:51 +01:00
stffabi	d8fe011509	[v2] Update docs with new assetdir management and add reloaddirs	2021-12-07 03:34:19 +01:00
stffabi	e7bb3b3e83	[v2] Omit empty assetdir and reloaddirs in wails.json	2021-12-07 03:26:55 +01:00
meatherly	3201206d4f	locking the event manager before mutating it. this should resolve issue #950	2021-12-06 16:21:35 -06:00
Lea Anthony	69c14d2a5d	Merge pull request #1001 from stffabi/feature/fsfs-assets proposal: [v2] Support fs.FS for assets	2021-12-07 06:03:59 +11:00
stffabi	778cbe04d9	[v2] Add reloaddirs flag to add additional reload directories This is interesting if someone uses an asset FS which is not an embed.FS, but still has some special handling to include loading data from disk in dev mode. E.g. one might conditionally use an embed.FS or os.DirFS depending on the build mode.	2021-12-06 13:47:16 +01:00
stffabi	131a8f421d	[v2] Infer assetDir from embed.FS AssetDir is now inferred from the assets, if the assets is an embed.FS, by taking the relativ path to the index.html joined with the project root. The assetDir flag still exists and can be used if the inferring doesn't work, because the provided embed.FS wasn't defined in the main package.	2021-12-06 13:47:16 +01:00
stffabi	6fcd4b7bd4	[v2] Support fs.FS for assets Reloading changed asset files in dev mode will only work if an embed.FS has been provided for the assets.	2021-12-06 08:50:39 +01:00
Lea Anthony	f3b2f6ab76	Merge pull request #1011 from misitebao/optimize-documentation docs: synchronize and optimize documents	2021-12-06 17:37:44 +11:00
misitebao	b556e860c4	docs: fix document translation	2021-12-06 11:10:36 +08:00
misitebao	eb01a005dc	docs: fix document translation	2021-12-06 11:09:22 +08:00
misitebao	6dcee51940	docs: optimize english documents	2021-12-06 11:06:08 +08:00
misitebao	4c7a53b72b	docs: synchronize chinese documents	2021-12-06 11:05:37 +08:00
$Lea\Anthony$ Lea\Anthony	73c9fba731	[website] Added Angular router guide	2021-12-05 22:23:02 +11:00
$Lea\Anthony$ Lea\Anthony	0726ae9e83	[website] Added router guide	2021-12-05 22:18:52 +11:00
$Lea\Anthony$ Lea\Anthony	9ba4ca10ca	[website] Link to Awesome Wails	2021-12-05 19:31:42 +11:00
$Lea\Anthony$ Lea\Anthony	38caa645e5	[v2] A better approach to delayed IPC	2021-12-05 14:23:48 +11:00