[v2] v2.0.0-beta.13

add artix linux distro

.github/workflows/deploy-website-to-wails.top-mirror.yml

@@ -0,0 +1,35 @@
+name: Deploy mirror | 部署镜像
+
+on:
+  push:
+    branches: [master]
+  # pull_request:
+  #   branches: [ main ]
+
+jobs:
+  build-and-deploy:
+    name: Automatic deployment | 自动部署
+    runs-on: ubuntu-latest
+    if: github.repository == 'misitebao/wails'
+
+    steps:
+      - name: Checkout | 切换到部署分支
+        uses: actions/checkout@v2
+        with:
+          ref: "master"
+          submodules: true
+          fetch-depth: 0
+
+      - name: Build Site | 构建网站
+        run: |
+          cd website &&
+          npm install && npm run build
+
+      - name: Deploy to Server | 部署到服务器
+        uses: hengkx/ssh-deploy@v1.0.1
+        with:
+          HOST: ${{ secrets.DEPLOY_HOST }}
+          USERNAME: ${{ secrets.DEPLOY_HOST_USER }}
+          PASSWORD: ${{ secrets.DEPLOY_HOST_PASSWORD }}
+          SOURCE: "website/build"
+          TARGET: "/www/wwwroot/wails.top"

.github/workflows/latest-pre.yml

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

.github/workflows/pr.yml

@@ -13,11 +13,11 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
 
-      - name: Set up Go 1.16
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.16
-        id: go
+    - name: Set up Go 1.16
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.16
+      id: go
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v1
@@ -29,4 +29,4 @@ jobs:
       run: go build -v ./cmd/wails
 
     - name: Test
-      run: ./wails version
+      run: ./wails version

.github/workflows/release.yml

@@ -15,11 +15,11 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
 
-      - name: Set up Go 1.16
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.16
-        id: go
+    - name: Set up Go 1.16
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.16
+      id: go
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v1
@@ -31,4 +31,4 @@ jobs:
       run: go build -v ./cmd/wails
 
     - name: Test
-      run: ./wails version
+      run: ./wails version

README.md

@@ -79,45 +79,58 @@ This project is supported by these kind people / companies:
 <a href="https://github.com/snider" style="width:100px;">
   <img src="https://github.com/snider.png?size=100" width="100"/>
 </a>
+<a href="https://github.com/codydbentley" style="width:100px">
+  <img src="https://github.com/codydbentley.png?size=100" width="100"/>
+</a>
+<br/>
 <br/>
 <a href="https://github.com/matryer" style="width:100px">
   <img src="https://github.com/matryer.png" width="100"/>
 </a>
 <a href="https://www.jetbrains.com?from=Wails" style="width:100px">
-  <img src="jetbrains-grayscale.png" width="100"/>
+  <img src="/img/jetbrains-grayscale.png" width="100"/>
 </a>
-<a href="https://github.com/tc-hib" style="width:55px;border-radius: 50%">
- <img src="https://github.com/tc-hib.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/tc-hib" style="width:55px">
+ <img src="https://github.com/tc-hib.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/picatz" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/picatz.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/picatz" style="width:50px">
+  <img src="https://github.com/picatz.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/tylertravisty" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/tylertravisty.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/tylertravisty" style="width:50px">
+  <img src="https://github.com/tylertravisty.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/akhudek" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/akhudek.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/akhudek" style="width:50px">
+  <img src="https://github.com/akhudek.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/trea" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/trea.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/trea" style="width:50px">
+  <img src="https://github.com/trea.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/LanguageAgnostic" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/LanguageAgnostic" style="width:55px">
+  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/fcjr" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/fcjr.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/fcjr" style="width:55px">
+  <img src="https://github.com/fcjr.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/nickarellano" style="width:60px;border-radius: 50%">
-  <img src="https://github.com/nickarellano.png?size=60" width="60" style="border-radius: 50%"/>
+<a href="https://github.com/nickarellano" style="width:60px">
+  <img src="https://github.com/nickarellano.png?size=60" width="60"/>
 </a>
-<a href="https://github.com/bglw" style="width:65px;border-radius: 50%">
-  <img src="https://github.com/bglw.png?size=65" width="65" style="border-radius: 50%"/>
+<a href="https://github.com/bglw" style="width:65px">
+  <img src="https://github.com/bglw.png?size=65" width="65"/>
 </a>
-<a href="https://github.com/jugglingjsons" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/jugglingjsons.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/jugglingjsons" style="width:50px">
+  <img src="https://github.com/jugglingjsons.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/marcus-crane" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/marcus-crane.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/marcus-crane" style="width:50px">
+  <img src="https://github.com/marcus-crane.png?size=50" width="50"/>
+</a>
+<a href="https://github.com/bbergshaven" style="width:45px">
+  <img src="https://github.com/bbergshaven.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/Gilgames000" style="width:45px">
+  <img src="https://github.com/Gilgames000.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/ilgityildirim" style="width:50px">
+  <img src="https://github.com/ilgityildirim.png?size=50" width="50"/>
 </a>
 
 <span id="nav-5"></span>

README.zh-Hans.md

@@ -73,47 +73,65 @@
 
 这个项目由以下这些人或者公司支持：
 
+
+<a href="https://github.com/sponsors/leaanthony" style="width:100px;">
+  <img src="sponsors/bronze%20sponsor.png" width="100"/>
+</a>
+<a href="https://github.com/snider" style="width:100px;">
+  <img src="https://github.com/snider.png?size=100" width="100"/>
+</a>
+<a href="https://github.com/codydbentley" style="width:100px">
+  <img src="https://github.com/codydbentley.png?size=100" width="100"/>
+</a>
+<br/>
+<br/>
 <a href="https://github.com/matryer" style="width:100px">
   <img src="https://github.com/matryer.png" width="100"/>
 </a>
 <a href="https://www.jetbrains.com?from=Wails" style="width:100px">
-  <img src="jetbrains-grayscale.png" width="100"/>
+  <img src="/img/jetbrains-grayscale.png" width="100"/>
 </a>
-<a href="https://github.com/tc-hib" style="width:55px;border-radius: 50%">
- <img src="https://github.com/tc-hib.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/tc-hib" style="width:55px">
+ <img src="https://github.com/tc-hib.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/picatz" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/picatz.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/picatz" style="width:50px">
+  <img src="https://github.com/picatz.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/tylertravisty" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/tylertravisty.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/tylertravisty" style="width:50px">
+  <img src="https://github.com/tylertravisty.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/akhudek" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/akhudek.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/akhudek" style="width:50px">
+  <img src="https://github.com/akhudek.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/trea" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/trea.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/trea" style="width:50px">
+  <img src="https://github.com/trea.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/LanguageAgnostic" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/LanguageAgnostic" style="width:55px">
+  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/snider" style="width:60px;border-radius: 50%">
-  <img src="https://github.com/snider.png?size=60" width="60" style="border-radius: 50%"/>
+<a href="https://github.com/fcjr" style="width:55px">
+  <img src="https://github.com/fcjr.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/fcjr" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/fcjr.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/nickarellano" style="width:60px">
+  <img src="https://github.com/nickarellano.png?size=60" width="60"/>
 </a>
-<a href="https://github.com/nickarellano" style="width:60px;border-radius: 50%">
-  <img src="https://github.com/nickarellano.png?size=60" width="60" style="border-radius: 50%"/>
+<a href="https://github.com/bglw" style="width:65px">
+  <img src="https://github.com/bglw.png?size=65" width="65"/>
 </a>
-<a href="https://github.com/bglw" style="width:65px;border-radius: 50%">
-  <img src="https://github.com/bglw.png?size=65" width="65" style="border-radius: 50%"/>
+<a href="https://github.com/jugglingjsons" style="width:50px">
+  <img src="https://github.com/jugglingjsons.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/jugglingjsons" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/jugglingjsons.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/marcus-crane" style="width:50px">
+  <img src="https://github.com/marcus-crane.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/marcus-crane" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/marcus-crane.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/bbergshaven" style="width:45px">
+  <img src="https://github.com/bbergshaven.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/Gilgames000" style="width:45px">
+  <img src="https://github.com/Gilgames000.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/ilgityildirim" style="width:50px">
+  <img src="https://github.com/ilgityildirim.png?size=50" width="50"/>
 </a>
 
 <span id="nav-5"></span>

cmd/linux.go

@@ -71,6 +71,8 @@ const (
 	Crux
 	// RHEL distribution
 	RHEL
+	// Artix linux distribution
+	ArtixLinux
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -183,6 +185,8 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = EndeavourOS
 	case "crux":
 		result.Distribution = Crux
+	case "artix":
+		result.Distribution = ArtixLinux
 	default:
 		result.Distribution = Unknown
 	}

cmd/linuxdb.yaml

@@ -213,6 +213,15 @@ distributions:
         gccversioncommand: *gccdumpversion
         programs: *archdefaultprograms
         libraries: *archdefaultlibraries
+  artix:
+    id: artix 
+    releases:
+      default:
+        version: default
+        name: Artix Linux
+        gccversioncommand: *gccdumpversion
+        programs: *archdefaultprograms
+        libraries: *archdefaultlibraries
   ctlos:
     id: ctlos
     releases:

cmd/system.go

@@ -281,7 +281,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		switch distroInfo.Distribution {
 		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
 			libraryChecker = DpkgInstalled
-		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS:
+		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS, ArtixLinux:
 			libraryChecker = PacmanInstalled
 		case CentOS, Fedora, Tumbleweed, Leap, RHEL:
 			libraryChecker = RpmInstalled

go.mod

@@ -5,7 +5,7 @@ require (
 	github.com/abadojack/whatlanggo v1.0.1
 	github.com/fatih/color v1.7.0
 	github.com/go-playground/colors v1.2.0
-	github.com/gorilla/websocket v1.4.0
+	github.com/gorilla/websocket v1.4.1
 	github.com/jackmordaunt/icns v1.0.0
 	github.com/kennygrant/sanitize v1.2.4
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect

go.sum

@@ -11,8 +11,8 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/go-playground/colors v1.2.0 h1:0EdjTXKrr2g1L/LQTYtIqabeHpZuGZz1U4osS1T8+5M=
 github.com/go-playground/colors v1.2.0/go.mod h1:miw1R2JIE19cclPxsXqNdzLZsk4DP4iF+m88bRc7kfM=
-github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
-github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ=
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
 github.com/jackmordaunt/icns v1.0.0 h1:RYSxplerf/l/DUd09AHtITwckkv/mqjVv4DjYdPmAMQ=

runtime/js/runtime/package-lock.json

@@ -260,9 +260,9 @@
       }
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "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
     },
     "path-type": {

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

@@ -1,15 +1,20 @@
 package dev
 
 import (
+	"context"
 	"fmt"
+	"github.com/wailsapp/wails/v2/cmd/wails/internal"
+	"github.com/wailsapp/wails/v2/internal/gomod"
 	"io"
-	"log"
 	"net/http"
 	"os"
+	"os/exec"
 	"os/signal"
 	"path/filepath"
 	"runtime"
+	"strconv"
 	"strings"
+	"sync"
 	"syscall"
 	"time"
 
@@ -27,6 +32,8 @@ import (
 	"github.com/wailsapp/wails/v2/pkg/commands/build"
 )
 
+const defaultDevServerURL = "http://localhost:34115"
+
 func LogGreen(message string, args ...interface{}) {
 	text := fmt.Sprintf(message, args...)
 	println(colour.Green(text))
@@ -50,51 +57,43 @@ func sliceToMap(input []string) map[string]struct{} {
 	return result
 }
 
+type devFlags struct {
+	ldflags         string
+	compilerCommand string
+	assetDir        string
+	extensions      string
+	openBrowser     bool
+	noReload        bool
+	wailsjsdir      string
+	tags            string
+	verbosity       int
+	loglevel        string
+	forceBuild      bool
+	debounceMS      int
+	devServerURL    string
+}
+
 // AddSubcommand adds the `dev` command for the Wails application
 func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	command := app.NewSubCommand("dev", "Development mode")
 
-	// Passthrough ldflags
-	ldflags := ""
-	command.StringFlag("ldflags", "optional ldflags", &ldflags)
-
-	// compiler command
-	compilerCommand := "go"
-	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
-
-	assetDir := ""
-	command.StringFlag("assetdir", "Serve assets from the given directory", &assetDir)
-
-	// extensions to trigger rebuilds of application
-	extensions := "go"
-	command.StringFlag("e", "Extensions to trigger rebuilds (comma separated) eg go", &extensions)
-
-	openBrowser := false
-	command.BoolFlag("browser", "Open application in browser", &openBrowser)
-
-	noreload := false
-	command.BoolFlag("noreload", "Disable reload on asset change", &noreload)
-
-	wailsjsdir := ""
-	command.StringFlag("wailsjsdir", "Directory to generate the Wails JS modules", &wailsjsdir)
-
-	// tags to pass to `go`
-	tags := ""
-	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &tags)
-
-	// Verbosity
-	verbosity := 1
-	command.IntFlag("v", "Verbosity level (0 - silent, 1 - standard, 2 - verbose)", &verbosity)
-
-	loglevel := ""
-	command.StringFlag("loglevel", "Loglevel to use - Trace, Dev, Info, Warning, Error", &loglevel)
-
-	forceBuild := false
-	command.BoolFlag("f", "Force build application", &forceBuild)
+	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("e", "Extensions to trigger rebuilds (comma separated) eg go", &flags.extensions)
+	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)
+	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &flags.tags)
+	command.IntFlag("v", "Verbosity level (0 - silent, 1 - standard, 2 - verbose)", &flags.verbosity)
+	command.StringFlag("loglevel", "Loglevel to use - Trace, Debug, Info, Warning, Error", &flags.loglevel)
+	command.BoolFlag("f", "Force build application", &flags.forceBuild)
+	command.IntFlag("debounce", "The amount of time to wait to trigger a reload on change", &flags.debounceMS)
+	command.StringFlag("devserverurl", "The url of the dev server to use", &flags.devServerURL)
 
 	command.Action(func() error {
-
 		// Create logger
 		logger := clilogger.New(w)
 		app.PrintBanner()
@@ -103,90 +102,54 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		if err != nil {
 			return err
 		}
-		projectConfig, err := project.Load(cwd)
+
+		projectConfig, err := loadAndMergeProjectConfig(cwd, &flags)
 		if err != nil {
 			return err
 		}
 
-		if projectConfig.AssetDirectory == "" && assetDir == "" {
-			return fmt.Errorf("No asset directory provided. Please use -assetdir to indicate which directory contains your built assets.")
-		}
-
-		if assetDir == "" && projectConfig.AssetDirectory != "" {
-			assetDir = projectConfig.AssetDirectory
-		}
-
-		if assetDir != projectConfig.AssetDirectory {
-			projectConfig.AssetDirectory = filepath.ToSlash(assetDir)
-			err := projectConfig.Save()
-			if err != nil {
-				return err
-			}
-		}
-
-		assetDir, err := filepath.Abs(assetDir)
+		// Update go.mod to use current wails version
+		err = syncGoModVersion(cwd)
 		if err != nil {
 			return err
 		}
 
-		if wailsjsdir == "" && projectConfig.WailsJSDir != "" {
-			wailsjsdir = projectConfig.WailsJSDir
-		}
-
-		if wailsjsdir == "" {
-			wailsjsdir = "./frontend"
-		}
-
-		if wailsjsdir != projectConfig.WailsJSDir {
-			projectConfig.WailsJSDir = filepath.ToSlash(wailsjsdir)
-			err := projectConfig.Save()
-			if err != nil {
-				return err
-			}
-		}
-
-		buildOptions := &build.Options{
-			Logger:         logger,
-			OutputType:     "dev",
-			Mode:           build.Dev,
-			Arch:           runtime.GOARCH,
-			Pack:           true,
-			Platform:       runtime.GOOS,
-			LDFlags:        ldflags,
-			Compiler:       compilerCommand,
-			ForceBuild:     forceBuild,
-			IgnoreFrontend: false,
-			Verbosity:      verbosity,
-			WailsJSDir:     wailsjsdir,
-		}
-
-		watcher, err := fsnotify.NewWatcher()
+		// Run go mod tidy to ensure we're up to date
+		err = runCommand(cwd, false, "go", "mod", "tidy")
 		if err != nil {
 			return err
 		}
-		defer func(watcher *fsnotify.Watcher) {
-			err := watcher.Close()
-			if err != nil {
-				log.Fatal(err)
-			}
-		}(watcher)
+
+		if flags.tags != "" {
+			err = runCommand(cwd, true, "wails", "generate", "module", "-tags", flags.tags)
+		} else {
+			err = runCommand(cwd, true, "wails", "generate", "module")
+		}
+		if err != nil {
+			return err
+		}
+
+		// frontend:dev server command
+		if projectConfig.DevCommand != "" {
+			var devCommandWaitGroup sync.WaitGroup
+			closer := runFrontendDevCommand(cwd, projectConfig.DevCommand, &devCommandWaitGroup)
+			defer closer(&devCommandWaitGroup)
+		}
+
+		buildOptions := generateBuildOptions(flags)
+		buildOptions.Logger = logger
+		buildOptions.UserTags = internal.ParseUserTags(flags.tags)
 
 		var debugBinaryProcess *process.Process = nil
-		var extensionsThatTriggerARebuild = sliceToMap(strings.Split(extensions, ","))
 
 		// Setup signal handler
 		quitChannel := make(chan os.Signal, 1)
 		signal.Notify(quitChannel, os.Interrupt, os.Kill, syscall.SIGTERM)
 		exitCodeChannel := make(chan int, 1)
 
-		var passthruArgs []string
-		//if len(os.Args) > 2 {
-		//	passthruArgs = os.Args[2:]
-		//}
-
 		// Do initial build
 		logger.Println("Building application for development...")
-		newProcess, appBinary, err := restartApp(logger, buildOptions, debugBinaryProcess, loglevel, passthruArgs, assetDir, false, exitCodeChannel)
+		newProcess, appBinary, err := restartApp(buildOptions, debugBinaryProcess, flags, exitCodeChannel)
 		if err != nil {
 			return err
 		}
@@ -195,129 +158,32 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		}
 
 		// open browser
-		if openBrowser {
-			err = browser.OpenURL("http://localhost:34115")
+		if flags.openBrowser {
+			url := defaultDevServerURL
+			if flags.devServerURL != "" {
+				url = flags.devServerURL
+			}
+			err = browser.OpenURL(url)
 			if err != nil {
 				return err
 			}
 		}
 
-		if err != nil {
-			return err
-		}
-		var newBinaryProcess *process.Process
-
-		// Get project dir
-		projectDir, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-
-		// Get all subdirectories
-		dirs, err := fs.GetSubdirectories(projectDir)
-		if err != nil {
-			return err
-		}
-
-		LogGreen("Watching (sub)/directory: %s", projectDir)
-
-		// Setup a watcher for non-node_modules directories
-		dirs.Each(func(dir string) {
-			if strings.Contains(dir, "node_modules") {
-				return
-			}
-			// Ignore build directory
-			if strings.HasPrefix(dir, filepath.Join(projectDir, "build")) {
-				return
-			}
-			// Ignore dot directories
-			if strings.HasPrefix(dir, ".") {
-				return
-			}
-			err = watcher.Add(dir)
+		// create the project files watcher
+		watcher, err := initialiseWatcher(cwd, logger.Fatal)
+		defer func(watcher *fsnotify.Watcher) {
+			err := watcher.Close()
 			if err != nil {
 				logger.Fatal(err.Error())
 			}
-		})
+		}(watcher)
 
-		// Main Loop
-		quit := false
-		// Use 100ms debounce
-		interval := 100 * time.Millisecond
-		timer := time.NewTimer(interval)
-		rebuild := false
-		reload := false
-		for quit == false {
-			//reload := false
-			select {
-			case exitCode := <-exitCodeChannel:
-				if exitCode == 0 {
-					quit = true
-				}
-			case item := <-watcher.Events:
-				// Check for file writes
-				if item.Op&fsnotify.Write == fsnotify.Write {
-					// Ignore directories
-					if fs.DirExists(item.Name) {
-						continue
-					}
+		LogGreen("Watching (sub)/directory: %s", cwd)
+		LogGreen("Using Dev Server URL: %s", flags.devServerURL)
+		LogGreen("Using reload debounce setting of %d milliseconds", flags.debounceMS)
 
-					// Iterate all file patterns
-					ext := filepath.Ext(item.Name)
-					if ext != "" {
-						ext = ext[1:]
-						if _, exists := extensionsThatTriggerARebuild[ext]; exists {
-							rebuild = true
-							continue
-						}
-					}
-
-					if strings.HasPrefix(item.Name, assetDir) {
-						reload = true
-					}
-					timer.Reset(interval)
-				}
-				// Check for new directories
-				if item.Op&fsnotify.Create == fsnotify.Create {
-					// If this is a folder, add it to our watch list
-					if fs.DirExists(item.Name) {
-						//node_modules is BANNED!
-						if !strings.Contains(item.Name, "node_modules") {
-							err := watcher.Add(item.Name)
-							if err != nil {
-								logger.Fatal("%s", err.Error())
-							}
-							LogGreen("Added new directory to watcher: %s", item.Name)
-						}
-					}
-				}
-			case <-timer.C:
-				if rebuild {
-					rebuild = false
-					LogGreen("[Rebuild triggered] files updated")
-					// Try and build the app
-					newBinaryProcess, _, err = restartApp(logger, buildOptions, debugBinaryProcess, loglevel, passthruArgs, assetDir, false, exitCodeChannel)
-					if err != nil {
-						LogRed("Error during build: %s", err.Error())
-						continue
-					}
-					// If we have a new process, save it
-					if newBinaryProcess != nil {
-						debugBinaryProcess = newBinaryProcess
-					}
-				}
-				if reload {
-					reload = false
-					_, err = http.Get("http://localhost:34115/wails/reload")
-					if err != nil {
-						LogRed("Error during refresh: %s", err.Error())
-					}
-				}
-			case <-quitChannel:
-				LogGreen("\nCaught quit")
-				quit = true
-			}
-		}
+		// Watch for changes and trigger restartApp()
+		doWatcherLoop(buildOptions, debugBinaryProcess, flags, watcher, exitCodeChannel, quitChannel)
 
 		// Kill the current program if running
 		if debugBinaryProcess != nil {
@@ -337,18 +203,226 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 		return nil
 	})
-
 	return nil
 }
 
-func restartApp(logger *clilogger.CLILogger, buildOptions *build.Options, debugBinaryProcess *process.Process, loglevel string, passthruArgs []string, assetDir string, firstRun bool, exitCodeChannel chan int) (*process.Process, string, error) {
+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)
+}
+
+func runCommand(dir string, exitOnError bool, command string, args ...string) error {
+	LogGreen("Executing: " + command + " " + strings.Join(args, " "))
+	cmd := exec.Command(command, args...)
+	cmd.Dir = dir
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		println(string(output))
+		if exitOnError {
+			os.Exit(1)
+		}
+		return err
+	}
+	return nil
+}
+
+// defaultDevFlags generates devFlags with default options
+func defaultDevFlags() devFlags {
+	return devFlags{
+		devServerURL:    defaultDevServerURL,
+		compilerCommand: "go",
+		verbosity:       1,
+		extensions:      "go",
+		debounceMS:      100,
+	}
+}
+
+// generateBuildOptions creates a build.Options using the flags
+func generateBuildOptions(flags devFlags) *build.Options {
+	return &build.Options{
+		OutputType:     "dev",
+		Mode:           build.Dev,
+		Arch:           runtime.GOARCH,
+		Pack:           true,
+		Platform:       runtime.GOOS,
+		LDFlags:        flags.ldflags,
+		Compiler:       flags.compilerCommand,
+		ForceBuild:     flags.forceBuild,
+		IgnoreFrontend: false,
+		Verbosity:      flags.verbosity,
+		WailsJSDir:     flags.wailsjsdir,
+	}
+}
+
+// loadAndMergeProjectConfig reconciles flags passed to the CLI with project config settings and updates
+// the project config if necessary
+func loadAndMergeProjectConfig(cwd string, flags *devFlags) (*project.Project, error) {
+	projectConfig, err := project.Load(cwd)
+	if err != nil {
+		return nil, err
+	}
+
+	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)
+	}
+
+	flags.assetDir, err = filepath.Abs(flags.assetDir)
+	if err != nil {
+		return nil, err
+	}
+
+	if flags.devServerURL == defaultDevServerURL && projectConfig.DevServerURL != defaultDevServerURL && projectConfig.DevServerURL != "" {
+		flags.devServerURL = projectConfig.DevServerURL
+	}
+
+	if flags.devServerURL != projectConfig.DevServerURL {
+		projectConfig.DevServerURL = flags.devServerURL
+		shouldSaveConfig = true
+	}
+
+	if flags.wailsjsdir == "" && projectConfig.WailsJSDir != "" {
+		flags.wailsjsdir = projectConfig.WailsJSDir
+	}
+
+	if flags.wailsjsdir == "" {
+		flags.wailsjsdir = "./frontend"
+	}
+
+	if flags.wailsjsdir != projectConfig.WailsJSDir {
+		projectConfig.WailsJSDir = filepath.ToSlash(flags.wailsjsdir)
+		shouldSaveConfig = true
+	}
+
+	if flags.debounceMS == 100 && projectConfig.DebounceMS != 100 {
+		if projectConfig.DebounceMS == 0 {
+			projectConfig.DebounceMS = 100
+		}
+		flags.debounceMS = projectConfig.DebounceMS
+	}
+
+	if flags.debounceMS != projectConfig.DebounceMS {
+		projectConfig.DebounceMS = flags.debounceMS
+		shouldSaveConfig = true
+	}
+
+	if shouldSaveConfig {
+		err = projectConfig.Save()
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return projectConfig, nil
+}
+
+// runFrontendDevCommand will run the `frontend:dev` command if it was given, ex- `npm run dev`
+func runFrontendDevCommand(cwd string, devCommand string, wg *sync.WaitGroup) func(group *sync.WaitGroup) {
+	LogGreen("Running frontend dev command: '%s'", devCommand)
+	ctx, cancel := context.WithCancel(context.Background())
+	dir := filepath.Join(cwd, "frontend")
+	cmdSlice := strings.Split(devCommand, " ")
+	wg.Add(1)
+	cmd := exec.CommandContext(ctx, cmdSlice[0], cmdSlice[1:]...)
+	cmd.Stderr = os.Stderr
+	cmd.Stdout = os.Stdout
+	cmd.Dir = dir
+	go func(ctx context.Context, devCommand string, cwd string, wg *sync.WaitGroup) {
+		err := cmd.Run()
+		if err != nil {
+			if err.Error() != "exit status 1" {
+				LogRed("Error from '%s': %s", devCommand, err.Error())
+			}
+		}
+		LogGreen("Dev command exited!")
+		wg.Done()
+	}(ctx, devCommand, cwd, wg)
+
+	return func(wg *sync.WaitGroup) {
+		if runtime.GOOS == "windows" {
+			// Credit: https://stackoverflow.com/a/44551450
+			// For whatever reason, killing an npm script on windows just doesn't exit properly with cancel
+			kill := exec.Command("TASKKILL", "/T", "/F", "/PID", strconv.Itoa(cmd.Process.Pid))
+			kill.Stderr = os.Stderr
+			kill.Stdout = os.Stdout
+			err := kill.Run()
+			if err != nil {
+				if err.Error() != "exit status 1" {
+					LogRed("Error from '%s': %s", devCommand, err.Error())
+				}
+			}
+		} else {
+			cancel()
+		}
+		wg.Wait()
+	}
+}
+
+// initialiseWatcher creates the project directory watcher that will trigger recompile
+func initialiseWatcher(cwd string, logFatal func(string, ...interface{})) (*fsnotify.Watcher, error) {
+	watcher, err := fsnotify.NewWatcher()
+	if err != nil {
+		return nil, err
+	}
+
+	// Get all subdirectories
+	dirs, err := fs.GetSubdirectories(cwd)
+	if err != nil {
+		return nil, err
+	}
+
+	// Setup a watcher for non-node_modules directories
+	dirs.Each(func(dir string) {
+		if strings.Contains(dir, "node_modules") {
+			return
+		}
+		// Ignore build directory
+		if strings.HasPrefix(dir, filepath.Join(cwd, "build")) {
+			return
+		}
+		// Ignore dot directories
+		if strings.HasPrefix(dir, ".") {
+			return
+		}
+		err = watcher.Add(dir)
+		if err != nil {
+			logFatal(err.Error())
+		}
+	})
+	return watcher, nil
+}
+
+// restartApp does the actual rebuilding of the application when files change
+func restartApp(buildOptions *build.Options, debugBinaryProcess *process.Process, flags devFlags, exitCodeChannel chan int) (*process.Process, string, error) {
 
 	appBinary, err := build.Build(buildOptions)
 	println()
 	if err != nil {
-		if firstRun {
-			return nil, "", err
-		}
 		LogRed("Build error - continuing to run current version")
 		LogDarkYellow(err.Error())
 		return nil, "", nil
@@ -359,7 +433,7 @@ func restartApp(logger *clilogger.CLILogger, buildOptions *build.Options, debugB
 		killError := debugBinaryProcess.Kill()
 
 		if killError != nil {
-			logger.Fatal("Unable to kill debug binary (PID: %d)!", debugBinaryProcess.PID())
+			buildOptions.Logger.Fatal("Unable to kill debug binary (PID: %d)!", debugBinaryProcess.PID())
 		}
 
 		debugBinaryProcess = nil
@@ -367,13 +441,12 @@ func restartApp(logger *clilogger.CLILogger, buildOptions *build.Options, debugB
 
 	// Start up new binary with correct args
 	args := slicer.StringSlicer{}
-	args.Add("-loglevel", loglevel)
-	if assetDir != "" {
-		args.Add("-assetdir", assetDir)
+	args.Add("-loglevel", flags.loglevel)
+	if flags.assetDir != "" {
+		args.Add("-assetdir", flags.assetDir)
 	}
-
-	if len(passthruArgs) > 0 {
-		args.AddSlice(passthruArgs)
+	if flags.devServerURL != "" {
+		args.Add("-devserverurl", flags.devServerURL)
 	}
 	newProcess := process.NewProcess(appBinary, args.AsSlice()...)
 	err = newProcess.Start(exitCodeChannel)
@@ -382,11 +455,98 @@ func restartApp(logger *clilogger.CLILogger, buildOptions *build.Options, debugB
 		if fs.FileExists(appBinary) {
 			deleteError := fs.DeleteFile(appBinary)
 			if deleteError != nil {
-				logger.Fatal("Unable to delete app binary: " + appBinary)
+				buildOptions.Logger.Fatal("Unable to delete app binary: " + appBinary)
 			}
 		}
-		logger.Fatal("Unable to start application: %s", err.Error())
+		buildOptions.Logger.Fatal("Unable to start application: %s", err.Error())
 	}
 
 	return newProcess, appBinary, nil
 }
+
+// doWatcherLoop is the main watch loop that runs while dev is active
+func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Process, flags devFlags, watcher *fsnotify.Watcher, exitCodeChannel chan int, quitChannel chan os.Signal) {
+	// Main Loop
+	var (
+		err              error
+		newBinaryProcess *process.Process
+	)
+	var extensionsThatTriggerARebuild = sliceToMap(strings.Split(flags.extensions, ","))
+	quit := false
+	interval := time.Duration(flags.debounceMS) * time.Millisecond
+	timer := time.NewTimer(interval)
+	rebuild := false
+	reload := false
+	for quit == false {
+		//reload := false
+		select {
+		case exitCode := <-exitCodeChannel:
+			if exitCode == 0 {
+				quit = true
+			}
+		case item := <-watcher.Events:
+			// Check for file writes
+			if item.Op&fsnotify.Write == fsnotify.Write {
+				// Ignore directories
+				if fs.DirExists(item.Name) {
+					continue
+				}
+
+				// Iterate all file patterns
+				ext := filepath.Ext(item.Name)
+				if ext != "" {
+					ext = ext[1:]
+					if _, exists := extensionsThatTriggerARebuild[ext]; exists {
+						rebuild = true
+						timer.Reset(interval)
+						continue
+					}
+				}
+
+				if strings.HasPrefix(item.Name, flags.assetDir) {
+					reload = true
+				}
+				timer.Reset(interval)
+			}
+			// Check for new directories
+			if item.Op&fsnotify.Create == fsnotify.Create {
+				// If this is a folder, add it to our watch list
+				if fs.DirExists(item.Name) {
+					//node_modules is BANNED!
+					if !strings.Contains(item.Name, "node_modules") {
+						err := watcher.Add(item.Name)
+						if err != nil {
+							buildOptions.Logger.Fatal("%s", err.Error())
+						}
+						LogGreen("Added new directory to watcher: %s", item.Name)
+					}
+				}
+			}
+		case <-timer.C:
+			if rebuild {
+				rebuild = false
+				LogGreen("[Rebuild triggered] files updated")
+				// Try and build the app
+				newBinaryProcess, _, err = restartApp(buildOptions, debugBinaryProcess, flags, exitCodeChannel)
+				if err != nil {
+					LogRed("Error during build: %s", err.Error())
+					continue
+				}
+				// If we have a new process, save it
+				if newBinaryProcess != nil {
+					debugBinaryProcess = newBinaryProcess
+				}
+			}
+			if reload {
+				reload = false
+				_, err = http.Get("http://localhost:34115/wails/reload")
+				if err != nil {
+					LogRed("Error during refresh: %s", err.Error())
+				}
+			}
+		case <-quitChannel:
+			LogGreen("\nCaught quit")
+			quit = true
+		}
+	}
+}

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

@@ -6,8 +6,6 @@ import (
 	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/generate/template"
 
 	"github.com/leaanthony/clir"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-	"github.com/wailsapp/wails/v2/pkg/parser"
 )
 
 // AddSubcommand adds the `generate` command for the Wails application
@@ -15,34 +13,11 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 	command := app.NewSubCommand("generate", "Code Generation Tools")
 
-	//AddModuleCommand(app, command, w)
+	err := AddModuleCommand(app, command, w)
+	if err != nil {
+		return err
+	}
 	template.AddSubCommand(app, command, w)
 
 	return nil
 }
-
-func logPackage(pkg *parser.Package, logger *clilogger.CLILogger) {
-
-	logger.Println("Processed Go package '" + pkg.Gopackage.Name + "' as '" + pkg.Name + "'")
-	for _, strct := range pkg.Structs() {
-		logger.Println("")
-		logger.Println("  Processed struct '" + strct.Name + "'")
-		if strct.IsBound {
-			for _, method := range strct.Methods {
-				logger.Println("    Bound method '" + method.Name + "'")
-			}
-		}
-		if strct.IsUsedAsData {
-			for _, field := range strct.Fields {
-				if !field.Ignored {
-					logger.Print("    Processed ")
-					if field.IsOptional {
-						logger.Print("optional ")
-					}
-					logger.Println("field '" + field.Name + "' as '" + field.JSName() + "'")
-				}
-			}
-		}
-	}
-	logger.Println("")
-}

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

@@ -1,58 +1,58 @@
 package generate
 
 import (
-	"io"
-	"time"
-
+	"fmt"
 	"github.com/leaanthony/clir"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-	"github.com/wailsapp/wails/v2/pkg/parser"
+	"github.com/wailsapp/wails/v2/cmd/wails/internal"
+	"github.com/wailsapp/wails/v2/internal/shell"
+	"io"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
 )
 
-func AddModuleCommand(app *clir.Cli, parent *clir.Command, w io.Writer) {
+// AddModuleCommand adds the `module` subcommand for the `generate` command
+func AddModuleCommand(app *clir.Cli, parent *clir.Command, w io.Writer) error {
 
-	// Backend API
-	backendAPI := parent.NewSubCommand("module", "Generates a JS module for the frontend to interface with the backend")
+	command := parent.NewSubCommand("module", "Generate wailsjs modules")
+	var tags string
+	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &tags)
 
-	// Quiet Init
-	quiet := false
-	backendAPI.BoolFlag("q", "Suppress output to console", &quiet)
+	command.Action(func() error {
 
-	backendAPI.Action(func() error {
+		filename := "wailsbindings"
+		if runtime.GOOS == "windows" {
+			filename += ".exe"
+		}
+		// go build -tags bindings -o bindings.exe
+		tempDir := os.TempDir()
+		filename = filepath.Join(tempDir, filename)
 
-		// Create logger
-		logger := clilogger.New(w)
-		logger.Mute(quiet)
-
-		app.PrintBanner()
-
-		logger.Print("Generating Javascript module for Go code...")
-
-		// Start Time
-		start := time.Now()
-
-		p, err := parser.GenerateWailsFrontendPackage()
+		cwd, err := os.Getwd()
 		if err != nil {
 			return err
 		}
 
-		logger.Println("done.")
-		logger.Println("")
-
-		elapsed := time.Since(start)
-		packages := p.Packages
-
-		// Print report
-		for _, pkg := range p.Packages {
-			if pkg.ShouldGenerate() {
-				logPackage(pkg, logger)
-			}
+		tagList := internal.ParseUserTags(tags)
+		tagList = append(tagList, "bindings")
 
+		stdout, stderr, err := shell.RunCommand(cwd, "go", "build", "-tags", strings.Join(tagList, ","), "-o", filename)
+		if err != nil {
+			return fmt.Errorf("%s\n%s\n%s", stdout, stderr, err)
 		}
 
-		logger.Println("%d packages parsed in %s.", len(packages), elapsed)
+		stdout, stderr, err = shell.RunCommand(cwd, filename)
+		if err != nil {
+			return fmt.Errorf("%s\n%s\n%s", stdout, stderr, err)
+		}
+
+		err = os.Remove(filename)
+		if err != nil {
+			return err
+		}
 
 		return nil
-
 	})
+	return nil
 }

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

@@ -21,7 +21,7 @@ The next steps to complete the template are:
 
 You can test your template by running this command:
 
-`wails init -name test -t {{.TemplateDir}}`
+`wails init -n test -t {{.TemplateDir}}`
 
 ### Checklist
 

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

@@ -12,5 +12,5 @@ To generate a platform native package, add the `-package` flag.
 ## Live Development
 
 To run in live development mode, run `wails dev` in the project directory. In another terminal, go into the `frontend` 
-directory and run `npm run dev`. The frontend dev server will run on http://localhost:5000. Connect to this
+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. 

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

@@ -2,7 +2,7 @@ module changeme
 
 go 1.17
 
-require github.com/wailsapp/wails/v2 v2.0.0-beta.1
+require github.com/wailsapp/wails/v2 {{.WailsVersion}}
 
 require (
 github.com/andybalholm/brotli v1.0.2 // indirect
@@ -35,4 +35,4 @@ golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
 )
 
-// replace github.com/wailsapp/wails/v2 v2.0.0-beta.1 => {{.WailsDirectory}}
+// replace github.com/wailsapp/wails/v2 {{.WailsVersion}} => {{.WailsDirectory}}

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

@@ -81,16 +81,18 @@ func AddSubCommand(app *clir.Cli, parent *clir.Command, w io.Writer) {
 		}
 
 		type templateData struct {
-			Name        string
-			Description string
-			TemplateDir string
+			Name         string
+			Description  string
+			TemplateDir  string
+			WailsVersion string
 		}
 
 		println("Extracting base template files...")
 
 		err = g.Extract(templateDir, &templateData{
-			Name:        name,
-			TemplateDir: templateDir,
+			Name:         name,
+			TemplateDir:  templateDir,
+			WailsVersion: app.Version(),
 		})
 		if err != nil {
 			return err

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

@@ -2,7 +2,12 @@ package initialise
 
 import (
 	"fmt"
+	"github.com/flytam/filenamify"
+	"github.com/leaanthony/slicer"
 	"io"
+	"os"
+	"os/exec"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -46,8 +51,8 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 	}
 
 	// VSCode project files
-	vscode := false
-	command.BoolFlag("vscode", "Generate VSCode project files", &vscode)
+	ide := ""
+	command.StringFlag("ide", "Generate IDE project files", &ide)
 
 	// List templates
 	list := false
@@ -75,6 +80,15 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 			return nil
 		}
 
+		// Validate IDE option
+		supportedIDEs := slicer.String([]string{"vscode", "goland"})
+		ide = strings.ToLower(ide)
+		if ide != "" {
+			if !supportedIDEs.Contains(ide) {
+				return fmt.Errorf("ide '%s' not supported. Valid values: %s", ide, supportedIDEs.Join(" "))
+			}
+		}
+
 		if !quiet {
 			app.PrintBanner()
 		}
@@ -83,27 +97,47 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		logger.Println(task)
 		logger.Println(strings.Repeat("-", len(task)))
 
+		projectFilename, err := filenamify.Filenamify(projectName, filenamify.Options{
+			Replacement: "_",
+			MaxLength:   255,
+		})
+		if err != nil {
+			return err
+		}
+		goBinary, err := exec.LookPath("go")
+		if err != nil {
+			return fmt.Errorf("unable to find Go compiler. Please download and install Go: https://golang.org/dl/")
+		}
+
+		// Get base path and convert to forward slashes
+		goPath := filepath.ToSlash(filepath.Dir(goBinary))
+		// Trim bin directory
+		goSDKPath := strings.TrimSuffix(goPath, "/bin")
+
 		// Create Template Options
 		options := &templates.Options{
-			ProjectName:    projectName,
-			TargetDir:      projectDirectory,
-			TemplateName:   templateName,
-			Logger:         logger,
-			GenerateVSCode: vscode,
-			InitGit:        initGit,
+			ProjectName:         projectName,
+			TargetDir:           projectDirectory,
+			TemplateName:        templateName,
+			Logger:              logger,
+			IDE:                 ide,
+			InitGit:             initGit,
+			ProjectNameFilename: projectFilename,
+			WailsVersion:        app.Version(),
+			GoSDKPath:           goSDKPath,
 		}
 
 		// Try to discover author details from git config
 		findAuthorDetails(options)
 
-		return initProject(options)
+		return initProject(options, quiet)
 	})
 
 	return nil
 }
 
 // initProject is our main init command
-func initProject(options *templates.Options) error {
+func initProject(options *templates.Options, quiet bool) error {
 
 	// Start Time
 	start := time.Now()
@@ -120,6 +154,19 @@ func initProject(options *templates.Options) error {
 		return err
 	}
 
+	// Run `go mod tidy` to ensure `go.sum` is up to date
+	cmd := exec.Command("go", "mod", "tidy")
+	cmd.Dir = options.TargetDir
+	cmd.Stderr = os.Stderr
+	if !quiet {
+		println("")
+		cmd.Stdout = os.Stdout
+	}
+	err = cmd.Run()
+	if err != nil {
+		return err
+	}
+
 	if options.InitGit {
 		err = initGit(options)
 		if err != nil {
@@ -127,6 +174,10 @@ func initProject(options *templates.Options) error {
 		}
 	}
 
+	if quiet {
+		return nil
+	}
+
 	// Output stats
 	elapsed := time.Since(start)
 	options.Logger.Println("")
@@ -135,9 +186,14 @@ func initProject(options *templates.Options) error {
 	options.Logger.Println("Project Template:  " + options.TemplateName)
 	options.Logger.Println("Template Support:  " + template.HelpURL)
 
-	if options.GenerateVSCode {
+	// IDE message
+	switch options.IDE {
+	case "vscode":
 		options.Logger.Println("VSCode config files generated.")
+	case "goland":
+		options.Logger.Println("Goland config files generated.")
 	}
+
 	if options.InitGit {
 		options.Logger.Println("Git repository initialised.")
 	}

v2/cmd/wails/internal/commands/initialise/templates/ides/goland/gitignore.txt

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

v2/cmd/wails/internal/commands/initialise/templates/ides/goland/modules.tmpl.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+    <component name="ProjectModuleManager">
+        <modules>
+            <module fileurl="file://$PROJECT_DIR$/.idea/{{.ProjectNameFilename}}.iml"
+                    filepath="$PROJECT_DIR$/.idea/{{.ProjectNameFilename}}.iml"/>
+        </modules>
+    </component>
+</project>

v2/cmd/wails/internal/commands/initialise/templates/ides/goland/name.tmpl

@@ -0,0 +1 @@
+{{.ProjectName}}

v2/cmd/wails/internal/commands/initialise/templates/ides/goland/projectname.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

v2/cmd/wails/internal/commands/initialise/templates/ides/goland/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+    <component name="VcsDirectoryMappings">
+        <mapping directory="$PROJECT_DIR$" vcs="Git"/>
+    </component>
+</project>

v2/cmd/wails/internal/commands/initialise/templates/ides/goland/workspace.tmpl.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+    <component name="AutoImportSettings">
+        <option name="autoReloadType" value="ALL"/>
+    </component>
+    <component name="GOROOT" url="file://{{.GoSDKPath}}"/>
+    <component name="Git.Settings">
+        <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$"/>
+    </component>
+    <component name="GoLibraries">
+        <option name="indexEntireGoPath" value="false"/>
+    </component>
+    <component name="ProjectId" id="wails-{{.ProjectName}}"/>
+    <component name="ProjectLevelVcsManager" settingsEditedManually="true"/>
+    <component name="ProjectViewState">
+        <option name="hideEmptyMiddlePackages" value="true"/>
+        <option name="showLibraryContents" value="true"/>
+    </component>
+    <component name="PropertiesComponent">
+        <property name="RunOnceActivity.OpenProjectViewOnStart" value="true"/>
+        <property name="RunOnceActivity.ShowReadmeOnStart" value="true"/>
+        <property name="WebServerToolWindowFactoryState" value="false"/>
+        <property name="com.intellij.ide.scratch.LRUPopupBuilder$1/New Scratch File" value="TEXT"/>
+        <property name="go.formatter.settings.were.checked" value="true"/>
+        <property name="go.import.settings.migrated" value="true"/>
+        <property name="go.modules.go.list.on.any.changes.was.set" value="true"/>
+        <property name="go.sdk.automatically.set" value="true"/>
+        <property name="go.tried.to.enable.integration.vgo.integrator" value="true"/>
+        <property name="last_opened_file_path" value="$PROJECT_DIR$"/>
+        <property name="settings.editor.selected.configurable"
+                  value="reference.settingsdialog.IDE.editor.colors.Console Font"/>
+    </component>
+    <component name="RunManager" selected="Go Build.{{.ProjectName}} (dev)">>
+        <configuration name="{{.ProjectName}} (dev)" type="GoApplicationRunConfiguration" factoryName="Go Application">
+            <module name="{{.ProjectName}}"/>
+            <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>
+            <kind value="DIRECTORY"/>
+            <directory value="$PROJECT_DIR$"/>
+            <filePath value="$PROJECT_DIR$"/>
+            <method v="2">
+            </method>
+        </configuration>
+        <configuration name="{{.ProjectName}} (production)" type="GoApplicationRunConfiguration"
+                       factoryName="Go Application">
+            <module name="{{.ProjectName}}"/>
+            <working_directory value="$PROJECT_DIR$"/>
+            <go_parameters
+                    value="-ldflags &quot;-w -s{{.WindowsFlags}}&quot; -tags desktop,production -o {{.PathToDesktopBinary}}"/>
+            <useCustomBuildTags value="true"/>
+            <envs>
+                <env name="CGO_ENABLED" value="&quot;{{.CGOEnabled}}&quot;"/>
+            </envs>
+            <kind value="DIRECTORY"/>
+            <directory value="$PROJECT_DIR$"/>
+            <filePath value="$PROJECT_DIR$"/>
+            <method v="2">
+            </method>
+        </configuration>
+
+        <list>
+            <item itemvalue="Go Build.{{.ProjectName}} (dev)"/>
+            <item itemvalue="Go Remote.Local"/>
+        </list>
+    </component>
+    <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0"
+               DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true"/>
+    <component name="TypeScriptGeneratedFilesManager">
+        <option name="version" value="3"/>
+    </component>
+    <component name="Vcs.Log.Tabs.Properties">
+        <option name="TAB_STATES">
+            <map>
+                <entry key="MAIN">
+                    <value>
+                        <State/>
+                    </value>
+                </entry>
+            </map>
+        </option>
+        <option name="oldMeFiltersMigrated" value="true"/>
+    </component>
+    <component name="VgoProject">
+        <integration-enabled>true</integration-enabled>
+    </component>
+    <component name="XDebuggerManager">
+        <breakpoint-manager>
+        </breakpoint-manager>
+    </component>
+</project>

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

@@ -42,6 +42,11 @@ type Data struct {
 	AuthorEmail        string
 	AuthorNameAndEmail string
 	WailsDirectory     string
+	GoSDKPath          string
+	AssetDir           string
+	WindowsFlags       string
+	CGOEnabled         string
+	OutputFile         string
 }
 
 // Options for installing a template
@@ -51,13 +56,19 @@ type Options struct {
 	BinaryName          string
 	TargetDir           string
 	Logger              *clilogger.CLILogger
-	GenerateVSCode      bool
 	PathToDesktopBinary string
 	PathToServerBinary  string
 	InitGit             bool
 	AuthorName          string
 	AuthorEmail         string
 	AssetDir            string
+	IDE                 string
+	ProjectNameFilename string // The project name but as a valid filename
+	WailsVersion        string
+	GoSDKPath           string
+	WindowsFlags        string
+	CGOEnabled          string
+	OutputFile          string
 }
 
 // Template holds data relating to a template
@@ -241,6 +252,7 @@ func Install(options *Options) (bool, *Template, error) {
 	BinaryName := filepath.Base(options.TargetDir)
 	NPMProjectName := strings.ToLower(strings.ReplaceAll(BinaryName, " ", ""))
 	localWailsDirectory := fs.RelativePath("../../../../../..")
+
 	templateData := &Data{
 		ProjectName:    options.ProjectName,
 		BinaryName:     filepath.Base(options.TargetDir),
@@ -248,6 +260,9 @@ func Install(options *Options) (bool, *Template, error) {
 		WailsDirectory: localWailsDirectory,
 		AuthorEmail:    options.AuthorEmail,
 		AuthorName:     options.AuthorName,
+		WailsVersion:   options.WailsVersion,
+		GoSDKPath:      options.GoSDKPath,
+		AssetDir:       options.AssetDir,
 	}
 
 	// Create a formatted name and email combo.
@@ -259,6 +274,10 @@ func Install(options *Options) (bool, *Template, error) {
 	}
 	templateData.AuthorNameAndEmail = strings.TrimSpace(templateData.AuthorNameAndEmail)
 
+	installer.RenameFiles(map[string]string{
+		"gitignore.txt": ".gitignore",
+	})
+
 	// Extract the template
 	err = installer.Extract(options.TargetDir, templateData)
 	if err != nil {
@@ -317,17 +336,58 @@ func OutputList(logger *clilogger.CLILogger) error {
 
 func generateIDEFiles(options *Options) error {
 
-	if options.GenerateVSCode {
+	switch options.IDE {
+	case "vscode":
 		return generateVSCodeFiles(options)
+	case "goland":
+		return generateGolandFiles(options)
+	}
+
+	return nil
+}
+
+type ideOptions struct {
+	name         string
+	targetDir    string
+	options      *Options
+	renameFiles  map[string]string
+	ignoredFiles []string
+}
+
+func generateGolandFiles(options *Options) error {
+	ideoptions := ideOptions{
+		name:      "goland",
+		targetDir: filepath.Join(options.TargetDir, ".idea"),
+		options:   options,
+		renameFiles: map[string]string{
+			"projectname.iml": options.ProjectNameFilename + ".iml",
+			"gitignore.txt":   ".gitignore",
+			"name":            ".name",
+		},
+	}
+	if !options.InitGit {
+		ideoptions.ignoredFiles = []string{"vcs.xml"}
+	}
+	err := installIDEFiles(ideoptions)
+	if err != nil {
+		return errors.Wrap(err, "generating Goland IDE files")
 	}
 
 	return nil
 }
 
 func generateVSCodeFiles(options *Options) error {
+	ideoptions := ideOptions{
+		name:      "vscode",
+		targetDir: filepath.Join(options.TargetDir, ".vscode"),
+		options:   options,
+	}
+	return installIDEFiles(ideoptions)
 
-	targetDir := filepath.Join(options.TargetDir, ".vscode")
-	source, err := debme.FS(ides, "ides/vscode")
+}
+
+func installIDEFiles(o ideOptions) error {
+	source, err := debme.FS(ides, "ides/"+o.name)
 	if err != nil {
 		return err
 	}
@@ -335,14 +395,22 @@ func generateVSCodeFiles(options *Options) error {
 	// Use gosod to install the template
 	installer := gosod.New(source)
 
-	binaryName := filepath.Base(options.TargetDir)
+	if o.renameFiles != nil {
+		installer.RenameFiles(o.renameFiles)
+	}
+
+	for _, ignoreFile := range o.ignoredFiles {
+		installer.IgnoreFile(ignoreFile)
+	}
+
+	binaryName := filepath.Base(o.options.TargetDir)
 	if runtime.GOOS == "windows" {
 		// yay windows
 		binaryName += ".exe"
 	}
 
 	// Parse wails.json for assetdir
-	wailsJSONBytes, err := os.ReadFile(filepath.Join(options.TargetDir, "wails.json"))
+	wailsJSONBytes, err := os.ReadFile(filepath.Join(o.options.TargetDir, "wails.json"))
 	if err != nil {
 		return err
 	}
@@ -356,10 +424,16 @@ func generateVSCodeFiles(options *Options) error {
 		return fmt.Errorf("Unable to find 'assetdir' in 'wails.json' ")
 	}
 
-	options.AssetDir = assetDir.(string)
-	options.PathToDesktopBinary = filepath.ToSlash(filepath.Join("build", "bin", binaryName))
+	o.options.AssetDir = assetDir.(string)
+	o.options.PathToDesktopBinary = filepath.ToSlash(filepath.Join("build", "bin", binaryName))
 
-	err = installer.Extract(targetDir, options)
+	o.options.WindowsFlags = ""
+	o.options.CGOEnabled = "1"
+	if runtime.GOOS == "windows" {
+		o.options.WindowsFlags = " -H windowsgui"
+		o.options.CGOEnabled = "0"
+	}
+	err = installer.Extract(o.targetDir, o.options)
 	if err != nil {
 		return err
 	}

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

@@ -0,0 +1,9 @@
+# Wails bin directory
+build/bin
+
+# IDEs
+.idea
+.vscode
+
+# The black hole that is...
+node_modules

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

@@ -2,7 +2,7 @@ module changeme
 
 go 1.17
 
-require github.com/wailsapp/wails/v2 v2.0.0-beta.1
+require github.com/wailsapp/wails/v2 {{.WailsVersion}}
 
 require (
 github.com/andybalholm/brotli v1.0.2 // indirect
@@ -35,4 +35,4 @@ golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
 )
 
-// replace github.com/wailsapp/wails/v2 v2.0.0-beta.1 => {{.WailsDirectory}}
+// replace github.com/wailsapp/wails/v2 {{.WailsVersion}} => {{.WailsDirectory}}

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

@@ -15,6 +15,7 @@ github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab h1:9e2joQGp642w
 github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab/go.mod h1:smsv/h4PBEBaU0XDTY5UwJTpZv69fQ0FfcLJr21mA6Y=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/flytam/filenamify v1.0.0/go.mod h1:Dzf9kVycwcsBlr2ATg6uxjqiFgKGH+5SKFuhdeP5zu8=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gabriel-vasile/mimetype v1.3.1 h1:qevA6c2MtE1RorlScnixeG0VA1H4xrXyhyX3oWBynNQ=
 github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
@@ -58,8 +59,9 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/jackmordaunt/icns v1.0.0/go.mod h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 h1:pdFFlHXY9tZXmJz+tRSm1DzYEH4ebha7cffmm607bMU=
 github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
@@ -75,16 +77,15 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leaanthony/clir v1.0.4/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0=
-github.com/leaanthony/debme v1.1.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
 github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oOc=
 github.com/leaanthony/debme v1.2.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
 github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQOk2DgKxGG4=
 github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM=
 github.com/leaanthony/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-20210914103035-f00aa774a934 h1:nK/JTPyJi5QRqYjVZjXgtN4/dhg2qtngoLxLDVn429k=
-github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
-github.com/leaanthony/gosod v1.0.2/go.mod h1:W8RyeSFBXu7RpIxPGEJfW4moSyGGEjlJMLV25wEbAdU=
+github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd h1:6m4zZ/esiByaDbzgdvDxjsOaIDgtuG1q2cyhjAi6uAg=
+github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
+github.com/leaanthony/gosod v1.0.3/go.mod h1:BJ2J+oHsQIyIQpnLPjnqFGTMnOZXDbvWtRCSG7jGxs4=
 github.com/leaanthony/idgen v1.0.0/go.mod h1:4nBZnt8ml/f/ic/EVQuLxuj817RccT2fyrUaZFxrcVA=
 github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY=
 github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
@@ -146,6 +147,8 @@ github.com/valyala/fasthttp v1.28.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfY
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
 github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
+github.com/wailsapp/wails/v2 v2.0.0-beta.3 h1:8vhBbnjpYDF6cCUwKadon7J/98UjcP1nrnptUl70Tfg=
+github.com/wailsapp/wails/v2 v2.0.0-beta.3/go.mod h1:aku28riyHF2G5jmx/qtxjLWi7VwpTjhhX/HVLCptWFA=
 github.com/wzshiming/ctc v1.2.3/go.mod h1:2tVAtIY7SUyraSk0JxvwmONNPFL4ARavPuEsg5+KA28=
 github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae/go.mod h1:VTAq37rkGeV+WOybvZwjXiJOicICdpLCN8ifpISjK20=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
@@ -193,8 +196,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 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-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -222,4 +225,4 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
+nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=

v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/gitignore.txt

@@ -0,0 +1,9 @@
+# Wails bin directory
+build/bin
+
+# IDEs
+.idea
+.vscode
+
+# The black hole that is...
+node_modules

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

@@ -2,7 +2,7 @@ module changeme
 
 go 1.17
 
-require github.com/wailsapp/wails/v2 v2.0.0-beta.1
+require github.com/wailsapp/wails/v2 {{.WailsVersion}}
 
 require (
 github.com/andybalholm/brotli v1.0.2 // indirect
@@ -35,4 +35,4 @@ golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
 golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
 )
 
-// replace github.com/wailsapp/wails/v2 v2.0.0-beta.1 => {{.WailsDirectory}}
+// replace github.com/wailsapp/wails/v2 {{.WailsVersion}} => {{.WailsDirectory}}

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

@@ -15,6 +15,7 @@ github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab h1:9e2joQGp642w
 github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab/go.mod h1:smsv/h4PBEBaU0XDTY5UwJTpZv69fQ0FfcLJr21mA6Y=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/flytam/filenamify v1.0.0/go.mod h1:Dzf9kVycwcsBlr2ATg6uxjqiFgKGH+5SKFuhdeP5zu8=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gabriel-vasile/mimetype v1.3.1 h1:qevA6c2MtE1RorlScnixeG0VA1H4xrXyhyX3oWBynNQ=
 github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
@@ -58,8 +59,9 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/jackmordaunt/icns v1.0.0/go.mod h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 h1:pdFFlHXY9tZXmJz+tRSm1DzYEH4ebha7cffmm607bMU=
 github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
@@ -75,16 +77,15 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leaanthony/clir v1.0.4/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0=
-github.com/leaanthony/debme v1.1.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
 github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oOc=
 github.com/leaanthony/debme v1.2.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
 github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQOk2DgKxGG4=
 github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM=
 github.com/leaanthony/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-20210914103035-f00aa774a934 h1:nK/JTPyJi5QRqYjVZjXgtN4/dhg2qtngoLxLDVn429k=
-github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
-github.com/leaanthony/gosod v1.0.2/go.mod h1:W8RyeSFBXu7RpIxPGEJfW4moSyGGEjlJMLV25wEbAdU=
+github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd h1:6m4zZ/esiByaDbzgdvDxjsOaIDgtuG1q2cyhjAi6uAg=
+github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
+github.com/leaanthony/gosod v1.0.3/go.mod h1:BJ2J+oHsQIyIQpnLPjnqFGTMnOZXDbvWtRCSG7jGxs4=
 github.com/leaanthony/idgen v1.0.0/go.mod h1:4nBZnt8ml/f/ic/EVQuLxuj817RccT2fyrUaZFxrcVA=
 github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY=
 github.com/leaanthony/slicer v1.5.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
@@ -146,6 +147,8 @@ github.com/valyala/fasthttp v1.28.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfY
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
 github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
+github.com/wailsapp/wails/v2 v2.0.0-beta.3 h1:8vhBbnjpYDF6cCUwKadon7J/98UjcP1nrnptUl70Tfg=
+github.com/wailsapp/wails/v2 v2.0.0-beta.3/go.mod h1:aku28riyHF2G5jmx/qtxjLWi7VwpTjhhX/HVLCptWFA=
 github.com/wzshiming/ctc v1.2.3/go.mod h1:2tVAtIY7SUyraSk0JxvwmONNPFL4ARavPuEsg5+KA28=
 github.com/wzshiming/winseq v0.0.0-20200112104235-db357dc107ae/go.mod h1:VTAq37rkGeV+WOybvZwjXiJOicICdpLCN8ifpISjK20=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
@@ -193,8 +196,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 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-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

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

@@ -86,7 +86,7 @@ func updateToVersion(logger *clilogger.CLILogger, targetVersion *github.Semantic
 
 	// Early exit
 	if targetVersionString == currentVersion {
-		logger.Println("Looks like you're up to date!")
+		logger.Println("\nLooks like you're up to date!")
 		return nil
 	}
 
@@ -151,14 +151,16 @@ func updateToVersion(logger *clilogger.CLILogger, targetVersion *github.Semantic
 		log.Fatal("Cannot find home directory! Please file a bug report!")
 	}
 
-	sout, serr, err := shell.RunCommand(homeDir, "go", "get", "github.com/wailsapp/wails/v2/cmd/wails@"+desiredVersion)
+	sout, serr, err := shell.RunCommand(homeDir, "go", "install", "github.com/wailsapp/wails/v2/cmd/wails@"+desiredVersion)
 	if err != nil {
 		logger.Println("Failed.")
 		logger.Println(sout + `\n` + serr)
 		return err
 	}
-	fmt.Println()
+	logger.Println("\n")
 	logger.Println("Wails CLI updated to " + desiredVersion)
+	logger.Println("Make sure you update your project go.mod file to use " + desiredVersion + ":")
+	logger.Println("  require github.com/wailsapp/wails/v2 " + desiredVersion)
 
 	return nil
 }

v2/cmd/wails/internal/tags.go

@@ -0,0 +1,15 @@
+package internal
+
+import "strings"
+
+// ParseUserTags takes the string form of tags and converts to a slice of strings
+func ParseUserTags(tagString string) []string {
+	userTags := make([]string, 0)
+	for _, tag := range strings.Split(tagString, " ") {
+		thisTag := strings.TrimSpace(tag)
+		if thisTag != "" {
+			userTags = append(userTags, thisTag)
+		}
+	}
+	return userTags
+}

v2/cmd/wails/internal/version.go

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

v2/cmd/wails/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"github.com/wailsapp/wails/v2/cmd/wails/internal"
 	"os"
 
 	"github.com/wailsapp/wails/v2/internal/colour"
@@ -24,7 +25,7 @@ func fatal(message string) {
 func banner(_ *clir.Cli) string {
 	return fmt.Sprintf("%s %s\n",
 		colour.Yellow("Wails CLI"),
-		colour.DarkRed(version))
+		colour.DarkRed(internal.Version))
 }
 
 func printFooter() {
@@ -35,7 +36,7 @@ func main() {
 
 	var err error
 
-	app := clir.NewCli("Wails", "Go/HTML Appkit", version)
+	app := clir.NewCli("Wails", "Go/HTML Appkit", internal.Version)
 
 	app.SetBannerFunction(banner)
 	defer printFooter()
@@ -61,14 +62,14 @@ func main() {
 		fatal(err.Error())
 	}
 
-	err = update.AddSubcommand(app, os.Stdout, version)
+	err = update.AddSubcommand(app, os.Stdout, internal.Version)
 	if err != nil {
 		fatal(err.Error())
 	}
 
 	command := app.NewSubCommand("version", "The Wails CLI version")
 	command.Action(func() error {
-		println(version)
+		println(internal.Version)
 		return nil
 	})
 

v2/cmd/wails/version.go

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

v2/go.mod

@@ -5,6 +5,7 @@ go 1.17
 require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/fatih/structtag v1.2.0
+	github.com/flytam/filenamify v1.0.0
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/gabriel-vasile/mimetype v1.3.1
 	github.com/go-git/go-billy/v5 v5.2.0 // indirect
@@ -20,8 +21,8 @@ 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-20210914103035-f00aa774a934
-	github.com/leaanthony/gosod v1.0.2
+	github.com/leaanthony/go-webview2 v0.0.0-20211007095229-b1759d2e4ec7
+	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
@@ -40,9 +41,9 @@ require (
 	github.com/wzshiming/ctc v1.2.3
 	github.com/xyproto/xpm v1.2.1
 	github.com/ztrue/tracerr v0.3.0
-	golang.org/x/mod v0.4.1 // indirect
+	golang.org/x/mod v0.4.1
 	golang.org/x/net v0.0.0-20210510120150-4163338589ed
-	golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6
 	golang.org/x/tools v0.1.0
 	nhooyr.io/websocket v1.8.6
 )
@@ -56,7 +57,7 @@ require (
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/google/go-cmp v0.5.5 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
 	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
 	github.com/klauspost/compress v1.12.2 // indirect
 	github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e // indirect

v2/go.sum

@@ -22,6 +22,8 @@ github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab/go.mod h1:smsv/
 github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/flytam/filenamify v1.0.0 h1:ewx6BY2dj7U6h2zGPJmt33q/BjkSf/YsY/woQvnUNIs=
+github.com/flytam/filenamify v1.0.0/go.mod h1:Dzf9kVycwcsBlr2ATg6uxjqiFgKGH+5SKFuhdeP5zu8=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gabriel-vasile/mimetype v1.3.1 h1:qevA6c2MtE1RorlScnixeG0VA1H4xrXyhyX3oWBynNQ=
@@ -84,8 +86,9 @@ github.com/jackmordaunt/icns v1.0.0 h1:RYSxplerf/l/DUd09AHtITwckkv/mqjVv4DjYdPmA
 github.com/jackmordaunt/icns v1.0.0/go.mod h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5 h1:pdFFlHXY9tZXmJz+tRSm1DzYEH4ebha7cffmm607bMU=
 github.com/jchv/go-winloader v0.0.0-20200815041850-dec1ee9a7fd5/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
+github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -106,17 +109,18 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leaanthony/clir v1.0.4 h1:Dov2y9zWJmZr7CjaCe86lKa4b5CSxskGAt2yBkoDyiU=
 github.com/leaanthony/clir v1.0.4/go.mod h1:k/RBkdkFl18xkkACMCLt09bhiZnrGORoxmomeMvDpE0=
-github.com/leaanthony/debme v1.1.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
 github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oOc=
 github.com/leaanthony/debme v1.2.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
 github.com/leaanthony/go-ansi-parser v1.0.1 h1:97v6c5kYppVsbScf4r/VZdXyQ21KQIfeQOk2DgKxGG4=
 github.com/leaanthony/go-ansi-parser v1.0.1/go.mod h1:7arTzgVI47srICYhvgUV4CGd063sGEeoSlych5yeSPM=
 github.com/leaanthony/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-20210914103035-f00aa774a934 h1:nK/JTPyJi5QRqYjVZjXgtN4/dhg2qtngoLxLDVn429k=
-github.com/leaanthony/go-webview2 v0.0.0-20210914103035-f00aa774a934/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
-github.com/leaanthony/gosod v1.0.2 h1:LtjqaIoHuoXiQXbzMPq0isjNfltSyHKhWeiU/JbmP0w=
-github.com/leaanthony/gosod v1.0.2/go.mod h1:W8RyeSFBXu7RpIxPGEJfW4moSyGGEjlJMLV25wEbAdU=
+github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd h1:6m4zZ/esiByaDbzgdvDxjsOaIDgtuG1q2cyhjAi6uAg=
+github.com/leaanthony/go-webview2 v0.0.0-20210928094513-a94a08b538bd/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
+github.com/leaanthony/go-webview2 v0.0.0-20211007095229-b1759d2e4ec7 h1:qw9f/UqPp2GQ318n8G0Ikawe8GRkdPpUNJMuYeeafGA=
+github.com/leaanthony/go-webview2 v0.0.0-20211007095229-b1759d2e4ec7/go.mod h1:lS5ds4bruPk9d7lzdF/OH31Z0YCerI6MmHNFGsWoUnM=
+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=
 github.com/leaanthony/idgen v1.0.0/go.mod h1:4nBZnt8ml/f/ic/EVQuLxuj817RccT2fyrUaZFxrcVA=
 github.com/leaanthony/slicer v1.5.0 h1:aHYTN8xbCCLxJmkNKiLB6tgcMARl4eWmH9/F+S/0HtY=
@@ -255,8 +259,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 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-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

v2/internal/appng/app_bindings.go

@@ -0,0 +1,105 @@
+//go:build bindings
+// +build bindings
+
+package appng
+
+import (
+	"github.com/leaanthony/gosod"
+	"github.com/wailsapp/wails/v2/internal/binding"
+	wailsRuntime "github.com/wailsapp/wails/v2/internal/frontend/runtime"
+	"github.com/wailsapp/wails/v2/internal/frontend/runtime/wrapper"
+	"github.com/wailsapp/wails/v2/internal/fs"
+	"github.com/wailsapp/wails/v2/internal/logger"
+	"github.com/wailsapp/wails/v2/internal/project"
+	"github.com/wailsapp/wails/v2/pkg/options"
+	"os"
+	"path/filepath"
+)
+
+// App defines a Wails application structure
+type App struct {
+	logger     *logger.Logger
+	appoptions *options.App
+}
+
+func (a *App) Run() error {
+
+	// Create binding exemptions - Ugly hack. There must be a better way
+	bindingExemptions := []interface{}{a.appoptions.OnStartup, a.appoptions.OnShutdown, a.appoptions.OnDomReady}
+	appBindings := binding.NewBindings(a.logger, a.appoptions.Bind, bindingExemptions)
+
+	err := generateBindings(appBindings)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// CreateApp creates the app!
+func CreateApp(appoptions *options.App) (*App, error) {
+	// Set up logger
+	myLogger := logger.New(appoptions.Logger)
+	myLogger.SetLogLevel(appoptions.LogLevel)
+
+	result := &App{
+		logger:     myLogger,
+		appoptions: appoptions,
+	}
+
+	return result, nil
+
+}
+
+func generateBindings(bindings *binding.Bindings) error {
+
+	cwd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+	projectConfig, err := project.Load(cwd)
+	if err != nil {
+		return err
+	}
+
+	wrapperDir := filepath.Join(projectConfig.WailsJSDir, "wailsjs", "runtime")
+	_ = os.RemoveAll(wrapperDir)
+	extractor := gosod.New(wrapper.RuntimeWrapper)
+	err = extractor.Extract(wrapperDir, nil)
+	if err != nil {
+		return err
+	}
+
+	//ipcdev.js
+	err = os.WriteFile(filepath.Join(wrapperDir, "ipcdev.js"), wailsRuntime.DesktopIPC, 0755)
+	if err != nil {
+		return err
+	}
+	//runtimedev.js
+	err = os.WriteFile(filepath.Join(wrapperDir, "runtimedev.js"), wailsRuntime.RuntimeDesktopJS, 0755)
+	if err != nil {
+		return err
+	}
+
+	targetDir := filepath.Join(projectConfig.WailsJSDir, "wailsjs", "go")
+	err = os.RemoveAll(targetDir)
+	if err != nil {
+		return err
+	}
+	_ = fs.MkDirs(targetDir)
+
+	modelsFile := filepath.Join(targetDir, "models.ts")
+	err = bindings.WriteTS(modelsFile)
+	if err != nil {
+		return err
+	}
+
+	// Write backend method wrappers
+	bindingsFilename := filepath.Join(targetDir, "bindings.js")
+	err = bindings.GenerateBackendJS(bindingsFilename, true)
+	if err != nil {
+		return err
+	}
+
+	return nil
+
+}

v2/internal/appng/app_darwin.go

@@ -1,4 +1,4 @@
-//go:build darwin
+//go:build darwin && !bindings
 
 package appng
 

v2/internal/appng/app_default_darwin.go

@@ -1,4 +1,4 @@
-//go:build !dev && !production && darwin
+//go:build !dev && !production && !bindings && darwin
 
 package appng
 

v2/internal/appng/app_default_windows.go

@@ -1,4 +1,4 @@
-//go:build !dev && !production && windows
+//go:build !dev && !production && !bindings && windows
 
 package appng
 
@@ -24,7 +24,7 @@ Please use "wails build" or press "OK" to open the documentation on how to use "
 		"Error",
 		w32.MB_ICONERROR|w32.MB_OKCANCEL)
 	if result == 1 {
-		exec.Command("rundll32", "url.dll,FileProtocolHandler", "https://wails.io").Start()
+		exec.Command("rundll32", "url.dll,FileProtocolHandler", "https://wails.io/docs/guides/manual-builds").Start()
 	}
 	return nil, nil
 }

v2/internal/appng/app_dev.go

@@ -61,11 +61,16 @@ func CreateApp(appoptions *options.App) (*App, error) {
 
 	// Check for CLI Flags
 	assetdir := flag.String("assetdir", "", "Directory to serve assets")
+	devServerURL := flag.String("devserverurl", "", "URL of development server")
 	loglevel := flag.String("loglevel", "debug", "Loglevel to use - Trace, Debug, Info, Warning, Error")
 	flag.Parse()
+	if devServerURL != nil && *devServerURL != "" {
+		ctx = context.WithValue(ctx, "devserverurl", *devServerURL)
+	}
 	if assetdir != nil && *assetdir != "" {
 		ctx = context.WithValue(ctx, "assetdir", *assetdir)
 	}
+
 	if loglevel != nil && *loglevel != "" {
 		level, err := pkglogger.StringToLogLevel(*loglevel)
 		if err != nil {
@@ -157,7 +162,7 @@ func generateBindings(bindings *binding.Bindings) error {
 
 	// Write backend method wrappers
 	bindingsFilename := filepath.Join(targetDir, "bindings.js")
-	err = bindings.GenerateBackendJS(bindingsFilename)
+	err = bindings.GenerateBackendJS(bindingsFilename, false)
 	if err != nil {
 		return err
 	}

v2/internal/appng/app_windows.go

@@ -1,4 +1,4 @@
-//go:build windows
+//go:build windows && !bindings
 
 package appng
 

v2/internal/binding/generate.go

@@ -4,18 +4,19 @@ import (
 	"bytes"
 	_ "embed"
 	"fmt"
-	"github.com/wailsapp/wails/v2/internal/fs"
 	"os"
 	"path/filepath"
 	"strings"
 
+	"github.com/wailsapp/wails/v2/internal/fs"
+
 	"github.com/leaanthony/slicer"
 )
 
 //go:embed assets/package.json
 var packageJSON []byte
 
-func (b *Bindings) GenerateBackendJS(targetfile string) error {
+func (b *Bindings) GenerateBackendJS(targetfile string, isDevBindings bool) error {
 
 	store := b.db.store
 	var output bytes.Buffer
@@ -23,8 +24,18 @@ func (b *Bindings) GenerateBackendJS(targetfile string) error {
 	output.WriteString(`// @ts-check
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
+`)
 
-const go = {`)
+	if isDevBindings {
+		json, err := b.ToJSON()
+		if err != nil {
+			return err
+		}
+		output.WriteString("window.wailsbindings = " + json + ";")
+		output.WriteString("\n")
+	}
+
+	output.WriteString(`const go = {`)
 	output.WriteString("\n")
 
 	var sortedPackageNames slicer.StringSlicer
@@ -89,12 +100,10 @@ const go = {`)
 
 			})
 
-			output.WriteString(fmt.Sprintf("    }"))
-			output.WriteString("\n")
+			output.WriteString("    },\n")
 		})
 
-		output.WriteString(fmt.Sprintf("  }\n"))
-		output.WriteString("\n")
+		output.WriteString("  },\n\n")
 	})
 
 	output.WriteString(`};

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

@@ -8,7 +8,7 @@ import (
 )
 
 func doInstallationStrategy(installStatus installationStatus) error {
-	confirmed, err := webview2runtime.Confirm("This application requires the WebView2 runtime. Press OK to open the download page. Minimum version required: "+minimumRuntimeVersion, "Missing Requirements")
+	confirmed, err := webview2runtime.Confirm("This application requires the WebView2 runtime. Press OK to open the download page. Minimum version required: "+MinimumRuntimeVersion, "Missing Requirements")
 	if err != nil {
 		return err
 	}

v2/internal/frontend/assetserver/assetserver_browser_dev.go

@@ -0,0 +1,115 @@
+//go:build dev
+// +build dev
+
+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"
+	"strings"
+)
+
+/*
+
+The assetserver for dev serves assets from disk.
+It injects a websocket based IPC script into `index.html`.
+
+*/
+
+import (
+	"os"
+)
+
+type BrowserAssetServer struct {
+	runtimeJS  []byte
+	assetdir   string
+	appOptions *options.App
+}
+
+func NewBrowserAssetServer(assetdir string, bindingsJSON string, appOptions *options.App) (*BrowserAssetServer, error) {
+	result := &BrowserAssetServer{
+		assetdir:   assetdir,
+		appOptions: appOptions,
+	}
+
+	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 (a *BrowserAssetServer) processIndexHTML() ([]byte, error) {
+	indexHTML, err := a.loadFileFromDisk("index.html")
+	if err != nil {
+		return nil, err
+	}
+	htmlNode, err := getHTMLNode(indexHTML)
+	if err != nil {
+		return nil, err
+	}
+	err = appendSpinnerToBody(htmlNode)
+	if err != nil {
+		return nil, err
+	}
+	wailsOptions, err := extractOptions(indexHTML)
+	if err != nil {
+		return nil, err
+	}
+
+	if wailsOptions.disableIPCInjection == false {
+		err := insertScriptInHead(htmlNode, "/wails/ipc.js")
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if wailsOptions.disableRuntimeInjection == false {
+		err := insertScriptInHead(htmlNode, "/wails/runtime.js")
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	var buffer bytes.Buffer
+	err = html.Render(&buffer, htmlNode)
+	if err != nil {
+		return nil, err
+	}
+	return buffer.Bytes(), nil
+}
+
+func (a *BrowserAssetServer) Load(filename string) ([]byte, string, error) {
+	var content []byte
+	var err error
+	switch filename {
+	case "/":
+		content, err = a.processIndexHTML()
+	case "/wails/runtime.js":
+		content = a.runtimeJS
+	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()
+		}
+	}
+	if err != nil {
+		return nil, "", err
+	}
+	mimeType := GetMimetype(filename, content)
+	return content, mimeType, nil
+}

v2/internal/frontend/assetserver/assetserver_desktop.go

@@ -10,13 +10,13 @@ import (
 	"github.com/wailsapp/wails/v2/internal/frontend/runtime"
 	"github.com/wailsapp/wails/v2/internal/logger"
 	"io/fs"
+	"log"
 	"path/filepath"
 	"strings"
 )
 
 type DesktopAssetServer struct {
 	assets    debme.Debme
-	indexFile []byte
 	runtimeJS []byte
 	assetdir  string
 	logger    *logger.Logger
@@ -106,27 +106,41 @@ func (a *DesktopAssetServer) init(assets embed.FS) error {
 	if err != nil {
 		return err
 	}
-	indexHTML, err := a.assets.ReadFile("index.html")
-	if err != nil {
-		return err
-	}
-	a.indexFile, err = injectHTML(string(indexHTML), `<script src="/wails/runtime.js"></script>`)
-	if err != nil {
-		return err
-	}
-	a.indexFile, err = injectHTML(string(a.indexFile), `<script src="/wails/ipc.js"></script>`)
-	if err != nil {
-		return err
-	}
 	return nil
 }
 
+func (a *DesktopAssetServer) processIndexHTML() ([]byte, error) {
+	indexHTML, err := a.ReadFile("index.html")
+	if err != nil {
+		return nil, err
+	}
+	wailsOptions, err := extractOptions(indexHTML)
+	if err != nil {
+		log.Fatal(err)
+		return nil, err
+	}
+	if wailsOptions.disableRuntimeInjection == false {
+		indexHTML, err = injectHTML(string(indexHTML), `<script src="/wails/runtime.js"></script>`)
+		if err != nil {
+			return nil, err
+		}
+	}
+	if wailsOptions.disableIPCInjection == false {
+		indexHTML, err = injectHTML(string(indexHTML), `<script src="/wails/ipc.js"></script>`)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return indexHTML, nil
+}
+
 func (a *DesktopAssetServer) Load(filename string) ([]byte, string, error) {
 	var content []byte
 	var err error
 	switch filename {
 	case "/":
-		content = a.indexFile
+		content, err = a.processIndexHTML()
 	case "/wails/runtime.js":
 		content = a.runtimeJS
 	case "/wails/ipc.js":

v2/internal/frontend/assetserver/assetserver_dev.go

@@ -1,93 +0,0 @@
-//go:build dev
-// +build dev
-
-package assetserver
-
-import (
-	"bytes"
-	"github.com/wailsapp/wails/v2/internal/frontend/runtime"
-	"github.com/wailsapp/wails/v2/pkg/options"
-	"path/filepath"
-)
-
-/*
-
-The assetserver for dev serves assets from disk.
-It injects a websocket based IPC script into `index.html`.
-
-*/
-
-import (
-	"os"
-)
-
-type AssetServer struct {
-	indexFile  []byte
-	runtimeJS  []byte
-	assetdir   string
-	appOptions *options.App
-}
-
-func NewAssetServer(assetdir string, bindingsJSON string, appOptions *options.App) (*AssetServer, error) {
-	result := &AssetServer{
-		assetdir:   assetdir,
-		appOptions: appOptions,
-	}
-
-	err := result.init()
-	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()
-	return result, err
-}
-
-func (a *AssetServer) loadFileFromDisk(filename string) ([]byte, error) {
-	return os.ReadFile(filepath.Join(a.assetdir, filename))
-}
-
-func (a *AssetServer) init() error {
-	var err error
-	a.indexFile, err = a.loadFileFromDisk("index.html")
-	if err != nil {
-		return err
-	}
-	a.indexFile, err = injectHTML(string(a.indexFile), `<div id="wails-spinner"></div>`)
-	if err != nil {
-		return err
-	}
-	a.indexFile, err = injectHTML(string(a.indexFile), `<script src="/wails/ipc.js"></script>`)
-	if err != nil {
-		return err
-	}
-	a.indexFile, err = injectHTML(string(a.indexFile), `<script src="/wails/runtime.js"></script>`)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (a *AssetServer) Load(filename string) ([]byte, string, error) {
-	var content []byte
-	var err error
-	switch filename {
-	case "/":
-		content = a.indexFile
-	case "/wails/runtime.js":
-		content = a.runtimeJS
-	case "/wails/ipc.js":
-		content = runtime.WebsocketIPC
-	default:
-		content, err = a.loadFileFromDisk(filename)
-	}
-	if err != nil {
-		return nil, "", err
-	}
-	mimeType := GetMimetype(filename, content)
-	return content, mimeType, nil
-}

v2/internal/frontend/assetserver/common.go

@@ -2,20 +2,162 @@ package assetserver
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
+	"golang.org/x/net/html"
 	"strings"
 )
 
+type optionType string
+
+const (
+	noAutoInject        optionType = "noautoinject"
+	noAutoInjectRuntime optionType = "noautoinjectruntime"
+	noAutoInjectIPC     optionType = "noautoinjectipc"
+)
+
+type Options struct {
+	disableRuntimeInjection bool
+	disableIPCInjection     bool
+}
+
+func newOptions(optionString string) *Options {
+	var result = &Options{}
+	optionString = strings.ToLower(optionString)
+	options := strings.Split(optionString, ",")
+	for _, option := range options {
+		switch optionType(strings.TrimSpace(option)) {
+		case noAutoInject:
+			result.disableRuntimeInjection = true
+			result.disableIPCInjection = true
+		case noAutoInjectIPC:
+			result.disableIPCInjection = true
+		case noAutoInjectRuntime:
+			result.disableRuntimeInjection = true
+		}
+	}
+	return result
+}
+
 func injectHTML(input string, html string) ([]byte, error) {
-	splits := strings.Split(input, "</body>")
+	splits := strings.Split(input, "</head>")
 	if len(splits) != 2 {
-		return nil, fmt.Errorf("unable to locate a </body> tag in your html")
+		return nil, fmt.Errorf("unable to locate a </head> tag in your html")
 	}
 
 	var result bytes.Buffer
 	result.WriteString(splits[0])
 	result.WriteString(html)
-	result.WriteString("</body>")
+	result.WriteString("</head>")
 	result.WriteString(splits[1])
 	return result.Bytes(), nil
 }
+
+func extractOptions(htmldata []byte) (*Options, error) {
+	doc, err := html.Parse(bytes.NewReader(htmldata))
+	if err != nil {
+		return nil, err
+	}
+	var extractor func(*html.Node) *Options
+	extractor = func(node *html.Node) *Options {
+		if node.Type == html.ElementNode && node.Data == "meta" {
+			isWailsOptionsTag := false
+			wailsOptions := ""
+			for _, attr := range node.Attr {
+				if isWailsOptionsTag && attr.Key == "content" {
+					wailsOptions = attr.Val
+				}
+				if attr.Val == "wails-options" {
+					isWailsOptionsTag = true
+				}
+			}
+			return newOptions(wailsOptions)
+		}
+		for child := node.FirstChild; child != nil; child = child.NextSibling {
+			result := extractor(child)
+			if result != nil {
+				return result
+			}
+		}
+		return nil
+	}
+	result := extractor(doc)
+	if result == nil {
+		result = &Options{}
+	}
+	return result, nil
+}
+
+func createScriptNode(scriptName string) *html.Node {
+	return &html.Node{
+		Type: html.ElementNode,
+		Data: "script",
+		Attr: []html.Attribute{
+			{
+				Key: "src",
+				Val: scriptName,
+			},
+		},
+	}
+}
+
+func createDivNode(id string) *html.Node {
+	return &html.Node{
+		Type: html.ElementNode,
+		Data: "div",
+		Attr: []html.Attribute{
+			{
+				Namespace: "",
+				Key:       "id",
+				Val:       id,
+			},
+		},
+	}
+}
+
+func insertScriptInHead(htmlNode *html.Node, scriptName string) error {
+	headNode := findFirstTag(htmlNode, "head")
+	if headNode == nil {
+		return errors.New("cannot find head in HTML")
+	}
+	scriptNode := createScriptNode(scriptName)
+	if headNode.FirstChild != nil {
+		headNode.InsertBefore(scriptNode, headNode.FirstChild)
+	} else {
+		headNode.AppendChild(scriptNode)
+	}
+	return nil
+}
+
+func appendSpinnerToBody(htmlNode *html.Node) error {
+	bodyNode := findFirstTag(htmlNode, "body")
+	if bodyNode == nil {
+		return errors.New("cannot find body in HTML")
+	}
+	scriptNode := createDivNode("wails-spinner")
+	bodyNode.AppendChild(scriptNode)
+	return nil
+}
+
+func getHTMLNode(htmldata []byte) (*html.Node, error) {
+	return html.Parse(bytes.NewReader(htmldata))
+}
+
+func findFirstTag(htmlnode *html.Node, tagName string) *html.Node {
+	var extractor func(*html.Node) *html.Node
+	var result *html.Node
+	extractor = func(node *html.Node) *html.Node {
+		if node.Type == html.ElementNode && node.Data == tagName {
+			return node
+		}
+		for child := node.FirstChild; child != nil; child = child.NextSibling {
+			result := extractor(child)
+			if result != nil {
+				return result
+			}
+		}
+		return nil
+	}
+	result = extractor(htmlnode)
+	return result
+}

v2/internal/frontend/assetserver/common_test.go

@@ -0,0 +1,70 @@
+package assetserver
+
+import (
+	"reflect"
+	"testing"
+)
+
+const realHTML = `<html>
+
+<head>
+  <title>test3</title>
+  <meta name="wails-options" content="noautoinject">
+  <link rel="stylesheet" href="/main.css">
+</head>
+
+<body data-wails-drag>
+  <div class="logo"></div>
+  <div class="result" id="result">Please enter your name below <20></div>
+  <div class="input-box" id="input" data-wails-no-drag>
+    <input class="input" id="name" type="text" autocomplete="off">
+    <button class="btn" onclick="greet()">Greet</button>
+  </div>
+
+  <script src="/main.js"></script>
+</body>
+
+</html>
+`
+
+func genMeta(content string) []byte {
+	return []byte("<html><head><meta name=\"wails-options\" content=\"" + content + "\"></head><body></body></html>")
+}
+
+func genOptions(runtime bool, bindings bool) *Options {
+	return &Options{
+		disableRuntimeInjection: runtime,
+		disableIPCInjection:     bindings,
+	}
+}
+
+func Test_extractOptions(t *testing.T) {
+	tests := []struct {
+		name      string
+		htmldata  []byte
+		want      *Options
+		wantError bool
+	}{
+		{"empty", []byte(""), &Options{}, false},
+		{"bad data", []byte("<"), &Options{}, false},
+		{"bad options", genMeta("noauto"), genOptions(false, false), false},
+		{"realhtml", []byte(realHTML), genOptions(true, true), false},
+		{"noautoinject", genMeta("noautoinject"), genOptions(true, true), false},
+		{"noautoinjectipc", genMeta("noautoinjectipc"), genOptions(false, true), false},
+		{"noautoinjectruntime", genMeta("noautoinjectruntime"), genOptions(true, false), false},
+		{"spaces", genMeta("  noautoinjectruntime  "), genOptions(true, false), false},
+		{"multiple", genMeta("noautoinjectruntime,noautoinjectipc"), genOptions(true, true), false},
+		{"multiple spaces", genMeta(" noautoinjectruntime, noautoinjectipc "), genOptions(true, true), false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := extractOptions(tt.htmldata)
+			if !tt.wantError && err != nil {
+				t.Errorf("did not want error but got it")
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("extractOptions() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

v2/internal/frontend/assetserver/mimecache.go

@@ -5,8 +5,9 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
+
+	"github.com/gabriel-vasile/mimetype"
 )
-import "github.com/gabriel-vasile/mimetype"
 
 var (
 	cache = map[string]string{}
@@ -33,6 +34,10 @@ func GetMimetype(filename string, data []byte) string {
 		result = strings.Replace(result, "text/plain", "text/css", 1)
 	}
 
+	if filepath.Ext(filename) == ".js" && strings.HasPrefix(result, "text/plain") {
+		result = strings.Replace(result, "text/plain", "text/javascript", 1)
+	}
+
 	if result == "" {
 		result = "application/octet-stream"
 	}

v2/internal/frontend/assetserver/mimecache_test.go

@@ -14,6 +14,7 @@ func TestGetMimetype(t *testing.T) {
 	}{
 		// TODO: Add test cases.
 		{"css", args{"test.css", []byte("body{margin:0;padding:0;background-color:#d579b2}#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-align:center;color:#2c3e50;background-color:#ededed}#nav{padding:30px}#nav a{font-weight:700;color:#2c\n3e50}#nav a.router-link-exact-active{color:#42b983}.hello[data-v-4e26ad49]{margin:10px 0}")}, "text/css; charset=utf-8"},
+		{"js", args{"test.js", []byte("let foo = 'bar'; console.log(foo);")}, "text/javascript; charset=utf-8"},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

v2/internal/frontend/desktop/darwin/browser.go

@@ -1,3 +1,5 @@
+//go:build darwin
+
 package darwin
 
 import (

v2/internal/frontend/desktop/darwin/dialog.go

@@ -2,7 +2,6 @@
 
 package darwin
 
-import "C"
 import (
 	"github.com/wailsapp/wails/v2/internal/frontend"
 )

v2/internal/frontend/desktop/darwin/frontend.go

@@ -5,6 +5,7 @@ package darwin
 import (
 	"context"
 	"encoding/json"
+	"html/template"
 	"log"
 	"runtime"
 
@@ -310,7 +311,7 @@ func (f *Frontend) Notify(name string, data ...interface{}) {
 		f.logger.Error(err.Error())
 		return
 	}
-	f.ExecJS(`window.wails.EventsNotify('` + string(payload) + `');`)
+	f.ExecJS(`window.wails.EventsNotify('` + template.JSEscapeString(string(payload)) + `');`)
 }
 
 //func (f *Frontend) processRequest(req *edge.ICoreWebView2WebResourceRequest, args *edge.ICoreWebView2WebResourceRequestedEventArgs) {

v2/internal/frontend/desktop/windows/dialog.go

@@ -2,7 +2,6 @@
 
 package windows
 
-import "C"
 import (
 	"github.com/leaanthony/go-common-file-dialog/cfd"
 	"github.com/wailsapp/wails/v2/internal/frontend"

v2/internal/frontend/desktop/windows/frontend.go

@@ -11,8 +11,7 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
-
-	"github.com/leaanthony/slicer"
+	"text/template"
 
 	"github.com/leaanthony/go-webview2/pkg/edge"
 	"github.com/leaanthony/winc"
@@ -35,7 +34,8 @@ type Frontend struct {
 	debug           bool
 
 	// Assets
-	assets *assetserver.DesktopAssetServer
+	assets   *assetserver.DesktopAssetServer
+	startURL string
 
 	// main window handle
 	mainWindow                               *Window
@@ -57,21 +57,33 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger.
 		minWidth:        appoptions.MinWidth,
 		maxHeight:       appoptions.MaxHeight,
 		maxWidth:        appoptions.MaxWidth,
-	}
-
-	// Check if we have been given a directory to serve assets from.
-	// If so, this means we are in dev mode and are serving assets off disk.
-	// We indicate this through the `servingFromDisk` flag to ensure requests
-	// aren't cached by WebView2 in dev mode
-	_assetdir := ctx.Value("assetdir")
-	if _assetdir != nil {
-		result.servingFromDisk = true
+		startURL:        "file://wails/",
 	}
 
 	bindingsJSON, err := appBindings.ToJSON()
 	if err != nil {
 		log.Fatal(err)
 	}
+
+	_devServerURL := ctx.Value("devserverurl")
+	if _devServerURL != nil {
+		devServerURL := _devServerURL.(string)
+		if len(devServerURL) > 0 && devServerURL != "http://localhost:34115" {
+			result.startURL = devServerURL
+			return result
+		}
+	}
+
+	// Check if we have been given a directory to serve assets from.
+	// If so, this means we are in dev mode and are serving assets off disk.
+	// We indicate this through the `servingFromDisk` flag to ensure requests
+	// aren't cached by WebView2 in dev mode
+
+	_assetdir := ctx.Value("assetdir")
+	if _assetdir != nil {
+		result.servingFromDisk = true
+	}
+
 	assets, err := assetserver.NewDesktopAssetServer(ctx, appoptions.Assets, bindingsJSON)
 	if err != nil {
 		log.Fatal(err)
@@ -123,6 +135,7 @@ func (f *Frontend) Run(ctx context.Context) error {
 	}
 
 	mainWindow.Run()
+	mainWindow.Close()
 	return nil
 }
 
@@ -264,16 +277,9 @@ func (f *Frontend) setupChromium() {
 	chromium.MessageCallback = f.processMessage
 	chromium.WebResourceRequestedCallback = f.processRequest
 	chromium.NavigationCompletedCallback = f.navigationCompleted
-	acceleratorsWebviewShouldProcess := slicer.Int([]int{ctrlV, ctrlC, ctrlX, ctrlZ, ctrlA, arrowLeft, arrowRight, arrowUp, arrowDown, keyDel})
-
 	chromium.AcceleratorKeyCallback = func(vkey uint) bool {
-		// We want webview to handle ctrl-C, ctrl-Z, ctrl-v, ctrl-x
-		if acceleratorsWebviewShouldProcess.Contains(int(vkey)) {
-			return false
-		}
-		// Post keypress
 		w32.PostMessage(f.mainWindow.Handle(), w32.WM_KEYDOWN, uintptr(vkey), 0)
-		return true
+		return false
 	}
 	chromium.Embed(f.mainWindow.Handle())
 	chromium.Resize()
@@ -297,7 +303,7 @@ func (f *Frontend) setupChromium() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	err = settings.PutIsStatusBarEnabled(false)
+	err = settings.PutAreBrowserAcceleratorKeysEnabled(false)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -306,7 +312,7 @@ func (f *Frontend) setupChromium() {
 	f.WindowSetRGBA(f.frontendOptions.RGBA)
 
 	chromium.AddWebResourceRequestedFilter("*", edge.COREWEBVIEW2_WEB_RESOURCE_CONTEXT_ALL)
-	chromium.Navigate("file://wails/")
+	chromium.Navigate(f.startURL)
 }
 
 type EventNotify struct {
@@ -324,7 +330,7 @@ func (f *Frontend) Notify(name string, data ...interface{}) {
 		f.logger.Error(err.Error())
 		return
 	}
-	f.ExecJS(`window.wails.EventsNotify('` + string(payload) + `');`)
+	f.ExecJS(`window.wails.EventsNotify('` + template.JSEscapeString(string(payload)) + `');`)
 }
 
 func (f *Frontend) processRequest(req *edge.ICoreWebView2WebResourceRequest, args *edge.ICoreWebView2WebResourceRequestedEventArgs) {

v2/internal/frontend/devserver/devserver.go

@@ -33,9 +33,9 @@ type DevWebServer struct {
 	logger           *logger.Logger
 	appBindings      *binding.Bindings
 	dispatcher       frontend.Dispatcher
-	assetServer      *assetserver.AssetServer
+	assetServer      *assetserver.BrowserAssetServer
 	socketMutex      sync.Mutex
-	websocketClients map[*websocket.Conn]struct{}
+	websocketClients map[*websocket.Conn]*sync.Mutex
 	menuManager      *menumanager.Manager
 	starttime        string
 
@@ -58,6 +58,7 @@ func (d *DevWebServer) Run(ctx context.Context) error {
 
 	d.server.Get("/wails/ipc", websocket.New(func(c *websocket.Conn) {
 		d.newWebsocketSession(c)
+		locker := d.websocketClients[c]
 		// websocket.Conn bindings https://pkg.go.dev/github.com/fasthttp/websocket?tab=doc#pkg-index
 		var (
 			mt  int
@@ -85,55 +86,65 @@ func (d *DevWebServer) Run(ctx context.Context) error {
 				d.logger.Error(err.Error())
 			}
 			if result != "" {
+				locker.Lock()
 				if err = c.WriteMessage(mt, []byte(result)); err != nil {
+					locker.Unlock()
 					break
 				}
+				locker.Unlock()
 			}
 
 		}
 	}))
 
-	_assetdir := ctx.Value("assetdir")
-	if _assetdir == nil {
-		return fmt.Errorf("no assetdir provided")
+	_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")
+		}
+		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.server.Get("*", d.loadAsset)
+
+		// Start server
+		go func(server *fiber.App, log *logger.Logger) {
+			err := server.Listen("localhost:34115")
+			if err != nil {
+				log.Error(err.Error())
+			}
+			d.LogDebug("Shutdown completed")
+		}(d.server, d.logger)
+
+		d.LogDebug("Serving application at http://localhost:34115")
+
+		defer func() {
+			err := d.server.Shutdown()
+			if err != nil {
+				d.logger.Error(err.Error())
+			}
+		}()
 	}
-	if _assetdir != nil {
-		assetdir := _assetdir.(string)
-		bindingsJSON, err := d.appBindings.ToJSON()
-		if err != nil {
-			log.Fatal(err)
-		}
-		d.assetServer, err = assetserver.NewAssetServer(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.server.Get("*", d.loadAsset)
-
-	// Start server
-	go func(server *fiber.App, log *logger.Logger) {
-		err := server.Listen(":34115")
-		if err != nil {
-			log.Error(err.Error())
-		}
-		d.LogDebug("Shutdown completed")
-	}(d.server, d.logger)
-
-	d.LogDebug("Serving application at http://localhost:34115")
 
 	// Launch desktop app
 	err := d.desktopFrontend.Run(ctx)
 	d.LogDebug("Starting shutdown")
-	err2 := d.server.Shutdown()
-	if err2 != nil {
-		d.logger.Error(err.Error())
-	}
 
 	return err
 }
@@ -286,7 +297,7 @@ func (d *DevWebServer) newWebsocketSession(c *websocket.Conn) {
 		d.LogDebug(fmt.Sprintf("Websocket client %p disconnected", c))
 		return nil
 	})
-	d.websocketClients[c] = struct{}{}
+	d.websocketClients[c] = &sync.Mutex{}
 	d.LogDebug(fmt.Sprintf("Websocket client %p connected", c))
 }
 
@@ -298,12 +309,21 @@ type EventNotify struct {
 func (d *DevWebServer) broadcast(message string) {
 	d.socketMutex.Lock()
 	defer d.socketMutex.Unlock()
-	for client := range d.websocketClients {
-		err := client.WriteMessage(websocket.TextMessage, []byte(message))
-		if err != nil {
-			d.logger.Error(err.Error())
-			return
-		}
+	for client, locker := range d.websocketClients {
+		go func() {
+			if client == nil {
+				d.logger.Error("Lost connection to websocket server")
+				return
+			}
+			locker.Lock()
+			err := client.WriteMessage(websocket.TextMessage, []byte(message))
+			if err != nil {
+				locker.Unlock()
+				d.logger.Error(err.Error())
+				return
+			}
+			locker.Unlock()
+		}()
 	}
 }
 
@@ -324,15 +344,20 @@ func (d *DevWebServer) notify(name string, data ...interface{}) {
 func (d *DevWebServer) broadcastExcludingSender(message string, sender *websocket.Conn) {
 	d.socketMutex.Lock()
 	defer d.socketMutex.Unlock()
-	for client := range d.websocketClients {
-		if client == sender {
-			continue
-		}
-		err := client.WriteMessage(websocket.TextMessage, []byte(message))
-		if err != nil {
-			d.logger.Error(err.Error())
-			return
-		}
+	for client, locker := range d.websocketClients {
+		go func() {
+			if client == sender {
+				return
+			}
+			locker.Lock()
+			err := client.WriteMessage(websocket.TextMessage, []byte(message))
+			if err != nil {
+				locker.Unlock()
+				d.logger.Error(err.Error())
+				return
+			}
+			locker.Unlock()
+		}()
 	}
 }
 
@@ -358,11 +383,12 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger.
 		appBindings:     appBindings,
 		dispatcher:      dispatcher,
 		server: fiber.New(fiber.Config{
+
 			ReadTimeout:           time.Second * 5,
 			DisableStartupMessage: true,
 		}),
 		menuManager:      menuManager,
-		websocketClients: make(map[*websocket.Conn]struct{}),
+		websocketClients: make(map[*websocket.Conn]*sync.Mutex),
 	}
 	return result
 }

v2/internal/frontend/runtime/desktop/ipc.js

@@ -10,25 +10,22 @@ The electron alternative for Go
 /* jshint esversion: 6 */
 
 /**
- * SendMessage sends the given message to the backend
+ * WailsInvoke sends the given message to the backend
  *
  * @param {string} message
  */
 
-// const windows = 0;
-// const macos = 1;
-// const linux = 2;
+(function () {
+	// Credit: https://stackoverflow.com/a/2631521
+	let _deeptest = function (s) {
+		var obj = window[s.shift()];
+		while (obj && s.length) obj = obj[s.shift()];
+		return obj;
+	};
+	window.WailsInvoke = _deeptest(["chrome", "webview", "postMessage"]) ||
+		_deeptest(["webkit", "messageHandlers", "external", "postMessage"]);
 
-window.WailsInvoke = function (message) {
-
-	// Call Platform specific invoke method
-	if (PLATFORM === 0) {
-		window.chrome.webview.postMessage(message);
-	} else if (PLATFORM === 1) {
-		window.webkit.messageHandlers.external.postMessage(message);
-	} else if (PLATFORM === 2) {
-		console.error("Unsupported Platform");
-	} else {
+	if (!window.WailsInvoke) {
 		console.error("Unsupported Platform");
 	}
-};
+})();

v2/internal/frontend/runtime/desktop/main.js

@@ -39,7 +39,10 @@ window.wails = {
     EventsNotify,
     SetBindings,
     eventListeners,
-    callbacks
+    callbacks,
+    flags: {
+        disableScrollbarDrag: false,
+    }
 };
 
 // Set the bindings
@@ -61,7 +64,14 @@ window.addEventListener('mousedown', (e) => {
         if (currentElement.hasAttribute('data-wails-no-drag')) {
             break;
         } else if (currentElement.hasAttribute('data-wails-drag')) {
+            if (window.wails.flags.disableScrollbarDrag) {
+                // This checks for clicks on the scroll bar
+                if (e.offsetX > e.target.clientWidth || e.offsetY > e.target.clientHeight) {
+                    break;
+                }
+            }
             window.WailsInvoke("drag");
+            e.preventDefault();
             break;
         }
         currentElement = currentElement.parentElement;

v2/internal/frontend/runtime/dev/build.js

@@ -1,50 +1,15 @@
 /* jshint esversion: 8 */
+const esbuild = require("esbuild");
+const sveltePlugin = require("esbuild-svelte");
 
-let sveltePlugin = {
-    name: 'svelte',
-    setup(build) {
-        let svelte = require('svelte/compiler');
-        let path = require('path');
-        let fs = require('fs');
-
-        build.onLoad({filter: /\.svelte$/}, async (args) => {
-            // This converts a message in Svelte's format to esbuild's format
-            let convertMessage = ({message, start, end}) => {
-                let location;
-                if (start && end) {
-                    let lineText = source.split(/\r\n|\r|\n/g)[start.line - 1];
-                    let lineEnd = start.line === end.line ? end.column : lineText.length;
-                    location = {
-                        file: filename,
-                        line: start.line,
-                        column: start.column,
-                        length: lineEnd - start.column,
-                        lineText,
-                    };
-                }
-                return {text: message, location};
-            };
-
-            // Load the file from the file system
-            let source = await fs.promises.readFile(args.path, 'utf8');
-            let filename = path.relative(process.cwd(), args.path);
-
-            // Convert Svelte syntax to JavaScript
-            try {
-                let {js, warnings} = svelte.compile(source, {filename});
-                let contents = js.code + `//# sourceMappingURL=` + js.map.toUrl();
-                return {contents, warnings: warnings.map(convertMessage)};
-            } catch (e) {
-                return {errors: [convertMessage(e)]};
-            }
-        });
-    }
-};
-
-require('esbuild').build({
-    minify: true,
-    entryPoints: ['main.js'],
-    bundle: true,
-    outfile: '../ipc_websocket.js',
-    plugins: [sveltePlugin],
-}).catch(() => process.exit(1));
+esbuild
+    .build({
+        entryPoints: ["main.js"],
+        bundle: true,
+        minify: true,
+        outfile: "../ipc_websocket.js",
+        plugins: [sveltePlugin({compileOptions: {css: true}})],
+        logLevel: "info",
+        sourcemap: "inline",
+    })
+    .catch(() => process.exit(1));

v2/internal/frontend/runtime/dev/main.js

@@ -14,11 +14,21 @@ import Overlay from "./Overlay.svelte";
 import {hideOverlay, showOverlay} from "./store";
 
 let components = {};
+window.ipcCallbacks = [];
+window.ipcCallbackNames = [];
 
-// Sets up the overlay
-components.overlay = new Overlay({
-    target: document.body,
-    anchor: document.querySelector('#wails-spinner'),
+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);
+};
+
+window.addEventListener('DOMContentLoaded', () => {
+    components.overlay = new Overlay({
+        target: document.body,
+        anchor: document.querySelector('#wails-spinner'),
+    });
 });
 
 let websocket = null;
@@ -40,6 +50,12 @@ function setupIPCBridge() {
     window.WailsInvoke = (message) => {
         websocket.send(message);
     };
+    for (let i = 0; i < window.ipcCallbacks.length; i++) {
+        log("Executing JS: " + window.ipcCallbackNames[i]);
+        window.ipcCallbacks[i]();
+    }
+    delete window.ipcCallbacks;
+    delete window.ipcCallbackNames;
 }
 
 // Handles incoming websocket connections
@@ -60,21 +76,24 @@ function handleDisconnect() {
     connect();
 }
 
-// Try to connect to the backend every 1s (default value).
+function _connect() {
+    if (websocket == null) {
+        websocket = new WebSocket('ws://' + window.location.hostname + ':34115/wails/ipc');
+        websocket.onopen = handleConnect;
+        websocket.onerror = function (e) {
+            e.stopImmediatePropagation();
+            e.stopPropagation();
+            e.preventDefault();
+            websocket = null;
+            return false;
+        };
+    }
+}
+
+// Try to connect to the backend every .5s
 function connect() {
-    connectTimer = setInterval(function () {
-        if (websocket == null) {
-            websocket = new WebSocket('ws://' + window.location.hostname + ':34115/wails/ipc');
-            websocket.onopen = handleConnect;
-            websocket.onerror = function (e) {
-                e.stopImmediatePropagation();
-                e.stopPropagation();
-                e.preventDefault();
-                websocket = null;
-                return false;
-            };
-        }
-    }, 250);
+    _connect();
+    connectTimer = setInterval(_connect, 500);
 }
 
 function handleMessage(message) {

v2/internal/frontend/runtime/dev/package-lock.json

@@ -1,871 +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",
-        "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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/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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "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"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    }
-  },
   "dependencies": {
     "ansi-styles": {
       "version": "3.2.1",
@@ -1007,6 +144,21 @@
       "integrity": "sha512-7hyXbU3g94aREufI/5nls7Xcc+RGQeZWZApm6hoBaFvt2BPtpT4TjFMQ9Tb1jU8XyBGz00ShmiyflCogphMHFQ==",
       "dev": true
     },
+    "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==",
+      "requires": {
+        "svelte": "^3.42.6"
+      },
+      "dependencies": {
+        "svelte": {
+          "version": "3.43.1",
+          "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.43.1.tgz",
+          "integrity": "sha512-nvPIaKx4HLzYlSdquISZpgG1Kqr2VAWQjZOt3Iwm3UhbqmA0LnSx4k1YpRMEhjQYW3ZCqQoK8Egto9tv4YewMA=="
+        }
+      }
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",

v2/internal/frontend/runtime/dev/package.json

@@ -12,6 +12,7 @@
   "devDependencies": {
     "esbuild": "^0.12.17",
     "npm-run-all": "^4.1.5",
-    "svelte": "^3.42.2"
+    "svelte": "^3.42.2",
+    "esbuild-svelte": "^0.5.6"
   }
 }

v2/internal/frontend/runtime/ipc.go

@@ -1,8 +1,8 @@
-//go:build windows
+//go:build darwin || windows
 
 package runtime
 
 import _ "embed"
 
-//go:embed ipc_windows.js
+//go:embed ipc.js
 var DesktopIPC []byte

v2/internal/frontend/runtime/ipc.js

@@ -0,0 +1 @@
+(()=>{(function(){let n=function(o){for(var e=window[o.shift()];e&&o.length;)e=e[o.shift()];return e};window.WailsInvoke=n(["chrome","webview","postMessage"])||n(["webkit","messageHandlers","external","postMessage"]),window.WailsInvoke||console.error("Unsupported Platform")})();})();

v2/internal/frontend/runtime/ipc_darwin.go

@@ -1,8 +0,0 @@
-//go:build darwin
-
-package runtime
-
-import _ "embed"
-
-//go:embed ipc_darwin.js
-var DesktopIPC []byte

v2/internal/frontend/runtime/ipc_darwin.js

@@ -1 +0,0 @@
-(()=>{window.WailsInvoke=function(e){window.webkit.messageHandlers.external.postMessage(e)};})();

v2/internal/frontend/runtime/ipc_windows.js

@@ -1 +0,0 @@
-(()=>{window.WailsInvoke=function(e){window.chrome.webview.postMessage(e)};})();

v2/internal/frontend/runtime/package.json

@@ -5,8 +5,7 @@
   "main": "index.js",
   "scripts": {
     "build": "run-p build:*",
-    "build:ipc-windows": "esbuild desktop/ipc.js --bundle --minify --outfile=ipc_windows.js --define:PLATFORM=0",
-    "build:ipc-darwin": "esbuild desktop/ipc.js --bundle --minify --outfile=ipc_darwin.js --define:PLATFORM=1",
+    "build:ipc-desktop": "esbuild desktop/ipc.js --bundle --minify --outfile=ipc.js",
     "build:ipc-dev": "cd dev && npm run build",
     "build:runtime-desktop-prod": "esbuild desktop/main.js --bundle --minify --outfile=runtime_prod_desktop.js --define:ENV=1",
     "build:runtime-desktop-dev": "esbuild desktop/main.js --bundle --sourcemap=inline --outfile=runtime_dev_desktop.js --define:ENV=0",

v2/internal/frontend/runtime/runtime_dev_desktop.go

@@ -1,4 +1,4 @@
-//go:build dev
+//go:build dev || bindings || (!dev && !production && !bindings)
 
 package runtime
 

v2/internal/frontend/runtime/runtime_prod_desktop.js

@@ -1 +1 @@
-(()=>{var g=Object.defineProperty;var h=o=>g(o,"__esModule",{value:!0});var f=(o,n)=>{h(o);for(var e in n)g(o,e,{get:n[e],enumerable:!0})};var W={};f(W,{LogDebug:()=>T,LogError:()=>D,LogFatal:()=>F,LogInfo:()=>C,LogLevel:()=>U,LogPrint:()=>B,LogTrace:()=>R,LogWarning:()=>J,SetLogLevel:()=>G});function l(o,n){window.WailsInvoke("L"+o+n)}function R(o){l("T",o)}function B(o){l("P",o)}function T(o){l("D",o)}function C(o){l("I",o)}function J(o){l("W",o)}function D(o){l("E",o)}function F(o){l("F",o)}function G(o){l("S",o)}var U={TRACE:1,DEBUG:2,INFO:3,WARNING:4,ERROR:5};var E=class{constructor(n,e){e=e||-1,this.Callback=t=>(n.apply(null,t),e===-1?!1:(e-=1,e===0))}},s={};function d(o,n,e){s[o]=s[o]||[];let t=new E(n,e);s[o].push(t)}function I(o,n){d(o,n,-1)}function k(o,n){d(o,n,1)}function m(o){let n=o.name;if(s[n]){let e=s[n].slice();for(let t=0;t<s[n].length;t+=1){let r=s[n][t],i=o.data;r.Callback(i)&&e.splice(t,1)}s[n]=e}}function S(o){let n;try{n=JSON.parse(o)}catch(e){let t="Invalid JSON passed to Notify: "+o;throw new Error(t)}m(n)}function y(o){let n={name:o,data:[].slice.apply(arguments).slice(1)};m(n),window.WailsInvoke("EE"+JSON.stringify(n))}function L(o){s.delete(o),window.WailsInvoke("EX"+o)}var c={};function z(){var o=new Uint32Array(1);return window.crypto.getRandomValues(o)[0]}function A(){return Math.random()*9007199254740991}var p;window.crypto?p=z:p=A;function a(o,n,e){return e==null&&(e=0),new Promise(function(t,r){var i;do i=o+"-"+p();while(c[i]);var w;e>0&&(w=setTimeout(function(){r(Error("Call to "+o+" timed out. Request ID: "+i))},e)),c[i]={timeoutHandle:w,reject:r,resolve:t};try{let u={name:o,args:n,callbackID:i};window.WailsInvoke("C"+JSON.stringify(u))}catch(u){console.error(u)}})}function O(o){var n;try{n=JSON.parse(o)}catch(r){let i=`Invalid JSON passed to callback: ${r.message}. Message: ${o}`;throw wails.LogDebug(i),new Error(i)}var e=n.callbackid,t=c[e];if(!t){let r=`Callback '${e}' not registered!!!`;throw console.error(r),new Error(r)}clearTimeout(t.timeoutHandle),delete c[e],n.error?t.reject(n.error):t.resolve(n.result)}window.go={};function b(o){try{o=JSON.parse(o)}catch(n){console.error(n)}window.go=window.go||{},Object.keys(o).forEach(n=>{window.go[n]=window.go[n]||{},Object.keys(o[n]).forEach(e=>{window.go[n][e]=window.go[n][e]||{},Object.keys(o[n][e]).forEach(t=>{window.go[n][e][t]=function(){let r=0;function i(){let w=[].slice.call(arguments);return a([n,e,t].join("."),w,r)}return i.setTimeout=function(w){r=w},i.getTimeout=function(){return r},i}()})})})}var v={};f(v,{WindowCenter:()=>j,WindowFullscreen:()=>M,WindowGetPosition:()=>Z,WindowGetSize:()=>V,WindowHide:()=>K,WindowMaximise:()=>_,WindowMinimise:()=>no,WindowReload:()=>P,WindowSetMaxSize:()=>q,WindowSetMinSize:()=>N,WindowSetPosition:()=>X,WindowSetRGBA:()=>to,WindowSetSize:()=>Q,WindowSetTitle:()=>H,WindowShow:()=>Y,WindowUnFullscreen:()=>$,WindowUnmaximise:()=>oo,WindowUnminimise:()=>eo});function P(){window.location.reload()}function j(){window.WailsInvoke("Wc")}function H(o){window.WailsInvoke("WT"+o)}function M(){window.WailsInvoke("WF")}function $(){window.WailsInvoke("Wf")}function Q(o,n){window.WailsInvoke("Ws:"+o+":"+n)}function V(){return a(":wails:WindowGetSize")}function q(o,n){window.WailsInvoke("WZ:"+o+":"+n)}function N(o,n){window.WailsInvoke("Wz:"+o+":"+n)}function X(o,n){window.WailsInvoke("Wp:"+o+":"+n)}function Z(){return a(":wails:WindowGetPos")}function K(){window.WailsInvoke("WH")}function Y(){window.WailsInvoke("WS")}function _(){window.WailsInvoke("WM")}function oo(){window.WailsInvoke("WU")}function no(){window.WailsInvoke("Wm")}function eo(){window.WailsInvoke("Wu")}function to(o){let n=JSON.stringify(o);window.WailsInvoke("Wr:"+n)}var x={};f(x,{BrowserOpenURL:()=>io});function io(o){window.WailsInvoke("BO:"+o)}function ro(){window.WailsInvoke("Q")}window.runtime={...W,...v,...x,EventsOn:I,EventsOnce:k,EventsOnMultiple:d,EventsEmit:y,EventsOff:L,Quit:ro};window.wails={Callback:O,EventsNotify:S,SetBindings:b,eventListeners:s,callbacks:c};window.wails.SetBindings(window.wailsbindings);delete window.wails.SetBindings;window.addEventListener("mousedown",o=>{let n=o.target;for(;n!=null&&!n.hasAttribute("data-wails-no-drag");){if(n.hasAttribute("data-wails-drag")){window.WailsInvoke("drag");break}n=n.parentElement}});})();
+(()=>{var x=Object.defineProperty;var h=o=>x(o,"__esModule",{value:!0});var u=(o,n)=>{h(o);for(var e in n)x(o,e,{get:n[e],enumerable:!0})};var W={};u(W,{LogDebug:()=>B,LogError:()=>J,LogFatal:()=>F,LogInfo:()=>T,LogLevel:()=>U,LogPrint:()=>D,LogTrace:()=>R,LogWarning:()=>C,SetLogLevel:()=>G});function l(o,n){window.WailsInvoke("L"+o+n)}function R(o){l("T",o)}function D(o){l("P",o)}function B(o){l("D",o)}function T(o){l("I",o)}function C(o){l("W",o)}function J(o){l("E",o)}function F(o){l("F",o)}function G(o){l("S",o)}var U={TRACE:1,DEBUG:2,INFO:3,WARNING:4,ERROR:5};var E=class{constructor(n,e){e=e||-1,this.Callback=t=>(n.apply(null,t),e===-1?!1:(e-=1,e===0))}},s={};function d(o,n,e){s[o]=s[o]||[];let t=new E(n,e);s[o].push(t)}function I(o,n){d(o,n,-1)}function k(o,n){d(o,n,1)}function S(o){let n=o.name;if(s[n]){let e=s[n].slice();for(let t=0;t<s[n].length;t+=1){let r=s[n][t],i=o.data;r.Callback(i)&&e.splice(t,1)}s[n]=e}}function m(o){let n;try{n=JSON.parse(o)}catch(e){let t="Invalid JSON passed to Notify: "+o;throw new Error(t)}S(n)}function y(o){let n={name:o,data:[].slice.apply(arguments).slice(1)};S(n),window.WailsInvoke("EE"+JSON.stringify(n))}function b(o){s.delete(o),window.WailsInvoke("EX"+o)}var a={};function z(){var o=new Uint32Array(1);return window.crypto.getRandomValues(o)[0]}function A(){return Math.random()*9007199254740991}var p;window.crypto?p=z:p=A;function c(o,n,e){return e==null&&(e=0),new Promise(function(t,r){var i;do i=o+"-"+p();while(a[i]);var w;e>0&&(w=setTimeout(function(){r(Error("Call to "+o+" timed out. Request ID: "+i))},e)),a[i]={timeoutHandle:w,reject:r,resolve:t};try{let f={name:o,args:n,callbackID:i};window.WailsInvoke("C"+JSON.stringify(f))}catch(f){console.error(f)}})}function L(o){var n;try{n=JSON.parse(o)}catch(r){let i=`Invalid JSON passed to callback: ${r.message}. Message: ${o}`;throw wails.LogDebug(i),new Error(i)}var e=n.callbackid,t=a[e];if(!t){let r=`Callback '${e}' not registered!!!`;throw console.error(r),new Error(r)}clearTimeout(t.timeoutHandle),delete a[e],n.error?t.reject(n.error):t.resolve(n.result)}window.go={};function O(o){try{o=JSON.parse(o)}catch(n){console.error(n)}window.go=window.go||{},Object.keys(o).forEach(n=>{window.go[n]=window.go[n]||{},Object.keys(o[n]).forEach(e=>{window.go[n][e]=window.go[n][e]||{},Object.keys(o[n][e]).forEach(t=>{window.go[n][e][t]=function(){let r=0;function i(){let w=[].slice.call(arguments);return c([n,e,t].join("."),w,r)}return i.setTimeout=function(w){r=w},i.getTimeout=function(){return r},i}()})})})}var v={};u(v,{WindowCenter:()=>P,WindowFullscreen:()=>M,WindowGetPosition:()=>Y,WindowGetSize:()=>V,WindowHide:()=>Z,WindowMaximise:()=>_,WindowMinimise:()=>no,WindowReload:()=>H,WindowSetMaxSize:()=>X,WindowSetMinSize:()=>q,WindowSetPosition:()=>N,WindowSetRGBA:()=>to,WindowSetSize:()=>Q,WindowSetTitle:()=>j,WindowShow:()=>K,WindowUnFullscreen:()=>$,WindowUnmaximise:()=>oo,WindowUnminimise:()=>eo});function H(){window.location.reload()}function P(){window.WailsInvoke("Wc")}function j(o){window.WailsInvoke("WT"+o)}function M(){window.WailsInvoke("WF")}function $(){window.WailsInvoke("Wf")}function Q(o,n){window.WailsInvoke("Ws:"+o+":"+n)}function V(){return c(":wails:WindowGetSize")}function X(o,n){window.WailsInvoke("WZ:"+o+":"+n)}function q(o,n){window.WailsInvoke("Wz:"+o+":"+n)}function N(o,n){window.WailsInvoke("Wp:"+o+":"+n)}function Y(){return c(":wails:WindowGetPos")}function Z(){window.WailsInvoke("WH")}function K(){window.WailsInvoke("WS")}function _(){window.WailsInvoke("WM")}function oo(){window.WailsInvoke("WU")}function no(){window.WailsInvoke("Wm")}function eo(){window.WailsInvoke("Wu")}function to(o){let n=JSON.stringify(o);window.WailsInvoke("Wr:"+n)}var g={};u(g,{BrowserOpenURL:()=>io});function io(o){window.WailsInvoke("BO:"+o)}function ro(){window.WailsInvoke("Q")}window.runtime={...W,...v,...g,EventsOn:I,EventsOnce:k,EventsOnMultiple:d,EventsEmit:y,EventsOff:b,Quit:ro};window.wails={Callback:L,EventsNotify:m,SetBindings:O,eventListeners:s,callbacks:a,flags:{disableScrollbarDrag:!1}};window.wails.SetBindings(window.wailsbindings);delete window.wails.SetBindings;window.addEventListener("mousedown",o=>{let n=o.target;for(;n!=null&&!n.hasAttribute("data-wails-no-drag");){if(n.hasAttribute("data-wails-drag")){if(window.wails.flags.disableScrollbarDrag&&(o.offsetX>o.target.clientWidth||o.offsetY>o.target.clientHeight))break;window.WailsInvoke("drag"),o.preventDefault();break}n=n.parentElement}});})();

v2/internal/gomod/gomod.go

@@ -0,0 +1,79 @@
+package gomod
+
+import (
+	"fmt"
+	"github.com/Masterminds/semver"
+	"golang.org/x/mod/modfile"
+)
+
+func GetWailsVersionFromModFile(goModText []byte) (*semver.Version, error) {
+	file, err := modfile.Parse("", goModText, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, req := range file.Require {
+		if req.Syntax == nil {
+			continue
+		}
+		tokenPosition := 0
+		if !req.Syntax.InBlock {
+			tokenPosition = 1
+		}
+		if req.Syntax.Token[tokenPosition] == "github.com/wailsapp/wails/v2" {
+			version := req.Syntax.Token[tokenPosition+1]
+			return semver.NewVersion(version)
+		}
+	}
+
+	return nil, nil
+}
+
+func GoModOutOfSync(goModData []byte, currentVersion string) (bool, error) {
+	gomodversion, err := GetWailsVersionFromModFile(goModData)
+	if err != nil {
+		return false, err
+	}
+	result, err := semver.NewVersion(currentVersion)
+	if err != nil || result == nil {
+		return false, fmt.Errorf("Unable to parse Wails version: %s", currentVersion)
+	}
+
+	return !gomodversion.Equal(result), nil
+}
+
+func UpdateGoModVersion(goModText []byte, currentVersion string) ([]byte, error) {
+	file, err := modfile.Parse("", goModText, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	err = file.AddRequire("github.com/wailsapp/wails/v2", currentVersion)
+	if err != nil {
+		return nil, err
+	}
+
+	// Replace
+	if len(file.Replace) == 0 {
+		return file.Format()
+	}
+
+	for _, req := range file.Replace {
+		if req.Syntax == nil {
+			continue
+		}
+		tokenPosition := 0
+		if !req.Syntax.InBlock {
+			tokenPosition = 1
+		}
+		if req.Syntax.Token[tokenPosition] == "github.com/wailsapp/wails/v2" {
+			version := req.Syntax.Token[tokenPosition+1]
+			_, err := semver.NewVersion(version)
+			if err == nil {
+				req.Syntax.Token[tokenPosition+1] = currentVersion
+			}
+		}
+	}
+
+	return file.Format()
+}

v2/internal/gomod/gomod_test.go

@@ -0,0 +1,603 @@
+package gomod
+
+import (
+	"github.com/Masterminds/semver"
+	"github.com/matryer/is"
+	"reflect"
+	"testing"
+)
+
+const basic string = `module changeme
+
+go 1.17
+
+require github.com/wailsapp/wails/v2 v2.0.0-beta.7
+
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gofiber/fiber/v2 v2.17.0 // indirect
+	github.com/gofiber/websocket/v2 v2.0.8 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+	github.com/klauspost/compress v1.12.2 // indirect
+	github.com/leaanthony/debme v1.2.1 // indirect
+	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
+	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
+	github.com/leaanthony/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect
+	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
+	github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect
+	github.com/tkrajina/go-reflector v0.5.5 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.28.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+)
+
+//replace github.com/wailsapp/wails/v2 v2.0.0-beta.7 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+`
+
+func TestGetWailsVersion(t *testing.T) {
+	tests := []struct {
+		name      string
+		goModText []byte
+		want      *semver.Version
+		wantErr   bool
+	}{
+		{"basic", []byte(basic), semver.MustParse("v2.0.0-beta.7"), false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := GetWailsVersionFromModFile(tt.goModText)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GetWailsVersion() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("GetWailsVersion() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+const basicUpdated string = `module changeme
+
+go 1.17
+
+require github.com/wailsapp/wails/v2 v2.0.0-beta.13
+
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gofiber/fiber/v2 v2.17.0 // indirect
+	github.com/gofiber/websocket/v2 v2.0.8 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+	github.com/klauspost/compress v1.12.2 // indirect
+	github.com/leaanthony/debme v1.2.1 // indirect
+	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
+	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
+	github.com/leaanthony/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect
+	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
+	github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect
+	github.com/tkrajina/go-reflector v0.5.5 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.28.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+)
+
+//replace github.com/wailsapp/wails/v2 v2.0.0-beta.7 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+`
+
+const multilineRequire = `module changeme
+
+go 1.17
+
+require (
+	github.com/wailsapp/wails/v2 v2.0.0-beta.7
+)
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gofiber/fiber/v2 v2.17.0 // indirect
+	github.com/gofiber/websocket/v2 v2.0.8 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+	github.com/klauspost/compress v1.12.2 // indirect
+	github.com/leaanthony/debme v1.2.1 // indirect
+	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
+	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
+	github.com/leaanthony/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect
+	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
+	github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect
+	github.com/tkrajina/go-reflector v0.5.5 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.28.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+)
+
+//replace github.com/wailsapp/wails/v2 v2.0.0-beta.7 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+`
+const multilineReplace = `module changeme
+
+go 1.17
+
+require (
+	github.com/wailsapp/wails/v2 v2.0.0-beta.7
+)
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gofiber/fiber/v2 v2.17.0 // indirect
+	github.com/gofiber/websocket/v2 v2.0.8 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+	github.com/klauspost/compress v1.12.2 // indirect
+	github.com/leaanthony/debme v1.2.1 // indirect
+	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
+	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
+	github.com/leaanthony/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect
+	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
+	github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect
+	github.com/tkrajina/go-reflector v0.5.5 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.28.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+)
+
+replace github.com/wailsapp/wails/v2 v2.0.0-beta.7 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+`
+
+const multilineReplaceNoVersion = `module changeme
+
+go 1.17
+
+require (
+	github.com/wailsapp/wails/v2 v2.0.0-beta.7
+)
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gofiber/fiber/v2 v2.17.0 // indirect
+	github.com/gofiber/websocket/v2 v2.0.8 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+	github.com/klauspost/compress v1.12.2 // indirect
+	github.com/leaanthony/debme v1.2.1 // indirect
+	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
+	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
+	github.com/leaanthony/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect
+	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
+	github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect
+	github.com/tkrajina/go-reflector v0.5.5 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.28.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+)
+
+replace github.com/wailsapp/wails/v2 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+`
+
+const multilineReplaceNoVersionBlock = `module changeme
+
+go 1.17
+
+require (
+	github.com/wailsapp/wails/v2 v2.0.0-beta.7
+)
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gofiber/fiber/v2 v2.17.0 // indirect
+	github.com/gofiber/websocket/v2 v2.0.8 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+	github.com/klauspost/compress v1.12.2 // indirect
+	github.com/leaanthony/debme v1.2.1 // indirect
+	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
+	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
+	github.com/leaanthony/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect
+	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
+	github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect
+	github.com/tkrajina/go-reflector v0.5.5 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.28.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+)
+
+replace (
+	github.com/wailsapp/wails/v2 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+)
+`
+
+const multilineReplaceBlock = `module changeme
+
+go 1.17
+
+require (
+	github.com/wailsapp/wails/v2 v2.0.0-beta.7
+)
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gofiber/fiber/v2 v2.17.0 // indirect
+	github.com/gofiber/websocket/v2 v2.0.8 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+	github.com/klauspost/compress v1.12.2 // indirect
+	github.com/leaanthony/debme v1.2.1 // indirect
+	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
+	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
+	github.com/leaanthony/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect
+	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
+	github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect
+	github.com/tkrajina/go-reflector v0.5.5 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.28.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+)
+
+replace (
+	github.com/wailsapp/wails/v2 v2.0.0-beta.7 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+)
+`
+
+const multilineRequireUpdated = `module changeme
+
+go 1.17
+
+require (
+	github.com/wailsapp/wails/v2 v2.0.0-beta.13
+)
+
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gofiber/fiber/v2 v2.17.0 // indirect
+	github.com/gofiber/websocket/v2 v2.0.8 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+	github.com/klauspost/compress v1.12.2 // indirect
+	github.com/leaanthony/debme v1.2.1 // indirect
+	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
+	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
+	github.com/leaanthony/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect
+	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
+	github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect
+	github.com/tkrajina/go-reflector v0.5.5 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.28.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+)
+
+//replace github.com/wailsapp/wails/v2 v2.0.0-beta.7 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+`
+
+func TestUpdateGoModVersion(t *testing.T) {
+	is2 := is.New(t)
+
+	type args struct {
+		goModText      []byte
+		currentVersion string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    []byte
+		wantErr bool
+	}{
+		{"basic", args{[]byte(basic), "v2.0.0-beta.13"}, []byte(basicUpdated), false},
+		{"basicmultiline", args{[]byte(multilineRequire), "v2.0.0-beta.13"}, []byte(multilineRequireUpdated), false},
+		{"basicmultilinereplace", args{[]byte(multilineReplace), "v2.0.0-beta.13"}, []byte(multilineReplaceUpdated), false},
+		{"basicmultilinereplaceblock", args{[]byte(multilineReplaceBlock), "v2.0.0-beta.13"}, []byte(multilineReplaceBlockUpdated), false},
+		{"basicmultilinereplacenoversion", args{[]byte(multilineReplaceNoVersion), "v2.0.0-beta.13"}, []byte(multilineReplaceNoVersionUpdated), false},
+		{"basicmultilinereplacenoversionblock", args{[]byte(multilineReplaceNoVersionBlock), "v2.0.0-beta.13"}, []byte(multilineReplaceNoVersionBlockUpdated), false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := UpdateGoModVersion(tt.args.goModText, tt.args.currentVersion)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("UpdateGoModVersion() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			is2.Equal(got, tt.want)
+		})
+	}
+}
+
+func TestGoModOutOfSync(t *testing.T) {
+	is2 := is.New(t)
+
+	type args struct {
+		goModData      []byte
+		currentVersion string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    bool
+		wantErr bool
+	}{
+		{"basic", args{[]byte(basic), "v2.0.0-beta.13"}, true, false},
+		{"basicmultiline", args{[]byte(multilineRequire), "v2.0.0-beta.13"}, true, false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := GoModOutOfSync(tt.args.goModData, tt.args.currentVersion)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GoModOutOfSync() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			is2.Equal(got, tt.want)
+		})
+	}
+}
+
+const multilineReplaceUpdated = `module changeme
+
+go 1.17
+
+require (
+	github.com/wailsapp/wails/v2 v2.0.0-beta.13
+)
+
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gofiber/fiber/v2 v2.17.0 // indirect
+	github.com/gofiber/websocket/v2 v2.0.8 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+	github.com/klauspost/compress v1.12.2 // indirect
+	github.com/leaanthony/debme v1.2.1 // indirect
+	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
+	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
+	github.com/leaanthony/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect
+	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
+	github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect
+	github.com/tkrajina/go-reflector v0.5.5 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.28.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+)
+
+replace github.com/wailsapp/wails/v2 v2.0.0-beta.13 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+`
+const multilineReplaceNoVersionUpdated = `module changeme
+
+go 1.17
+
+require (
+	github.com/wailsapp/wails/v2 v2.0.0-beta.13
+)
+
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gofiber/fiber/v2 v2.17.0 // indirect
+	github.com/gofiber/websocket/v2 v2.0.8 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+	github.com/klauspost/compress v1.12.2 // indirect
+	github.com/leaanthony/debme v1.2.1 // indirect
+	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
+	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
+	github.com/leaanthony/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect
+	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
+	github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect
+	github.com/tkrajina/go-reflector v0.5.5 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.28.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+)
+
+replace github.com/wailsapp/wails/v2 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+`
+const multilineReplaceNoVersionBlockUpdated = `module changeme
+
+go 1.17
+
+require (
+	github.com/wailsapp/wails/v2 v2.0.0-beta.13
+)
+
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gofiber/fiber/v2 v2.17.0 // indirect
+	github.com/gofiber/websocket/v2 v2.0.8 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+	github.com/klauspost/compress v1.12.2 // indirect
+	github.com/leaanthony/debme v1.2.1 // indirect
+	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
+	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
+	github.com/leaanthony/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect
+	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
+	github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect
+	github.com/tkrajina/go-reflector v0.5.5 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.28.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+)
+
+replace (
+	github.com/wailsapp/wails/v2 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+)
+`
+
+const multilineReplaceBlockUpdated = `module changeme
+
+go 1.17
+
+require (
+	github.com/wailsapp/wails/v2 v2.0.0-beta.13
+)
+
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab // indirect
+	github.com/gabriel-vasile/mimetype v1.3.1 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/gofiber/fiber/v2 v2.17.0 // indirect
+	github.com/gofiber/websocket/v2 v2.0.8 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
+	github.com/klauspost/compress v1.12.2 // indirect
+	github.com/leaanthony/debme v1.2.1 // indirect
+	github.com/leaanthony/go-ansi-parser v1.0.1 // indirect
+	github.com/leaanthony/go-common-file-dialog v1.0.3 // indirect
+	github.com/leaanthony/go-webview2 v0.0.0-20211007092718-65d2f028ef2d // indirect
+	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
+	github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f // indirect
+	github.com/tkrajina/go-reflector v0.5.5 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/fasthttp v1.28.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+)
+
+replace (
+	github.com/wailsapp/wails/v2 v2.0.0-beta.13 => C:\Users\leaan\Documents\wails-v2-beta\wails\v2
+)
+`

v2/internal/process/process.go

@@ -69,3 +69,7 @@ func (p *Process) Kill() error {
 func (p *Process) PID() int {
 	return p.cmd.Process.Pid
 }
+
+func (p *Process) SetDir(dir string) {
+	p.cmd.Dir = dir
+}

v2/internal/project/project.go

@@ -18,6 +18,7 @@ type Project struct {
 
 	BuildCommand   string `json:"frontend:build"`
 	InstallCommand string `json:"frontend:install"`
+	DevCommand     string `json:"frontend:dev"`
 
 	// Directory to generate the API Module
 	WailsJSDir string `json:"wailsjsdir"`
@@ -46,6 +47,12 @@ type Project struct {
 
 	// Fully qualified filename
 	filename string
+
+	// The debounce time for hot-reload of the built-in dev server. Default 100
+	DebounceMS int `json:"debounceMS"`
+
+	// The url to use to server assets. Default "https://localhost:34115"
+	DevServerURL string `json:"devserverurl"`
 }
 
 func (p *Project) Save() error {

v2/pkg/commands/build/base.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"github.com/leaanthony/gosod"
+	wailsRuntime "github.com/wailsapp/wails/v2/internal/frontend/runtime"
 	"github.com/wailsapp/wails/v2/internal/frontend/runtime/wrapper"
 	"io/ioutil"
 	"os"
@@ -377,7 +378,22 @@ func generateRuntimeWrapper(options *Options) error {
 	wrapperDir := filepath.Join(options.WailsJSDir, "wailsjs", "runtime")
 	_ = os.RemoveAll(wrapperDir)
 	extractor := gosod.New(wrapper.RuntimeWrapper)
-	return extractor.Extract(wrapperDir, nil)
+	err := extractor.Extract(wrapperDir, nil)
+	if err != nil {
+		return err
+	}
+
+	//ipcdev.js
+	err = os.WriteFile(filepath.Join(wrapperDir, "ipcdev.js"), wailsRuntime.DesktopIPC, 0755)
+	if err != nil {
+		return err
+	}
+	//runtimedev.js
+	err = os.WriteFile(filepath.Join(wrapperDir, "runtimedev.js"), wailsRuntime.RuntimeDesktopJS, 0755)
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 // NpmInstall runs "npm install" in the given directory

v2/pkg/commands/build/build.go

@@ -46,11 +46,10 @@ type Options struct {
 	Verbosity           int                  // Verbosity level (0 - silent, 1 - default, 2 - verbose)
 	Compress            bool                 // Compress the final binary
 	CompressFlags       string               // Flags to pass to UPX
-	AppleIdentity       string
-	WebView2Strategy    string // WebView2 installer strategy
-	RunDelve            bool   // Indicates if we should run delve after the build
-	WailsJSDir          string // Directory to generate the wailsjs module
-	ForceBuild          bool   // Force
+	WebView2Strategy    string               // WebView2 installer strategy
+	RunDelve            bool                 // Indicates if we should run delve after the build
+	WailsJSDir          string               // Directory to generate the wailsjs module
+	ForceBuild          bool                 // Force
 }
 
 // Build the project!

v2/pkg/commands/build/packager_darwin.go

@@ -2,17 +2,16 @@ package build
 
 import (
 	"bytes"
-	"fmt"
-	"github.com/wailsapp/wails/v2/pkg/buildassets"
 	"image"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path"
 	"path/filepath"
 	"strings"
 	"text/template"
 
+	"github.com/wailsapp/wails/v2/pkg/buildassets"
+
 	"github.com/jackmordaunt/icns"
 	"github.com/pkg/errors"
 	"github.com/wailsapp/wails/v2/internal/fs"
@@ -55,13 +54,7 @@ func packageApplication(options *Options) error {
 		return err
 	}
 
-	// Sign app if needed
-	if options.AppleIdentity != "" {
-		err = signApplication(options)
-		if err != nil {
-			return err
-		}
-	}
+	options.CompiledBinary = packedBinaryPath
 
 	return nil
 }
@@ -186,21 +179,3 @@ func processApplicationIcon(resourceDir string, iconsDir string) (err error) {
 	}()
 	return icns.Encode(dest, srcImg)
 }
-
-func signApplication(options *Options) error {
-	bundlename := filepath.Join(options.BuildDirectory, options.ProjectData.Name+".app")
-	identity := fmt.Sprintf(`"%s"`, options.AppleIdentity)
-	cmd := exec.Command("codesign", "--sign", identity, "--deep", "--force", "--verbose", "--timestamp", "--options", "runtime", bundlename)
-	var stdo, stde bytes.Buffer
-	cmd.Stdout = &stdo
-	cmd.Stderr = &stde
-
-	// Run command
-	err := cmd.Run()
-
-	// Format error if we have one
-	if err != nil {
-		return fmt.Errorf("%s\n%s", err, string(stde.Bytes()))
-	}
-	return nil
-}

website/.github/deploy-to-wails.top-mirror.yml

@@ -1,34 +0,0 @@
-name: Deploy mirror | 部署镜像
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build-and-deploy:
-    name: Automatic deployment | 自动部署
-    runs-on: ubuntu-latest
-    if: github.repository == 'misitebao/wails-docs'
-
-    steps:
-      - name: Checkout | 切换到部署分支
-        uses: actions/checkout@v2
-        with:
-          ref: "main"
-          submodules: true
-          fetch-depth: 0
-
-      - name: Build Site | 构建网站
-        run: |
-          npm install && npm run build
-
-      # - name: Deploy to Server | 部署到服务器
-      #   uses: hengkx/ssh-deploy@v1.0.1
-      #   with:
-      #     HOST: ${{ secrets.DEPLOY_HOST }}
-      #     USERNAME: ${{ secrets.DEPLOY_HOST_USER }}
-      #     PASSWORD: ${{ secrets.DEPLOY_HOST_PASSWORD }}
-      #     SOURCE: "build"
-      #     TARGET: "/www/wwwroot/beta.wails.top"

website/docs/community/showcase/encrypteasy.mdx

@@ -2,7 +2,7 @@
 # EncryptEasy
 
 <p style={{"text-align": "center"}}>
-   <img src="encrypteasy.jpg"></img><br/>
+   <img src="/img/showcase/encrypteasy.jpg"></img><br/>
 </p>
 
 **[EncryptEasy](https://www.encrypteasy.app) is a simple and easy to use PGP encryption tool, managing all your and your contacts keys. Encryption should be simple. Developed with Wails.**

website/docs/community/showcase/filehound.mdx

@@ -2,7 +2,7 @@
 # FileHound Export Utility
 
 <p style={{"text-align": "center"}}>
-   <img src="filehound.jpg"></img><br/>
+   <img src="/img/showcase/filehound.jpg"></img><br/>
 </p>
 
 

website/docs/community/showcase/mollywallet.mdx

@@ -2,7 +2,7 @@
 # Molley Wallet
 
 <p style={{"text-align": "center"}}>
-   <img src="mollywallet.png"></img><br/>
+   <img src="/img/showcase/mollywallet.png"></img><br/>
 </p>
 
 [Molly Wallet](https://github.com/grvlle/constellation_wallet/) the official $DAG wallet of the Constellation Network. It'll let users interact with the Hypergraph Network in various ways, not limited to producing $DAG transactions.

website/docs/community/showcase/optimus.mdx

@@ -2,7 +2,7 @@
 # Optimus
 
 <p style={{"text-align": "center"}}>
-   <img src="optimus.png"></img><br/>
+   <img src="/img/showcase/optimus.png"></img><br/>
 </p>
 
 [Optimus](https://github.com/splode/optimus) is a desktop image optimization application. It supports conversion and compression between WebP, JPEG, and PNG image formats.

website/docs/community/showcase/portfall.mdx

@@ -2,7 +2,7 @@
 # Portfall
 
 <p style={{"text-align": "center"}}>
-   <img src="portfall.gif"></img><br/>
+   <img src="/img/showcase/portfall.gif"></img><br/>
 </p>
 
 [Portfall](https://github.com/rekon-oss/portfall) - A desktop k8s port-forwarding portal for easy access to all your cluster UIs

website/docs/community/showcase/surge.mdx

@@ -2,7 +2,7 @@
 # Surge
 
 <p style={{"text-align": "center"}}>
-   <img src="surge.png"></img><br/>
+   <img src="/img/showcase/surge.png"></img><br/>
 </p>
 
 [Surge](https://surge.rule110.io/) is a p2p filesharing app designed to utilize blockchain technologies to enable 100% anonymous file transfers. Surge is end-to-end encrypted, decentralized and open source.

website/docs/community/showcase/wally.mdx

@@ -2,7 +2,7 @@
 # Wally
 
 <p style={{"text-align": "center"}}>
-   <img src="wally.png"></img><br/>
+   <img src="/img/showcase/wally.png"></img><br/>
 </p>
 
 [Wally](https://ergodox-ez.com/pages/wally) is the official firmware flasher for [Ergodox](https://ergodox-ez.com/) keyboards. It looks great and is a fantastic example of what you can achieve with Wails: the ability to combine the power of Go and the rich graphical tools of the web development world.

website/docs/community/showcase/wombat.mdx

@@ -2,7 +2,7 @@
 # Wombat
 
 <p style={{"text-align": "center"}}>
-   <img src="wombat.png"></img><br/>
+   <img src="/img/showcase/wombat.png"></img><br/>
 </p>
 
 

website/docs/community/templates.mdx

@@ -22,4 +22,6 @@ Example: `wails init -n "Your Project Name" -t https://github.com/misitebao/wail
 ## Vue
 
 - [wails-template-vue](https://github.com/misitebao/wails-template-vue) - A template using vue and vue-router
+- [wails-vite-vue-ts](https://github.com/codydbentley/wails-vite-vue-ts) - Vue 3 TypeScript with Vite (and instructions to add features)
+- [wails-vite-vue-the-works](https://github.com/codydbentley/wails-vite-vue-the-works) - Vue 3 TypeScript with Vite, Vuex, Vue Router, Sass, and ESLint + Prettier
 

website/docs/credits.mdx

@@ -20,6 +20,9 @@ sidebar_position: 99
 <a href="https://github.com/snider" style="width:100px;">
   <img src="https://github.com/snider.png?size=100" width="100"/>
 </a>
+<a href="https://github.com/codydbentley" style="width:100px">
+  <img src="https://github.com/codydbentley.png?size=100" width="100"/>
+</a>
 <br/>
 <br/>
 <a href="https://github.com/matryer" style="width:100px">
@@ -61,6 +64,16 @@ sidebar_position: 99
 <a href="https://github.com/marcus-crane" style="width:50px">
   <img src="https://github.com/marcus-crane.png?size=50" width="50"/>
 </a>
+<a href="https://github.com/bbergshaven" style="width:45px">
+  <img src="https://github.com/bbergshaven.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/Gilgames000" style="width:45px">
+  <img src="https://github.com/Gilgames000.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/ilgityildirim" style="width:50px">
+  <img src="https://github.com/ilgityildirim.png?size=50" width="50"/>
+</a>
+
 `,
   }}
 />

website/docs/gettingstarted/installation.mdx

@@ -6,16 +6,16 @@ sidebar_position: 1
 
 ## Supported Platforms
 
- - Windows 10
- - MacOS x64 & arm64 (due October '21)
- - Linux (due December '21)
+- Windows 10
+- MacOS x64 & arm64 (due October '21)
+- Linux (due December '21)
 
 ## Dependencies
 
 Wails has a number of common dependencies that are required before installation:
 
-  - Go 1.17+
-  - npm (Node 14+)
+- Go 1.17+
+- npm (Node 14+)
 
 ### Go
 
@@ -23,8 +23,8 @@ Download Go from the [Go Downloads Page](https://golang.org/dl/).
 
 Ensure that you follow the official [Go installation instructions](https://golang.org/doc/install#install). You will also need to ensure that your `PATH` environment variable also includes the path to your `~/go/bin` directory. Restart your terminal and do the following checks:
 
- * Check Go is installed correctly: `go version`
- * Check "~/go/bin" is in your PATH variable: `echo $PATH | grep go/bin`
+- Check Go is installed correctly: `go version`
+- Check "~/go/bin" is in your PATH variable: `echo $PATH | grep go/bin`
 
 ### npm
 
@@ -36,35 +36,33 @@ Run `npm --version` to verify.
 
 You will also need to install platform specific dependencies:
 
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
+import Tabs from "@theme/Tabs";
+import TabItem from "@theme/TabItem";
 
 <Tabs
   defaultValue="Windows"
   values={[
-    {label: 'Windows', value: 'Windows'},
-    {label: 'MacOS', value: 'MacOS'},
-    {label: 'Linux', value: 'Linux'},
-  ]}>
-  <TabItem value="MacOS">
-    Coming Soon...
-  </TabItem>
+    { label: "Windows", value: "Windows" },
+    { label: "MacOS", value: "MacOS" },
+    { label: "Linux", value: "Linux" },
+  ]}
+>
+  <TabItem value="MacOS">Coming Soon...</TabItem>
   <TabItem value="Windows">
-      Wails requires that the <a href='https://developer.microsoft.com/en-us/microsoft-edge/webview2/'>WebView2</a> runtime is installed.
-      Some Windows installations will already have this installed. You can check using the `wails doctor` command (see below).
-  </TabItem>
-  <TabItem value="Linux">
-    Coming Soon...
+    Wails requires that the <a href="https://developer.microsoft.com/en-us/microsoft-edge/webview2/">WebView2</a>{" "}
+    runtime is installed. Some Windows installations will already have this installed. You can check using the{" "}
+    <code>wails doctor</code> command (see below).
   </TabItem>
+  <TabItem value="Linux">Coming Soon...</TabItem>
 </Tabs>
 
 ## Optional Dependencies
 
-  - [UPX](https://upx.github.io/) for compressing your applications.
+- [UPX](https://upx.github.io/) for compressing your applications.
 
 ## Installing Wails
 
-Run `go install github.com/wailsapp/wails/v2/cmd/wails@v2.0.0-beta.1` to install the Wails CLI.
+Run `go install github.com/wailsapp/wails/v2/cmd/wails@v2.0.0-beta.13` to install the Wails CLI.
 
 ## System Check
 

website/docs/guides/application-development.mdx

@@ -161,11 +161,20 @@ The second, if given, will be executed in the `frontend` directory to build the
 
 If these 2 keys aren't given, then Wails does absolutely nothing with the frontend. It is only expecting that `embed.FS`.
 
-## Live Reloading
+## Built in Dev Server
 
-Running `wails dev` 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, it will issue a reload.
+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,
+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,
+as there may be multiple files changed in a short amount of time. When a trigger occurs, it waits for a set amount of time
+before issuing a reload. If another trigger happens, it resets to the wait time again. By default this value is `100ms`.
+If this value doesn't work for your project, it can be configured using the `-debounce` flag. If used, this value will
+be saved to your project config and become the default.
+
+## External Dev Server
 
 Some frameworks come with their own live-reloading server, however they will not be able to take advantage of the Wails
 Go bindings. In this scenario, it is best to run a watcher script that rebuilds the project into the build directory, which

website/docs/guides/frontend.mdx

@@ -0,0 +1,77 @@
+
+# Frontend
+
+## Script Injection
+
+When Wails serves your `index.html`, by default, it will inject 2 script entries into the `<body>` tag to load `/wails/bindings.js`
+and `/wails/runtime.js`. These files install the bindings and runtime respectively.
+
+The code below shows where these are injected by default:
+
+```html
+<html>
+<head>
+  <title>injection example</title>
+  <link rel="stylesheet" href="/main.css">
+  <!--     <script src="/wails/ipc.js"></script> -->
+  <!--     <script src="/wails/runtime.js"></script> -->
+</head>
+
+<body data-wails-drag>
+  <div class="logo"></div>
+  <div class="result" id="result">Please enter your name below 👇</div>
+  <div class="input-box" id="input" data-wails-no-drag>
+    <input class="input" id="name" type="text" autocomplete="off">
+    <button class="btn" onclick="greet()">Greet</button>
+  </div>
+
+  <script src="/main.js"></script>
+</body>
+
+</html>
+```
+
+### Overriding Default Script Injection
+
+To provide more flexibility to developers, there is a meta tag that may be used to customise this behaviour:
+
+```html
+  <meta name="wails-options" content="[options]">
+```
+
+The options are as follows:
+
+| Value                | Description                                       |
+| -------------------- | ------------------------------------------------- |
+| noautoinjectruntime  | Disable the autoinjection of `/wails/runtime.js`  |
+| noautoinjectipc | Disable the autoinjection of `/wails/ipc.js` |
+| noautoinject         | Disable all autoinjection of scripts              |
+
+Multiple options may be used provided they are comma seperated.
+
+This code is perfectly valid and operates the same as the autoinjection version:
+
+```html
+<html>
+
+<head>
+  <title>injection example</title>
+  <meta name="wails-options" content="noautoinject">
+  <link rel="stylesheet" href="/main.css">
+</head>
+
+<body data-wails-drag>
+  <div class="logo"></div>
+  <div class="result" id="result">Please enter your name below 👇</div>
+  <div class="input-box" id="input" data-wails-no-drag>
+    <input class="input" id="name" type="text" autocomplete="off">
+    <button class="btn" onclick="greet()">Greet</button>
+  </div>
+
+  <script src="/wails/ipc.js"></script>
+  <script src="/wails/runtime.js"></script>
+  <script src="/main.js"></script>
+</body>
+
+</html>
+```

website/docs/guides/ides.mdx

@@ -12,7 +12,7 @@ Currently, we support [Visual Studio Code](https://code.visualstudio.com/) but a
     <img src="/img/vscode.png" style={{"width": "75%"}}></img>
 </p>
 
-When generating a project using the `-vscode` flag, IDE files will be created alongside the other project files.
+When generating a project using the `-ide vscode` flags, IDE files will be created alongside the other project files.
 These files are placed into the `.vscode` directory and provide the correct configuration for debugging your application.
 
 The 2 files generated are `tasks.json` and `launch.json`. Below are the files generated for the default vanilla project:

website/docs/howdoesitwork.mdx

@@ -11,12 +11,13 @@ version of the runtime library. Finally, it is possible to bind Go methods to th
 Javascript methods that can be called, just as if they were local Javascript methods.
 
 <div className="text--center">
-<img src="/img/architecture.svg" width='75%'/>
+  <img src="/img/architecture.svg" width="75%" />
 </div>
 
 ## The Main Application
 
 ### Overview
+
 The main application consists of a single call to `wails.Run()`. It accepts the
 application configuration which describes the size of the application window, the window title,
 what assets to use, etc. A basic application might look like this:
@@ -75,12 +76,12 @@ func (b *App) Greet(name string) string {
 
 This example has the following options set:
 
-  - `Title` - The text that should appear in the window's title bar
-  - `Width` & `Height` - The dimensions of the window
-  - `Assets` - The application's frontend assets
-  - `OnStartup` - A callback for when the window is created and is about to start loading the frontend assets
-  - `OnShutdown` - A callback for when the application is about to quit
-  - `Bind` - A slice of struct instances that we wish to expose to the frontend
+- `Title` - The text that should appear in the window's title bar
+- `Width` & `Height` - The dimensions of the window
+- `Assets` - The application's frontend assets
+- `OnStartup` - A callback for when the window is created and is about to start loading the frontend assets
+- `OnShutdown` - A callback for when the application is about to quit
+- `Bind` - A slice of struct instances that we wish to expose to the frontend
 
 A full list of application options can be found in the [Options Reference](/docs/reference/options).
 
@@ -94,7 +95,7 @@ there is no requirement on where in the `embed.FS` the files live. It is likely
 directory relative to your main application code, such as `frontend/dist`:
 
 ```go title="main.go"
-// go:embed frontend/dist
+//go:embed frontend/dist
 var assets embed.FS
 ```
 
@@ -117,7 +118,7 @@ Just before the frontend is about to load `index.html`, a callback is made to th
 A standard Go context is passed to this method. This context is required when calling the runtime so a standard pattern is to save
 a reference to in this method. Just before the application shuts down, the [OnShutdown](/docs/reference/options#OnShutdown) callback is called in the same way,
 again with the context. There is also an [OnDomReady](/docs/reference/options#OnDomReady) callback for when the frontend
- has completed loading all assets in `index.html` and is equivalent of the [`body onload`](https://www.w3schools.com/jsref/event_onload.asp) event in Javascript.
+has completed loading all assets in `index.html` and is equivalent of the [`body onload`](https://www.w3schools.com/jsref/event_onload.asp) event in Javascript.
 
 #### Method Binding
 
@@ -133,7 +134,7 @@ These methods return a promise. A successful call will result in the first retur
 to the resolve handler. An unsuccessful call is when a Go method that has an error type as it's second return value,
 passes an error instance back to the caller. This is passed back via the reject handler.
 In the example above, `Greet` only returns a `string` so the Javascript call will never reject - unless invalid data
- is passed to it.
+is passed to it.
 
 All data types are correctly translated between Go and Javascript. Even structs. If you return a struct from a Go call,
 it will be returned to your frontend as a Javascript map. Note: If you wish to use structs, you **must** define `json` struct
@@ -148,14 +149,17 @@ section of the [Application Development Guide](/docs/guides/application-developm
 ## The Frontend
 
 ### Overview
+
 The frontend is a collection of files rendered by webkit. It's like a browser and webserver in one.
 There is virtually[^1] no limit to which frameworks or libraries you can use. The main points of interaction between
 the frontend and your Go code are:
-  - Calling bound Go methods
-  - Calling runtime methods
 
-[^1]: There is a very small subset of libraries that use features unsupported in WebViews. There are often alternatives and
-workarounds for such cases.
+- Calling bound Go methods
+- Calling runtime methods
+
+[^1]:
+    There is a very small subset of libraries that use features unsupported in WebViews. There are often alternatives and
+    workarounds for such cases.
 
 ### Calling bound Go methods
 
@@ -163,11 +167,11 @@ All bound Go methods are available at `window.go.<package>.<struct>.<method>`. A
 the previous section, these return a Promise where a successful call returns a value to the
 resolve handler and an error returns a value to the reject handler.
 
- ```go title="mycode.js"
- window.go.main.App.Greet("Bill").then((result) => {
-    console.log("The greeting is: " + result);
- })
- ```
+```go title="mycode.js"
+window.go.main.App.Greet("Bill").then((result) => {
+   console.log("The greeting is: " + result);
+})
+```
 
 When running the application in `dev` mode, a javascript module is generated that wraps these
 methods with JSDoc annotations. This really help with development, especially as most
@@ -178,19 +182,18 @@ following code:
 
 ```js title="bindings.js"
 const go = {
-  "main": {
-    "App": {
+  main: {
+    App: {
       /**
        * Greet
        * @param {Person} arg1 - Go Type: string
        * @returns {Promise<string>}  - Go Type: string
        */
-      "Greet": (arg1) => {
+      Greet: (arg1) => {
         return window.go.main.App.Greet(arg1);
       },
-    }
-  }
-
+    },
+  },
 };
 export default go;
 ```
@@ -221,93 +224,97 @@ func (a *App) Greet(p Person) string {
 	return fmt.Sprintf("Hello %s (Age: %d)!", p.Name, p.Age)
 }
 ```
+
 Our `bindings.js` file has now been updated to reflect the change:
 
 ```js title="bindings.js"
 const go = {
-  "main": {
-    "App": {
+  main: {
+    App: {
       /**
        * Greet
        * @param {Person} arg1 - Go Type: main.Person
        * @returns {Promise<string>}  - Go Type: string
        */
-      "Greet": (arg1) => {
+      Greet: (arg1) => {
         return window.go.main.App.Greet(arg1);
       },
-    }
-  }
-
+    },
+  },
 };
 export default go;
 ```
+
 Alongside `bindings.js`, there is a file called `models.ts`. This contains our Go structs in TypeScript form:
+
 ```ts title="models.ts"
 export class Address {
-    street: string;
-    postcode: string;
+  street: string;
+  postcode: string;
 
-    static createFrom(source: any = {}) {
-        return new Address(source);
-    }
+  static createFrom(source: any = {}) {
+    return new Address(source);
+  }
 
-    constructor(source: any = {}) {
-        if ('string' === typeof source) source = JSON.parse(source);
-        this.street = source["street"];
-        this.postcode = source["postcode"];
-    }
+  constructor(source: any = {}) {
+    if ("string" === typeof source) source = JSON.parse(source);
+    this.street = source["street"];
+    this.postcode = source["postcode"];
+  }
 }
 export class Person {
-    name: string;
-    age: number;
-    address?: Address;
+  name: string;
+  age: number;
+  address?: Address;
 
-    static createFrom(source: any = {}) {
-        return new Person(source);
+  static createFrom(source: any = {}) {
+    return new Person(source);
+  }
+
+  constructor(source: any = {}) {
+    if ("string" === typeof source) source = JSON.parse(source);
+    this.name = source["name"];
+    this.age = source["age"];
+    this.address = this.convertValues(source["address"], Address);
+  }
+
+  convertValues(a: any, classs: any, asMap: boolean = false): any {
+    if (!a) {
+      return a;
     }
-
-    constructor(source: any = {}) {
-        if ('string' === typeof source) source = JSON.parse(source);
-        this.name = source["name"];
-        this.age = source["age"];
-        this.address = this.convertValues(source["address"], Address);
+    if (a.slice) {
+      return (a as any[]).map((elem) => this.convertValues(elem, classs));
+    } else if ("object" === typeof a) {
+      if (asMap) {
+        for (const key of Object.keys(a)) {
+          a[key] = new classs(a[key]);
+        }
+        return a;
+      }
+      return new classs(a);
     }
-
-	convertValues(a: any, classs: any, asMap: boolean = false): any {
-	    if (!a) {
-	        return a;
-	    }
-	    if (a.slice) {
-	        return (a as any[]).map(elem => this.convertValues(elem, classs));
-	    } else if ("object" === typeof a) {
-	        if (asMap) {
-	            for (const key of Object.keys(a)) {
-	                a[key] = new classs(a[key]);
-	            }
-	            return a;
-	        }
-	        return new classs(a);
-	    }
-	    return a;
-	}
+    return a;
+  }
 }
 ```
+
 So long as you have TypeScript as part of your frontend build configuration, you can use these models in
 the following way:
+
 ```js title="mycode.js"
-    import go from "./wailsjs/go/bindings";
-	import {Person} from "./wailsjs/go/models";
+import go from "./wailsjs/go/bindings";
+import { Person } from "./wailsjs/go/models";
 
-	let name = "";
+let name = "";
 
-	function greet(name) {
-		let p = new Person();
-		p.name = name;
-		p.age = 42;
-		go.main.App.Greet(p).then((result) => {
-			console.log(result);
-		});
-	}
+function greet(name) {
+  let p = new Person();
+  p.name = name;
+  p.age = 42;
+  go.main.App.Greet(p).then((result) => {
+    console.log(result);
+  });
+}
 ```
 
 The combination of JSDoc and TypeScript generated models makes for a powerful development environment.