Merge master

# Conflicts:
#	v2/internal/frontend/desktop/windows/win32/consts.go

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,48 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-<!---
-*** Please note: No new bug reports are being accepted for Wails v1 ***
-
-Before submitting this issue, please do the following:
-  - Do a web search for your error. This usually leads to a much better understanding of the issue.
-  - Prove that the error is indeed a Wails bug and not an application bug, with a specific set of steps to reproduce. 
-  - Search both the issue tracker (even closed issues) and discussion forums.
-  - Try to fix it yourself. Keep a list of things you have done to fix the problem.   
-
-If after doing all the above, the problem remains, please continue with this ticket providing *all* the information requested.
-
-Bug reports that do not follow these steps will likely be closed, so please help us to help you.
-
---->
-
-**Description**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behaviour:
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behaviour**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Attempted Fixes**
-A list of things you have tried to fix the problem, including search engine links.
-
-**System Details**
-Please add the output of `wails doctor`.
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,83 @@
+name: Bug Report
+description: Create a report to help us improve
+# title: ""
+labels: ["bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ***Please note: No new bug reports are being accepted for Wails v1***
+        Before submitting this issue, please do the following:
+        - Do a web search for your error. This usually leads to a much better understanding of the issue.
+        - Prove that the error is indeed a Wails bug and not an application bug, with a specific set of steps to reproduce. 
+        - Search the issue tracker using [this link](https://github.com/wailsapp/wails/issues?q=is%3Aissue+).
+        - Search the [discussion forums](https://github.com/wailsapp/wails/discussions?discussions_q=type+your+issue+here).
+        - Read the [Troubleshooting Guide](https://wails.io/docs/next/guides/troubleshooting).
+        - Try to fix it yourself. Keep a list of things you have done to fix the problem.   
+
+        If after doing all the above, the problem remains, please continue with this ticket providing *all* the information requested.
+
+        Bug reports that do not follow these steps will likely be closed, so please help us to help you.
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A clear and concise description of what the bug is.
+      placeholder: A clear and concise description of what the bug is.
+      # value: ""
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce the behaviour
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: Expected behaviour
+      description: A clear and concise description of what you expected to happen.
+      placeholder: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain your problem.
+      placeholder: If applicable, add screenshots to help explain your problem.
+    validations:
+      required: false
+  - type: textarea
+    id: attempted-fixes
+    attributes:
+      label: Attempted Fixes
+      description: A list of things you have tried to fix the problem, including search engine links.
+      placeholder: A list of things you have tried to fix the problem, including search engine links.
+    validations:
+      required: false
+  - type: textarea
+    id: systemetails
+    attributes:
+      label: System Details
+      description: Please add the output of `wails doctor`.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.
+      placeholder: Add any other context about the problem here.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: GitHub Community Discussions
+    url: https://github.com/wailsapp/wails/discussions
+    about: If your question is not a feature or a bug, please go to the discussion panel and retrieve if your question already exists before submitting.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,23 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-<!---
-*** Please note: No new feature requests are being accepted for Wails v1 ***
---->
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,39 @@
+name: Feature request
+description: Suggest an idea for this project
+# title: ""
+labels: ["enhancement"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before opening a feature request, please check the [Roadmap](https://github.com/wailsapp/wails/discussions/1484) to see if it has already been requested.
+        ***Please note: No new feature requests are being accepted for Wails v1***
+
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false

.github/stale.yml

@@ -8,6 +8,7 @@ exemptLabels:
   - security
   - onhold
   - inprogress
+  - "Selected For Development"
 # Label to use when marking an issue as stale
 staleLabel: wontfix
 # Comment to post when marking an issue as stale. Set to `false` to disable
@@ -16,4 +17,6 @@ markComment: >
   recent activity. It will be closed if no further activity occurs. Thank you
   for your contributions.
 # Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
+closeComment: false
+exemptMilestones: true
+exemptAssignees: true

.gitignore

@@ -31,3 +31,5 @@ v2/test/kitchensink/frontend/package.json.md5
 !v2/internal/ffenestri/windows/x64/webview2.dll
 !v2/internal/ffenestri/windows/x64/WebView2Loader.dll
 .idea/
+v2/cmd/wails/internal/commands/initialise/templates/testtemplates/
+v2/internal/frontend/desktop/darwin/test.xcodeproj

README.md

@@ -52,27 +52,16 @@
 - [4. Features](#nav-4)
 - [5. Sponsors](#nav-5)
 - [6. Installation](#nav-6)
-  - [6.1 MacOS](#nav-6-1)
-  - [6.2 Linux](#nav-6-2)
-    - [6.2.1 Debian/Ubuntu](#nav-6-2-1)
-    - [6.2.2 Arch Linux / ArchLabs / Ctlos Linux](#nav-6-2-2)
-    - [6.2.3 Centos](#nav-6-2-3)
-    - [6.2.4 Fedora](#nav-6-2-4)
-    - [6.2.5 VoidLinux & VoidLinux-musl](#nav-6-2-5)
-    - [6.2.6 Gentoo](#nav-6-2-6)
-  - [6.3 Windows](#nav-6-3)
-- [7. Usage](#nav-7)
-  - [7.1 Next Steps](#nav-7-1)
-- [8. FAQ](#nav-8)
-- [9. Contributors](#nav-9)
-- [10. Special Mentions](#nav-10)
-- [12. Special Thanks](#nav-11)
+- [7. FAQ](#nav-8)
+- [8. Contributors](#nav-9)
+- [9. Special Mentions](#nav-10)
+- [10. Special Thanks](#nav-11)
 
 </details>
 
 <span id="nav-3"></span>
 
-## Introductions
+## Introduction
 
 The traditional method of providing web interfaces to Go programs is via a built-in web server. Wails offers a different
 approach: it provides the ability to wrap both Go code and a web frontend into a single binary. Tools are provided to
@@ -97,14 +86,16 @@ The legacy v1 docs can be found at [https://wails.app](https://wails.app).
 ## Features
 
 - Use standard Go for the backend
-- Use any frontend technology to build your UI
-- Quickly create Vue, Vuetify or React frontends for your Go programs
-- Expose Go methods/functions to the frontend via a single bind command
-- Uses native rendering engines - no embedded browser
-- Shared events system
-- Native file dialogs
-- Powerful cli tool
+- Use any frontend technology you are already familiar with to build your UI
+- Quickly create rich frontends for your Go programs using pre-built templates
+- Easily call Go methods from Javascript
+- Auto-generated Typescript definitions for your Go structs and methods
+- Native Dialogs & Menus
+- Supports modern translucency and "frosted window" effects
+- Unified eventing system between Go and Javascript
+- Powerful cli tool to quickly generate and build your projects
 - Multiplatform
+- Uses native rendering engines - *no embedded browser*!
 
 <span id="nav-5"></span>
 
@@ -115,8 +106,8 @@ This project is supported by these kind people / companies:
 <a href="https://github.com/sponsors/leaanthony" style="width:100px;">
   <img src="/img/silver%20sponsor.png" width="100"/>
 </a>
-<a href="https://github.com/letheanVPN" style="width:100px;">
-  <img src="https://github.com/letheanVPN.png?size=100" width="100"/>
+<a href="https://github.com/selvindev" style="width:100px;">
+  <img src="https://github.com/selvindev.png?size=100" width="100"/>
 </a>
 <br/>
 <br/>
@@ -129,9 +120,6 @@ This project is supported by these kind people / companies:
 <a href="https://github.com/codydbentley" style="width:100px">
   <img src="https://github.com/codydbentley.png?size=100" width="100"/>
 </a>
-<a href="https://github.com/CrackDavid" style="width:100px">
-  <img src="https://github.com/CrackDavid.png?size=100" width="100"/>
-</a>
 <a href="https://www.easywebadv.it/" style="width:100px">
   <img src="website/static/img/easyweb.png" width="100"/>
 </a>
@@ -170,9 +158,6 @@ This project is supported by these kind people / companies:
 <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">
-  <img src="https://github.com/jugglingjsons.png?size=50" width="50"/>
-</a>
 <a href="https://github.com/marcus-crane" style="width:65px">
   <img src="https://github.com/marcus-crane.png?size=65" width="65"/>
 </a>
@@ -206,102 +191,26 @@ This project is supported by these kind people / companies:
 <a href="https://github.com/GargantuaX" style="width:45px">
   <img src="https://github.com/GargantuaX.png?size=45" width="45"/>
 </a>
+<a href="https://github.com/CharlieGo88" style="width:55px">
+  <img src="https://github.com/CharlieGo88.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/Bironou" style="width:55px">
+  <img src="https://github.com/Bironou.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/Shackelford-Arden" style="width:55px">
+  <img src="https://github.com/Shackelford-Arden.png?size=55" width="55"/>
+</a>
 
 <span id="nav-6"></span>
 
+## Roadmap
+
+The project roadmap may be found [here](https://github.com/wailsapp/wails/discussions/1484). Please consult
+this before open up an enhancement request.
+
 ## Installation
 
-Wails uses cgo to bind to the native rendering engines so a number of platform dependent libraries are needed as well as
-an installation of Go. The basic requirements are:
-
-- Go 1.16
-- npm
-
-<span id="nav-6-1"></span>
-
-### MacOS
-
-Make sure you have the xcode command line tools installed. This can be done by running:
-
-`xcode-select --install`
-
-<span id="nav-6-2"></span>
-
-### Linux
-
-<span id="nav-6-2-1"></span>
-
-#### Debian/Ubuntu
-
-`sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev`
-
-_Debian: 8, 9, 10_
-
-_Ubuntu: 16.04, 18.04, 19.04_
-
-_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_, Pop!\_OS
-
-<span id="nav-6-2-2"></span>
-
-#### Arch Linux / ArchLabs / Ctlos Linux
-
-`sudo pacman -S webkit2gtk gtk3`
-
-_Also succesfully test on: Manjaro & ArcoLinux_
-
-<span id="nav-6-2-3"></span>
-
-#### Centos
-
-`sudo yum install webkitgtk3-devel gtk3-devel`
-
-_CentOS 6, 7_
-
-<span id="nav-6-2-4"></span>
-
-#### Fedora
-
-`sudo yum install webkit2gtk3-devel gtk3-devel`
-
-_Fedora 29, 30_
-
-<span id="nav-6-2-5"></span>
-
-#### VoidLinux & VoidLinux-musl
-
-`xbps-install gtk+3-devel webkit2gtk-devel`
-
-<span id="nav-6-2-6"></span>
-
-#### Gentoo
-
-`sudo emerge gtk+:3 webkit-gtk`
-
-<span id="nav-6-3"></span>
-
-### Windows
-
-Windows requires gcc and related tooling. The recommended download is
-from [http://tdm-gcc.tdragon.net/download](http://tdm-gcc.tdragon.net/download). Once this is installed, you are good to
-go.
-
-<span id="nav-7"></span>
-
-## Usage
-
-**Ensure Go modules are enabled: GO111MODULE=on and go/bin is in your PATH variable.**
-
-Installation is as simple as running the following command:
-
-```
-go get -u github.com/wailsapp/wails/cmd/wails
-```
-
-<span id="nav-7-1"></span>
-
-### Next Steps
-
-It is recommended at this stage to read the comprehensive documentation at [https://wails.app](https://wails.app).
+The installation instructions are on the [official website](https://wails.io/docs/gettingstarted/installation).
 
 <span id="nav-8"></span>
 
@@ -310,8 +219,8 @@ It is recommended at this stage to read the comprehensive documentation at [http
 - Is this an alternative to Electron?
 
   Depends on your requirements. It's designed to make it easy for Go programmers to make lightweight desktop
-  applications or add a frontend to their existing applications. Whilst Wails does not currently offer hooks into native
-  elements such as menus, this may change in the future.
+  applications or add a frontend to their existing applications. Wails v2 does offer native elements such as menus
+  and dialogs, so it is becoming a lightweight electron alternative.
 
 - Who is this project aimed at?
 

README.zh-Hans.md

@@ -116,8 +116,8 @@ Wails v2 已针对所有 3 个平台发布了 Beta 版。如果您有兴趣尝
 <a href="https://github.com/sponsors/leaanthony" style="width:100px;">
   <img src="/img/silver%20sponsor.png" width="100"/>
 </a>
-<a href="https://github.com/letheanVPN" style="width:100px;">
-  <img src="https://github.com/letheanVPN.png?size=100" width="100"/>
+<a href="https://github.com/selvindev" style="width:100px;">
+  <img src="https://github.com/selvindev.png?size=100" width="100"/>
 </a>
 <br/>
 <br/>
@@ -130,9 +130,6 @@ Wails v2 已针对所有 3 个平台发布了 Beta 版。如果您有兴趣尝
 <a href="https://github.com/codydbentley" style="width:100px">
   <img src="https://github.com/codydbentley.png?size=100" width="100"/>
 </a>
-<a href="https://github.com/CrackDavid" style="width:100px">
-  <img src="https://github.com/CrackDavid.png?size=100" width="100"/>
-</a>
 <a href="https://www.easywebadv.it/" style="width:100px">
   <img src="website/static/img/easyweb.png" width="100"/>
 </a>
@@ -171,9 +168,6 @@ Wails v2 已针对所有 3 个平台发布了 Beta 版。如果您有兴趣尝
 <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">
-  <img src="https://github.com/jugglingjsons.png?size=50" width="50"/>
-</a>
 <a href="https://github.com/marcus-crane" style="width:65px">
   <img src="https://github.com/marcus-crane.png?size=65" width="65"/>
 </a>
@@ -207,7 +201,15 @@ Wails v2 已针对所有 3 个平台发布了 Beta 版。如果您有兴趣尝
 <a href="https://github.com/GargantuaX" style="width:45px">
   <img src="https://github.com/GargantuaX.png?size=45" width="45"/>
 </a>
-
+<a href="https://github.com/CharlieGo88" style="width:55px">
+  <img src="https://github.com/CharlieGo88.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/Bironou" style="width:55px">
+  <img src="https://github.com/Bironou.png?size=55" width="55"/>
+</a>
+<a href="https://github.com/Shackelford-Arden" style="width:55px">
+  <img src="https://github.com/Shackelford-Arden.png?size=55" width="55"/>
+</a>
 <span id="nav-6"></span>
 
 ## 安装

runtime/js/package-lock.json

@@ -1461,9 +1461,9 @@
       "dev": true
     },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true
     },
     "ansi-styles": {
@@ -2297,9 +2297,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
         "strip-ansi": {
@@ -4385,9 +4385,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "mississippi": {
@@ -5605,9 +5605,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
         "strip-ansi": {
@@ -6535,9 +6535,9 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
           "dev": true
         },
         "ansi-styles": {

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

@@ -96,6 +96,15 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 	nsis := false
 	command.BoolFlag("nsis", "Generate NSIS installer for Windows", &nsis)
 
+	trimpath := false
+	command.BoolFlag("trimpath", "Remove all file system paths from the resulting executable", &trimpath)
+
+	raceDetector := false
+	command.BoolFlag("race", "Build with Go's race detector", &raceDetector)
+
+	windowsConsole := false
+	command.BoolFlag("windowsconsole", "Keep the console when building for Windows", &windowsConsole)
+
 	command.Action(func() error {
 
 		quiet := verbosity == 0
@@ -176,6 +185,9 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			CompressFlags:       compressFlags,
 			UserTags:            userTags,
 			WebView2Strategy:    wv2rtstrategy,
+			TrimPath:            trimpath,
+			RaceDetector:        raceDetector,
+			WindowsConsole:      windowsConsole,
 		}
 
 		// Start a new tabwriter
@@ -183,21 +195,25 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 		w.Init(os.Stdout, 8, 8, 0, '\t', 0)
 
 		// Write out the system information
-		fmt.Fprintf(w, "App Type: \t%s\n", buildOptions.OutputType)
-		fmt.Fprintf(w, "Platforms: \t%s\n", platform)
-		fmt.Fprintf(w, "Compiler: \t%s\n", compilerPath)
-		fmt.Fprintf(w, "Build Mode: \t%s\n", modeString)
-		fmt.Fprintf(w, "Skip Frontend: \t%t\n", skipFrontend)
-		fmt.Fprintf(w, "Compress: \t%t\n", buildOptions.Compress)
-		fmt.Fprintf(w, "Package: \t%t\n", buildOptions.Pack)
-		fmt.Fprintf(w, "Clean Build Dir: \t%t\n", buildOptions.CleanBuildDirectory)
-		fmt.Fprintf(w, "LDFlags: \t\"%s\"\n", buildOptions.LDFlags)
-		fmt.Fprintf(w, "Tags: \t[%s]\n", strings.Join(buildOptions.UserTags, ","))
+		_, _ = fmt.Fprintf(w, "App Type: \t%s\n", buildOptions.OutputType)
+		_, _ = fmt.Fprintf(w, "Platforms: \t%s\n", platform)
+		_, _ = fmt.Fprintf(w, "Compiler: \t%s\n", compilerPath)
+		_, _ = fmt.Fprintf(w, "Build Mode: \t%s\n", modeString)
+		_, _ = fmt.Fprintf(w, "Skip Frontend: \t%t\n", skipFrontend)
+		_, _ = fmt.Fprintf(w, "Compress: \t%t\n", buildOptions.Compress)
+		_, _ = fmt.Fprintf(w, "Package: \t%t\n", buildOptions.Pack)
+		_, _ = fmt.Fprintf(w, "Clean Build Dir: \t%t\n", buildOptions.CleanBuildDirectory)
+		_, _ = fmt.Fprintf(w, "LDFlags: \t\"%s\"\n", buildOptions.LDFlags)
+		_, _ = fmt.Fprintf(w, "Tags: \t[%s]\n", strings.Join(buildOptions.UserTags, ","))
+		_, _ = fmt.Fprintf(w, "Race Detector: \t%t\n", buildOptions.RaceDetector)
 		if len(buildOptions.OutputFile) > 0 && targets.Length() == 1 {
-			fmt.Fprintf(w, "Output File: \t%s\n", buildOptions.OutputFile)
+			_, _ = fmt.Fprintf(w, "Output File: \t%s\n", buildOptions.OutputFile)
+		}
+		_, _ = fmt.Fprintf(w, "\n")
+		err = w.Flush()
+		if err != nil {
+			return err
 		}
-		fmt.Fprintf(w, "\n")
-		w.Flush()
 
 		err = checkGoModVersion(logger, updateGoMod)
 		if err != nil {
@@ -222,6 +238,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			"linux",
 			"linux/amd64",
 			"linux/arm64",
+			"linux/arm",
 			"windows",
 			"windows/amd64",
 			"windows/arm64",
@@ -252,10 +269,9 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			// Calculate platform and arch
 			platformSplit := strings.Split(platform, "/")
 			buildOptions.Platform = platformSplit[0]
+			buildOptions.Arch = runtime.GOARCH
 			if system.IsAppleSilicon {
 				buildOptions.Arch = "arm64"
-			} else {
-				buildOptions.Arch = runtime.GOARCH
 			}
 			if len(platformSplit) == 2 {
 				buildOptions.Arch = platformSplit[1]
@@ -303,6 +319,10 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			}
 			buildOptions.OutputFile = desiredFilename
 
+			if outputFilename != "" {
+				buildOptions.OutputFile = outputFilename
+			}
+
 			// Start Time
 			start := time.Now()
 
@@ -319,7 +339,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 			// Output stats
 			buildOptions.Logger.Println(fmt.Sprintf("Built '%s' in %s.\n", outputFilename, time.Since(start).Round(time.Millisecond).String()))
 
-			outputBinaries[platform] = outputFilename
+			outputBinaries[buildOptions.Platform+"/"+buildOptions.Arch] = outputFilename
 		})
 
 		if targetErr != nil {

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

@@ -2,12 +2,16 @@ package dev
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
+	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"os/exec"
 	"os/signal"
+	"path"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -32,19 +36,26 @@ import (
 	"github.com/wailsapp/wails/v2/pkg/commands/build"
 )
 
-const defaultDevServerURL = "http://localhost:34115"
-
 func LogGreen(message string, args ...interface{}) {
+	if len(message) == 0 {
+		return
+	}
 	text := fmt.Sprintf(message, args...)
 	println(colour.Green(text))
 }
 
 func LogRed(message string, args ...interface{}) {
+	if len(message) == 0 {
+		return
+	}
 	text := fmt.Sprintf(message, args...)
 	println(colour.Red(text))
 }
 
 func LogDarkYellow(message string, args ...interface{}) {
+	if len(message) == 0 {
+		return
+	}
 	text := fmt.Sprintf(message, args...)
 	println(colour.DarkYellow(text))
 }
@@ -65,14 +76,19 @@ type devFlags struct {
 	reloadDirs      string
 	openBrowser     bool
 	noReload        bool
+	noGen           bool
 	wailsjsdir      string
 	tags            string
 	verbosity       int
 	loglevel        string
 	forceBuild      bool
 	debounceMS      int
-	devServerURL    string
+	devServer       string
 	appargs         string
+	saveConfig      bool
+	raceDetector    bool
+
+	frontendDevServerURL string
 }
 
 // AddSubcommand adds the `dev` command for the Wails application
@@ -88,14 +104,18 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 	command.StringFlag("reloaddirs", "Additional directories to trigger reloads (comma separated)", &flags.reloadDirs)
 	command.BoolFlag("browser", "Open application in browser", &flags.openBrowser)
 	command.BoolFlag("noreload", "Disable reload on asset change", &flags.noReload)
+	command.BoolFlag("nogen", "Disable generate module", &flags.noGen)
 	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.StringFlag("appargs", "arguments to pass to the underlying app (quoted and space searated)", &flags.appargs)
+	command.StringFlag("devserver", "The address of the wails dev server", &flags.devServer)
+	command.StringFlag("frontenddevserverurl", "The url of the external frontend dev server to use", &flags.frontendDevServerURL)
+	command.StringFlag("appargs", "arguments to pass to the underlying app (quoted and space separated)", &flags.appargs)
+	command.BoolFlag("save", "Save given flags as defaults", &flags.saveConfig)
+	command.BoolFlag("race", "Build with Go's race detector", &flags.raceDetector)
 
 	command.Action(func() error {
 		// Create logger
@@ -120,6 +140,16 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 			return err
 		}
 
+		devServer := flags.devServer
+		if _, _, err := net.SplitHostPort(devServer); err != nil {
+			return fmt.Errorf("DevServer is not of the form 'host:port', please check your wails.json")
+		}
+
+		devServerURL, err := url.Parse("http://" + devServer)
+		if err != nil {
+			return err
+		}
+
 		// Update go.mod to use current wails version
 		err = syncGoModVersion(cwd)
 		if err != nil {
@@ -127,27 +157,27 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		}
 
 		// Run go mod tidy to ensure we're up to date
-		err = runCommand(cwd, false, "go", "mod", "tidy")
+		err = runCommand(cwd, false, "go", "mod", "tidy", "-compat=1.17")
 		if err != nil {
 			return err
 		}
 
-		self := os.Args[0]
-		if flags.tags != "" {
-			err = runCommand(cwd, true, self, "generate", "module", "-tags", flags.tags)
-		} else {
-			err = runCommand(cwd, true, self, "generate", "module")
-		}
-		if err != nil {
-			return err
+		if !flags.noGen {
+			self := os.Args[0]
+			if flags.tags != "" {
+				err = runCommand(cwd, true, self, "generate", "module", "-tags", flags.tags)
+			} else {
+				err = runCommand(cwd, true, self, "generate", "module")
+			}
+			if err != nil {
+				return err
+			}
 		}
 
 		buildOptions := generateBuildOptions(flags)
 		buildOptions.Logger = logger
 		buildOptions.UserTags = internal.ParseUserTags(flags.tags)
 
-		var debugBinaryProcess *process.Process = nil
-
 		// Setup signal handler
 		quitChannel := make(chan os.Signal, 1)
 		signal.Notify(quitChannel, os.Interrupt, os.Kill, syscall.SIGTERM)
@@ -155,28 +185,28 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 		// Do initial build
 		logger.Println("Building application for development...")
-		newProcess, appBinary, err := restartApp(buildOptions, debugBinaryProcess, flags, exitCodeChannel)
+		debugBinaryProcess, appBinary, err := restartApp(buildOptions, nil, flags, exitCodeChannel)
 		if err != nil {
 			return err
 		}
-		if newProcess != nil {
-			debugBinaryProcess = newProcess
-		}
+		defer func() {
+			if err := killProcessAndCleanupBinary(debugBinaryProcess, appBinary); err != nil {
+				LogDarkYellow("Unable to kill process and cleanup binary: %s", err)
+			}
+		}()
 
 		// frontend:dev:watcher command.
 		if command := projectConfig.DevWatcherCommand; command != "" {
-			var devCommandWaitGroup sync.WaitGroup
-			closer := runFrontendDevWatcherCommand(cwd, command, &devCommandWaitGroup)
-			defer closer(&devCommandWaitGroup)
+			closer, err := runFrontendDevWatcherCommand(cwd, command)
+			if err != nil {
+				return err
+			}
+			defer closer()
 		}
 
 		// open browser
 		if flags.openBrowser {
-			url := defaultDevServerURL
-			if flags.devServerURL != "" {
-				url = flags.devServerURL
-			}
-			err = browser.OpenURL(url)
+			err = browser.OpenURL(devServerURL.String())
 			if err != nil {
 				return err
 			}
@@ -184,6 +214,10 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 
 		// create the project files watcher
 		watcher, err := initialiseWatcher(cwd, logger.Fatal)
+		if err != nil {
+			return err
+		}
+
 		defer func(watcher *fsnotify.Watcher) {
 			err := watcher.Close()
 			if err != nil {
@@ -192,26 +226,24 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		}(watcher)
 
 		LogGreen("Watching (sub)/directory: %s", cwd)
-		LogGreen("Using Dev Server URL: %s", flags.devServerURL)
+		LogGreen("Using DevServer URL: %s", devServerURL)
+		if flags.frontendDevServerURL != "" {
+			LogGreen("Using Frontend DevServer URL: %s", flags.frontendDevServerURL)
+		}
 		LogGreen("Using reload debounce setting of %d milliseconds", flags.debounceMS)
 
 		// Watch for changes and trigger restartApp()
-		doWatcherLoop(buildOptions, debugBinaryProcess, flags, watcher, exitCodeChannel, quitChannel)
+		debugBinaryProcess = doWatcherLoop(buildOptions, debugBinaryProcess, flags, watcher, exitCodeChannel, quitChannel, devServerURL)
 
-		// Kill the current program if running
-		if debugBinaryProcess != nil {
-			err := debugBinaryProcess.Kill()
-			if err != nil {
-				return err
-			}
-		}
-
-		// Remove dev binary
-		err = os.Remove(appBinary)
-		if err != nil {
+		// Kill the current program if running and remove dev binary
+		if err := killProcessAndCleanupBinary(debugBinaryProcess, appBinary); err != nil {
 			return err
 		}
 
+		// Reset the process and the binary so the defer knows about it and is a nop.
+		debugBinaryProcess = nil
+		appBinary = ""
+
 		LogGreen("Development mode exited")
 
 		return nil
@@ -219,6 +251,22 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 	return nil
 }
 
+func killProcessAndCleanupBinary(process *process.Process, binary string) error {
+	if process != nil && process.Running {
+		if err := process.Kill(); err != nil {
+			return err
+		}
+	}
+
+	if binary != "" {
+		err := os.Remove(binary)
+		if err != nil && !errors.Is(err, os.ErrNotExist) {
+			return err
+		}
+	}
+	return nil
+}
+
 func syncGoModVersion(cwd string) error {
 	gomodFilename := filepath.Join(cwd, "go.mod")
 	gomodData, err := os.ReadFile(gomodFilename)
@@ -259,7 +307,6 @@ func runCommand(dir string, exitOnError bool, command string, args ...string) er
 // defaultDevFlags generates devFlags with default options
 func defaultDevFlags() devFlags {
 	return devFlags{
-		devServerURL:    defaultDevServerURL,
 		compilerCommand: "go",
 		verbosity:       1,
 		extensions:      "go",
@@ -281,6 +328,7 @@ func generateBuildOptions(flags devFlags) *build.Options {
 		IgnoreFrontend: false,
 		Verbosity:      flags.verbosity,
 		WailsJSDir:     flags.wailsjsdir,
+		RaceDetector:   flags.raceDetector,
 	}
 
 	return result
@@ -294,15 +342,12 @@ func loadAndMergeProjectConfig(cwd string, flags *devFlags) (*project.Project, e
 		return nil, err
 	}
 
-	var shouldSaveConfig bool
-
 	if flags.assetDir == "" && projectConfig.AssetDirectory != "" {
 		flags.assetDir = projectConfig.AssetDirectory
 	}
 
 	if flags.assetDir != projectConfig.AssetDirectory {
 		projectConfig.AssetDirectory = filepath.ToSlash(flags.assetDir)
-		shouldSaveConfig = true
 	}
 
 	if flags.assetDir != "" {
@@ -318,16 +363,14 @@ func loadAndMergeProjectConfig(cwd string, flags *devFlags) (*project.Project, e
 
 	if flags.reloadDirs != projectConfig.ReloadDirectories {
 		projectConfig.ReloadDirectories = filepath.ToSlash(flags.reloadDirs)
-		shouldSaveConfig = true
 	}
 
-	if flags.devServerURL == defaultDevServerURL && projectConfig.DevServerURL != defaultDevServerURL && projectConfig.DevServerURL != "" {
-		flags.devServerURL = projectConfig.DevServerURL
+	if flags.devServer == "" && projectConfig.DevServer != "" {
+		flags.devServer = projectConfig.DevServer
 	}
 
-	if flags.devServerURL != projectConfig.DevServerURL {
-		projectConfig.DevServerURL = flags.devServerURL
-		shouldSaveConfig = true
+	if flags.frontendDevServerURL == "" && projectConfig.FrontendDevServerURL != "" {
+		flags.frontendDevServerURL = projectConfig.FrontendDevServerURL
 	}
 
 	if flags.wailsjsdir == "" && projectConfig.WailsJSDir != "" {
@@ -340,7 +383,6 @@ func loadAndMergeProjectConfig(cwd string, flags *devFlags) (*project.Project, e
 
 	if flags.wailsjsdir != projectConfig.WailsJSDir {
 		projectConfig.WailsJSDir = filepath.ToSlash(flags.wailsjsdir)
-		shouldSaveConfig = true
 	}
 
 	if flags.debounceMS == 100 && projectConfig.DebounceMS != 100 {
@@ -352,14 +394,13 @@ func loadAndMergeProjectConfig(cwd string, flags *devFlags) (*project.Project, e
 
 	if flags.debounceMS != projectConfig.DebounceMS {
 		projectConfig.DebounceMS = flags.debounceMS
-		shouldSaveConfig = true
 	}
 
 	if flags.appargs == "" && projectConfig.AppArgs != "" {
 		flags.appargs = projectConfig.AppArgs
 	}
 
-	if shouldSaveConfig {
+	if flags.saveConfig {
 		err = projectConfig.Save()
 		if err != nil {
 			return nil, err
@@ -370,35 +411,39 @@ func loadAndMergeProjectConfig(cwd string, flags *devFlags) (*project.Project, e
 }
 
 // runFrontendDevWatcherCommand will run the `frontend:dev:watcher` command if it was given, ex- `npm run dev`
-func runFrontendDevWatcherCommand(cwd string, devCommand string, wg *sync.WaitGroup) func(group *sync.WaitGroup) {
-	LogGreen("Running frontend dev watcher command: '%s'", devCommand)
+func runFrontendDevWatcherCommand(cwd string, devCommand string) (func(), error) {
 	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
-
 	setParentGID(cmd)
-	go func(ctx context.Context, devCommand string, cwd string, wg *sync.WaitGroup) {
-		err := cmd.Run()
-		if err != nil {
+	if err := cmd.Start(); err != nil {
+		cancel()
+		return nil, fmt.Errorf("Unable to start frontend DevWatcher: %w", err)
+	}
+
+	LogGreen("Running frontend DevWatcher command: '%s'", devCommand)
+	var wg sync.WaitGroup
+	wg.Add(1)
+	go func() {
+		if err := cmd.Wait(); err != nil {
 			if err.Error() != "exit status 1" {
-				LogRed("Error from '%s': %s", devCommand, err.Error())
+				LogRed("Error from DevWatcher '%s': %s", devCommand, err.Error())
 			}
 		}
-		LogGreen("Dev command exited!")
+		LogGreen("DevWatcher command exited!")
 		wg.Done()
-	}(ctx, devCommand, cwd, wg)
+	}()
 
-	return func(wg *sync.WaitGroup) {
+	return func() {
 		killProc(cmd, devCommand)
-		LogGreen("Dev command killed!")
+		LogGreen("DevWatcher command killed!")
 		cancel()
 		wg.Wait()
-	}
+	}, nil
 }
 
 // initialiseWatcher creates the project directory watcher that will trigger recompile
@@ -445,8 +490,13 @@ func restartApp(buildOptions *build.Options, debugBinaryProcess *process.Process
 	appBinary, err := build.Build(buildOptions)
 	println()
 	if err != nil {
-		LogRed("Build error - continuing to run current version")
-		LogDarkYellow(err.Error())
+		LogRed("Build error - " + err.Error())
+
+		msg := "Continuing to run current version"
+		if debugBinaryProcess == nil {
+			msg = "No version running, build will be retriggered as soon as changes have been detected"
+		}
+		LogDarkYellow(msg)
 		return nil, "", nil
 	}
 
@@ -471,7 +521,8 @@ func restartApp(buildOptions *build.Options, debugBinaryProcess *process.Process
 	// Set environment variables accordingly
 	os.Setenv("loglevel", flags.loglevel)
 	os.Setenv("assetdir", flags.assetDir)
-	os.Setenv("devserverurl", flags.devServerURL)
+	os.Setenv("devserver", flags.devServer)
+	os.Setenv("frontenddevserverurl", flags.frontendDevServerURL)
 
 	// Start up new binary with correct args
 	newProcess := process.NewProcess(appBinary, args...)
@@ -491,12 +542,8 @@ func restartApp(buildOptions *build.Options, debugBinaryProcess *process.Process
 }
 
 // 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) {
+func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Process, flags devFlags, watcher *fsnotify.Watcher, exitCodeChannel chan int, quitChannel chan os.Signal, devServerURL *url.URL) *process.Process {
 	// Main Loop
-	var (
-		err              error
-		newBinaryProcess *process.Process
-	)
 	var extensionsThatTriggerARebuild = sliceToMap(strings.Split(flags.extensions, ","))
 	var dirsThatTriggerAReload []string
 	for _, dir := range strings.Split(flags.reloadDirs, ",") {
@@ -518,8 +565,11 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc
 	reload := false
 	assetDir := ""
 	changedPaths := map[string]struct{}{}
+
+	assetDirURL := joinPath(devServerURL, "/wails/assetdir")
+	reloadURL := joinPath(devServerURL, "/wails/reload")
 	for quit == false {
-		//reload := false
+		// reload := false
 		select {
 		case exitCode := <-exitCodeChannel:
 			if exitCode == 0 {
@@ -564,7 +614,7 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc
 			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!
+					// node_modules is BANNED!
 					if !strings.Contains(item.Name, "node_modules") {
 						err := watcher.Add(item.Name)
 						if err != nil {
@@ -579,19 +629,24 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc
 				rebuild = false
 				LogGreen("[Rebuild triggered] files updated")
 				// Try and build the app
-				newBinaryProcess, _, err = restartApp(buildOptions, debugBinaryProcess, flags, exitCodeChannel)
+				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 we have a new process, saveConfig it
 				if newBinaryProcess != nil {
 					debugBinaryProcess = newBinaryProcess
 				}
 			}
+
+			if flags.frontendDevServerURL != "" {
+				// If we are using an external dev server all the reload of the frontend part can be skipped
+				continue
+			}
 			if len(changedPaths) != 0 {
 				if assetDir == "" {
-					resp, err := http.Get("http://localhost:34115/wails/assetdir")
+					resp, err := http.Get(assetDirURL)
 					if err != nil {
 						LogRed("Error during retrieving assetdir: %s", err.Error())
 					} else {
@@ -620,7 +675,7 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc
 			}
 			if reload {
 				reload = false
-				_, err = http.Get("http://localhost:34115/wails/reload")
+				_, err := http.Get(reloadURL)
 				if err != nil {
 					LogRed("Error during refresh: %s", err.Error())
 				}
@@ -630,4 +685,11 @@ func doWatcherLoop(buildOptions *build.Options, debugBinaryProcess *process.Proc
 			quit = true
 		}
 	}
+	return debugBinaryProcess
+}
+
+func joinPath(url *url.URL, subPath string) string {
+	u := *url
+	u.Path = path.Join(u.Path, subPath)
+	return u.String()
 }

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

@@ -6,6 +6,8 @@ package dev
 import (
 	"os/exec"
 	"syscall"
+
+	"golang.org/x/sys/unix"
 )
 
 func setParentGID(cmd *exec.Cmd) {
@@ -15,6 +17,10 @@ func setParentGID(cmd *exec.Cmd) {
 }
 
 func killProc(cmd *exec.Cmd, devCommand string) {
+	if cmd == nil || cmd.Process == nil {
+		return
+	}
+
 	// Experiencing the same issue on macOS BigSur
 	// I'm using Vite, but I would imagine this could be an issue with Node (npm) in general
 	// Also, after several edit/rebuild cycles any abnormal shutdown (crash or CTRL-C) may still leave Node running
@@ -22,7 +28,7 @@ func killProc(cmd *exec.Cmd, devCommand string) {
 	// Not tested on *nix
 	pgid, err := syscall.Getpgid(cmd.Process.Pid)
 	if err == nil {
-		err := syscall.Kill(-pgid, 15) // note the minus sign
+		err := syscall.Kill(-pgid, unix.SIGTERM) // note the minus sign
 		if err != nil {
 			LogRed("Error from '%s' when attempting to kill the process: %s", devCommand, err.Error())
 		}

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

@@ -53,6 +53,14 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		fmt.Fprintf(w, "%s\t%s\n", "Platform:", runtime.GOOS)
 		fmt.Fprintf(w, "%s\t%s\n", "Architecture:", runtime.GOARCH)
 
+		// Write out the wails information
+		fmt.Fprintf(w, "\n")
+		fmt.Fprintf(w, "Wails\n")
+		fmt.Fprintf(w, "------\n")
+		fmt.Fprintf(w, "%s\t%s\n", "Version: ", app.Version())
+
+		printBuildSettings(w)
+
 		// Exit early if PM not found
 		if info.PM != nil {
 			fmt.Fprintf(w, "%s\t%s\n", "Package Manager: ", info.PM.Name())
@@ -133,21 +141,11 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		if dependenciesAvailableOptional != 0 {
 			logger.Println("Optional package(s) installation details: \n" + info.Dependencies.InstallAllOptionalCommand())
 		}
-		//
-		//if len(externalPackages) > 0 {
-		//	for _, p := range externalPackages {
-		//		if p.Optional {
-		//			print("[Optional] ")
-		//		}
-		//		logger.Println("Install " + p.Name + ": " + p.InstallCommand)
-		//	}
-		//}
 
 		if len(dependenciesMissing) != 0 {
-			// TODO: Check if apps are available locally and if so, adjust the diagnosis
 			logger.Println("Fatal:")
 			logger.Println("Required dependencies missing: " + strings.Join(dependenciesMissing, " "))
-			logger.Println("Please read this article on how to resolve this: https://wails.app/guides/resolving-missing-packages")
+			logger.Println("Please read this article on how to resolve this: https://wails.io/guides/resolving-missing-packages")
 		}
 
 		logger.Println("")

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

@@ -0,0 +1,10 @@
+//go:build !go1.18
+// +build !go1.18
+
+package doctor
+
+import "text/tabwriter"
+
+func printBuildSettings(_ *tabwriter.Writer) {
+	return
+}

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

@@ -0,0 +1,27 @@
+//go:build go1.18
+// +build go1.18
+
+package doctor
+
+import (
+	"fmt"
+	"runtime/debug"
+	"text/tabwriter"
+)
+
+func printBuildSettings(w *tabwriter.Writer) {
+	if buildInfo, _ := debug.ReadBuildInfo(); buildInfo != nil {
+		buildSettingToName := map[string]string{
+			"vcs.revision": "Revision",
+			"vcs.modified": "Modified",
+		}
+		for _, buildSetting := range buildInfo.Settings {
+			name := buildSettingToName[buildSetting.Key]
+			if name == "" {
+				continue
+			}
+
+			fmt.Fprintf(w, "%s:\t%s\n", name, buildSetting.Value)
+		}
+	}
+}

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

@@ -2,14 +2,15 @@ package generate
 
 import (
 	"fmt"
-	"github.com/leaanthony/clir"
-	"github.com/wailsapp/wails/v2/cmd/wails/internal"
-	"github.com/wailsapp/wails/v2/internal/shell"
 	"io"
 	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
+
+	"github.com/leaanthony/clir"
+	"github.com/wailsapp/wails/v2/cmd/wails/internal"
+	"github.com/wailsapp/wails/v2/internal/shell"
 )
 
 // AddModuleCommand adds the `module` subcommand for the `generate` command
@@ -43,14 +44,14 @@ func AddModuleCommand(app *clir.Cli, parent *clir.Command, w io.Writer) error {
 		}
 
 		stdout, stderr, err = shell.RunCommand(cwd, filename)
+		println(stdout)
+		println(stderr)
 		if err != nil {
 			return fmt.Errorf("%s\n%s\n%s", stdout, stderr, err)
 		}
 
-		err = os.Remove(filename)
-		if err != nil {
-			return err
-		}
+		// Best effort removal of temp file
+		_ = os.Remove(filename)
 
 		return nil
 	})

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

@@ -2,8 +2,6 @@ github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF0
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
-github.com/andybalholm/brotli v1.0.2 h1:JKnhI/XQ75uFBTiuzXpzFrUriDPiZjlOSzh6wXogP0E=
-github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -11,15 +9,9 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
-github.com/fasthttp/websocket v0.0.0-20200320073529-1554a54587ab h1:9e2joQGp642wHGFP5m86SDptAavrdGBe8/x9DGEEAaI=
-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=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
 github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
@@ -28,80 +20,56 @@ github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI
 github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw=
 github.com/go-git/go-git/v5 v5.3.0/go.mod h1:xdX4bWJ48aOrdhnl2XqHYstHbbp6+LFS4r4X+lNVprw=
 github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
-github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
-github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/gofiber/fiber/v2 v2.17.0 h1:qP3PkGUbBB0i9iQh5E057XI1yO5CZigUxZhyUFYAFoM=
-github.com/gofiber/fiber/v2 v2.17.0/go.mod h1:iftruuHGkRYGEXVISmdD7HTYWyfS2Bh+Dkfq4n/1Owg=
-github.com/gofiber/websocket/v2 v2.0.8 h1:Hb4y6IxYZVMO0segROODXJiXVgVD3a6i7wnfot8kM6k=
-github.com/gofiber/websocket/v2 v2.0.8/go.mod h1:fv8HSGQX09sauNv9g5Xq8GeGAaahLFYQKKb4ZdT0x2w=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 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=
-github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.12.2 h1:2KCfW3I9M7nSc5wOqXAlW2v2U6v+w6cbjvbfp+OykW8=
-github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
-github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 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/labstack/echo/v4 v4.7.2 h1:Kv2/p8OaQ+M6Ex4eGimg9b9e6icoxA42JSlOR3msKtI=
+github.com/labstack/echo/v4 v4.7.2/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
+github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o=
+github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
 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/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/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=
 github.com/leaanthony/typescriptify-golang-structs v0.1.7 h1:yoznzWzyxkO/iWdlpq+aPcuJ5Y/hpjq/lmgMFmpjwl0=
 github.com/leaanthony/typescriptify-golang-structs v0.1.7/go.mod h1:cWtOkiVhMF77e6phAXUcfNwYmMwCJ67Sij24lfvi9Js=
-github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18 h1:5iOd93PZbpH4Iir8QkC4coFD+zEQEZSIRcjwjTFZkr0=
-github.com/leaanthony/winc v0.0.0-20210921073452-54963136bf18/go.mod h1:KEbMsKoznsebyGHwLk5LqkFOxL5uXSRdvpP4+avmAMs=
 github.com/leaanthony/winicon v1.0.0/go.mod h1:en5xhijl92aphrJdmRPlh4NI1L6wq3gEm0LpXAPghjU=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
+github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
@@ -112,42 +80,31 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f h1:PgA+Olipyj258EIEYnpFFONrrCcAIWNUNoFhUfMqAGY=
-github.com/savsgio/gotils v0.0.0-20200117113501-90175b0fbe3f/go.mod h1:lHhJedqxCoHN+zMtwGNTXWmF0u9Jt363FYRhV6g0CdY=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tc-hib/winres v0.1.5/go.mod h1:pe6dOR40VOrGz8PkzreVKNvEKnlE8t4yR8A8naL+t7A=
-github.com/tdewolff/minify v2.3.6+incompatible/go.mod h1:9Ov578KJUmAWpS6NeZwRZyT56Uf6o3Mcz9CEsg8USYs=
-github.com/tdewolff/parse v2.3.4+incompatible/go.mod h1:8oBwCsVmUkgHO8M5iCzSIDtpzXOT0WXX9cWhz+bIzJQ=
-github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
 github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
 github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/sjson v1.1.7/go.mod h1:w/yG+ezBeTdUxiKs5NcPicO9diP38nk96QBAbIIGeFs=
 github.com/tkrajina/go-reflector v0.5.5 h1:gwoQFNye30Kk7NrExj8zm3zFtrGPqOkzFMLuQZg1DtQ=
 github.com/tkrajina/go-reflector v0.5.5/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.9.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
-github.com/valyala/fasthttp v1.26.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfYYdPJBl8BA=
-github.com/valyala/fasthttp v1.28.0 h1:ruVmTmZaBR5i67NqnjvvH5gEv0zwHfWtbjoyW98iho4=
-github.com/valyala/fasthttp v1.28.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfYYdPJBl8BA=
-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/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
+github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/wailsapp/mimetype v1.4.1-beta.1.0.20220331112158-6df7e41671fe h1:FiWQ7XhDkc4zAH8SEx1BTte/6VHyceraUusH8jf5SQw=
+github.com/wailsapp/mimetype v1.4.1-beta.1.0.20220331112158-6df7e41671fe/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
 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=
-github.com/xyproto/xpm v1.2.1/go.mod h1:cMnesLsD0PBXLgjDfTDEaKr8XyTFsnP1QycSqRw7BiY=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/ztrue/tracerr v0.3.0/go.mod h1:qEalzze4VN9O8tnhBXScfCrmoJo10o8TN5ciKjm6Mww=
 golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -155,20 +112,20 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210510120150-4163338589ed h1:p9UgmWI9wKpfYmgaV/IZKGdXc5qEK45tDwwwDyjS26I=
-golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -178,27 +135,28 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/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-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/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=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
@@ -206,18 +164,17 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-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=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

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

@@ -1,37 +1,32 @@
 module changeme
 
-go 1.17
+        go 1.17
 
-require github.com/wailsapp/wails/v2 {{.WailsVersion}}
+        require github.com/wailsapp/wails/v2 {{.WailsVersion}}
 
-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-20200815041850-dec1ee9a7fd5 // 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-20210914103035-f00aa774a934 // indirect
-github.com/leaanthony/slicer v1.5.0 // indirect
-github.com/leaanthony/typescriptify-golang-structs v0.1.7 // 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-20210823070655-63515b42dcdf // indirect
-)
+        require (
+        github.com/go-ole/go-ole v1.2.6 // 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/labstack/echo/v4 v4.7.2 // indirect
+        github.com/labstack/gommon v0.3.1 // indirect
+        github.com/leaanthony/go-ansi-parser v1.0.1 // 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/mattn/go-colorable v0.1.11 // indirect
+        github.com/mattn/go-isatty v0.0.14 // indirect
+        github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 // indirect
+        github.com/pkg/errors v0.9.1 // indirect
+        github.com/tkrajina/go-reflector v0.5.5 // indirect
+        github.com/valyala/bytebufferpool v1.0.0 // indirect
+        github.com/valyala/fasttemplate v1.2.1 // indirect
+        github.com/wailsapp/mimetype v1.4.1-beta.1.0.20220331112158-6df7e41671fe // indirect
+        golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+        golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
+        golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
+        golang.org/x/text v0.3.7 // indirect
+        )
 
-// replace github.com/wailsapp/wails/v2 {{.WailsVersion}} => {{.WailsDirectory}}
+        // replace github.com/wailsapp/wails/v2 {{.WailsVersion}} => {{.WailsDirectory}}

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

@@ -35,7 +35,7 @@ func main() {
 		Frameless:         false,
 		StartHidden:       false,
 		HideWindowOnClose: false,
-		RGBA:              &options.RGBA{R: 255, G: 255, B: 255, A: 255},
+		BackgroundColour:  &options.RGBA{R: 255, G: 255, B: 255, A: 255},
 		Assets:            assets,
 		Menu:              nil,
 		Logger:            nil,