v1.13.1

(cherry picked from commit 7036a3183e)

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: [ leaanthony ]
+github: [leaanthony]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

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

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

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

.github/workflows/pr.yml

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

.github/workflows/release.yml

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

.github/workflows/runtime.yml

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

.gitignore

@@ -17,17 +17,8 @@ cmd/wails/wails
 .DS_Store
 tmp
 node_modules/
-package.json.md5
-v2/test/**/frontend/dist
-v2/test/**/build/
-v2/test/frameless/icon.png
-v2/test/hidden/icon.png
-v2/test/kitchensink/frontend/public/bundle.*
-v2/pkg/parser/testproject/frontend/wails
 v2/test/kitchensink/frontend/public
+v2/internal/ffenestri/runtime.c
+v2/internal/runtime/assets/desktop.js
 v2/test/kitchensink/build/darwin/desktop/kitchensink
 v2/test/kitchensink/frontend/package.json.md5
-/v2/internal/ffenestri/windows/test/cmake-build-debug/
-!v2/internal/ffenestri/windows/x64/webview2.dll
-!v2/internal/ffenestri/windows/x64/WebView2Loader.dll
-.idea/

.vscode/settings.json

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

CONTRIBUTORS.md

@@ -31,18 +31,18 @@ Wails is what it is because of the time and effort given by these great people.
   * [Christopher Murphy](https://github.com/Splode)
   * [Zámbó, Levente](https://github.com/Lyimmi)
   * [artem](https://github.com/Unix4ever)
-* [Tim Kipp](https://github.com/timkippdev)
-* [Dmitry Gomzyakov](https://github.com/kyoto44)
-* [Arthur Wiebe](https://github.com/artooro)
-* [Ilgıt Yıldırım](https://github.com/ilgityildirim)
-* [Altynbek](https://github.com/gelleson)
-* [Kyle](https://github.com/kmuchmore)
-* [Balakrishna Prasad Ganne](https://github.com/aayush420)
-* [Charaf Rezrazi](https://github.com/Rezrazi)
-* [misitebao](https://github.com/misitebao)
-* [Elie Grenon](https://github.com/DrunkenPoney)
-* [SophieAu](https://github.com/SophieAu)
-* [Alexander Matviychuk](https://github.com/alexmat)
-* [RH12503](https://github.com/RH12503)
-* [hi019](https://github.com/hi019)
-* [Igor Minen](https://github.com/Igogrek)
+  * [Tim Kipp](https://github.com/timkippdev)
+  * [Dmitry Gomzyakov](https://github.com/kyoto44)
+  * [Arthur Wiebe](https://github.com/artooro)
+  * [Ilgıt Yıldırım](https://github.com/ilgityildirim)
+  * [Altynbek](https://github.com/gelleson)
+  * [Kyle](https://github.com/kmuchmore)
+  * [Balakrishna Prasad Ganne](https://github.com/aayush420)
+  * [Charaf Rezrazi](https://github.com/Rezrazi)
+  * [misitebao](https://github.com/misitebao)
+  * [Elie Grenon](https://github.com/DrunkenPoney)
+  * [SophieAu](https://github.com/SophieAu)
+  * [Alexander Matviychuk](https://github.com/alexmat)
+  * [RH12503](https://github.com/RH12503) 
+  * [hi019](https://github.com/hi019)
+  

README.md

@@ -1,5 +1,5 @@
 <p align="center" style="text-align: center">
-   <img src="logo.png" width="55%"><br/>
+   <img src="logo_cropped.png" width="40%"><br/>
 </p>
 <p align="center">
    Build desktop applications using Go & Web Technologies.<br/><br/>
@@ -14,62 +14,10 @@
    <a href="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" rel="nofollow"><img src="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" alt="Release Pipelines"></a>
 </p>
 
-<span id="nav-1"></span>
-
-## Internationalization
-
-[English](README.md) | [简体中文](README.zh-Hans.md)
-
-<span id="nav-2"></span>
-
-## Table of Contents
-
-<details>
-  <summary>Click me to Open/Close the directory listing</summary>
-
-- [1. Internationalization](#nav-1)
-- [2. Table of Contents](#nav-2)
-- [3. Introduction](#nav-3)
-  - [3.1 Official Website](#nav-3-1)
-- [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)
-
-</details>
-
-<span id="nav-3"></span>
-
-## Introductions
-
-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
-make this easy for you by handling project creation, compilation and bundling. All you have to do is get creative!
-
-<span id="nav-3-1"></span>
-
-### Official Website
+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 make this easy for you by handling project creation, compilation and bundling. All you have to do is get creative!
 
 The official docs can be found at [https://wails.app](https://wails.app).
 
-Click [here](https://wails.io) if you are interested in trying out v2 Beta for Windows.
-
-<span id="nav-4"></span>
-
 ## Features
 
 - Use standard Go for the backend
@@ -82,108 +30,39 @@ Click [here](https://wails.io) if you are interested in trying out v2 Beta for W
 - Powerful cli tool
 - Multiplatform
 
-<span id="nav-5"></span>
-
 ## Sponsors
 
-This project is supported by these kind people / companies:
+This project is supported by these kind people:
 
-<a href="https://github.com/sponsors/leaanthony" style="width:100px;">
-  <img src="sponsors/bronze%20sponsor.png" width="100"/>
+<a href="https://pace.dev" style="width:100px"><img src="pace.jpeg" width="100"/></a>
+<a href="https://github.com/tc-hib" style="width:50px;border-radius: 50%">
+  <img src="https://github.com/tc-hib.png?size=50" width="50" style="border-radius: 50%"/>
 </a>
-<a href="https://github.com/snider" style="width:100px;">
-  <img src="https://github.com/snider.png?size=100" width="100"/>
+<a href="https://github.com/picatz" style="width:50px;border-radius: 50%">
+  <img src="https://github.com/picatz.png?size=50" width="50" style="border-radius: 50%"/>
 </a>
-<a href="https://github.com/codydbentley" style="width:100px">
-  <img src="https://github.com/codydbentley.png?size=100" width="100"/>
+<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>
-<a href="https://github.com/CrackDavid" style="width:100px">
-  <img src="https://github.com/CrackDavid.png?size=100" width="100"/>
+<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>
-<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="/img/jetbrains-grayscale.png" width="100"/>
-</a>
-<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">
-  <img src="https://github.com/picatz.png?size=50" width="50"/>
-</a>
-<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">
-  <img src="https://github.com/akhudek.png?size=50" width="50"/>
-</a>
-<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">
-  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55"/>
-</a>
-<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">
-  <img src="https://github.com/nickarellano.png?size=60" width="60"/>
-</a>
-<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>
-<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>
-<a href="https://github.com/ondoki" style="width:65px">
-  <img src="https://github.com/ondoki.png?size=65" width="65"/>
-</a>
-<a href="https://github.com/questrail" style="width:50px">
-  <img src="https://github.com/questrail.png?size=50" width="50"/>
-</a>
-<a href="https://github.com/DonTomato" style="width:45px">
-  <img src="https://github.com/DonTomato.png?size=45" width="45"/>
-</a>
-
-<span id="nav-6"></span>
 
 ## 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:
+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
+- Go 1.13
 - 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`
@@ -192,9 +71,7 @@ _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>
+_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_, Pop!_OS
 
 #### Arch Linux / ArchLabs / Ctlos Linux
 
@@ -202,168 +79,96 @@ _Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, K
 
 _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.
+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
+## Installation
 
 **Ensure Go modules are enabled: GO111MODULE=on and go/bin is in your PATH variable.**
 
 Installation is as simple as running the following command:
 
-```
+<pre style='color:white'>
 go get -u github.com/wailsapp/wails/cmd/wails
-```
+</pre>
 
-<span id="nav-7-1"></span>
-
-### Next Steps
+## Next Steps
 
 It is recommended at this stage to read the comprehensive documentation at [https://wails.app](https://wails.app).
 
-<span id="nav-8"></span>
-
 ## FAQ
 
-- Is this an alternative to Electron?
+ * 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.
+   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.
 
-- Who is this project aimed at?
+ * Who is this project aimed at?
 
-  Go programmers who want to bundle an HTML/JS/CSS frontend with their applications, without resorting to creating a
-  server and opening a browser to view it.
+   Go programmers who want to bundle an HTML/JS/CSS frontend with their applications, without resorting to creating a server and opening a browser to view it.
 
-- What's with the name?
+ * What's with the name?
 
-  When I saw WebView, I thought "What I really want is tooling around building a WebView app, a bit like Rails is to
-  Ruby". So initially it was a play on words (Webview on Rails). It just so happened to also be a homophone of the
-  English name for the [Country](https://en.wikipedia.org/wiki/Wales) I am from. So it stuck.
+   When I saw WebView, I thought "What I really want is tooling around building a WebView app, a bit like Rails is to Ruby". So initially it was a play on words (Webview on Rails). It just so happened to also be a homophone of the English name for the [Country](https://en.wikipedia.org/wiki/Wales) I am from. So it stuck.
 
-<span id="nav-9"></span>
-
-## Contributors
-
-<a href="https://github.com/qaisjp"><img src="https://github.com/qaisjp.png?size=40" width="40"/></a>
-<a href="https://github.com/alee792"><img src="https://github.com/alee792.png?size=40" width="40"/></a>
-<a href="https://github.com/lanzafame"><img src="https://github.com/lanzafame.png?size=40" width="40"/></a>
-<a href="https://github.com/mattn"><img src="https://github.com/mattn.png?size=40" width="40"/></a>
-<a href="https://github.com/0xflotus"><img src="https://github.com/0xflotus.png?size=40" width="40"/></a>
-<a href="https://github.com/mdhender"><img src="https://github.com/mdhender.png?size=40" width="40"/></a>
-<a href="https://github.com/fishfishfish2104"><img src="https://github.com/fishfishfish2104.png?size=40" width="40"/></a>
-<a href="https://github.com/intelwalk"><img src="https://github.com/intelwalk.png?size=40" width="40"/></a>
-<a href="https://github.com/ocelotsloth"><img src="https://github.com/ocelotsloth.png?size=40" width="40"/></a>
-<a href="https://github.com/bh90210"><img src="https://github.com/bh90210.png?size=40" width="40"/></a>
-<a href="https://github.com/iceleo-com"><img src="https://github.com/iceleo-com.png?size=40" width="40"/></a>
-<a href="https://github.com/fallendusk"><img src="https://github.com/fallendusk.png?size=40" width="40"/></a>
-<a href="https://github.com/Chronophylos"><img src="https://github.com/Chronophylos.png?size=40" width="40"/></a>
-<a href="https://github.com/Vaelatern"><img src="https://github.com/Vaelatern.png?size=40" width="40"/></a>
-<a href="https://github.com/mewmew"><img src="https://github.com/mewmew.png?size=40" width="40"/></a>
-<a href="https://github.com/kraney"><img src="https://github.com/kraney.png?size=40" width="40"/></a>
-<a href="https://github.com/JackMordaunt"><img src="https://github.com/JackMordaunt.png?size=40" width="40"/></a>
-<a href="https://github.com/MichaelHipp"><img src="https://github.com/MichaelHipp.png?size=40" width="40"/></a>
-<a href="https://github.com/tmclane"><img src="https://github.com/tmclane.png?size=40" width="40"/></a>
-<a href="https://github.com/Rested"><img src="https://github.com/Rested.png?size=40" width="40"/></a>
-<a href="https://github.com/Jarek-SRT"><img src="https://github.com/Jarek-SRT.png?size=40" width="40"/></a>
-<a href="https://github.com/konez2k"><img src="https://github.com/konez2k.png?size=40" width="40"/></a>
-<a href="https://github.com/sayuthisobri"><img src="https://github.com/sayuthisobri.png?size=40" width="40"/></a>
-<a href="https://github.com/dedo1911"><img src="https://github.com/dedo1911.png?size=40" width="40"/></a>
-<a href="https://github.com/fdidron"><img src="https://github.com/fdidron.png?size=40" width="40"/></a>
-<a href="https://github.com/Splode"><img src="https://github.com/Splode.png?size=40" width="40"/></a>
-<a href="https://github.com/Lyimmi"><img src="https://github.com/Lyimmi.png?size=40" width="40"/></a>
-<a href="https://github.com/Unix4ever"><img src="https://github.com/Unix4ever.png?size=40" width="40"/></a>
-<a href="https://github.com/timkippdev"><img src="https://github.com/timkippdev.png?size=40" width="40"/></a>
-<a href="https://github.com/kyoto44"><img src="https://github.com/kyoto44.png?size=40" width="40"/></a>
-<a href="https://github.com/artooro"><img src="https://github.com/artooro.png?size=40" width="40"/></a>
-<a href="https://github.com/ilgityildirim"><img src="https://github.com/ilgityildirim.png?size=40" width="40"/></a>
-<a href="https://github.com/gelleson"><img src="https://github.com/gelleson.png?size=40" width="40"/></a>
-<a href="https://github.com/kmuchmore"><img src="https://github.com/kmuchmore.png?size=40" width="40"/></a>
-<a href="https://github.com/aayush420"><img src="https://github.com/aayush420.png?size=40" width="40"/></a>
-<a href="https://github.com/Rezrazi"><img src="https://github.com/Rezrazi.png?size=40" width="40"/></a>
-<a href="https://github.com/misitebao"><img src="https://github.com/misitebao.png?size=40" width="40"/></a>
-<a href="https://github.com/DrunkenPoney"><img src="https://github.com/DrunkenPoney.png?size=40" width="40"/></a>
-<a href="https://github.com/SophieAu"><img src="https://github.com/SophieAu.png?size=40" width="40"/></a>
-<a href="https://github.com/alexmat"><img src="https://github.com/alexmat.png?size=40" width="40"/></a>
-<a href="https://github.com/RH12503"><img src="https://github.com/RH12503.png?size=40" width="40"/></a>
-<a href="https://github.com/hi019"><img src="https://github.com/hi019.png?size=40" width="40"/></a></a>
-<a href="https://github.com/Igogrek"><img src="https://github.com/Igogrek.png?size=40" width="40"/></a></a>
-<a href="https://github.com/aschey"><img src="https://github.com/aschey.png?size=40" width="40"/></a></a>
-<a href="https://github.com/akhudek"><img src="https://github.com/akhudek.png?size=40" width="40"/></a></a>
-<a href="https://github.com/s12chung"><img src="https://github.com/s12chung.png?size=40" width="40"/></a></a>
-
-<span id="nav-10"></span>
-
-## Special Mentions
+## Shoulders of Giants
 
 Without the following people, this project would never have existed:
 
-- [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot) - His support and feedback has been immense. More patience than
-  you can throw a stick at (Not long now Dustin!).
-- [Serge Zaitsev](https://github.com/zserge) - Creator of [Webview](https://github.com/zserge/webview) which Wails uses
-  for the windowing.
-- [Byron](https://github.com/bh90210) - At times, Byron has single handedly kept this project alive. Without his
-  incredible input, we never would have got to v1.
+  * [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot) - His support and feedback has been immense. More patience than you can throw a stick at (Not long now Dustin!).
+  * [Serge Zaitsev](https://github.com/zserge) - Creator of [Webview](https://github.com/zserge/webview) which Wails uses for the windowing.
+
+And without [these people](CONTRIBUTORS.md), it wouldn't be what it is today. A huge thank you to each and every one of you!
+
+Special Mentions:
+
+  * [Byron](https://github.com/bh90210) - At times, Byron has single handedly kept this project alive. Without his incredible input, we never would have got to v1.
 
 This project was mainly coded to the following albums:
 
-- [Manic Street Preachers - Resistance Is Futile](https://open.spotify.com/album/1R2rsEUqXjIvAbzM0yHrxA)
-- [Manic Street Preachers - This Is My Truth, Tell Me Yours](https://open.spotify.com/album/4VzCL9kjhgGQeKCiojK1YN)
-- [The Midnight - Endless Summer](https://open.spotify.com/album/4Krg8zvprquh7TVn9OxZn8)
-- [Gary Newman - Savage (Songs from a Broken World)](https://open.spotify.com/album/3kMfsD07Q32HRWKRrpcexr)
-- [Steve Vai - Passion & Warfare](https://open.spotify.com/album/0oL0OhrE2rYVns4IGj8h2m)
-- [Ben Howard - Every Kingdom](https://open.spotify.com/album/1nJsbWm3Yy2DW1KIc1OKle)
-- [Ben Howard - Noonday Dream](https://open.spotify.com/album/6astw05cTiXEc2OvyByaPs)
-- [Adwaith - Melyn](https://open.spotify.com/album/2vBE40Rp60tl7rNqIZjaXM)
-- [Gwidaith Hen Fran - Cedors Hen Wrach](https://open.spotify.com/album/3v2hrfNGINPLuDP0YDTOjm)
-- [Metallica - Metallica](https://open.spotify.com/album/2Kh43m04B1UkVcpcRa1Zug)
-- [Bloc Party - Silent Alarm](https://open.spotify.com/album/6SsIdN05HQg2GwYLfXuzLB)
-- [Maxthor - Another World](https://open.spotify.com/album/3tklE2Fgw1hCIUstIwPBJF)
-- [Alun Tan Lan - Y Distawrwydd](https://open.spotify.com/album/0c32OywcLpdJCWWMC6vB8v)
+  * [Manic Street Preachers - Resistance Is Futile](https://open.spotify.com/album/1R2rsEUqXjIvAbzM0yHrxA)
+  * [Manic Street Preachers - This Is My Truth, Tell Me Yours](https://open.spotify.com/album/4VzCL9kjhgGQeKCiojK1YN)
+  * [The Midnight - Endless Summer](https://open.spotify.com/album/4Krg8zvprquh7TVn9OxZn8)
+  * [Gary Newman - Savage (Songs from a Broken World)](https://open.spotify.com/album/3kMfsD07Q32HRWKRrpcexr)
+  * [Steve Vai - Passion & Warfare](https://open.spotify.com/album/0oL0OhrE2rYVns4IGj8h2m)
+  * [Ben Howard - Every Kingdom](https://open.spotify.com/album/1nJsbWm3Yy2DW1KIc1OKle)
+  * [Ben Howard - Noonday Dream](https://open.spotify.com/album/6astw05cTiXEc2OvyByaPs)
+  * [Adwaith - Melyn](https://open.spotify.com/album/2vBE40Rp60tl7rNqIZjaXM)
+  * [Gwidaith Hen Fran - Cedors Hen Wrach](https://open.spotify.com/album/3v2hrfNGINPLuDP0YDTOjm)
+  * [Metallica - Metallica](https://open.spotify.com/album/2Kh43m04B1UkVcpcRa1Zug)
+  * [Bloc Party - Silent Alarm](https://open.spotify.com/album/6SsIdN05HQg2GwYLfXuzLB)
+  * [Maxthor - Another World](https://open.spotify.com/album/3tklE2Fgw1hCIUstIwPBJF)
+  * [Alun Tan Lan - Y Distawrwydd](https://open.spotify.com/album/0c32OywcLpdJCWWMC6vB8v)
 
-<span id="nav-11"></span>
+## Licensing
+
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_large)
 
 ## Special Thanks
 
 <p align="center" style="text-align: center">
    <a href="https://pace.dev"><img src="pace.jpeg"/></a><br/>
-   A <i>huge</i> thanks to <a href="https://pace.dev">Pace</a> for sponsoring the project and helping the efforts to get Wails ported to Apple Silicon!<br/><br/>
+   A *huge* thanks to <a href="https://pace.dev">Pace</a> for sponsoring the project and helping the efforts to get Wails ported to Apple Silicon!<br/><br/>
    If you are looking for a Project Management tool that's powerful but quick and easy to use, check them out!<br/><br/>
 </p>
 

README.zh-Hans.md

@@ -1,367 +0,0 @@
-<p align="center" style="text-align: center">
-   <img src="logo.png" width="55%"><br/>
-</p>
-<p align="center">
-   使用 Go 和 Web 技术构建桌面应用程序。<br/><br/>
-   <a href="https://github.com/wailsapp/wails/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-MIT-blue.svg"></a>
-   <a href="https://goreportcard.com/report/github.com/wailsapp/wails"><img src="https://goreportcard.com/badge/github.com/wailsapp/wails"/></a>
-   <a href="http://godoc.org/github.com/wailsapp/wails"><img src="https://img.shields.io/badge/godoc-reference-blue.svg"/></a>
-   <a href="https://www.codefactor.io/repository/github/wailsapp/wails"><img src="https://www.codefactor.io/repository/github/wailsapp/wails/badge" alt="CodeFactor" /></a>
-   <a href="https://github.com/wailsapp/wails/issues"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="CodeFactor" /></a>
-   <a href="https://app.fossa.io/projects/git%2Bgithub.com%2Fwailsapp%2Fwails?ref=badge_shield" alt="FOSSA Status"><img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwailsapp%2Fwails.svg?type=shield"/></a>
-   <a href="https://houndci.com"><img src="https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg"/></a>
-   <a href="https://github.com/avelino/awesome-go" rel="nofollow"><img src="https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg" alt="Awesome"></a>
-   <a href="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" rel="nofollow"><img src="https://github.com/wailsapp/wails/workflows/release/badge.svg?branch=master" alt="Release Pipelines"></a>
-</p>
-
-<span id="nav-1"></span>
-
-## 国际化
-
-[English](README.md) | [简体中文](README.zh-Hans.md)
-
-<span id="nav-2"></span>
-
-## 内容目录
-
-<details>
-  <summary>点我 打开/关闭 目录列表</summary>
-
-- [1. 国际化](#nav-1)
-- [2. 内容目录](#nav-2)
-- [3. 项目介绍](#nav-3)
-  - [3.1 官方网站](#nav-3-1)
-- [4. 功能](#nav-4)
-- [5. 赞助商](#nav-5)
-- [6. 安装](#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. 使用方法](#nav-7)
-  - [7.1 下一步](#nav-7-1)
-- [8. 常见问题](#nav-8)
-- [9. 贡献者](#nav-9)
-- [10. 特别提及](#nav-10)
-- [12. 特别感谢](#nav-11)
-
-</details>
-
-<span id="nav-3"></span>
-
-## 项目介绍
-
-为 Go 程序提供 Web 界面的传统方法是通过内置 Web 服务器。Wails 提供了一种不同的方法：它提供了将 Go 代码和 Web
-前端一起打包成单个二进制文件的能力。通过提供的工具，可以很轻松的完成项目的创建、编译和打包。你所要做的就是发挥想象力！
-
-<span id="nav-3-1"></span>
-
-### 官方网站
-
-官方文档可以在 [https://wails.app](https://wails.app) 中找到。
-
-如果您对适用于 Windows 的 v2 测试版感兴趣，可以点击[此处](https://wails.io)查看。
-
-镜像网站：
-
-- [中国大陆镜像站点 - https://wails.top](https://wails.top)
-
-<span id="nav-4"></span>
-
-## 功能
-
-- 后端使用标准 Go
-- 使用任意前端技术构建 UI 界面
-- 快速为您的 Go 应用生成 Vue、Vuetify、React 前端代码
-- 通过简单的绑定命令将 Go 方法暴露到前端
-- 使用原生渲染引擎 - 无嵌入式浏览器
-- 共享事件系统
-- 原生文件系统对话框
-- 强大的命令行工具
-- 跨多个平台
-
-<span id="nav-5"></span>
-
-## 赞助商
-
-这个项目由以下这些人或者公司支持：
-
-<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>
-<a href="https://github.com/CrackDavid" style="width:100px">
-  <img src="https://github.com/CrackDavid.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="/img/jetbrains-grayscale.png" width="100"/>
-</a>
-<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">
-  <img src="https://github.com/picatz.png?size=50" width="50"/>
-</a>
-<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">
-  <img src="https://github.com/akhudek.png?size=50" width="50"/>
-</a>
-<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">
-  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55"/>
-</a>
-<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">
-  <img src="https://github.com/nickarellano.png?size=60" width="60"/>
-</a>
-<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>
-<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>
-<a href="https://github.com/ondoki" style="width:65px">
-  <img src="https://github.com/ondoki.png?size=65" width="65"/>
-</a>
-<a href="https://github.com/questrail" style="width:50px">
-  <img src="https://github.com/questrail.png?size=50" width="50"/>
-</a>
-<a href="https://github.com/DonTomato" style="width:45px">
-  <img src="https://github.com/DonTomato.png?size=45" width="45"/>
-</a>
-
-<span id="nav-6"></span>
-
-## 安装
-
-Wails 使用 cgo 与原生渲染引擎结合，因此需要依赖一些平台的库以及 Go 的安装。基本要求是：
-
-- Go 1.16
-- npm
-
-<span id="nav-6-1"></span>
-
-### MacOS
-
-请确保已安装 xcode 命令行工具。这可以通过运行下面的命令来完成：
-
-`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_
-
-_也成功测试了: 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`
-
-_也成功测试了: 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 需要 GCC 和相关工具。 建议从 [http://tdm-gcc.tdragon.net/download](http://tdm-gcc.tdragon.net/download) 下载， 安装完成，您就可以开始了。
-
-<span id="nav-7"></span>
-
-## 使用方法
-
-**确保 Go modules 是开启的：GO111MODULE=on 并且 go/bin 在您的 PATH 变量中。**
-
-安装很简单，运行以下命令：
-
-```
-go get -u github.com/wailsapp/wails/cmd/wails
-```
-
-<span id="nav-7-1"></span>
-
-### 下一步
-
-建议在此时阅读 [https://wails.app](https://wails.app) 上面的文档.
-
-<span id="nav-8"></span>
-
-## 常见问题
-
-- 它是 Electron 的替代品吗?
-
-  取决于您的要求。它旨在使 Go 程序员可以轻松制作轻量级桌面应用程序或在其现有应用程序中添加前端。尽管 Wails 当前不提供对诸如菜单之类的原生元素的钩子，但将来可能会改变。
-
-- 这个项目针对的是哪些人?
-
-  希望将 HTML / JS / CSS 前端与其应用程序捆绑在一起的程序员，而不是借助创建服务并打开浏览器进行查看的方式。
-
-- 名字怎么来的?
-
-  当我看到 WebView 时，我想"我真正想要的是围绕构建 WebView 应用程序工作，有点像 Rails 对于 Ruby"。因此，最初它是一个文字游戏（Webview on
-  Rails）。碰巧也是我来自的 [国家](https://en.wikipedia.org/wiki/Wales) 的英文名字的同音。所以就是它了。
-
-<span id="nav-9"></span>
-
-## 贡献者
-
-<a href="https://github.com/qaisjp"><img src="https://github.com/qaisjp.png?size=40" width="40"/></a>
-<a href="https://github.com/alee792"><img src="https://github.com/alee792.png?size=40" width="40"/></a>
-<a href="https://github.com/lanzafame"><img src="https://github.com/lanzafame.png?size=40" width="40"/></a>
-<a href="https://github.com/mattn"><img src="https://github.com/mattn.png?size=40" width="40"/></a>
-<a href="https://github.com/0xflotus"><img src="https://github.com/0xflotus.png?size=40" width="40"/></a>
-<a href="https://github.com/mdhender"><img src="https://github.com/mdhender.png?size=40" width="40"/></a>
-<a href="https://github.com/fishfishfish2104"><img src="https://github.com/fishfishfish2104.png?size=40" width="40"/></a>
-<a href="https://github.com/intelwalk"><img src="https://github.com/intelwalk.png?size=40" width="40"/></a>
-<a href="https://github.com/ocelotsloth"><img src="https://github.com/ocelotsloth.png?size=40" width="40"/></a>
-<a href="https://github.com/bh90210"><img src="https://github.com/bh90210.png?size=40" width="40"/></a>
-<a href="https://github.com/iceleo-com"><img src="https://github.com/iceleo-com.png?size=40" width="40"/></a>
-<a href="https://github.com/fallendusk"><img src="https://github.com/fallendusk.png?size=40" width="40"/></a>
-<a href="https://github.com/Chronophylos"><img src="https://github.com/Chronophylos.png?size=40" width="40"/></a>
-<a href="https://github.com/Vaelatern"><img src="https://github.com/Vaelatern.png?size=40" width="40"/></a>
-<a href="https://github.com/mewmew"><img src="https://github.com/mewmew.png?size=40" width="40"/></a>
-<a href="https://github.com/kraney"><img src="https://github.com/kraney.png?size=40" width="40"/></a>
-<a href="https://github.com/JackMordaunt"><img src="https://github.com/JackMordaunt.png?size=40" width="40"/></a>
-<a href="https://github.com/MichaelHipp"><img src="https://github.com/MichaelHipp.png?size=40" width="40"/></a>
-<a href="https://github.com/tmclane"><img src="https://github.com/tmclane.png?size=40" width="40"/></a>
-<a href="https://github.com/Rested"><img src="https://github.com/Rested.png?size=40" width="40"/></a>
-<a href="https://github.com/Jarek-SRT"><img src="https://github.com/Jarek-SRT.png?size=40" width="40"/></a>
-<a href="https://github.com/konez2k"><img src="https://github.com/konez2k.png?size=40" width="40"/></a>
-<a href="https://github.com/sayuthisobri"><img src="https://github.com/sayuthisobri.png?size=40" width="40"/></a>
-<a href="https://github.com/dedo1911"><img src="https://github.com/dedo1911.png?size=40" width="40"/></a>
-<a href="https://github.com/fdidron"><img src="https://github.com/fdidron.png?size=40" width="40"/></a>
-<a href="https://github.com/Splode"><img src="https://github.com/Splode.png?size=40" width="40"/></a>
-<a href="https://github.com/Lyimmi"><img src="https://github.com/Lyimmi.png?size=40" width="40"/></a>
-<a href="https://github.com/Unix4ever"><img src="https://github.com/Unix4ever.png?size=40" width="40"/></a>
-<a href="https://github.com/timkippdev"><img src="https://github.com/timkippdev.png?size=40" width="40"/></a>
-<a href="https://github.com/kyoto44"><img src="https://github.com/kyoto44.png?size=40" width="40"/></a>
-<a href="https://github.com/artooro"><img src="https://github.com/artooro.png?size=40" width="40"/></a>
-<a href="https://github.com/ilgityildirim"><img src="https://github.com/ilgityildirim.png?size=40" width="40"/></a>
-<a href="https://github.com/gelleson"><img src="https://github.com/gelleson.png?size=40" width="40"/></a>
-<a href="https://github.com/kmuchmore"><img src="https://github.com/kmuchmore.png?size=40" width="40"/></a>
-<a href="https://github.com/aayush420"><img src="https://github.com/aayush420.png?size=40" width="40"/></a>
-<a href="https://github.com/Rezrazi"><img src="https://github.com/Rezrazi.png?size=40" width="40"/></a>
-<a href="https://github.com/misitebao"><img src="https://github.com/misitebao.png?size=40" width="40"/></a>
-<a href="https://github.com/DrunkenPoney"><img src="https://github.com/DrunkenPoney.png?size=40" width="40"/></a>
-<a href="https://github.com/SophieAu"><img src="https://github.com/SophieAu.png?size=40" width="40"/></a>
-<a href="https://github.com/alexmat"><img src="https://github.com/alexmat.png?size=40" width="40"/></a>
-<a href="https://github.com/RH12503"><img src="https://github.com/RH12503.png?size=40" width="40"/></a>
-<a href="https://github.com/hi019"><img src="https://github.com/hi019.png?size=40" width="40"/></a></a>
-<a href="https://github.com/Igogrek"><img src="https://github.com/Igogrek.png?size=40" width="40"/></a></a>
-<a href="https://github.com/aschey"><img src="https://github.com/aschey.png?size=40" width="40"/></a></a>
-<a href="https://github.com/akhudek"><img src="https://github.com/akhudek.png?size=40" width="40"/></a></a>
-<a href="https://github.com/s12chung"><img src="https://github.com/s12chung.png?size=40" width="40"/></a></a>
-
-<span id="nav-10"></span>
-
-## 特别提及
-
-如果没有以下人员，此项目或许永远不会存在：
-
-- [Dustin Krysak](https://wiki.ubuntu.com/bashfulrobot) - 他的支持和反馈是巨大的。
-- [Serge Zaitsev](https://github.com/zserge) - Wails 窗口所使用的 [Webview](https://github.com/zserge/webview) 的作者。
-- [Byron](https://github.com/bh90210) - 有时，Byron 一个人保持这个项目活跃着。没有他令人难以置信的投入，我们永远不会得到 v1 。
-
-编写项目代码时伴随着以下专辑：
-
-- [Manic Street Preachers - Resistance Is Futile](https://open.spotify.com/album/1R2rsEUqXjIvAbzM0yHrxA)
-- [Manic Street Preachers - This Is My Truth, Tell Me Yours](https://open.spotify.com/album/4VzCL9kjhgGQeKCiojK1YN)
-- [The Midnight - Endless Summer](https://open.spotify.com/album/4Krg8zvprquh7TVn9OxZn8)
-- [Gary Newman - Savage (Songs from a Broken World)](https://open.spotify.com/album/3kMfsD07Q32HRWKRrpcexr)
-- [Steve Vai - Passion & Warfare](https://open.spotify.com/album/0oL0OhrE2rYVns4IGj8h2m)
-- [Ben Howard - Every Kingdom](https://open.spotify.com/album/1nJsbWm3Yy2DW1KIc1OKle)
-- [Ben Howard - Noonday Dream](https://open.spotify.com/album/6astw05cTiXEc2OvyByaPs)
-- [Adwaith - Melyn](https://open.spotify.com/album/2vBE40Rp60tl7rNqIZjaXM)
-- [Gwidaith Hen Fran - Cedors Hen Wrach](https://open.spotify.com/album/3v2hrfNGINPLuDP0YDTOjm)
-- [Metallica - Metallica](https://open.spotify.com/album/2Kh43m04B1UkVcpcRa1Zug)
-- [Bloc Party - Silent Alarm](https://open.spotify.com/album/6SsIdN05HQg2GwYLfXuzLB)
-- [Maxthor - Another World](https://open.spotify.com/album/3tklE2Fgw1hCIUstIwPBJF)
-- [Alun Tan Lan - Y Distawrwydd](https://open.spotify.com/album/0c32OywcLpdJCWWMC6vB8v)
-
-<span id="nav-11"></span>
-
-## 特别感谢
-
-<p align="center" style="text-align: center">
-   <a href="https://pace.dev"><img src="pace.jpeg"/></a><br/>
-   <i>非常</i> 感谢<a href="https://pace.dev">Pace</a>对项目的赞助，并帮助将 Wails 移植到 Apple Silicon !<br/><br/>
-   如果您正在寻找一个强大并且快速和易于使用的项目管理工具，可以看看他们！<br/><br/>
-</p>
-
-<p align="center" style="text-align: center">
-   特别感谢 JetBrains 向我们捐赠许可！<br/><br/>
-   请点击 logo 让他们知道你的感激之情！<br/><br/>
-   <a href="https://www.jetbrains.com?from=Wails"><img src="jetbrains-grayscale.png" width="30%"></a>
-</p>

app_other.go

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

app_windows.go

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

cmd/helpers.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"os/user"
@@ -11,12 +12,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/leaanthony/mewn"
+	"github.com/leaanthony/mewn/lib"
 	"github.com/leaanthony/slicer"
 	"github.com/leaanthony/spinner"
-	wailsruntime "github.com/wailsapp/wails/runtime"
 )
 
-const xgoVersion = "1.16.3"
+const xgoVersion = "1.0.1"
 
 var fs = NewFSHelper()
 
@@ -46,7 +48,7 @@ func InstallGoDependencies(verbose bool) error {
 		depSpinner.SetSpinSpeed(50)
 		depSpinner.Start()
 	}
-	err := NewProgramHelper(verbose).RunCommand("go mod tidy")
+	err := NewProgramHelper(verbose).RunCommand("go get")
 	if err != nil {
 		if !verbose {
 			depSpinner.Error()
@@ -59,6 +61,30 @@ func InstallGoDependencies(verbose bool) error {
 	return nil
 }
 
+// EmbedAssets will embed the built frontend assets via mewn.
+func EmbedAssets() ([]string, error) {
+	mewnFiles := lib.GetMewnFiles([]string{}, false)
+
+	referencedAssets, err := lib.GetReferencedAssets(mewnFiles)
+	if err != nil {
+		return []string{}, err
+	}
+
+	targetFiles := []string{}
+
+	for _, referencedAsset := range referencedAssets {
+		packfileData, err := lib.GeneratePackFileString(referencedAsset, false)
+		if err != nil {
+			return []string{}, err
+		}
+		targetFile := filepath.Join(referencedAsset.BaseDir, referencedAsset.PackageName+"-mewn.go")
+		targetFiles = append(targetFiles, targetFile)
+		ioutil.WriteFile(targetFile, []byte(packfileData), 0644)
+	}
+
+	return targetFiles, nil
+}
+
 func InitializeCrossCompilation(verbose bool) error {
 	// Check Docker
 	if err := CheckIfInstalled("docker"); err != nil {
@@ -101,16 +127,13 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt
 	// Check build directory
 	buildDirectory := filepath.Join(fs.Cwd(), "build")
 	if !fs.DirExists(buildDirectory) {
-		err := fs.MkDir(buildDirectory)
-		if err != nil {
-			return err
-		}
+		fs.MkDir(buildDirectory)
 	}
 
 	buildCommand := slicer.String()
 	userid := 1000
-	currentUser, _ := user.Current()
-	if i, err := strconv.Atoi(currentUser.Uid); err == nil {
+	user, _ := user.Current()
+	if i, err := strconv.Atoi(user.Uid); err == nil {
 		userid = i
 	}
 	for _, arg := range []string{
@@ -175,6 +198,11 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt
 // BuildNative builds on the target platform itself.
 func BuildNative(binaryName string, forceRebuild bool, buildMode string, projectOptions *ProjectOptions) error {
 
+	// Check Mewn is installed
+	if err := CheckMewn(projectOptions.Verbose); err != nil {
+		return err
+	}
+
 	if err := CheckWindres(); err != nil {
 		return err
 	}
@@ -247,6 +275,12 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project
 func BuildApplication(binaryName string, forceRebuild bool, buildMode string, packageApp bool, projectOptions *ProjectOptions) error {
 	var err error
 
+	// embed resources
+	targetFiles, err := EmbedAssets()
+	if err != nil {
+		return err
+	}
+
 	if projectOptions.CrossCompile {
 		if err := InitializeCrossCompilation(projectOptions.Verbose); err != nil {
 			return err
@@ -262,6 +296,20 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 		}
 	}
 
+	// cleanup temporary embedded assets
+	defer func() {
+		for _, filename := range targetFiles {
+			if err := os.Remove(filename); err != nil {
+				fmt.Println(err)
+			}
+		}
+		// Removed by popular demand
+		// TODO: Potentially add a flag to cleanup
+		// if projectOptions.Platform == "windows" {
+		// 	helper.CleanWindows(projectOptions)
+		// }
+	}()
+
 	if projectOptions.CrossCompile {
 		err = BuildDocker(binaryName, buildMode, projectOptions)
 	} else {
@@ -326,6 +374,30 @@ func BuildFrontend(projectOptions *ProjectOptions) error {
 	return nil
 }
 
+// CheckMewn checks if mewn is installed and if not, attempts to fetch it
+func CheckMewn(verbose bool) (err error) {
+	programHelper := NewProgramHelper(verbose)
+	if !programHelper.IsInstalled("mewn") {
+		var buildSpinner *spinner.Spinner
+		if !verbose {
+			buildSpinner = spinner.New()
+			buildSpinner.SetSpinSpeed(50)
+			buildSpinner.Start("Installing Mewn asset packer...")
+		}
+		err := programHelper.InstallGoPackage("github.com/leaanthony/mewn/cmd/mewn")
+		if err != nil {
+			if buildSpinner != nil {
+				buildSpinner.Error()
+			}
+			return err
+		}
+		if buildSpinner != nil {
+			buildSpinner.Success()
+		}
+	}
+	return nil
+}
+
 // CheckWindres checks if Windres is installed and if not, aborts
 func CheckWindres() (err error) {
 	if runtime.GOOS != "windows" { // FIXME: Handle windows cross-compile for windows!
@@ -421,18 +493,11 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 		}
 
 		// Update md5sum file
-		err := os.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
-		if err != nil {
-			return err
-		}
+		ioutil.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
 	}
 
 	// Install the runtime
-	if caller == "build" {
-		err = InstallProdRuntime(projectDir, projectOptions)
-	} else {
-		err = InstallBridge(projectDir, projectOptions)
-	}
+	err = InstallRuntime(caller, projectDir, projectOptions)
 	if err != nil {
 		return err
 	}
@@ -445,17 +510,28 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	return nil
 }
 
+// InstallRuntime installs the correct runtime for the type of build
+func InstallRuntime(caller string, projectDir string, projectOptions *ProjectOptions) error {
+	if caller == "build" {
+		return InstallProdRuntime(projectDir, projectOptions)
+	}
+
+	return InstallBridge(projectDir, projectOptions)
+}
+
 // InstallBridge installs the relevant bridge javascript library
 func InstallBridge(projectDir string, projectOptions *ProjectOptions) error {
+	bridgeFileData := mewn.String("../runtime/assets/bridge.js")
 	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
-	err := fs.CreateFile(bridgeFileTarget, wailsruntime.BridgeJS)
+	err := fs.CreateFile(bridgeFileTarget, []byte(bridgeFileData))
 	return err
 }
 
 // InstallProdRuntime installs the production runtime
 func InstallProdRuntime(projectDir string, projectOptions *ProjectOptions) error {
+	prodInit := mewn.String("../runtime/js/runtime/init.js")
 	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
-	err := fs.CreateFile(bridgeFileTarget, wailsruntime.InitJS)
+	err := fs.CreateFile(bridgeFileTarget, []byte(prodInit))
 	return err
 }
 
@@ -475,22 +551,7 @@ func ServeProject(projectOptions *ProjectOptions, logger *Logger) error {
 	}
 
 	logger.Yellow("Serving Application: " + location)
-	var args []string
-	if len(os.Args) > 2 {
-		foundArgSep := false
-		for index, arg := range os.Args[2:] {
-			if arg == "--" {
-				foundArgSep = true
-				continue
-			}
-			if foundArgSep {
-				args = os.Args[index:]
-				break
-			}
-		}
-		logger.Yellow("Passing arguments: %+v", args)
-	}
-	cmd := exec.Command(location, args...)
+	cmd := exec.Command(location)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()

cmd/linux.go

@@ -69,13 +69,6 @@ const (
 	EndeavourOS
 	// Crux linux distribution
 	Crux
-	// RHEL distribution
-	RHEL
-	// NixOS distribution
-	NixOS
-	// Artix linux distribution
-	ArtixLinux
-
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -138,8 +131,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = Fedora
 	case "centos":
 		result.Distribution = CentOS
-	case "rhel":
-		result.Distribution = RHEL
 	case "arch":
 		result.Distribution = Arch
 	case "archlabs":
@@ -188,10 +179,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = EndeavourOS
 	case "crux":
 		result.Distribution = Crux
-	case "nixos":
-		result.Distribution = NixOS
-	case "artix":
-		result.Distribution = ArtixLinux
 	default:
 		result.Distribution = Unknown
 	}
@@ -283,18 +270,6 @@ func PrtGetInstalled(packageName string) (bool, error) {
 	return exitCode == 0, nil
 }
 
-// NixEnvInstalled uses nix-env to see if a package is installed
-func NixEnvInstalled(packageName string) (bool, error) {
-	program := NewProgramHelper()
-	nixEnv := program.FindProgram("nix-env")
-	if nixEnv == nil {
-		return false, fmt.Errorf("cannot check dependencies: nix-env not found")
-	}
-	packageName = strings.ReplaceAll(packageName, "+", `\+`)
-	_, _, exitCode, _ := nixEnv.Run("-q", packageName)
-	return exitCode == 0, nil
-}
-
 // RequestSupportForDistribution promts the user to submit a request to support their
 // currently unsupported distribution
 func RequestSupportForDistribution(distroInfo *DistroInfo) error {

cmd/linuxdb.yaml

@@ -138,25 +138,6 @@ distributions:
             help: Please install with `sudo yum install gtk3-devel` and try again
           - name: webkitgtk3-devel
             help: Please install with `sudo yum install webkitgtk3-devel` and try again
-  rhel:
-    id: rhel
-    releases:
-      default:
-        version: default
-        name: Red Hat Enterprise Linux
-        gccversioncommand: *gccdumpversion
-        programs:
-          - name: gcc
-            help: Please install with `sudo yum install gcc-c++ make` and try again
-          - name: pkg-config
-            help: Please install with `sudo yum install pkgconf-pkg-config` and try again
-          - name: npm
-            help: Please install with `sudo yum install epel-release && sudo yum install nodejs` and try again
-        libraries:
-          - name: gtk3-devel
-            help: Please install with `sudo yum install gtk3-devel` and try again
-          - name: webkitgtk3-devel
-            help: Please install with `sudo yum install webkitgtk3-devel` and try again
   fedora:
     id: fedora
     releases:
@@ -213,15 +194,6 @@ 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:
@@ -327,49 +299,30 @@ distributions:
           - name: webkit2gtk3-devel
             help: Please install with `sudo zypper in webkit2gtk3-devel` and try again
   opensuse-leap:
-    id: opensuse-leap
-    releases:
-      default:
-        version: default
-        name: openSUSE Leap
-        gccversioncommand: *gccdumpfullversion
-        programs: *opensusedefaultprograms
-        libraries: *opensusedefaultlibraries
+      id: opensuse-leap
+      releases:
+        default:
+          version: default
+          name: openSUSE Leap
+          gccversioncommand: *gccdumpfullversion
+          programs: *opensusedefaultprograms
+          libraries: *opensusedefaultlibraries
   crux:
-    id: crux
-    releases:
-      default:
-        version: default
-        name: Crux Linux
-        gccversioncommand: *gccdumpversion
-        programs:
-          - name: gcc
-            help: Please install with `sudo prt-get depinst gcc-c++ make` and try again
-          - name: pkg-config
-            help: Please install with `sudo prt-get depinst pkg-config` and try again
-          - name: npm
-            help: Please install with `sudo prt-get depinst nodejs` and try again
-        libraries:
-          - name: gtk3
-            help: Please install with `sudo prt-get depinst gtk3` and try again
-          - name: webkitgtk
-            help: Please install with `sudo prt-get depinst webkitgtk` and try again
-  nixos:
-    id: nixos
-    releases:
-      default:
-        version: default
-        name: NixOS
-        gccversioncommand: *gccdumpversion
-        programs:
-          - name: gcc
-            help: Please install with `nix-env -iA nixos.gcc`
-          - name: pkg-config
-            help: Please install with `nix-env -iA nixos.pkg-config`
-          - name: npm
-            help: Please install with `nix-env -iA nixos.nodejs`
-        libraries:
-          - name: gtk+3
-            help: Please install with `nix-env -iA nixos.gtk3`
-          - name: webkitgtk
-            help: Please install with `nix-env -iA nixos.nodePackages.webkitgtk`
+      id: crux
+      releases:
+        default:
+          version: default
+          name: Crux Linux
+          gccversioncommand: *gccdumpversion
+          programs:
+            - name: gcc
+              help: Please install with `sudo prt-get depinst gcc-c++ make` and try again
+            - name: pkg-config
+              help: Please install with `sudo prt-get depinst pkg-config` and try again
+            - name: npm
+              help: Please install with `sudo prt-get depinst nodejs` and try again
+          libraries:
+            - name: gtk3
+              help: Please install with `sudo prt-get depinst gtk3` and try again
+            - name: webkitgtk
+              help: Please install with `sudo prt-get depinst webkitgtk` and try again

cmd/package.go

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

cmd/system.go

@@ -281,9 +281,9 @@ 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, ArtixLinux:
+		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS:
 			libraryChecker = PacmanInstalled
-		case CentOS, Fedora, Tumbleweed, Leap, RHEL:
+		case CentOS, Fedora, Tumbleweed, Leap:
 			libraryChecker = RpmInstalled
 		case Gentoo:
 			libraryChecker = EqueryInstalled
@@ -293,8 +293,6 @@ func CheckDependencies(logger *Logger) (bool, error) {
 			libraryChecker = EOpkgInstalled
 		case Crux:
 			libraryChecker = PrtGetInstalled
-		case NixOS:
-			libraryChecker = NixEnvInstalled
 		default:
 			return false, RequestSupportForDistribution(distroInfo)
 		}

cmd/templates/angular-template/main.go.template

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

cmd/templates/create-react-app/main.go.template

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

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

@@ -2,7 +2,7 @@ import svelte from 'rollup-plugin-svelte';
 import resolve from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import livereload from 'rollup-plugin-livereload';
-import {terser} from 'rollup-plugin-terser';
+import { terser } from 'rollup-plugin-terser';
 import image from '@rollup/plugin-image';
 import babel from 'rollup-plugin-babel';
 import polyfill from 'rollup-plugin-polyfill';

cmd/templates/svelte/main.go.template

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

cmd/templates/vanilla/main.go.template

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

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

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

cmd/templates/vue3-js/frontend/.gitignore

@@ -1,23 +0,0 @@
-.DS_Store
-node_modules
-/dist
-
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?

cmd/templates/vue3-js/frontend/README.md

@@ -1,29 +0,0 @@
-# vue-js
-
-## Project setup
-
-```
-npm install
-```
-
-### Compiles and hot-reloads for development
-
-```
-npm run serve
-```
-
-### Compiles and minifies for production
-
-```
-npm run build
-```
-
-### Lints and fixes files
-
-```
-npm run lint
-```
-
-### Customize configuration
-
-See [Configuration Reference](https://cli.vuejs.org/config/).

cmd/templates/vue3-js/frontend/babel.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-    presets: [
-        '@vue/cli-plugin-babel/preset'
-    ]
-}

cmd/templates/vue3-js/frontend/package.json.template

@@ -1,49 +0,0 @@
-{
-  "name": "{{.NPMProjectName}}",
-  "version": "1.0.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "@wailsapp/runtime": "^1.1.1",
-    "core-js": "^3.6.5",
-    "vue": "^3.0.0",
-    "vue-router": "^4.0.0-0",
-    "vuex": "^4.0.0-0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-plugin-router": "~4.5.0",
-    "@vue/cli-plugin-vuex": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "@vue/compiler-sfc": "^3.0.0",
-    "babel-eslint": "^10.1.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-vue": "^7.0.0",
-    "stylus": "^0.54.7",
-    "stylus-loader": "^3.0.2"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/vue3-essential",
-      "eslint:recommended"
-    ],
-    "parserOptions": {
-      "parser": "babel-eslint"
-    },
-    "rules": {}
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
-}

cmd/templates/vue3-js/frontend/public/index.html

@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html lang="">
-<head>
-    <meta charset="utf-8">
-    <meta content="IE=edge" http-equiv="X-UA-Compatible">
-    <meta content="width=device-width,initial-scale=1.0" name="viewport">
-    <link href="<%= BASE_URL %>favicon.ico" rel="icon">
-    <title><%= htmlWebpackPlugin.options.title %></title>
-</head>
-<body>
-<noscript>
-    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
-        Please enable it to continue.</strong>
-</noscript>
-<div id="app"></div>
-<!-- built files will be auto injected -->
-</body>
-</html>

cmd/templates/vue3-js/frontend/src/App.vue

@@ -1,30 +0,0 @@
-<template>
-  <div id="nav">
-    <router-link to="/">Home</router-link> |
-    <router-link to="/about">About</router-link>
-  </div>
-  <router-view />
-</template>
-
-<style lang="stylus">
-#app {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-}
-
-#nav {
-  padding: 30px;
-}
-
-#nav a {
-  font-weight: bold;
-  color: #2c3e50;
-}
-
-#nav a.router-link-exact-active {
-  color: #42b983;
-}
-</style>

cmd/templates/vue3-js/frontend/src/components/HelloWorld.vue

@@ -1,32 +0,0 @@
-<template>
-  <div class="hello">
-    <h1>{{ msg }}</h1>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "HelloWorld",
-  props: {
-    msg: String,
-  },
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-h3 {
-  margin: 40px 0 0;
-}
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-a {
-  color: #42b983;
-}
-</style>

cmd/templates/vue3-js/frontend/src/main.js

@@ -1,14 +0,0 @@
-import {createApp} from 'vue'
-import App from './App.vue'
-import router from './router'
-import store from './store'
-
-// import wails runtime
-import * as Wails from '@wailsapp/runtime';
-
-Wails.Init(() => {
-  createApp(App)
-      .use(store)
-      .use(router)
-      .mount('#app')
-})

cmd/templates/vue3-js/frontend/src/router/index.js

@@ -1,25 +0,0 @@
-import {createMemoryHistory, createRouter} from 'vue-router'
-import Home from '../views/Home.vue'
-import About from '../views/About.vue'
-
-
-const routes = [
-  {
-    path: '/',
-    name: 'Home',
-    component: Home
-  },
-  {
-    path: '/about',
-    name: 'About',
-    // You can only use pre-loading to add routes, not the on-demand loading method.
-    component: About
-  }
-]
-
-const router = createRouter({
-  history: createMemoryHistory(),
-  routes
-})
-
-export default router

cmd/templates/vue3-js/frontend/src/store/index.js

@@ -1,8 +0,0 @@
-import {createStore} from 'vuex'
-
-export default createStore({
-  state: {},
-  mutations: {},
-  actions: {},
-  modules: {}
-})

cmd/templates/vue3-js/frontend/src/views/About.vue

@@ -1,5 +0,0 @@
-<template>
-  <div class="about">
-    <h1>This is an about page</h1>
-  </div>
-</template>

cmd/templates/vue3-js/frontend/src/views/Home.vue

@@ -1,42 +0,0 @@
-<template>
-  <div class="home">
-    <img
-      @click="getMessage"
-      alt="Vue logo"
-      src="../assets/appicon.png"
-      :style="{ height: '400px' }"
-    />
-    <HelloWorld :msg="message" />
-  </div>
-</template>
-
-<script>
-import { ref } from "vue";
-import HelloWorld from "@/components/HelloWorld.vue";
-
-export default {
-  name: "Home",
-  components: {
-    HelloWorld,
-  },
-  setup() {
-    const message = ref("Click the Icon");
-
-    const getMessage = () => {
-      window.backend
-        .basic()
-        .then((res) => {
-          message.value = res;
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    };
-
-    return {
-      message: message,
-      getMessage: getMessage,
-    };
-  },
-};
-</script>

cmd/templates/vue3-js/frontend/vue.config.js

@@ -1,42 +0,0 @@
-let cssConfig = {};
-
-if (process.env.NODE_ENV == 'production') {
-    cssConfig = {
-        extract: {
-            filename: '[name].css',
-            chunkFilename: '[name].css'
-        }
-    };
-}
-
-module.exports = {
-    chainWebpack: config => {
-        let limit = 9999999999999999;
-        config.module
-            .rule('images')
-            .test(/\.(png|gif|jpg)(\?.*)?$/i)
-            .use('url-loader')
-            .loader('url-loader')
-            .tap(options => Object.assign(options, {limit: limit}));
-        config.module
-            .rule('fonts')
-            .test(/\.(woff2?|eot|ttf|otf|svg)(\?.*)?$/i)
-            .use('url-loader')
-            .loader('url-loader')
-            .options({
-                limit: limit
-            });
-    },
-    css: cssConfig,
-    configureWebpack: {
-        output: {
-            filename: '[name].js'
-        },
-        optimization: {
-            splitChunks: false
-        }
-    },
-    devServer: {
-        disableHostCheck: true
-    }
-};

cmd/templates/vue3-js/go.mod.template

@@ -1,5 +0,0 @@
-module {{.BinaryName}}
-
-require (
-	github.com/wailsapp/wails {{.WailsVersion}}
-)

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

@@ -1,30 +0,0 @@
-package main
-
-import (
-  _ "embed"
-  "github.com/wailsapp/wails"
-)
-
-func basic() string {
-  return "Hello World!"
-}
-
-//go:embed frontend/dist/app.js
-var js string
-
-//go:embed frontend/dist/app.css
-var css string
-
-func main() {
-
-  app := wails.CreateApp(&wails.AppConfig{
-    Width:  1024,
-    Height: 768,
-    Title:  "{{.Name}}",
-    JS:     js,
-    CSS:    css,
-    Colour: "#131313",
-  })
-  app.Bind(basic)
-  app.Run()
-}

cmd/templates/vue3-js/template.json

@@ -1,18 +0,0 @@
-{
-  "name": "Vue3 JS",
-  "version": "1.0.0",
-  "shortdescription": "A template based on Vue 3, Vue-router, Vuex, and Webpack5",
-  "description": "A template based on Vue 3, Vue-router, Vuex, and Webpack5",
-  "install": "npm install",
-  "build": "npm run build",
-  "author": "Misitebao <i@misitebao.com>",
-  "created": "2021-05-02 17:25:55",
-  "frontenddir": "frontend",
-  "serve": "npm run serve",
-  "bridge": "src",
-  "wailsdir": "",
-  "platforms": [
-    "linux",
-    "darwin"
-  ]
-}

cmd/templates/vuebasic/main.go.template

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

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

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

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

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

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v1.16.8"
+const Version = "v1.13.1"

cmd/wails/0_setup.go

@@ -39,6 +39,12 @@ Create your first project by running 'wails init'.`
 			return err
 		}
 
+		// Check Mewn
+		err = cmd.CheckMewn(false)
+		if err != nil {
+			return err
+		}
+
 		// Check for errors
 		// CheckDependencies() returns !errors
 		// so to get the right message in this

cmd/wails/10.1_dev_newtemplate.go

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

cmd/wails/10_dev.go

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

cmd/wails/2_init.go

@@ -15,7 +15,6 @@ func init() {
 	projectOptions := projectHelper.NewProjectOptions()
 	commandDescription := `Generates a new Wails project using the given flags. 
 Any flags that are required and not given will be prompted for.`
-	build := false
 
 	initCommand := app.Command("init", "Initialises a new Wails project").
 		LongDescription(commandDescription).
@@ -24,8 +23,7 @@ Any flags that are required and not given will be prompted for.`
 		StringFlag("template", "Template name", &projectOptions.Template).
 		StringFlag("name", "Project name", &projectOptions.Name).
 		StringFlag("description", "Project description", &projectOptions.Description).
-		StringFlag("output", "Output binary name", &projectOptions.BinaryName).
-		BoolFlag("build", "Build project after generating", &build)
+		StringFlag("output", "Output binary name", &projectOptions.BinaryName)
 
 	initCommand.Action(func() error {
 
@@ -66,10 +64,6 @@ Any flags that are required and not given will be prompted for.`
 			return err
 		}
 		genSpinner.Success()
-		if !build {
-			logger.Yellow("Project '%s' initialised. Run `wails build` to build it.", projectOptions.Name)
-			return nil
-		}
 
 		// Build the project
 		cwd, _ := os.Getwd()

cmd/wails/4_build.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"log"
 	"os"
 	"runtime"
 	"strings"
@@ -53,10 +52,7 @@ func init() {
 
 	var b strings.Builder
 	for _, plat := range getSupportedPlatforms() {
-		_, err := fmt.Fprintf(&b, " - %s\n", plat)
-		if err != nil {
-			log.Fatal(err)
-		}
+		fmt.Fprintf(&b, " - %s\n", plat)
 	}
 	initCmd.StringFlag("x",
 		fmt.Sprintf("Cross-compile application to specified platform via xgo\n%s", b.String()),
@@ -84,7 +80,7 @@ func init() {
 		fs := cmd.NewFSHelper()
 		err := projectOptions.LoadConfig(fs.Cwd())
 		if err != nil {
-			return fmt.Errorf("unable to find 'project.json'. Please check you are in a Wails project directory")
+			return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
 		}
 
 		// Set firebug flag
@@ -147,6 +143,12 @@ func init() {
 			if err != nil {
 				return err
 			}
+
+			// Ensure that runtime init.js is the production version
+			err = cmd.InstallProdRuntime(projectDir, projectOptions)
+			if err != nil {
+				return err
+			}
 		}
 
 		// Move to project directory

cmd/wails/6_serve.go

@@ -27,13 +27,19 @@ func init() {
 		logger.PrintSmallBanner(message)
 		fmt.Println()
 
+		// Check Mewn is installed
+		err := cmd.CheckMewn(verbose)
+		if err != nil {
+			return err
+		}
+
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
 
 		// Check we are in project directory
 		// Check project.json loads correctly
 		fs := cmd.NewFSHelper()
-		err := projectOptions.LoadConfig(fs.Cwd())
+		err = projectOptions.LoadConfig(fs.Cwd())
 		if err != nil {
 			return err
 		}

cmd/windows.go

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

config.go

@@ -181,7 +181,7 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		MaxWidth:  -1,
 		MaxHeight: -1,
 		Title:     "My Wails App",
-		Colour:    "",
+		Colour:    "#FFF", // White by default
 		HTML:      defaultHTML,
 	}
 

go.mod

@@ -5,10 +5,11 @@ 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.1
+	github.com/gorilla/websocket v1.4.0
 	github.com/jackmordaunt/icns v1.0.0
 	github.com/kennygrant/sanitize v1.2.4
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+	github.com/leaanthony/mewn v0.10.7
 	github.com/leaanthony/slicer v1.4.0
 	github.com/leaanthony/spinner v0.5.3
 	github.com/mattn/go-colorable v0.1.1 // indirect
@@ -16,16 +17,15 @@ require (
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
 	github.com/pkg/errors v0.8.1 // indirect
-	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/objx v0.1.1 // indirect
+	github.com/sirupsen/logrus v1.4.1
 	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba
 	golang.org/x/image v0.0.0-20200430140353-33d19683fad8
 	golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
-	golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359
+	golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
 	golang.org/x/text v0.3.0
 	gopkg.in/AlecAivazis/survey.v1 v1.8.4
 	gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
 )
 
-go 1.16
+go 1.13

go.sum

@@ -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.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+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/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=
@@ -26,6 +26,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/leaanthony/mewn v0.10.7 h1:jCcNJyIUOpwj+I5SuATvCugDjHkoo+j6ubEOxxrxmPA=
+github.com/leaanthony/mewn v0.10.7/go.mod h1:CRkTx8unLiSSilu/Sd7i1LwrdaAL+3eQ3ses99qGMEQ=
 github.com/leaanthony/slicer v1.4.0 h1:Q9u4w+UBU4WHjXnEDdz+eRLMKF/rnyosRBiqULnc1J8=
 github.com/leaanthony/slicer v1.4.0/go.mod h1:FwrApmf8gOrpzEWM2J/9Lh79tyq8KTX5AzRtwV7m4AY=
 github.com/leaanthony/spinner v0.5.3 h1:IMTvgdQCec5QA4qRy0wil4XsRP+QcG1OwLWVK/LPZ5Y=
@@ -54,8 +56,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 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.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -66,6 +66,7 @@ github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba h1:2DHfQOxcpWdGf5
 github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba/go.mod h1:iLnlXG2Pakcii2CU0cbY07DRCSvpWNa7nFxtevhOChk=
 golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/image v0.0.0-20200430140353-33d19683fad8 h1:6WW6V3x1P/jokJBpRQYUJnMHRP6isStQwCozxnU7XQw=
 golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -78,12 +79,8 @@ golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 h1:2B5p2L5IfGiD7+b9BOoRMC6DgObAVZV+Fsp050NqXik=
-golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 gopkg.in/AlecAivazis/survey.v1 v1.8.4 h1:10xXXN3wgIhPheb5NI58zFgZv32Ana7P3Tl4shW+0Qc=

lib/binding/function.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"reflect"
 	"runtime"
-	"strings"
 
 	"github.com/wailsapp/wails/lib/logger"
 )
@@ -28,10 +27,6 @@ func newBoundFunction(object interface{}) (*boundFunction, error) {
 	objectType := reflect.TypeOf(object)
 
 	name := runtime.FuncForPC(objectValue.Pointer()).Name()
-	if strings.Contains(name, "/") {
-		parts := strings.Split(name, "/")
-		name = parts[len(parts)-1]
-	}
 
 	result := &boundFunction{
 		fullName:     name,

lib/binding/manager.go

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

lib/renderer/bridge/session.go

@@ -3,9 +3,8 @@ package renderer
 import (
 	"time"
 
-	"github.com/wailsapp/wails/runtime"
-
 	"github.com/gorilla/websocket"
+	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/lib/interfaces"
 	"github.com/wailsapp/wails/lib/logger"
 )
@@ -59,7 +58,8 @@ func (s *session) start(firstSession bool) {
 	s.log.Infof("Connected to frontend.")
 	go s.writePump()
 
-	s.evalJS(runtime.WailsJS, wailsRuntimeMessage)
+	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
+	s.evalJS(wailsRuntime, wailsRuntimeMessage)
 
 	// Inject bindings
 	for _, binding := range s.bindingCache {

lib/renderer/webview.go

@@ -8,9 +8,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/wailsapp/wails/runtime"
-
 	"github.com/go-playground/colors"
+	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/lib/interfaces"
 	"github.com/wailsapp/wails/lib/logger"
 	"github.com/wailsapp/wails/lib/messages"
@@ -24,12 +23,13 @@ import (
 var UseFirebug = ""
 
 type WebView struct {
-	window         wv.WebView // The webview object
-	ipc            interfaces.IPCManager
-	log            *logger.CustomLogger
-	config         interfaces.AppConfig
-	eventManager   interfaces.EventManager
-	bindingCache   []string
+	window       wv.WebView // The webview object
+	ipc          interfaces.IPCManager
+	log          *logger.CustomLogger
+	config       interfaces.AppConfig
+	eventManager interfaces.EventManager
+	bindingCache []string
+	
 	maximumSizeSet bool
 }
 
@@ -93,6 +93,7 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 			w.ipc.Dispatch(message, w.callback)
 		},
 	})
+		fmt.Println("Control")
 
 	// Set minimum and maximum sizes
 	if setMinSize {
@@ -100,28 +101,19 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 	}
 	if setMaxSize {
 		w.SetMaxSize(maxWidth, maxHeight)
-	}
-
-	// Set minimum and maximum sizes
-	if setMinSize {
-		w.SetMinSize(minWidth, minHeight)
-	}
-	if setMaxSize {
-		w.SetMaxSize(maxWidth, maxHeight)
+		fmt.Println("Max")
 	}
 
 	// SignalManager.OnExit(w.Exit)
 
 	// Set colour
-	color := config.GetColour()
-	if color != "" {
-		err := w.SetColour(color)
-		if err != nil {
-			return err
-		}
+	err := w.SetColour(config.GetColour())
+	if err != nil {
+		return err
 	}
 
 	w.log.Info("Initialised")
+
 	return nil
 }
 
@@ -231,8 +223,8 @@ func (w *WebView) Run() error {
 	}
 
 	// Runtime assets
-	w.log.DebugFields("Injecting wails JS runtime", logger.Fields{"js": runtime.WailsJS})
-	w.evalJS(runtime.WailsJS)
+	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
+	w.evalJS(wailsRuntime)
 
 	// Ping the wait channel when the wails runtime is loaded
 	w.eventManager.On("wails:loaded", func(...interface{}) {
@@ -255,9 +247,10 @@ func (w *WebView) Run() error {
 				w.injectCSS(w.config.GetCSS())
 			} else {
 				// Use default wails css
+				w.log.Debug("Injecting Default Wails CSS")
+				defaultCSS := mewn.String("../../runtime/assets/wails.css")
 
-				w.log.Debug("Injecting Default Wails CSS: " + runtime.WailsCSS)
-				w.injectCSS(runtime.WailsCSS)
+				w.injectCSS(defaultCSS)
 			}
 
 			// Inject user JS

lib/renderer/webview/webview.h

@@ -54,7 +54,7 @@ extern "C"
     int ready;
     int js_busy;
     int should_exit;
-
+    
     int min_width;
     int min_height;
     int max_width;
@@ -179,7 +179,7 @@ struct webview_priv
   WEBVIEW_API int webview_inject_css(struct webview *w, const char *css);
   WEBVIEW_API void webview_set_title(struct webview *w, const char *title);
   WEBVIEW_API void webview_focus(struct webview *w);
-  WEBVIEW_API void webview_minsize(struct webview *w, int width, int height);
+  WEBVIEW_API void webview_minsize(struct webview *w, int width, int height);  
   WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height);
   WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen);
   WEBVIEW_API void webview_set_color(struct webview *w, uint8_t r, uint8_t g,
@@ -342,12 +342,12 @@ struct webview_priv
     w->priv.should_exit = 0;
     w->priv.queue = g_async_queue_new();
     w->priv.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
+    
     w->priv.min_width = -1;
     w->priv.min_height = -1;
     w->priv.max_width = -1;
     w->priv.max_height = -1;
-
+    
     gtk_window_set_title(GTK_WINDOW(w->priv.window), w->title);
 
     if (w->resizable)
@@ -421,13 +421,13 @@ struct webview_priv
   }
 
   WEBVIEW_API void webview_minsize(struct webview *w, int width, int height) {
-
+  
     w->priv.min_width = width;
     w->priv.min_height = height;
 
     GdkGeometry hints;
     GdkWindowHints usedHints = (GdkWindowHints) GDK_HINT_MIN_SIZE;
-
+    
     hints.min_width = w->priv.min_width;
     hints.min_height = w->priv.min_height;
     if (w->priv.max_width != -1) {
@@ -435,18 +435,18 @@ struct webview_priv
       hints.max_height = w->priv.max_height;
       usedHints = (GdkWindowHints)(GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
     }
-
+    
     gtk_window_set_geometry_hints(GTK_WINDOW(w->priv.window), w->priv.window, &hints, usedHints);
   }
 
   WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height) {
-
+    
     w->priv.max_width = width;
     w->priv.max_height = height;
-
+  
     GdkGeometry hints;
     GdkWindowHints usedHints = (GdkWindowHints) GDK_HINT_MAX_SIZE;
-
+    
     if (w->priv.min_width != -1) {
       hints.min_width = w->priv.min_width;
       hints.min_height = w->priv.min_height;
@@ -454,7 +454,7 @@ struct webview_priv
     }
     hints.max_width = w->priv.max_width;
     hints.max_height = w->priv.max_height;
-
+    
     gtk_window_set_geometry_hints(GTK_WINDOW(w->priv.window), w->priv.window, &hints, usedHints);
   }
 
@@ -514,6 +514,7 @@ struct webview_priv
       }
       gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dlg), FALSE);
       gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dlg), FALSE);
+      gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dlg), TRUE);
       gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dlg), TRUE);
       gtk_file_chooser_set_create_folders(GTK_FILE_CHOOSER(dlg), TRUE);
       gint response = gtk_dialog_run(GTK_DIALOG(dlg));
@@ -1397,12 +1398,12 @@ struct webview_priv
     case WM_GETMINMAXINFO:
     {
       if (w != NULL) {
-        // get pixel density
+        // get pixel density 
         HDC hDC = GetDC(NULL);
         double DPIScaleX = GetDeviceCaps(hDC, 88)/96.0;
         double DPIScaleY = GetDeviceCaps(hDC, 90)/96.0;
         ReleaseDC(NULL, hDC);
-
+      	
         RECT rcClient, rcWind;
         POINT ptDiff;
         GetClientRect(hwnd, &rcClient);
@@ -1412,7 +1413,7 @@ struct webview_priv
         int heightExtra = (rcWind.bottom - rcWind.top) - rcClient.bottom;
 
         LPMINMAXINFO lpMMI = (LPMINMAXINFO)lParam;
-
+      
         if (w->priv.min_width != -1) {
           lpMMI->ptMinTrackSize.x = w->priv.min_width * DPIScaleX + widthExtra;
           lpMMI->ptMinTrackSize.y = w->priv.min_height * DPIScaleY + heightExtra;
@@ -1422,7 +1423,7 @@ struct webview_priv
           lpMMI->ptMaxTrackSize.y = w->priv.max_height * DPIScaleY + heightExtra;
         }
       }
-
+      
       return 0;
     }
     case WM_DESTROY:
@@ -2154,10 +2155,6 @@ struct webview_priv
     objc_setAssociatedObject(w->priv.delegate, "webview", (id)(w),
                              OBJC_ASSOCIATION_ASSIGN);
 
-    // Disable damn smart quotes
-    // Credit: https://stackoverflow.com/a/31640511
-    [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"NSAutomaticQuoteSubstitutionEnabled"];
-
     NSRect r = NSMakeRect(0, 0, w->width, w->height);
     NSUInteger style = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
                        NSWindowStyleMaskMiniaturizable;
@@ -2327,25 +2324,26 @@ struct webview_priv
   {
     [w->priv.window makeKeyWindow];
   }
-
+  
   WEBVIEW_API void webview_minsize(struct webview *w, int width, int height) {
     NSSize size;
     size.width = width;
     size.height = height;
     [w->priv.window setMinSize:size];
   }
-
+  
   WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height) {
     NSSize size;
     size.width = width;
     size.height = height;
     [w->priv.window setMaxSize:size];
-
+    
+    [w->priv.window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary|NSWindowCollectionBehaviorFullScreenNone|NSWindowCollectionBehaviorFullScreenDisallowsTiling];
+       
     NSButton *button = [w->priv.window standardWindowButton:NSWindowZoomButton];
-    [button performSelectorOnMainThread:@selector(setEnabled:) withObject:NO
-    waitUntilDone:NO];
+    [button setEnabled: NO];
   }
-
+  
   WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
   {
     int b = ((([w->priv.window styleMask] & NSWindowStyleMaskFullScreen) ==
@@ -2430,8 +2428,6 @@ struct webview_priv
         [panel setAllowedFileTypes:fileTypes];
       }
       [panel setTreatsFilePackagesAsDirectories:YES];
-      [panel setNameFieldStringValue:@"Temp"]; // Necessary to prevent crash when replacing files
-      [panel setNameFieldStringValue:@"Untitled"];
       [panel beginSheetModalForWindow:w->priv.window
                     completionHandler:^(NSInteger result) {
                       [NSApp stopModalWithCode:result];
@@ -2502,4 +2498,4 @@ struct webview_priv
 }
 #endif
 
-#endif /* WEBVIEW_H */
+#endif /* WEBVIEW_H */

runtime/assets.go

@@ -1,15 +0,0 @@
-package runtime
-
-import _ "embed"
-
-//go:embed assets/bridge.js
-var BridgeJS []byte
-
-//go:embed assets/wails.js
-var WailsJS string
-
-//go:embed assets/wails.css
-var WailsCSS string
-
-//go:embed js/runtime/init.js
-var InitJS []byte

runtime/js/.eslintrc

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

runtime/js/core/browser.js

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

runtime/js/core/calls.js

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

runtime/js/core/ipc.js

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

runtime/js/core/main.js

@@ -10,11 +10,11 @@ The lightweight framework for web-like apps
 /* jshint esversion: 6 */
 import * as Log from './log';
 import * as Browser from './browser';
-import {Acknowledge, Emit, Heartbeat, Notify, On, OnMultiple} from './events';
-import {NewBinding} from './bindings';
-import {Callback} from './calls';
-import {AddScript, InjectCSS, InjectFirebug} from './utils';
-import {AddIPCListener} from './ipc';
+import { On, OnMultiple, Emit, Notify, Heartbeat, Acknowledge } from './events';
+import { NewBinding } from './bindings';
+import { Callback } from './calls';
+import { AddScript, InjectCSS, InjectFirebug } from './utils';
+import { AddIPCListener } from './ipc';
 import * as Store from './store';
 
 // Initialise global if not already
@@ -29,7 +29,7 @@ window.backend = {};
 // so we have to use an explicit if statement to prevent webpack from optimizing the code.
 if (window.external == undefined) {
 	window.external = {
-		invoke: function (x) {
+		invoke: function(x) {
 			window.webkit.messageHandlers.external.postMessage(x);
 		}
 	};
@@ -75,7 +75,7 @@ window.onerror = function (msg, url, lineNo, columnNo, error) {
 };
 
 // Use firebug?
-if (window.usefirebug) {
+if( window.usefirebug ) {
 	InjectFirebug();
 }
 

runtime/js/package-lock.json

@@ -4255,9 +4255,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
       "dev": true
     },
     "loose-envify": {
@@ -5525,9 +5525,9 @@
       "dev": true
     },
     "ssri": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
-      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
       "dev": true,
       "requires": {
         "figgy-pudding": "^3.5.1"

runtime/js/runtime/.npmignore

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

runtime/js/runtime/package-lock.json

@@ -124,9 +124,9 @@
       }
     },
     "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==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
       "dev": true
     },
     "ini": {
@@ -260,9 +260,9 @@
       }
     },
     "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==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
     "path-type": {

scripts/build.go

@@ -8,6 +8,38 @@ import (
 	"path/filepath"
 )
 
+// Default target to run when none is specified
+// If not set, running mage will list available targets
+// var Default = Build
+
+/*
+# Build runtime
+echo "**** Building Runtime ****"
+cd runtime/js
+npm install
+npm run build
+cd ../..
+
+echo "**** Packing Assets ****"
+cd cmd
+mewn
+cd ..
+cd lib/renderer
+mewn
+cd ../..
+
+echo "**** Installing Wails locally ****"
+cd cmd/wails
+go install
+cd ../..
+
+echo "**** Tidying the mods! ****"
+go mod tidy
+
+echo "**** WE ARE DONE! ****"
+
+*/
+
 func runCommand(command string, args ...string) {
 	cmd := exec.Command(command, args...)
 	output, err := cmd.CombinedOutput()
@@ -16,6 +48,7 @@ func runCommand(command string, args ...string) {
 		log.Println(string(output))
 		log.Fatal(err)
 	}
+	cmd.Run()
 	fmt.Println(string(output))
 }
 
@@ -27,26 +60,26 @@ func main() {
 	// Build Runtime
 	fmt.Println("**** Building Runtime ****")
 	runtimeDir, _ := filepath.Abs(filepath.Join(dir, "..", "runtime", "js"))
-	err := os.Chdir(runtimeDir)
-	if err != nil {
-		log.Fatal(err)
-	}
+	os.Chdir(runtimeDir)
 	runCommand("npm", "install")
 	runCommand("npm", "run", "build")
 
+	// Pack assets
+	fmt.Println("**** Packing Assets ****")
+	rendererDir, _ := filepath.Abs(filepath.Join(dir, "..", "lib", "renderer"))
+	os.Chdir(rendererDir)
+	runCommand("mewn")
+	cmdDir, _ := filepath.Abs(filepath.Join(dir, "..", "cmd"))
+	os.Chdir(cmdDir)
+	runCommand("mewn")
+
 	// Install Wails
 	fmt.Println("**** Installing Wails locally ****")
 	execDir, _ := filepath.Abs(filepath.Join(dir, "..", "cmd", "wails"))
-	err = os.Chdir(execDir)
-	if err != nil {
-		log.Fatal(err)
-	}
+	os.Chdir(execDir)
 	runCommand("go", "install")
 
 	baseDir, _ := filepath.Abs(filepath.Join(dir, ".."))
-	err = os.Chdir(baseDir)
-	if err != nil {
-		log.Fatal(err)
-	}
+	os.Chdir(baseDir)
 	runCommand("go", "mod", "tidy")
 }

scripts/build.sh

@@ -15,6 +15,15 @@ npm install
 npm run build
 cd ../..
 
+echo "**** Packing Assets ****"
+cd cmd
+mewn
+cd ..
+cd lib/renderer
+mewn
+cd ../..
+
+
 cd cmd/wails
 echo "**** Checking if Wails compiles ****"
 if ! go build .

scripts/updateversion.sh

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

v2/NOTES.md

@@ -1,40 +0,0 @@
-
-# Packing linux
-
-  * create app, app.desktop, app.png (512x512)
-  * chmod +x app!
-  * ./linuxdeploy-x86_64.AppImage --appdir AppDir -i react.png -d react.desktop  -e react --output appimage
-
-
-# Wails Doctor
-
-Tested on:
-
-  * Debian 8
-  * Ubuntu 20.04
-  * Ubuntu 19.10
-  * Solus 4.1
-  * Centos 8
-  * Gentoo
-  * OpenSUSE/leap
-  * Fedora 31
-
-### Development
-
-Add a new package manager processor here: `v2/internal/system/packagemanager/`. IsAvailable should work even if the package is installed.
-Add your new package manager to the list of package managers in `v2/internal/system/packagemanager/packagemanager.go`:
-
-```
-var db = map[string]PackageManager{
-	"eopkg":  NewEopkg(),
-	"apt":    NewApt(),
-	"yum":    NewYum(),
-	"pacman": NewPacman(),
-	"emerge": NewEmerge(),
-	"zypper": NewZypper(),
-}
-```
-
-## Gentoo
-
-  * Setup docker image using: emerge-webrsync -x -v

v2/README.md

@@ -1,6 +0,0 @@
-# Wails v2 ALPHA
-
-This branch contains WORK IN PROGRESS! There are no guarantees. Use at your peril! 
-
-This document will be updated as progress is made.
-

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

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

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

@@ -1,265 +0,0 @@
-package build
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"text/tabwriter"
-	"time"
-
-	"github.com/wailsapp/wails/v2/cmd/wails/internal"
-	"github.com/wailsapp/wails/v2/internal/gomod"
-
-	"github.com/wailsapp/wails/v2/internal/system"
-
-	"github.com/leaanthony/clir"
-	"github.com/leaanthony/slicer"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-	"github.com/wailsapp/wails/v2/pkg/commands/build"
-)
-
-// AddBuildSubcommand adds the `build` command for the Wails application
-func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
-
-	outputType := "desktop"
-
-	validTargetTypes := slicer.String([]string{"desktop", "hybrid", "server"})
-
-	command := app.NewSubCommand("build", "Builds the application")
-
-	// Setup noPackage flag
-	noPackage := false
-	command.BoolFlag("noPackage", "Skips platform specific packaging", &noPackage)
-
-	compilerCommand := "go"
-	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
-
-	compress := false
-	command.BoolFlag("upx", "Compress final binary with UPX (if installed)", &compress)
-
-	compressFlags := ""
-	command.StringFlag("upxflags", "Flags to pass to upx", &compressFlags)
-
-	// Setup Platform flag
-	platform := runtime.GOOS
-	command.StringFlag("platform", "Platform to target", &platform)
-
-	// Verbosity
-	verbosity := 1
-	command.IntFlag("v", "Verbosity level (0 - silent, 1 - default, 2 - verbose)", &verbosity)
-
-	// ldflags to pass to `go`
-	ldflags := ""
-	command.StringFlag("ldflags", "optional ldflags", &ldflags)
-
-	// tags to pass to `go`
-	tags := ""
-	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &tags)
-
-	outputFilename := ""
-	command.StringFlag("o", "Output filename", &outputFilename)
-
-	// Clean build directory
-	cleanBuildDirectory := false
-	command.BoolFlag("clean", "Clean the build directory before building", &cleanBuildDirectory)
-
-	webview2 := "download"
-	command.StringFlag("webview2", "WebView2 installer strategy: download,embed,browser,error.", &webview2)
-
-	skipFrontend := false
-	command.BoolFlag("s", "Skips building the frontend", &skipFrontend)
-
-	forceBuild := false
-	command.BoolFlag("f", "Force build application", &forceBuild)
-
-	command.Action(func() error {
-
-		quiet := verbosity == 0
-
-		// Create logger
-		logger := clilogger.New(w)
-		logger.Mute(quiet)
-
-		// Validate output type
-		if !validTargetTypes.Contains(outputType) {
-			return fmt.Errorf("output type '%s' is not valid", outputType)
-		}
-
-		if !quiet {
-			app.PrintBanner()
-		}
-
-		// Check platform
-		validPlatformArch := slicer.String([]string{
-			"darwin",
-			"darwin/amd64",
-			"darwin/arm64",
-			"darwin/universal",
-			//"linux",
-			//"linux/amd64",
-			//"linux/arm-7",
-			"windows",
-			"windows/amd64",
-		})
-		if !validPlatformArch.Contains(platform) {
-			return fmt.Errorf("platform %s is not supported. Platforms supported: %s", platform, validPlatformArch.Join(","))
-		}
-
-		if compress && platform == "darwin/universal" {
-			logger.Println("Warning: compress flag unsupported for universal binaries. Ignoring.")
-			compress = false
-		}
-
-		// Lookup compiler path
-		compilerPath, err := exec.LookPath(compilerCommand)
-		if err != nil {
-			return fmt.Errorf("unable to find compiler: %s", compilerCommand)
-		}
-
-		// Tags
-		experimental := false
-		userTags := []string{}
-		for _, tag := range strings.Split(tags, " ") {
-			thisTag := strings.TrimSpace(tag)
-			if thisTag != "" {
-				userTags = append(userTags, thisTag)
-			}
-			if thisTag == "exp" {
-				experimental = true
-			}
-		}
-
-		if runtime.GOOS == "linux" && !experimental {
-			return fmt.Errorf("Linux version coming soon!")
-		}
-
-		// Webview2 installer strategy (download by default)
-		wv2rtstrategy := ""
-		webview2 = strings.ToLower(webview2)
-		if webview2 != "" {
-			validWV2Runtime := slicer.String([]string{"download", "embed", "browser", "error"})
-			if !validWV2Runtime.Contains(webview2) {
-				return fmt.Errorf("invalid option for flag 'webview2': %s", webview2)
-			}
-			// These are the build tags associated with the strategies
-			switch webview2 {
-			case "embed":
-				wv2rtstrategy = "wv2runtime.embed"
-			case "error":
-				wv2rtstrategy = "wv2runtime.error"
-			case "browser":
-				wv2rtstrategy = "wv2runtime.browser"
-			}
-		}
-
-		// Create BuildOptions
-		buildOptions := &build.Options{
-			Logger:              logger,
-			OutputType:          outputType,
-			OutputFile:          outputFilename,
-			CleanBuildDirectory: cleanBuildDirectory,
-			Mode:                build.Production,
-			Pack:                !noPackage,
-			LDFlags:             ldflags,
-			Compiler:            compilerCommand,
-			Verbosity:           verbosity,
-			ForceBuild:          forceBuild,
-			IgnoreFrontend:      skipFrontend,
-			Compress:            compress,
-			CompressFlags:       compressFlags,
-			UserTags:            userTags,
-			WebView2Strategy:    wv2rtstrategy,
-		}
-
-		// Calculate platform and arch
-		platformSplit := strings.Split(platform, "/")
-		buildOptions.Platform = platformSplit[0]
-		if system.IsAppleSilicon {
-			buildOptions.Arch = "arm64"
-		} else {
-			buildOptions.Arch = runtime.GOARCH
-		}
-		if len(platformSplit) == 2 {
-			buildOptions.Arch = platformSplit[1]
-		}
-
-		// Start a new tabwriter
-		w := new(tabwriter.Writer)
-		w.Init(os.Stdout, 8, 8, 0, '\t', 0)
-
-		// Write out the system information
-		fmt.Fprintf(w, "\n")
-		fmt.Fprintf(w, "App Type: \t%s\n", buildOptions.OutputType)
-		fmt.Fprintf(w, "Platform: \t%s\n", buildOptions.Platform)
-		fmt.Fprintf(w, "Arch: \t%s\n", buildOptions.Arch)
-		fmt.Fprintf(w, "Compiler: \t%s\n", compilerPath)
-		fmt.Fprintf(w, "Skip Frontend: \t%t\n", skipFrontend)
-		fmt.Fprintf(w, "Compress: \t%t\n", buildOptions.Compress)
-		fmt.Fprintf(w, "Package: \t%t\n", buildOptions.Pack)
-		fmt.Fprintf(w, "Clean Build Dir: \t%t\n", buildOptions.CleanBuildDirectory)
-		fmt.Fprintf(w, "LDFlags: \t\"%s\"\n", buildOptions.LDFlags)
-		fmt.Fprintf(w, "Tags: \t[%s]\n", strings.Join(buildOptions.UserTags, ","))
-		if len(buildOptions.OutputFile) > 0 {
-			fmt.Fprintf(w, "Output File: \t%s\n", buildOptions.OutputFile)
-		}
-		fmt.Fprintf(w, "\n")
-		w.Flush()
-
-		err = checkGoModVersion(logger)
-		if err != nil {
-			return err
-		}
-
-		return doBuild(buildOptions)
-	})
-}
-
-// doBuild is our main build command
-func doBuild(buildOptions *build.Options) error {
-
-	// Start Time
-	start := time.Now()
-
-	outputFilename, err := build.Build(buildOptions)
-	if err != nil {
-		return err
-	}
-
-	// Output stats
-	elapsed := time.Since(start)
-	buildOptions.Logger.Println("")
-	buildOptions.Logger.Println(fmt.Sprintf("Built '%s' in %s.", outputFilename, elapsed.Round(time.Millisecond).String()))
-	buildOptions.Logger.Println("")
-
-	return nil
-}
-
-func checkGoModVersion(logger *clilogger.CLILogger) error {
-	cwd, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-	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
-	}
-	gomodversion, err := gomod.GetWailsVersionFromModFile(gomodData)
-	if err != nil {
-		return err
-	}
-
-	logger.Println("Warning: go.mod is using Wails '%s' but the CLI is '%s'. Consider updating it.\n", gomodversion.String(), internal.Version)
-	return nil
-}

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

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

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

@@ -1,586 +0,0 @@
-package dev
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"os/exec"
-	"os/signal"
-	"path/filepath"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/google/shlex"
-	"github.com/wailsapp/wails/v2/cmd/wails/internal"
-	"github.com/wailsapp/wails/v2/internal/gomod"
-
-	"github.com/wailsapp/wails/v2/internal/project"
-
-	"github.com/pkg/browser"
-	"github.com/wailsapp/wails/v2/internal/colour"
-
-	"github.com/fsnotify/fsnotify"
-	"github.com/leaanthony/clir"
-	"github.com/wailsapp/wails/v2/internal/fs"
-	"github.com/wailsapp/wails/v2/internal/process"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-	"github.com/wailsapp/wails/v2/pkg/commands/build"
-)
-
-const defaultDevServerURL = "http://localhost:34115"
-
-func LogGreen(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.Green(text))
-}
-
-func LogRed(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.Red(text))
-}
-
-func LogDarkYellow(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.DarkYellow(text))
-}
-
-func sliceToMap(input []string) map[string]struct{} {
-	result := map[string]struct{}{}
-	for _, value := range input {
-		result[value] = struct{}{}
-	}
-	return result
-}
-
-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
-	appargs         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")
-
-	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.StringFlag("appargs", "arguments to pass to the underlying app (quoted and space searated)", &flags.appargs)
-
-	command.Action(func() error {
-		// Create logger
-		logger := clilogger.New(w)
-		app.PrintBanner()
-
-		experimental := false
-		userTags := []string{}
-		for _, tag := range strings.Split(flags.tags, " ") {
-			thisTag := strings.TrimSpace(tag)
-			if thisTag != "" {
-				userTags = append(userTags, thisTag)
-			}
-			if thisTag == "exp" {
-				experimental = true
-			}
-		}
-
-		if runtime.GOOS == "linux" && !experimental {
-			return fmt.Errorf("Linux version coming soon!")
-		}
-
-		cwd, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-
-		projectConfig, err := loadAndMergeProjectConfig(cwd, &flags)
-		if err != nil {
-			return err
-		}
-
-		// Update go.mod to use current wails version
-		err = syncGoModVersion(cwd)
-		if err != nil {
-			return err
-		}
-
-		// Run go mod tidy to ensure we're up to date
-		err = runCommand(cwd, false, "go", "mod", "tidy")
-		if err != nil {
-			return err
-		}
-
-		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
-
-		// Setup signal handler
-		quitChannel := make(chan os.Signal, 1)
-		signal.Notify(quitChannel, os.Interrupt, os.Kill, syscall.SIGTERM)
-		exitCodeChannel := make(chan int, 1)
-
-		// Do initial build
-		logger.Println("Building application for development...")
-		newProcess, appBinary, err := restartApp(buildOptions, debugBinaryProcess, flags, exitCodeChannel)
-		if err != nil {
-			return err
-		}
-		if newProcess != nil {
-			debugBinaryProcess = newProcess
-		}
-
-		// open browser
-		if flags.openBrowser {
-			url := defaultDevServerURL
-			if flags.devServerURL != "" {
-				url = flags.devServerURL
-			}
-			err = browser.OpenURL(url)
-			if err != nil {
-				return err
-			}
-		}
-
-		// 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)
-
-		LogGreen("Watching (sub)/directory: %s", cwd)
-		LogGreen("Using Dev Server URL: %s", flags.devServerURL)
-		LogGreen("Using reload debounce setting of %d milliseconds", flags.debounceMS)
-
-		// Watch for changes and trigger restartApp()
-		doWatcherLoop(buildOptions, debugBinaryProcess, flags, watcher, exitCodeChannel, quitChannel)
-
-		// Kill the current program if running
-		if debugBinaryProcess != nil {
-			err := debugBinaryProcess.Kill()
-			if err != nil {
-				return err
-			}
-		}
-
-		// Remove dev binary
-		err = os.Remove(appBinary)
-		if err != nil {
-			return err
-		}
-
-		LogGreen("Development mode exited")
-
-		return nil
-	})
-	return nil
-}
-
-func 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 {
-	result := &build.Options{
-		OutputType:     "dev",
-		Mode:           build.Dev,
-		Arch:           runtime.GOARCH,
-		Pack:           false,
-		Platform:       runtime.GOOS,
-		LDFlags:        flags.ldflags,
-		Compiler:       flags.compilerCommand,
-		ForceBuild:     flags.forceBuild,
-		IgnoreFrontend: false,
-		Verbosity:      flags.verbosity,
-		WailsJSDir:     flags.wailsjsdir,
-	}
-	switch runtime.GOOS {
-	case "darwin":
-		result.Pack = false
-	}
-	return result
-}
-
-// 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 flags.appargs == "" && projectConfig.AppArgs != "" {
-		flags.appargs = projectConfig.AppArgs
-	}
-
-	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
-			if cmd != nil && cmd.Process != nil {
-				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 {
-		LogRed("Build error - continuing to run current version")
-		LogDarkYellow(err.Error())
-		return nil, "", nil
-	}
-
-	// Kill existing binary if need be
-	if debugBinaryProcess != nil {
-		killError := debugBinaryProcess.Kill()
-
-		if killError != nil {
-			buildOptions.Logger.Fatal("Unable to kill debug binary (PID: %d)!", debugBinaryProcess.PID())
-		}
-
-		debugBinaryProcess = nil
-	}
-
-	// parse appargs if any
-	args, err := shlex.Split(flags.appargs)
-
-	if err != nil {
-		buildOptions.Logger.Fatal("Unable to parse appargs: %s", err.Error())
-	}
-
-	// Set environment variables accordingly
-	os.Setenv("loglevel", flags.loglevel)
-	os.Setenv("assetdir", flags.assetDir)
-	os.Setenv("devserverurl", flags.devServerURL)
-
-	// Start up new binary with correct args
-	newProcess := process.NewProcess(appBinary, args...)
-	err = newProcess.Start(exitCodeChannel)
-	if err != nil {
-		// Remove binary
-		if fs.FileExists(appBinary) {
-			deleteError := fs.DeleteFile(appBinary)
-			if deleteError != nil {
-				buildOptions.Logger.Fatal("Unable to delete app binary: " + appBinary)
-			}
-		}
-		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/doctor/doctor.go

@@ -1,158 +0,0 @@
-package doctor
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"runtime"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/leaanthony/clir"
-	"github.com/wailsapp/wails/v2/internal/system"
-	"github.com/wailsapp/wails/v2/internal/system/packagemanager"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-)
-
-// AddSubcommand adds the `doctor` command for the Wails application
-func AddSubcommand(app *clir.Cli, w io.Writer) error {
-
-	command := app.NewSubCommand("doctor", "Diagnose your environment")
-
-	command.Action(func() error {
-
-		logger := clilogger.New(w)
-
-		app.PrintBanner()
-
-		logger.Print("Scanning system - Please wait (this may take a long time)...")
-
-		// Get system info
-		info, err := system.GetInfo()
-		if err != nil {
-			logger.Println("Failed.")
-			return err
-		}
-		logger.Println("Done.")
-
-		logger.Println("")
-
-		// Start a new tabwriter
-		w := new(tabwriter.Writer)
-		w.Init(os.Stdout, 8, 8, 0, '\t', 0)
-
-		// Write out the system information
-		fmt.Fprintf(w, "System\n")
-		fmt.Fprintf(w, "------\n")
-		fmt.Fprintf(w, "%s\t%s\n", "OS:", info.OS.Name)
-		fmt.Fprintf(w, "%s\t%s\n", "Version: ", info.OS.Version)
-		fmt.Fprintf(w, "%s\t%s\n", "ID:", info.OS.ID)
-
-		// Output Go Information
-		fmt.Fprintf(w, "%s\t%s\n", "Go Version:", runtime.Version())
-		fmt.Fprintf(w, "%s\t%s\n", "Platform:", runtime.GOOS)
-		fmt.Fprintf(w, "%s\t%s\n", "Architecture:", runtime.GOARCH)
-
-		// Exit early if PM not found
-		if info.PM != nil {
-			fmt.Fprintf(w, "%s\t%s\n", "Package Manager: ", info.PM.Name())
-		}
-
-		// Output Dependencies Status
-		var dependenciesMissing = []string{}
-		var externalPackages = []*packagemanager.Dependancy{}
-		var dependenciesAvailableRequired = 0
-		var dependenciesAvailableOptional = 0
-		fmt.Fprintf(w, "\n")
-		fmt.Fprintf(w, "Dependency\tPackage Name\tStatus\tVersion\n")
-		fmt.Fprintf(w, "----------\t------------\t------\t-------\n")
-
-		hasOptionalDependencies := false
-		// Loop over dependencies
-		for _, dependency := range info.Dependencies {
-
-			name := dependency.Name
-			if dependency.Optional {
-				name = "*" + name
-				hasOptionalDependencies = true
-			}
-			packageName := "Unknown"
-			status := "Not Found"
-
-			// If we found the package
-			if dependency.PackageName != "" {
-
-				packageName = dependency.PackageName
-
-				// If it's installed, update the status
-				if dependency.Installed {
-					status = "Installed"
-				} else {
-					// Generate meaningful status text
-					status = "Available"
-
-					if dependency.Optional {
-						dependenciesAvailableOptional++
-					} else {
-						dependenciesAvailableRequired++
-					}
-				}
-			} else {
-				if !dependency.Optional {
-					dependenciesMissing = append(dependenciesMissing, dependency.Name)
-				}
-
-				if dependency.External {
-					externalPackages = append(externalPackages, dependency)
-				}
-			}
-
-			fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", name, packageName, status, dependency.Version)
-		}
-		if hasOptionalDependencies {
-			fmt.Fprintf(w, "\n")
-			fmt.Fprintf(w, "* - Optional Dependency\n")
-		}
-		w.Flush()
-		logger.Println("")
-		logger.Println("Diagnosis")
-		logger.Println("---------")
-
-		// Generate an appropriate diagnosis
-
-		if len(dependenciesMissing) == 0 && dependenciesAvailableRequired == 0 {
-			logger.Println("Your system is ready for Wails development!")
-		} else {
-			logger.Println("Your system has missing dependencies!\n")
-		}
-
-		if dependenciesAvailableRequired != 0 {
-			logger.Println("Required package(s) installation details: \n" + info.Dependencies.InstallAllRequiredCommand())
-		}
-
-		if dependenciesAvailableOptional != 0 {
-			logger.Println("Optional package(s) installation details: \n" + info.Dependencies.InstallAllOptionalCommand())
-		}
-		//
-		//if len(externalPackages) > 0 {
-		//	for _, p := range externalPackages {
-		//		if p.Optional {
-		//			print("[Optional] ")
-		//		}
-		//		logger.Println("Install " + p.Name + ": " + p.InstallCommand)
-		//	}
-		//}
-
-		if len(dependenciesMissing) != 0 {
-			// TODO: Check if apps are available locally and if so, adjust the diagnosis
-			logger.Println("Fatal:")
-			logger.Println("Required dependencies missing: " + strings.Join(dependenciesMissing, " "))
-			logger.Println("Please read this article on how to resolve this: https://wails.app/guides/resolving-missing-packages")
-		}
-
-		logger.Println("")
-		return nil
-	})
-
-	return nil
-}

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

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

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

@@ -1,23 +0,0 @@
-package generate
-
-import (
-	"io"
-
-	"github.com/wailsapp/wails/v2/cmd/wails/internal/commands/generate/template"
-
-	"github.com/leaanthony/clir"
-)
-
-// AddSubcommand adds the `generate` command for the Wails application
-func AddSubcommand(app *clir.Cli, w io.Writer) error {
-
-	command := app.NewSubCommand("generate", "Code Generation Tools")
-
-	err := AddModuleCommand(app, command, w)
-	if err != nil {
-		return err
-	}
-	template.AddSubCommand(app, command, w)
-
-	return nil
-}

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

@@ -1,58 +0,0 @@
-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"
-)
-
-// AddModuleCommand adds the `module` subcommand for the `generate` command
-func AddModuleCommand(app *clir.Cli, parent *clir.Command, w io.Writer) error {
-
-	command := parent.NewSubCommand("module", "Generate wailsjs modules")
-	var tags string
-	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &tags)
-
-	command.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)
-
-		cwd, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-
-		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)
-		}
-
-		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

@@ -1,42 +0,0 @@
-# Next Steps
-
-Congratulations on generating your template!
-
-## Completing your template
-
-The next steps to complete the template are:
-
-  1. Complete the fields in the `template.json` file.
-     - It is really important to ensure `helpurl` is valid as this is where users of the template will be directed for help.
-  2. Update `README.md`.
-  3. Edit `wails.json` and ensure all fields are correct, especially:
-     - `assetdir` - path to your assets
-     - `wailsjsdir` - path to generate wailsjs modules
-     - `frontend:install` - The command to install your frontend dependencies
-     - `frontend:build` - The command to build your frontend
-  4. Remove any `public` or `dist` directories.
-  5. Delete this file.
-
-## Testing your template
-
-You can test your template by running this command:
-
-`wails init -n test -t {{.TemplateDir}}`
-
-### Checklist
-
-Once generated, do the following tests:
-  - Change into the new project directory and run `wails build`. A working binary should be generated in the `build/bin` project directory.
-  - Run `wails dev`. This will compile your app and run it.
-    - You should be able to see your application running on http://localhost:34115/
-
-## Publishing your template
-
-You can publish a template to a git repository and use it as follows:
-
-`wails init -name test -t https://your/git/url`
-
-EG: 
-
-`wails init -name test -t https://github.com/leaanthony/testtemplate`
-

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

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

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

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

v2/cmd/wails/internal/commands/generate/template/base/frontend/dist/assets/fonts/OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2016 The Nunito Project Authors (contact@sansoxygen.com),
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

v2/cmd/wails/internal/commands/generate/template/base/frontend/dist/assets/images/logo-dark.svg

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 551 436" version="1.1" xmlns="http://www.w3.org/2000/svg"
-     xml:space="preserve"
-     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1.27527,0,0,1.27527,104.01,410.563)">
-        <path d="M0,-51.891L14.429,-51.891L13.043,-21.183L22.568,-51.891L34.226,-51.891L34.084,-21.183L42.365,-51.891L56.794,-51.891L38.526,0L25.198,0L25.34,-32.45L15.211,0L1.919,0L0,-51.891Z"
-              style="fill:white;fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(1.27527,0,0,1.27527,224.985,367.503)">
-        <path d="M0,15.639L5.793,15.639L5.971,-3.589L0,15.639ZM-20.187,33.765L-0.675,-18.126L16.42,-18.126L20.08,33.765L5.437,33.765L5.509,26.123L-3.057,26.123L-5.332,33.765L-20.187,33.765Z"
-              style="fill:white;fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(0.19929,-1.2596,-1.2596,-0.19929,332.323,396.949)">
-        <path d="M-16.046,33.107L36.491,33.107L38.757,18.784L-13.785,18.82L-16.046,33.107Z"
-              style="fill:white;fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(1.27527,0,0,1.27527,353.217,344.388)">
-        <path d="M0,51.891L8.246,0L22.781,0L16.597,39.024L27.224,39.024L25.199,51.891L0,51.891Z"
-              style="fill:white;fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(1.27527,0,0,1.27527,427.939,364.922)">
-        <path d="M0,19.83C1.611,21.181 3.305,22.224 5.083,22.959C6.859,23.693 8.565,24.06 10.2,24.06C11.645,24.06 12.794,23.663 13.647,22.87C14.5,22.076 14.927,20.992 14.927,19.617C14.927,18.434 14.571,17.254 13.861,16.081C13.15,14.908 11.775,13.351 9.738,11.408C7.273,9.015 5.58,6.906 4.655,5.081C3.731,3.257 3.27,1.243 3.27,-0.96C3.27,-5.912 4.839,-9.846 7.979,-12.76C11.118,-15.674 15.377,-17.132 20.756,-17.132C22.936,-17.132 25.008,-16.889 26.975,-16.403C28.941,-15.917 30.943,-15.165 32.982,-14.146L30.92,-1.493C29.356,-2.583 27.834,-3.412 26.354,-3.981C24.872,-4.551 23.457,-4.835 22.106,-4.835C20.898,-4.835 19.943,-4.521 19.245,-3.894C18.546,-3.265 18.196,-2.406 18.196,-1.316C18.196,0.154 19.535,2.215 22.213,4.868C22.544,5.2 22.805,5.46 22.995,5.649C25.696,8.304 27.473,10.578 28.326,12.475C29.179,14.37 29.605,16.56 29.605,19.049C29.605,24.594 27.893,28.965 24.469,32.163C21.046,35.361 16.36,36.962 10.413,36.962C7.877,36.962 5.479,36.66 3.216,36.056C0.953,35.45 -0.948,34.615 -2.488,33.549L0,19.83Z"
-              style="fill:white;fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(-166.599,4.57132,4.57132,166.599,147.403,167.648)">
-        <path d="M0.883,-0.081L0.121,0.081L0.256,-0.063L0.883,-0.081Z" style="fill:url(#_Linear1);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(-106.443,-16.0669,-16.0669,106.443,428.19,188.033)">
-        <path d="M0.878,-0.285L-0.073,0.71L-1.186,0.542L0.015,0.207L-0.846,0.077L0.355,-0.258L-0.505,-0.388L0.649,-0.71L0.878,-0.285Z"
-              style="fill:url(#_Linear2);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(-114.484,-162.408,-162.408,114.484,333.291,285.804)">
-        <path d="M0.44,-0.04L0.44,-0.04L0.44,-0.04L0.265,-0.056L0.177,0.437L-0.311,-0.255L0.262,-0.437L0.568,-0.437L0.44,-0.04Z"
-              style="fill:url(#_Linear3);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(61.6919,58.8091,58.8091,-61.6919,258.631,180.413)">
-        <path d="M0.5,0L0.5,-0L0.5,0L0.5,0Z" style="fill:url(#_Linear4);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(238.126,298.893,298.893,-238.126,113.516,-150.536)">
-        <path d="M0.622,-0.115L0.761,-0.115L0.806,-0.013L0.826,0.182L0.622,-0.115Z"
-              style="fill:url(#_Linear5);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(-369.529,-97.4118,-97.4118,369.529,582.38,94.027)">
-        <path d="M0.467,0.005L0.49,0.062L0.271,-0.062L0.467,0.005Z" style="fill:url(#_Linear6);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(-496.156,-53.9751,-53.9751,496.156,367.888,125.085)">
-        <path d="M0.2,0.001L0.219,-0.018L0.614,0.012L0.519,0.089L0.282,0.068L0.2,0.135L0.463,0.194L0.374,0.266L0.138,0.186L0.138,0.186L0.138,0.186L0.047,0.033L-0.131,-0.266L0.2,0.001Z"
-              style="fill:url(#_Linear7);fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(185.076,176.427,176.427,-185.076,153.446,80.1488)">
-        <path d="M0.735,-0L0.735,-0L0.735,0L0.735,-0Z" style="fill:url(#_Linear8);fill-rule:nonzero;"/>
-    </g>
-    <defs>
-        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse"
-                        gradientTransform="matrix(1,-3.46945e-18,-3.46945e-18,-1,0,-3.05761e-06)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/>
-            <stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse"
-                        gradientTransform="matrix(1,0,0,-1,0,-2.75467e-06)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/>
-            <stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear3" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse"
-                        gradientTransform="matrix(1,-1.11022e-16,-1.11022e-16,-1,0,-2.61861e-06)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/>
-            <stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear4" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse"
-                        gradientTransform="matrix(1,-5.55112e-17,-5.55112e-17,-1,0,-1.57562e-06)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/>
-            <stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear5" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse"
-                        gradientTransform="matrix(-0.801899,-0.59746,-0.59746,0.801899,1.3495,0.447457)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/>
-            <stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear6" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse"
-                        gradientTransform="matrix(1,-2.77556e-17,-2.77556e-17,-1,0,-1.92826e-06)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/>
-            <stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear7" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse"
-                        gradientTransform="matrix(1,0,0,-1,0,9.68429e-07)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/>
-            <stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-        <linearGradient id="_Linear8" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse"
-                        gradientTransform="matrix(1,0,0,-1,0,1.43665e-07)"><stop offset="0" style="stop-color:rgb(227,50,50);stop-opacity:1"/>
-            <stop offset="1" style="stop-color:rgb(107,0,13);stop-opacity:1"/></linearGradient>
-    </defs>
-</svg>

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

@@ -1,18 +0,0 @@
-<html>
-
-<head>
-  <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="/main.js"></script>
-</body>
-
-</html>

v2/cmd/wails/internal/commands/generate/template/base/frontend/dist/main.css

@@ -1,72 +0,0 @@
-html {
-  background-color: rgba(33, 37, 43, 1);
-  text-align: center;
-  color: white;
-}
-
-body {
-  margin: 0;
-  color: white;
-  font-family: "Nunito", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
-    "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
-    sans-serif;
-}
-
-@font-face {
-  font-family: "Nunito";
-  font-style: normal;
-  font-weight: 400;
-  src: local(""),
-    url("assets/fonts/nunito-v16-latin-regular.woff2") format("woff2");
-}
-
-.logo {
-  display: block;
-  width: 35%;
-  height: 35%;
-  margin: auto;
-  padding: 15% 0 0;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-image: url("./assets/images/logo-dark.svg");
-}
-.result {
-  height: 20px;
-  line-height: 20px;
-  margin: 1.5rem auto;
-}
-.input-box .btn {
-  width: 60px;
-  height: 30px;
-  line-height: 30px;
-  border-radius: 3px;
-  border: none;
-  margin: 0 0 0 20px;
-  padding: 0 8px;
-  cursor: pointer;
-}
-.input-box .btn:hover {
-  background-image: linear-gradient(to top, #cfd9df 0%, #e2ebf0 100%);
-  color: #333333;
-}
-
-.input-box .input {
-  border: none;
-  border-radius: 3px;
-  outline: none;
-  height: 30px;
-  line-height: 30px;
-  padding: 0 10px;
-  background-color: rgba(240, 240, 240, 1);
-  -webkit-font-smoothing: antialiased;
-}
-
-.input-box .input:hover {
-  border: none;
-  background-color: rgba(255, 255, 255, 1);
-}
-
-.input-box .input:focus {
-  border: none;
-  background-color: rgba(255, 255, 255, 1);
-}

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

@@ -1,23 +0,0 @@
-// Get input + focus
-let nameElement = document.getElementById("name");
-nameElement.focus();
-
-// Setup the greet function
-window.greet = function () {
-
-  // Get name
-  let name = nameElement.value;
-
-  // Call App.Greet(name)
-  window.go.main.App.Greet(name).then((result) => {
-    // Update result with data back from App.Greet()
-    document.getElementById("result").innerText = result;
-  });
-};
-
-nameElement.onkeydown = function (e) {
-  console.log(e)
-  if (e.keyCode == 13) {
-    window.greet()
-  }
-}