improved 'generate' command for module

This reverts commit 15cdf7382b.

.github/FUNDING.yml

@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-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
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,12 +8,8 @@ assignees: ''
 ---
 
 #####################################################
-     **If you have a technical issue, please do not open a bug this way!** 
-                      Please use the `wails issue` command!
-          If you do not do this then the issue may be closed automatically.                      
-
- NOTE: If your bug is related to Windows, make sure you read 
- the [Windows Developer Guide](https://wails.app/guides/windows/)
+     If you have a technical issue, please do not open a bug this way! 
+                      Please use the `wails issue` command!                          
 #####################################################
 
 **Description**
@@ -37,5 +33,3 @@ Please provide your platform, GO version and variables, etc
 
 **Additional context**
 Add any other context about the problem here.
-
-- [ ] This issue is for Windows and I have read the [Windows Developer Guide](https://wails.app/guides/windows/)

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/workflows/latest-pre.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

.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

.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

.gitignore

@@ -17,8 +17,12 @@ cmd/wails/wails
 .DS_Store
 tmp
 node_modules/
-v2/test/kitchensink/frontend/public
+package.json.md5
+v2/test/**/frontend/dist
+v2/test/**/build/
+v2/test/frameless/icon.png
+v2/test/hidden/icon.png
 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/test/kitchensink/frontend/public/bundle.*
+v2/pkg/parser/testproject/frontend/wails

CONTRIBUTORS.md

@@ -32,17 +32,3 @@ Wails is what it is because of the time and effort given by these great people.
   * [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)

README.md

@@ -2,7 +2,7 @@
    <img src="logo_cropped.png" width="40%"><br/>
 </p>
 <p align="center">
-   Build desktop applications using Go & Web Technologies.<br/><br/>
+   A framework for building desktop applications using Go & Web Technologies.<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>
@@ -12,49 +12,16 @@
    <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>
+   <a href="https://github.com/wailsapp/wails/workflows/latest-pre/badge.svg?branch=masterr" rel="nofollow"><img src="https://github.com/wailsapp/wails/workflows/latest-pre/badge.svg?branch=master" alt="Pre-Release Pipelines"></a>
 </p>
 
-<span id="nav-1"></span>
-
-## Internationalization
-
-English | [简体中文](README.zh_CN.md)
-
 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).
 
-<span id="nav-2"></span>
-
-## Contents
-
-- [1. Internationalization](#nav-1)
-- [2. Contents](#nav-2)
-- [3. Features](#nav-3)
-- [4. Sponsors](#nav-4)
-- [5. Installation](#nav-5)
-  - [5.1 MacOS](#nav-5-1)
-  - [5.2 Linux](#nav-5-2)
-    - [5.2.1 Debian/Ubuntu](#nav-5-2-1)
-    - [5.2.2 Arch Linux / ArchLabs / Ctlos Linux](#nav-5-2-2)
-    - [5.2.3 Centos](#nav-5-2-3)
-    - [5.2.4 Fedora](#nav-5-2-4)
-    - [5.2.5 VoidLinux & VoidLinux-musl](#nav-5-2-5)
-    - [5.2.6 Gentoo](#nav-5-2-6)
-  - [5.3 Windows](#nav-5-3)
-- [6. Installation](#nav-6)
-- [7. Next Steps](#nav-7)
-- [8. FAQ](#nav-8)
-- [9. Contributors](#nav-9)
-- [10. Special Mentions](#nav-10)
-- [11. Licensing](#nav-11)
-- [12. Special Thanks](#nav-12)
-
-<span id="nav-3"></span>
-
 ## Features
 
-- Use standard Go for the backend
+- Use standard Go libraries/frameworks for the backend
 - Use any frontend technology to build your UI
 - Quickly create Vue, Vuetify or React frontends for your Go programs
 - Expose Go methods/functions to the frontend via a single bind command
@@ -64,57 +31,22 @@ The official docs can be found at [https://wails.app](https://wails.app).
 - Powerful cli tool
 - Multiplatform
 
-<span id="nav-4"></span>
-
-## Sponsors
-
-This project is supported by these kind people / companies:
-
-<a href="https://github.com/matryer" style="width:100px"><img src="https://github.com/matryer.png" width="100"/></a>
-<a href="https://www.jetbrains.com?from=Wails" style="width:100px"><img src="jetbrains-grayscale.png" width="100"/></a>
-<a href="https://github.com/tc-hib" style="width:55px;border-radius: 50%">
-<img src="https://github.com/tc-hib.png?size=55" width="55" style="border-radius: 50%"/>
-</a>
-<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/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/akhudek" style="width:50px;border-radius: 50%">
-<img src="https://github.com/akhudek.png?size=50" width="50" style="border-radius: 50%"/>
-</a>
-<a href="https://github.com/akhudek" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/akhudek.png?size=50" width="50" style="border-radius: 50%"/>
-</a>
-<a href="https://github.com/trea" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/trea.png?size=50" width="50" style="border-radius: 50%"/>
-</a>
-<a href="https://github.com/LanguageAgnostic" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55" style="border-radius: 50%"/>
-</a>
 
 ## Installation
 
 Wails uses cgo to bind to the native rendering engines so a number of platform dependent libraries are needed as well as an installation of Go. The basic requirements are:
 
-- Go 1.16
+- Go 1.13
 - npm
 
-<span id="nav-5-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-5-2"></span>
-
 ### Linux
 
-<span id="nav-5-2-1"></span>
-
 #### Debian/Ubuntu
 
 `sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev`
@@ -123,52 +55,38 @@ _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
+_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_, Pop!_OS
 
-<span id="nav-5-2-2"></span>
-
-#### Arch Linux / ArchLabs / Ctlos Linux
+#### Arch Linux / ArchLabs
 
 `sudo pacman -S webkit2gtk gtk3`
 
 _Also succesfully test on: Manjaro & ArcoLinux_
 
-<span id="nav-5-2-3"></span>
-
 #### Centos
 
 `sudo yum install webkitgtk3-devel gtk3-devel`
 
 _CentOS 6, 7_
 
-<span id="nav-5-2-4"></span>
-
 #### Fedora
 
 `sudo yum install webkit2gtk3-devel gtk3-devel`
 
 _Fedora 29, 30_
 
-<span id="nav-5-2-5"></span>
-
 #### VoidLinux & VoidLinux-musl
 
 `xbps-install gtk+3-devel webkit2gtk-devel`
 
-<span id="nav-5-2-6"></span>
-
 #### Gentoo
 
 `sudo emerge gtk+:3 webkit-gtk`
 
-<span id="nav-5-3"></span>
-
 ### Windows
 
 Windows requires gcc and related tooling. The recommended download is from [http://tdm-gcc.tdragon.net/download](http://tdm-gcc.tdragon.net/download). Once this is installed, you are good to go.
 
-<span id="nav-6"></span>
-
 ## Installation
 
 **Ensure Go modules are enabled: GO111MODULE=on and go/bin is in your PATH variable.**
@@ -179,119 +97,58 @@ Installation is as simple as running the following command:
 go get -u github.com/wailsapp/wails/cmd/wails
 </pre>
 
-<span id="nav-7"></span>
-
 ## 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>
-
-<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)
-
-<span id="nav-11"></span>
+  * [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)
 
 ## 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)
 
-<span id="nav-12"></span>
-
-## Special Thanks
-
-<p align="center" style="text-align: center">
-   <a href="https://pace.dev"><img src="pace.jpeg"/></a><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>
+## Special Thank You
 
 <p align="center" style="text-align: center">
    A special thank you to JetBrains for donating licenses to us!<br/><br/>

README.zh_CN.md

@@ -1,297 +0,0 @@
-<p align="center" style="text-align: center">
-   <img src="logo_cropped.png" width="40%"><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) | 简体中文
-
-向 Go 程序提供 Web 接口的传统方法是通过内置 Web 服务器。Wails 提供了一种不同的方法：它提供了将 Go 代码和 Web 前端都包装成单个二进制文件的能力。通过处理项目创建、编译和打包，可为您提供工具，使您轻松做到这一点。你所要做的就是发挥创造力！
-
-官方文档可以在 [https://wails.app](https://wails.app)中找到。
-国内镜像站点 [https://wails.top](https://wails.top)
-
-<span id="nav-2"></span>
-
-## 内容目录
-
-- [1. 国际化](#nav-1)
-- [2. 内容目录](#nav-2)
-- [3. 特征](#nav-3)
-- [4. 赞助商](#nav-4)
-- [5. 安装](#nav-5)
-  - [5.1 MacOS](#nav-5-1)
-  - [5.2 Linux](#nav-5-2)
-    - [5.2.1 Debian/Ubuntu](#nav-5-2-1)
-    - [5.2.2 Arch Linux / ArchLabs / Ctlos Linux](#nav-5-2-2)
-    - [5.2.3 Centos](#nav-5-2-3)
-    - [5.2.4 Fedora](#nav-5-2-4)
-    - [5.2.5 VoidLinux & VoidLinux-musl](#nav-5-2-5)
-    - [5.2.6 Gentoo](#nav-5-2-6)
-  - [5.3 Windows](#nav-5-3)
-- [6. 安装](#nav-6)
-- [7. 下一步](#nav-7)
-- [8. 常见问题](#nav-8)
-- [9. 贡献者](#nav-9)
-- [10. 特别提及](#nav-10)
-- [11. 许可协议](#nav-11)
-- [12. 特别感谢](#nav-12)
-
-<span id="nav-3"></span>
-
-## 特征
-
-- 后端使用标准 Go
-- 使用任意前端技术构建 UI 界面
-- 快速为您的 Go 应用生成 Vue、Vuetify、React 前端代码
-- 通过简单的绑定命令将 Go 方法暴露到前端
-- 使用原生渲染引擎 - 无嵌入式浏览器
-- 共享事件系统
-- 原生文件系统对话框
-- 强大的命令行工具
-- 跨多个平台
-
-<span id="nav-4"></span>
-
-## 赞助商
-
-这个项目由以下这些人或者公司支持：
-
-<a href="https://github.com/matryer" style="width:100px"><img src="https://github.com/matryer.png" width="100"/></a>
-<a href="https://www.jetbrains.com?from=Wails" style="width:100px"><img src="jetbrains-grayscale.png" width="100"/></a>
-<a href="https://github.com/tc-hib" style="width:55px;border-radius: 50%">
-<img src="https://github.com/tc-hib.png?size=55" width="55" style="border-radius: 50%"/>
-</a>
-<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/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/akhudek" style="width:50px;border-radius: 50%">
-<img src="https://github.com/akhudek.png?size=50" width="50" style="border-radius: 50%"/>
-</a>
-<a href="https://github.com/trea" style="width:50px;border-radius: 50%">
-<img src="https://github.com/trea.png?size=50" width="50" style="border-radius: 50%"/>
-</a>
-
-<span id="nav-5"></span>
-
-## 安装
-
-Wails 使用 cgo 与原生渲染引擎结合，因此需要一些依赖平台的库以及 Go 的安装。基本要求是：
-
-- Go 1.16
-- npm
-
-<span id="nav-5-1"></span>
-
-### MacOS
-
-请确保已安装 xcode 命令行工具。这可以通过运行下面的命令来完成：
-
-`xcode-select --install`
-
-<span id="nav-5-2"></span>
-
-### Linux
-
-<span id="nav-5-2-1"></span>
-
-#### Debian/Ubuntu
-
-`sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev`
-
-_Debian: 8, 9, 10_
-
-_Ubuntu: 16.04, 18.04, 19.04_
-
-_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_, Pop!\_OS
-
-<span id="nav-5-2-2"></span>
-
-#### Arch Linux / ArchLabs / Ctlos Linux
-
-`sudo pacman -S webkit2gtk gtk3`
-
-_Also succesfully test on: Manjaro & ArcoLinux_
-
-<span id="nav-5-2-3"></span>
-
-#### Centos
-
-`sudo yum install webkitgtk3-devel gtk3-devel`
-
-_CentOS 6, 7_
-
-<span id="nav-5-2-4"></span>
-
-#### Fedora
-
-`sudo yum install webkit2gtk3-devel gtk3-devel`
-
-_Fedora 29, 30_
-
-<span id="nav-5-2-5"></span>
-
-#### VoidLinux & VoidLinux-musl
-
-`xbps-install gtk+3-devel webkit2gtk-devel`
-
-<span id="nav-5-2-6"></span>
-
-#### Gentoo
-
-`sudo emerge gtk+:3 webkit-gtk`
-
-<span id="nav-5-3"></span>
-
-### Windows
-
-Windows 需要 GCC 和相关工具。 建议从 [http://tdm-gcc.tdragon.net/download](http://tdm-gcc.tdragon.net/download)下载， 安装完成，您就可以开始了。
-
-<span id="nav-6"></span>
-
-## 安装
-
-**确保 Go modules 是开启的: GO111MODULE=on 并且 go/bin 在您的 PATH 变量中.**
-
-安装很简单，运行以下命令：
-
-<pre style='color:white'>
-go get -u github.com/wailsapp/wails/cmd/wails
-</pre>
-
-<span id="nav-7"></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>
-
-<span id="nav-10"></span>
-
-## 特别提及
-
-如果没有以下人员，此项目将永远不会存在：
-
-- [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.
-
-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)
-
-<span id="nav-11"></span>
-
-## 许可协议
-
-[![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)
-
-<span id="nav-12"></span>
-
-## 特别感谢
-
-<p align="center" style="text-align: center">
-   <a href="https://pace.dev"><img src="pace.jpeg"/></a><br/>
-   非常感谢<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.go

@@ -2,6 +2,7 @@ package wails
 
 import (
 	"os"
+	"runtime"
 	"syscall"
 
 	"github.com/syossan27/tebata"
@@ -12,7 +13,6 @@ import (
 	"github.com/wailsapp/wails/lib/ipc"
 	"github.com/wailsapp/wails/lib/logger"
 	"github.com/wailsapp/wails/lib/renderer"
-	wailsruntime "github.com/wailsapp/wails/runtime"
 )
 
 // -------------------------------- Compile time Flags ------------------------------
@@ -20,16 +20,6 @@ import (
 // BuildMode indicates what mode we are in
 var BuildMode = cmd.BuildModeProd
 
-// Runtime is the Go Runtime struct
-type Runtime = wailsruntime.Runtime
-
-// Store is a state store used for syncing with
-// the front end
-type Store = wailsruntime.Store
-
-// CustomLogger is a specialised logger
-type CustomLogger = logger.CustomLogger
-
 // ----------------------------------------------------------------------------------
 
 // App defines the main application struct
@@ -116,6 +106,11 @@ func (a *App) start() error {
 		return err
 	}
 
+	// Enable console for Windows debug builds
+	if runtime.GOOS == "windows" && BuildMode == cmd.BuildModeDebug {
+		a.renderer.EnableConsole()
+	}
+
 	// Start signal handler
 	t := tebata.New(os.Interrupt, os.Kill, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
 	t.Reserve(func() {
@@ -130,7 +125,7 @@ func (a *App) start() error {
 	a.ipc.Start(a.eventManager, a.bindingManager)
 
 	// Create the runtime
-	a.runtime = wailsruntime.NewRuntime(a.eventManager, a.renderer)
+	a.runtime = NewRuntime(a.eventManager, a.renderer)
 
 	// Start binding manager and give it our renderer
 	err = a.bindingManager.Start(a.renderer, a.runtime)

cmd/github.go

@@ -24,7 +24,7 @@ func (g *GitHubHelper) GetVersionTags() ([]*SemanticVersion, error) {
 	result := []*SemanticVersion{}
 	var err error
 
-	resp, err := http.Get("https://api.github.com/repos/wailsapp/wails/releases")
+	resp, err := http.Get("https://api.github.com/repos/wailsapp/wails/tags")
 	if err != nil {
 		return result, err
 	}

cmd/helpers.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"os/user"
@@ -11,13 +12,12 @@ 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"
-
 var fs = NewFSHelper()
 
 // ValidateFrontendConfig checks if the frontend config is valid
@@ -46,7 +46,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 +59,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 {
@@ -66,17 +90,16 @@ func InitializeCrossCompilation(verbose bool) error {
 	}
 
 	var packSpinner *spinner.Spinner
-	msg := fmt.Sprintf("Pulling wailsapp/xgo:%s docker image... (may take a while)", xgoVersion)
 	if !verbose {
-		packSpinner = spinner.New(msg)
+		packSpinner = spinner.New("Pulling wailsapp/xgo:latest docker image... (may take a while)")
 		packSpinner.SetSpinSpeed(50)
 		packSpinner.Start()
 	} else {
-		println(msg)
+		println("Pulling wailsapp/xgo:latest docker image... (may take a while)")
 	}
 
 	err := NewProgramHelper(verbose).RunCommandArray([]string{"docker",
-		"pull", fmt.Sprintf("wailsapp/xgo:%s", xgoVersion)})
+		"pull", "wailsapp/xgo:latest"})
 
 	if err != nil {
 		if packSpinner != nil {
@@ -91,7 +114,7 @@ func InitializeCrossCompilation(verbose bool) error {
 	return nil
 }
 
-// BuildDocker builds the project using the cross compiling wailsapp/xgo:<xgoVersion> container
+// BuildDocker builds the project using the cross compiling wailsapp/xgo:latest container
 func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOptions) error {
 	var packSpinner *spinner.Spinner
 	if buildMode == BuildModeBridge {
@@ -101,16 +124,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{
@@ -120,31 +140,24 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt
 		"-v", fmt.Sprintf("%s:/build", filepath.Join(fs.Cwd(), "build")),
 		"-v", fmt.Sprintf("%s:/source", fs.Cwd()),
 		"-e", fmt.Sprintf("LOCAL_USER_ID=%v", userid),
-		"-e", fmt.Sprintf("FLAG_TAGS=%s", projectOptions.Tags),
 		"-e", fmt.Sprintf("FLAG_LDFLAGS=%s", ldFlags(projectOptions, buildMode)),
 		"-e", "FLAG_V=false",
 		"-e", "FLAG_X=false",
 		"-e", "FLAG_RACE=false",
 		"-e", "FLAG_BUILDMODE=default",
 		"-e", "FLAG_TRIMPATH=false",
-		"-e", fmt.Sprintf("TARGETS=%s/%s", projectOptions.Platform, projectOptions.Architecture),
+		"-e", fmt.Sprintf("TARGETS=%s", projectOptions.Platform+"/"+projectOptions.Architecture),
 		"-e", "GOPROXY=",
 		"-e", "GO111MODULE=on",
+		"wailsapp/xgo:latest",
+		".",
 	} {
 		buildCommand.Add(arg)
 	}
 
-	if projectOptions.GoPath != "" {
-		buildCommand.Add("-v")
-		buildCommand.Add(fmt.Sprintf("%s:/go", projectOptions.GoPath))
-	}
-
-	buildCommand.Add(fmt.Sprintf("wailsapp/xgo:%s", xgoVersion))
-	buildCommand.Add(".")
-
 	compileMessage := fmt.Sprintf(
-		"Packing + Compiling project for %s/%s using docker image wailsapp/xgo:%s",
-		projectOptions.Platform, projectOptions.Architecture, xgoVersion)
+		"Packing + Compiling project for %s/%s using docker image wailsapp/xgo:latest",
+		projectOptions.Platform, projectOptions.Architecture)
 
 	if buildMode == BuildModeDebug {
 		compileMessage += " (Debug Mode)"
@@ -175,6 +188,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
 	}
@@ -198,6 +216,10 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project
 	buildCommand.Add("go")
 
 	buildCommand.Add("build")
+	if buildMode == BuildModeBridge {
+		// Ignore errors
+		buildCommand.Add("-i")
+	}
 
 	if binaryName != "" {
 		// Alter binary name based on OS
@@ -221,10 +243,6 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project
 
 	buildCommand.AddSlice([]string{"-ldflags", ldFlags(projectOptions, buildMode)})
 
-	if projectOptions.Tags != "" {
-		buildCommand.AddSlice([]string{"--tags", projectOptions.Tags})
-	}
-
 	if projectOptions.Verbose {
 		fmt.Printf("Command: %v\n", buildCommand.AsSlice())
 	}
@@ -247,6 +265,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 +286,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 +364,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 +483,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 +500,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
 }
 
@@ -464,9 +530,6 @@ func InstallProdRuntime(projectDir string, projectOptions *ProjectOptions) error
 func ServeProject(projectOptions *ProjectOptions, logger *Logger) error {
 	go func() {
 		time.Sleep(2 * time.Second)
-		if projectOptions.Platform == "windows" {
-			logger.Yellow("*** Please note: Windows builds use mshtml which is only compatible with IE11. We strongly recommend only using IE11 when running 'wails serve'! For more information, please read https://wails.app/guides/windows/ ***")
-		}
 		logger.Green(">>>>> To connect, you will need to run '" + projectOptions.FrontEnd.Serve + "' in the '" + projectOptions.FrontEnd.Dir + "' directory <<<<<")
 	}()
 	location, err := filepath.Abs(filepath.Join("build", projectOptions.BinaryName))
@@ -475,22 +538,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()
@@ -513,10 +561,6 @@ func ldFlags(po *ProjectOptions, buildMode string) string {
 		ldflags += "-H windowsgui "
 	}
 
-	if po.UseFirebug {
-		ldflags += "-X github.com/wailsapp/wails/lib/renderer.UseFirebug=true "
-	}
-
 	ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode
 
 	// Add additional ldflags passed in via the `ldflags` cli flag
@@ -534,9 +578,3 @@ func ldFlags(po *ProjectOptions, buildMode string) string {
 	}
 	return ldflags
 }
-
-func getGitConfigValue(key string) (string, error) {
-	output, err := exec.Command("git", "config", "--get", "--null", key).Output()
-	// When using --null git appends a null character (\u0000) to the command output
-	return strings.TrimRight(string(output), "\u0000"), err
-}

cmd/linux.go

@@ -63,14 +63,6 @@ const (
 	PopOS
 	// Solus distribution
 	Solus
-	// Ctlos Linux distribution
-	Ctlos
-	// EndeavourOS linux distribution
-	EndeavourOS
-	// Crux linux distribution
-	Crux
-	// RHEL distribution
-	RHEL
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -133,14 +125,10 @@ 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":
 		result.Distribution = ArchLabs
-	case "ctlos":
-		result.Distribution = Ctlos
 	case "debian":
 		result.Distribution = Debian
 	case "ubuntu":
@@ -179,10 +167,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = PopOS
 	case "solus":
 		result.Distribution = Solus
-	case "endeavouros":
-		result.Distribution = EndeavourOS
-	case "crux":
-		result.Distribution = Crux
 	default:
 		result.Distribution = Unknown
 	}
@@ -263,17 +247,6 @@ func RpmInstalled(packageName string) (bool, error) {
 	return exitCode == 0, nil
 }
 
-// PrtGetInstalled uses prt-get to see if a package is installed
-func PrtGetInstalled(packageName string) (bool, error) {
-	program := NewProgramHelper()
-	prtget := program.FindProgram("prt-get")
-	if prtget == nil {
-		return false, fmt.Errorf("cannot check dependencies: prt-get not found")
-	}
-	_, _, exitCode, _ := prtget.Run("isinst", 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:
@@ -212,25 +193,7 @@ distributions:
         name: ArchLabs
         gccversioncommand: *gccdumpversion
         programs: *archdefaultprograms
-        libraries: *archdefaultlibraries
-  ctlos:
-    id: ctlos
-    releases:
-      default:
-        version: default
-        name: Ctlos Linux
-        gccversioncommand: *gccdumpversion
-        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries   
-  endeavouros:
-    id: endeavouros
-    releases:
-      default:
-        version: default
-        name: EndeavourOS
-        gccversioncommand: *gccdumpversion
-        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries             
+        libraries: *archdefaultlibraries        
   manjaro:
     id: manjaro
     releases:
@@ -326,22 +289,3 @@ distributions:
           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

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/project.go

@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"runtime"
 	"sort"
 	"strings"
 
@@ -151,7 +150,6 @@ type ProjectOptions struct {
 	Template               string    `json:"-"`
 	BinaryName             string    `json:"binaryname"`
 	FrontEnd               *frontend `json:"frontend,omitempty"`
-	Tags                   string    `json:"tags"`
 	NPMProjectName         string    `json:"-"`
 	system                 *SystemHelper
 	log                    *Logger
@@ -164,25 +162,6 @@ type ProjectOptions struct {
 	Platform               string
 	Architecture           string
 	LdFlags                string
-	GoPath                 string
-	UseFirebug             bool
-
-	// Supported platforms
-	Platforms []string `json:"platforms,omitempty"`
-}
-
-// PlatformSupported returns true if the template is supported
-// on the current platform
-func (po *ProjectOptions) PlatformSupported() bool {
-
-	// Default is all platforms supported
-	if len(po.Platforms) == 0 {
-		return true
-	}
-
-	// Check that the platform is in the list
-	platformsSupported := slicer.String(po.Platforms)
-	return platformsSupported.Contains(runtime.GOOS)
 }
 
 // Defaults sets the default project template
@@ -253,16 +232,13 @@ func (po *ProjectOptions) PromptForInputs() error {
 		for _, k := range keys {
 			templateDetail := templateDetails[k]
 			templateList.Add(templateDetail)
-			if !templateDetail.Metadata.PlatformSupported() {
-				templateDetail.Metadata.Name = "* " + templateDetail.Metadata.Name
-			}
 			options.Add(fmt.Sprintf("%s - %s", templateDetail.Metadata.Name, templateDetail.Metadata.ShortDescription))
 		}
 
 		templateIndex := 0
 
 		if len(options.AsSlice()) > 1 {
-			templateIndex = PromptSelection("Please select a template (* means unsupported on current platform)", options.AsSlice(), 0)
+			templateIndex = PromptSelection("Please select a template", options.AsSlice(), 0)
 		}
 
 		if len(templateList.AsSlice()) == 0 {
@@ -273,10 +249,6 @@ func (po *ProjectOptions) PromptForInputs() error {
 		po.selectedTemplate = templateList.AsSlice()[templateIndex].(*TemplateDetails)
 	}
 
-	po.selectedTemplate.Metadata.Name = strings.TrimPrefix(po.selectedTemplate.Metadata.Name, "* ")
-	if !po.selectedTemplate.Metadata.PlatformSupported() {
-		println("WARNING: This template is unsupported on this platform!")
-	}
 	fmt.Println("Template: " + po.selectedTemplate.Metadata.Name)
 
 	// Setup NPM Project name
@@ -399,9 +371,5 @@ func processTemplateMetadata(templateMetadata *TemplateMetadata, po *ProjectOpti
 		}
 		po.FrontEnd.Serve = templateMetadata.Serve
 	}
-
-	// Save platforms
-	po.Platforms = templateMetadata.Platforms
-
 	return nil
 }

cmd/semver.go

@@ -24,19 +24,11 @@ func NewSemanticVersion(version string) (*SemanticVersion, error) {
 
 // IsRelease returns true if it's a release version
 func (s *SemanticVersion) IsRelease() bool {
-	// Limit to v1
-	if s.Version.Major() != 1 {
-		return false
-	}
 	return len(s.Version.Prerelease()) == 0 && len(s.Version.Metadata()) == 0
 }
 
 // IsPreRelease returns true if it's a prerelease version
 func (s *SemanticVersion) IsPreRelease() bool {
-	// Limit to v1
-	if s.Version.Major() != 1 {
-		return false
-	}
 	return len(s.Version.Prerelease()) > 0
 }
 

cmd/semver_test.go

@@ -1,65 +0,0 @@
-package cmd
-
-import (
-	"testing"
-)
-
-func TestSemanticVersion_IsPreRelease(t *testing.T) {
-	tests := []struct {
-		name    string
-		version string
-		want    bool
-	}{
-		{"v1.6.7-pre0", "v1.6.7-pre0", true},
-		{"v2.6.7+pre0", "v2.6.7+pre0", false},
-		{"v2.6.7", "v2.6.7", false},
-		{"v2.0.0+alpha.1", "v2.0.0+alpha.1", false},
-		{"v2.0.0-alpha.1", "v2.0.0-alpha.1", false},
-		{"v1.6.7", "v1.6.7", false},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			semanticversion, err := NewSemanticVersion(tt.version)
-			if err != nil {
-				t.Errorf("Invalid semantic version: %s", semanticversion)
-				return
-			}
-			s := &SemanticVersion{
-				Version: semanticversion.Version,
-			}
-			if got := s.IsPreRelease(); got != tt.want {
-				t.Errorf("IsPreRelease() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestSemanticVersion_IsRelease(t *testing.T) {
-	tests := []struct {
-		name    string
-		version string
-		want    bool
-	}{
-		{"v1.6.7", "v1.6.7", true},
-		{"v2.6.7-pre0", "v2.6.7-pre0", false},
-		{"v2.6.7", "v2.6.7", false},
-		{"v2.6.7+release", "v2.6.7+release", false},
-		{"v2.0.0-alpha.1", "v2.0.0-alpha.1", false},
-		{"v1.6.7-pre0", "v1.6.7-pre0", false},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			semanticversion, err := NewSemanticVersion(tt.version)
-			if err != nil {
-				t.Errorf("Invalid semantic version: %s", semanticversion)
-				return
-			}
-			s := &SemanticVersion{
-				Version: semanticversion.Version,
-			}
-			if got := s.IsRelease(); got != tt.want {
-				t.Errorf("IsRelease() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

cmd/system.go

@@ -99,16 +99,11 @@ func (s *SystemHelper) setup() error {
 
 	if config.Name != "" {
 		systemConfig["name"] = PromptRequired("What is your name", config.Name)
-	} else if n, err := getGitConfigValue("user.name"); err == nil && n != "" {
-		systemConfig["name"] = PromptRequired("What is your name", n)
 	} else {
 		systemConfig["name"] = PromptRequired("What is your name")
 	}
-
 	if config.Email != "" {
 		systemConfig["email"] = PromptRequired("What is your email address", config.Email)
-	} else if e, err := getGitConfigValue("user.email"); err == nil && e != "" {
-		systemConfig["email"] = PromptRequired("What is your email address", e)
 	} else {
 		systemConfig["email"] = PromptRequired("What is your email address")
 	}
@@ -185,7 +180,7 @@ func (s *SystemHelper) Initialise() error {
 	return s.setup()
 }
 
-// SystemConfig - Defines system wide configuration data
+// SystemConfig - Defines system wode configuration data
 type SystemConfig struct {
 	Name  string `json:"name"`
 	Email string `json:"email"`
@@ -281,9 +276,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:
+		case Arch, ArcoLinux, ArchLabs, Manjaro, ManjaroARM:
 			libraryChecker = PacmanInstalled
-		case CentOS, Fedora, Tumbleweed, Leap, RHEL:
+		case CentOS, Fedora, Tumbleweed, Leap:
 			libraryChecker = RpmInstalled
 		case Gentoo:
 			libraryChecker = EqueryInstalled
@@ -291,8 +286,6 @@ func CheckDependencies(logger *Logger) (bool, error) {
 			libraryChecker = XbpsInstalled
 		case Solus:
 			libraryChecker = EOpkgInstalled
-		case Crux:
-			libraryChecker = PrtGetInstalled
 		default:
 			return false, RequestSupportForDistribution(distroInfo)
 		}

cmd/templates.go

@@ -7,7 +7,6 @@ import (
 	"io/ioutil"
 	"log"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"text/template"
 
@@ -30,26 +29,6 @@ type TemplateMetadata struct {
 	Bridge               string                `json:"bridge"`
 	WailsDir             string                `json:"wailsdir"`
 	TemplateDependencies []*TemplateDependency `json:"dependencies,omitempty"`
-
-	// List of platforms that this template is supported on.
-	// No value means all platforms. A platform name is the same string
-	// as `runtime.GOOS` will return, eg: "darwin". NOTE: This is
-	// case sensitive.
-	Platforms []string `json:"platforms,omitempty"`
-}
-
-// PlatformSupported returns true if this template supports the
-// currently running platform
-func (m *TemplateMetadata) PlatformSupported() bool {
-
-	// Default is all platforms supported
-	if len(m.Platforms) == 0 {
-		return true
-	}
-
-	// Check that the platform is in the list
-	platformsSupported := slicer.String(m.Platforms)
-	return platformsSupported.Contains(runtime.GOOS)
 }
 
 // TemplateDependency defines a binary dependency for the template
@@ -149,11 +128,11 @@ func (t *TemplateHelper) GetTemplateDetails() (map[string]*TemplateDetails, erro
 		result[name] = &TemplateDetails{
 			Path: dir,
 		}
+		_ = &TemplateMetadata{}
 		metadata, err := t.LoadMetadata(dir)
 		if err != nil {
 			return nil, err
 		}
-
 		result[name].Metadata = metadata
 		if metadata.Name != "" {
 			result[name].Name = metadata.Name

cmd/templates/angular-template/frontend/package.json.template

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "npx ng",
-    "serve": "npx ng serve --poll=2000 --host=0.0.0.0",
+    "start": "npx ng serve --poll=2000 --host=0.0.0.0",
     "build": "npx ng build --single-bundle true --output-hashing none --prod --bundle-styles false",
     "test": "npx ng test",
     "lint": "npx ng lint",

cmd/templates/angular-template/frontend/src/app/app-routing.module.ts

@@ -5,7 +5,7 @@ const routes: Routes = [];
 
 @NgModule({
   imports: [
-    RouterModule.forRoot(routes,{useHash:true})
+    RouterModule.forRoot(routes)
   ],
   exports: [RouterModule]
 })

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/angular-template/template.json

@@ -14,7 +14,7 @@
   "author": "bh90210 <ktc@pm.me>",
   "created": "2019-06-15 18:23:48.666414555 +0300 EEST m=+223.934866008",
   "frontenddir": "frontend",
-  "serve": "npm run serve",
+  "serve": "npx ng serve --poll=2000",
   "bridge": "src",
   "wailsdir": ""
 }

cmd/templates/create-react-app/frontend/package.json.template

@@ -12,7 +12,7 @@
     "@wailsapp/runtime": "^1.0.10"
   },
   "scripts": {
-    "serve": "react-scripts start",
+    "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"

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/create-react-app/template.json

@@ -8,7 +8,7 @@
   "author": "bh90210 <ktc@pm.me>",
   "created": "2019-06-07 18:23:48.666414555 +0300 EEST m=+223.934866008",
   "frontenddir": "frontend",
-  "serve": "npm run serve",
+  "serve": "npm run start",
   "bridge": "src",
   "wailsdir": ""
 }

cmd/templates/svelte/frontend/package.json.template

@@ -1,31 +0,0 @@
-{
-  "name": "{{.NPMProjectName}}",
-  "author": "{{.Author.Name}}<{{.Author.Email}}>",
-  "scripts": {
-    "build": "rollup -c",
-    "serve": "rollup -c -w",
-    "start": "sirv public"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.11.6",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.11.5",
-    "@babel/preset-env": "^7.11.5",
-    "@rollup/plugin-commonjs": "^14.0.0",
-    "@rollup/plugin-image": "^2.0.5",
-    "@rollup/plugin-node-resolve": "^8.0.0",
-    "core-js": "^3.6.5",
-    "rollup": "^2.3.4",
-    "rollup-plugin-babel": "^4.4.0",
-    "rollup-plugin-livereload": "^2.0.0",
-    "rollup-plugin-polyfill": "^3.0.0",
-    "rollup-plugin-svelte": "^6.0.0",
-    "rollup-plugin-terser": "^7.0.0",
-    "svelte": "^3.0.0"
-  },
-  "dependencies": {
-    "sirv-cli": "^1.0.0",
-	  "@wailsapp/runtime": "^1.0.10",
-	  "svelte-simple-modal": "^0.6.0"
-  }
-}

cmd/templates/svelte/frontend/public/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset='utf-8'>
-	<meta name='viewport' content='width=device-width,initial-scale=1'>
-
-	<title>Svelte app</title>
-
-	<link rel='icon' type='image/png' href='/favicon.png'>
-	<link rel='stylesheet' href='/build/bundle.css'>
-
-	<script defer src='/build/bundle.js'></script>
-</head>
-
-<body>
-</body>
-</html>

cmd/templates/svelte/frontend/src/App.svelte

@@ -1,69 +0,0 @@
-
-
-<script>
-	import Modal from 'svelte-simple-modal';
-	import HelloWorld from './components/HelloWorld.svelte'
-	import logo from './logo.png';
-</script>
-
-<main>
-	<div class="App">
-		<header class="App-header">
-			<Modal>
-				<img src={logo} class="App-logo" alt="logo" />
-				<p>Welcome to your new <code>wails/svelte</code> project.</p>
-				<HelloWorld/>
-			</Modal>
-		</header>
-	</div>
-</main>
-
-<style>
-	:global(body) {
-		margin: 0;
-		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
-			"Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
-			sans-serif;
-		-webkit-font-smoothing: antialiased;
-		-moz-osx-font-smoothing: grayscale;
-	}
-
-	code {
-		font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
-	}
-
-	.App {
-		text-align: center;
-	}
-
-	.App-logo {
-		height: 40vmin;
-		pointer-events: none;
-	}
-
-	@media (prefers-reduced-motion: no-preference) {
-		.App-logo {
-			animation: App-logo-spin infinite 20s linear;
-		}
-	}
-
-	.App-header {
-		background-color: #282c34;
-		min-height: 100vh;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		font-size: calc(10px + 2vmin);
-		color: white;
-	}
-
-	@keyframes App-logo-spin {
-		from {
-			transform: rotate(0deg);
-		}
-		to {
-			transform: rotate(360deg);
-		}
-	}
-</style>

cmd/templates/svelte/frontend/src/components/HelloWorld.svelte

@@ -1,18 +0,0 @@
-<script>
-	import { getContext } from 'svelte';
-	import ModalContent from './ModalContent.svelte'
-	
-	const { open } = getContext('simple-modal');
-
-	const handleOpenModal = () => {
-		window.backend.basic().then((result) => {
-			open(ModalContent, { message: result });
-		});
-	};
-</script>
-
-<main>
-	<p><button on:click={handleOpenModal}>Hello</button></p>
-</main>
-
-<style></style>

cmd/templates/svelte/frontend/src/components/ModalContent.svelte

@@ -1,7 +0,0 @@
-<script>
-	export let message;
-</script> 
-   
-<p>
-	{message}
-</p>

cmd/templates/svelte/frontend/src/main.js

@@ -1,13 +0,0 @@
-import App from './App.svelte';
-
-import * as Wails from '@wailsapp/runtime';
-
-let app;
-
-Wails.Init(() => {
-	app = new App({
-		target: document.body,
-	});
-}); 
-
-export default app;

cmd/templates/svelte/go.mod.template

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

cmd/templates/svelte/main.go.template

@@ -1,31 +0,0 @@
-package main
-
-import (
-    _ "embed"
-	"github.com/wailsapp/wails"
-)
-
-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() {
-
-	app := wails.CreateApp(&wails.AppConfig{
-		Width:  1024,
-		Height: 768,
-		Title:  "{{.Name}}",
-		JS:     js,
-		CSS:    css,
-		Colour: "#131313",
-	})
-
-	app.Bind(basic)
-	app.Run()
-}

cmd/templates/svelte/template.json

@@ -1,14 +0,0 @@
-{
-  "name": "Svelte",
-  "version": "1.0.0",
-  "shortdescription": "A basic Svelte template",
-  "description": "A basic Svelte template",
-  "install": "npm install",
-  "build": "npm run build",
-  "author": "Tim Kipp <timkipp.22.developer@gmail.com>",
-  "created": "2020-09-06 13:06:10.469848 -0700 PDT m=+213.578828559",
-  "frontenddir": "frontend",
-  "serve": "npm run serve",
-  "bridge": "src",
-  "wailsdir": ""
-}

cmd/templates/vanilla/counter.go

@@ -1,46 +0,0 @@
-package main
-
-import (
-	"math/rand"
-
-	"github.com/wailsapp/wails"
-)
-
-// Counter is what we use for counting
-type Counter struct {
-	r     *wails.Runtime
-	store *wails.Store
-}
-
-// WailsInit is called when the component is being initialised
-func (c *Counter) WailsInit(runtime *wails.Runtime) error {
-	c.r = runtime
-	c.store = runtime.Store.New("Counter", 0)
-	return nil
-}
-
-// RandomValue sets the counter to a random value
-func (c *Counter) RandomValue() {
-	c.store.Set(rand.Intn(1000))
-}
-
-// Increment will increment the counter
-func (c *Counter) Increment() {
-
-	increment := func(data int) int {
-		return data + 1
-	}
-
-	// Update the store using the increment function
-	c.store.Update(increment)
-}
-
-// Decrement will decrement the counter
-func (c *Counter) Decrement() {
-
-	decrement := func(data int) int {
-		return data - 1
-	}
-	// Update the store using the decrement function
-	c.store.Update(decrement)
-}

cmd/templates/vanilla/frontend/src/main.css

@@ -2,35 +2,20 @@
 html, 
 body {
   background-color: white;
-  color: black;
-  width: 100%;
-  height: 100%;
-  margin: 0;
-}
-
-input {
-  background-color: rgb(254,254,254);
-  color: black;
+  width: 1024px;
+  height: 768px;
 }
 
 .container {
   display: block;
   width:100%;
   text-align: center;
-  margin-top: 1rem;
+  margin-top: 3rem;
   font-size: 2rem;
 }
 
 button {
   font-size: 1rem;
-  background-color: white;
-  color: black;
-}
-
-.result {
-  margin-top: 1rem;
-  text-align: center;
-  font-size: 2rem;
 }
 
 .logo {

cmd/templates/vanilla/frontend/src/main.js

@@ -4,8 +4,6 @@ const runtime = require('@wailsapp/runtime');
 // Main entry point
 function start() {
 
-	var mystore = runtime.Store.New('Counter');
-
 	// Ensure the default app div is 100% wide/high
 	var app = document.getElementById('app');
 	app.style.width = '100%';
@@ -15,32 +13,17 @@ function start() {
 	app.innerHTML = `
 	<div class='logo'></div>
 	<div class='container'>
-	<button onClick='window.backend.Counter.Increment()'>
-		Increment Counter
-	</button>
-	<button onClick='window.backend.Counter.Decrement()'>
-		Decrement Counter
-		</button>
-	</div>
-	<div class='result'>Counter: <span id='counter'></span></div>
-	<div class='container'>
-		<input id='newCounter' type="number" value="0"/>
-		<button id='setvalue'>Set Counter Value</button>
-		<button onclick='window.backend.Counter.RandomValue()'>Set to Random Value</button>
+			<button id='button'>Click Me!</button>
+			<div id='result'/>
 	</div>
 	`;
 
-	// Connect counter value button to Go method
-	document.getElementById('setvalue').onclick = function() {
-		let newValue = parseInt(document.getElementById('newCounter').value,10);
-		mystore.set(newValue);
+	// Connect button to Go method
+	document.getElementById('button').onclick = function() {
+		window.backend.basic().then( function(result) {
+			document.getElementById('result').innerText = result;
+		});
 	};
-
-	mystore.subscribe( function(state) {
-		document.getElementById('counter').innerText = state;
-	});
-	
-	mystore.set(0);
 };
 
 // We provide our entrypoint as a callback for runtime.Init

cmd/templates/vanilla/main.go.template

@@ -1,18 +1,19 @@
 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 basic() string {
+  return "Hello World!"
+}
 
 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,
@@ -21,6 +22,6 @@ func main() {
     CSS:    css,
     Colour: "#131313",
   })
-  app.Bind(&Counter{})
+  app.Bind(basic)
   app.Run()
 }

cmd/templates/vue3-full/frontend/.browserslistrc

@@ -1,3 +0,0 @@
-> 1%
-last 2 versions
-not dead

cmd/templates/vue3-full/frontend/.eslintrc.js

@@ -1,29 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true
-  },
-  'extends': [
-    'plugin:vue/vue3-essential',
-    'eslint:recommended',
-    '@vue/typescript/recommended'
-  ],
-  parserOptions: {
-    ecmaVersion: 2020
-  },
-  rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
-  },
-  overrides: [
-    {
-      files: [
-        '**/__tests__/*.{j,t}s?(x)',
-        '**/tests/unit/**/*.spec.{j,t}s?(x)'
-      ],
-      env: {
-        mocha: true
-      }
-    }
-  ]
-}

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

@@ -1,21 +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*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw*

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

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

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

@@ -1,37 +0,0 @@
-{
-  "name": "{{.NPMProjectName}}",
-  "author": "{{.Author.Name}}<{{.Author.Email}}>",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "vue": "^3.0.0-0",
-    "vue-router": "^4.0.0-0",
-    "regenerator-runtime": "^0.13.7",
-    "@wailsapp/runtime": "^1.1.1"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.2.12",
-    "@types/mocha": "^8.0.3",
-    "@typescript-eslint/eslint-plugin": "^4.3.0",
-    "@typescript-eslint/parser": "^4.3.0",
-    "@vue/cli-plugin-eslint": "~4.5.9",
-    "@vue/cli-plugin-router": "~4.5.9",
-    "@vue/cli-plugin-typescript": "~4.5.9",
-    "@vue/cli-plugin-unit-mocha": "~4.5.9",
-    "@vue/cli-service": "~4.5.9",
-    "@vue/compiler-sfc": "^3.0.0",
-    "@vue/eslint-config-typescript": "^7.0.0",
-    "@vue/test-utils": "^2.0.0-0",
-    "chai": "^4.2.0",
-    "eslint": "<7.0.0",
-    "eslint-plugin-vue": "^7.0.0",
-    "node-sass": "^4.14.1",
-    "sass-loader": "^10.0.2",
-    "typescript": "~4.0.3"
-  }
-}

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

@@ -1,32 +0,0 @@
-<template>
-  <div id=app>
-    <div id="nav">
-      <router-link to="/">Home</router-link> |
-      <router-link to="/about">About</router-link>
-    </div>
-    <router-view/>
-  </div>
-</template>
-
-<style lang="scss">
-#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;
-
-  a {
-    font-weight: bold;
-    color: #2c3e50;
-
-    &.router-link-exact-active {
-      color: #42b983;
-    }
-  }
-}
-</style>

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

@@ -1,34 +0,0 @@
-<template>
-  <div class="hello">
-    <h1>{{ msg }}</h1>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-  name: 'HelloWorld',
-  props: {
-    msg: String,
-  },
-});
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped lang="scss">
-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-full/frontend/src/main.ts

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

cmd/templates/vue3-full/frontend/src/router/index.ts

@@ -1,27 +0,0 @@
-import { createRouter, createMemoryHistory, RouteRecordRaw } from 'vue-router'
-import Home from '../views/Home.vue'
-import About from '../views/About.vue'
-
-const routes: Array<RouteRecordRaw> = [
-  {
-    path: '/',
-    name: 'Home',
-    component: Home
-  },
-  {
-    path: '/about',
-    name: 'About',
-    // route level code-splitting
-    // this generates a separate chunk (about.[hash].js) for this route
-    // which is lazy-loaded when the route is visited.
-    // component: () => import(/* webpackChunkName: "about" */ '../views/About.vue')
-    component: About
-  }
-]
-
-const router = createRouter({
-  history: createMemoryHistory(),
-  routes
-})
-
-export default router

cmd/templates/vue3-full/frontend/src/shims-vue.d.ts

@@ -1,5 +0,0 @@
-declare module '*.vue' {
-  import { defineComponent } from 'vue'
-  const component: ReturnType<typeof defineComponent>
-  export default component
-}

cmd/templates/vue3-full/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-full/frontend/src/views/Home.vue

@@ -1,40 +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 lang="ts">
-import { ref, defineComponent } from "vue";
-import HelloWorld from "@/components/HelloWorld.vue"; // @ is an alias to /src
-
-interface Backend {
-  basic(): Promise<string>;
-}
-
-declare global {
-  interface Window {
-    backend: Backend;
-  }
-}
-
-export default defineComponent({
-  name: "Home",
-  components: {
-    HelloWorld,
-  },
-  setup() {
-    
-    const message = ref("Click the Icon");
-
-    const getMessage = () => {
-      window.backend.basic().then(result => {
-        message.value = result;
-      });
-    }
-
-    return { message: message, getMessage: getMessage };
-  },
-});
-</script>

cmd/templates/vue3-full/frontend/tests/unit/example.spec.ts

@@ -1,14 +0,0 @@
-import { expect } from 'chai';
-import { describe, it } from 'mocha';
-import { shallowMount } from '@vue/test-utils';
-import HelloWorld from '@/components/HelloWorld.vue';
-
-describe('HelloWorld.vue', () => {
-	it('renders props.msg when passed', () => {
-		const msg = 'new message';
-		const wrapper = shallowMount(HelloWorld, {
-			props: { msg }
-		});
-		expect(wrapper.text()).to.include(msg);
-	});
-});

cmd/templates/vue3-full/frontend/tsconfig.json

@@ -1,41 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "module": "esnext",
-    "strict": true,
-    "jsx": "preserve",
-    "importHelpers": true,
-    "moduleResolution": "node",
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "types": [
-      "webpack-env",
-      "mocha",
-      "chai"
-    ],
-    "paths": {
-      "@/*": [
-        "src/*"
-      ]
-    },
-    "lib": [
-      "esnext",
-      "dom",
-      "dom.iterable",
-      "scripthost"
-    ]
-  },
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.tsx",
-    "src/**/*.vue",
-    "tests/**/*.ts",
-    "tests/**/*.tsx"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
-}

cmd/templates/vue3-full/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-full/go.mod.template

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

cmd/templates/vue3-full/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-full/template.json

@@ -1,15 +0,0 @@
-{
-  "name": "Vue3 Full",
-  "version": "1.0.0",
-  "shortdescription": "Vue 3, Vuex, Vue-router, and Webpack4",
-  "description": "Vue3.0.0 Vuex, Vue-router, and Webpack 4",
-  "install": "npm install",
-  "build": "npm run build",
-  "author": "Kyle Muchmore <kmuchmor@gmail.com>",
-  "created": "2020-09-24 21:18:55.09417 +0000 UTC m=+90.125590001",
-  "frontenddir": "frontend",
-  "serve": "npm run serve",
-  "bridge": "src",
-  "wailsdir": "",
-  "platforms": ["linux", "darwin"]
-}

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,24 +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,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <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 { createRouter, createMemoryHistory } 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,12 +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/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,15 +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/frontend/package.json.template

@@ -11,7 +11,7 @@
     "core-js": "^3.6.4",
     "regenerator-runtime": "^0.13.3",
     "vue": "^2.6.11",
-    "vuetify": "^2.3.15",
+    "vuetify": "^2.2.15",
     "@wailsapp/runtime": "^1.0.10"
   },
   "devDependencies": {

cmd/templates/vuetify2-basic/frontend/src/App.vue

@@ -24,13 +24,13 @@
       <v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
       <v-toolbar-title>Application</v-toolbar-title>
     </v-app-bar>
-    <v-main>
+    <v-content>
       <v-container fluid class="px-0">
         <v-layout justify-center align-center class="px-0">
           <hello-world></hello-world>
         </v-layout>
       </v-container>
-    </v-main>
+    </v-content>
     <v-footer app fixed>
       <span style="margin-left:1em">&copy; You</span>
     </v-footer>
@@ -57,4 +57,4 @@
   .logo {
     width: 16em;
   }
-</style>
+</style>

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.6"
+const Version = "v1.7.2-pre3"

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/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"
@@ -27,13 +26,10 @@ func init() {
 	var packageApp = false
 	var forceRebuild = false
 	var debugMode = false
-	var usefirebug = false
-	var gopath = ""
 	var typescriptFilename = ""
 	var verbose = false
 	var platform = ""
 	var ldflags = ""
-	var tags = ""
 
 	buildSpinner := spinner.NewSpinner()
 	buildSpinner.SetSpinSpeed(50)
@@ -44,19 +40,13 @@ func init() {
 		BoolFlag("p", "Package application on successful build", &packageApp).
 		BoolFlag("f", "Force rebuild of application components", &forceRebuild).
 		BoolFlag("d", "Build in Debug mode", &debugMode).
-		BoolFlag("firebug", "Enable firebug console for debug builds", &usefirebug).
 		BoolFlag("verbose", "Verbose output", &verbose).
 		StringFlag("t", "Generate Typescript definitions to given file (at runtime)", &typescriptFilename).
-		StringFlag("ldflags", "Extra options for -ldflags", &ldflags).
-		StringFlag("gopath", "Specify your GOPATH location. Mounted to /go during cross-compilation.", &gopath).
-		StringFlag("tags", "Build tags to pass to the go compiler (quoted and space separated)", &tags)
+		StringFlag("ldflags", "Extra options for -ldflags", &ldflags)
 
 	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()),
@@ -77,22 +67,13 @@ func init() {
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
 		projectOptions.Verbose = verbose
-		projectOptions.UseFirebug = usefirebug
 
 		// Check we are in project directory
 		// Check project.json loads correctly
 		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")
-		}
-
-		// Set firebug flag
-		projectOptions.UseFirebug = usefirebug
-
-		// Check that this platform is supported
-		if !projectOptions.PlatformSupported() {
-			logger.Yellow("WARNING: This project is unsupported on %s - it probably won't work!\n         Valid platforms: %s\n", runtime.GOOS, strings.Join(projectOptions.Platforms, ", "))
+			return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
 		}
 
 		// Set cross-compile
@@ -116,10 +97,6 @@ func init() {
 
 		// Add ldflags
 		projectOptions.LdFlags = ldflags
-		projectOptions.GoPath = gopath
-
-		// Add tags
-		projectOptions.Tags = tags
 
 		// Validate config
 		// Check if we have a frontend
@@ -147,6 +124,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
@@ -198,10 +181,6 @@ func init() {
 			return err
 		}
 
-		if projectOptions.Platform == "windows" {
-			logger.Yellow("*** Please note: Windows builds use mshtml which is only compatible with IE11. For more information, please read https://wails.app/guides/windows/ ***")
-		}
-
 		logger.Yellow("Awesome! Project '%s' built!", projectOptions.Name)
 
 		return nil

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
 		}
@@ -64,7 +70,6 @@ func init() {
 		}
 
 		logger.Yellow("Awesome! Project '%s' built!", projectOptions.Name)
-
 		return cmd.ServeProject(projectOptions, logger)
 	})
 }

config.go

@@ -1,49 +1,20 @@
 package wails
 
 import (
-	"net/url"
-	"strings"
-
+	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/runtime"
 )
 
 // AppConfig is the configuration structure used when creating a Wails App object
 type AppConfig struct {
-	// The width and height of your application in pixels
-	Width, Height int
-
-	// The title to put in the title bar
-	Title string
-
-	// The HTML your app should use. If you leave it blank, a default will be used:
-	// <!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="IE=edge" content="IE=edge"></head><body><div id="app"></div><script type="text/javascript"></script></body></html>
-	HTML string
-
-	// The Javascript your app should use. Normally this should be generated by a bundler.
-	JS string
-
-	// The CSS your app should use. Normally this should be generated by a bundler.
-	CSS string
-
-	// The colour of your window. Can take "#fff", "rgb(255,255,255)", "rgba(255,255,255,1)" formats
-	Colour string
-
-	// Indicates whether your app should be resizable
-	Resizable bool
-
-	// Minimum width of a resizable window. If set, MinHeight should also be set.
-	MinWidth int
-
-	// Minimum height of a resizable window. If set, MinWidth should also be set.
-	MinHeight int
-
-	// Maximum width of a resizable window. If set, MaxHeight should also be set.
-	MaxWidth int
-
-	// Maximum height of a resizable window. If set, MaxWidth should also be set.
-	MaxHeight int
-
-	// Indicated if the devtools should be disabled
+	Width, Height    int
+	Title            string
+	defaultHTML      string
+	HTML             string
+	JS               string
+	CSS              string
+	Colour           string
+	Resizable        bool
 	DisableInspector bool
 }
 
@@ -62,14 +33,9 @@ func (a *AppConfig) GetTitle() string {
 	return a.Title
 }
 
-// GetHTML returns the default HTML
-func (a *AppConfig) GetHTML() string {
-	if len(a.HTML) > 0 {
-		a.HTML = url.QueryEscape(a.HTML)
-		a.HTML = "data:text/html," + strings.ReplaceAll(a.HTML, "+", "%20")
-		a.HTML = strings.ReplaceAll(a.HTML, "%3D", "=")
-	}
-	return a.HTML
+// GetDefaultHTML returns the default HTML
+func (a *AppConfig) GetDefaultHTML() string {
+	return a.defaultHTML
 }
 
 // GetResizable returns true if the window should be resizable
@@ -77,26 +43,6 @@ func (a *AppConfig) GetResizable() bool {
 	return a.Resizable
 }
 
-// GetMinWidth returns the minimum width of the window
-func (a *AppConfig) GetMinWidth() int {
-	return a.MinWidth
-}
-
-// GetMinHeight returns the minimum height of the window
-func (a *AppConfig) GetMinHeight() int {
-	return a.MinHeight
-}
-
-// GetMaxWidth returns the maximum width of the window
-func (a *AppConfig) GetMaxWidth() int {
-	return a.MaxWidth
-}
-
-// GetMaxHeight returns the maximum height of the window
-func (a *AppConfig) GetMaxHeight() int {
-	return a.MaxHeight
-}
-
 // GetDisableInspector returns true if the inspector should be disabled
 func (a *AppConfig) GetDisableInspector() bool {
 	return a.DisableInspector
@@ -129,41 +75,16 @@ func (a *AppConfig) merge(in *AppConfig) error {
 		a.Colour = in.Colour
 	}
 
-	if in.HTML != "" {
-		a.HTML = in.HTML
-	}
-
 	if in.JS != "" {
 		a.JS = in.JS
 	}
 
-	if in.HTML != "" {
-		a.HTML = in.HTML
-	}
-
 	if in.Width != 0 {
 		a.Width = in.Width
 	}
 	if in.Height != 0 {
 		a.Height = in.Height
 	}
-
-	if in.MinWidth != 0 {
-		a.MinWidth = in.MinWidth
-	}
-
-	if in.MinHeight != 0 {
-		a.MinHeight = in.MinHeight
-	}
-
-	if in.MaxWidth != 0 {
-		a.MaxWidth = in.MaxWidth
-	}
-
-	if in.MaxHeight != 0 {
-		a.MaxHeight = in.MaxHeight
-	}
-
 	a.Resizable = in.Resizable
 	a.DisableInspector = in.DisableInspector
 
@@ -176,13 +97,9 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		Width:     800,
 		Height:    600,
 		Resizable: true,
-		MinWidth:  -1,
-		MinHeight: -1,
-		MaxWidth:  -1,
-		MaxHeight: -1,
 		Title:     "My Wails App",
-		Colour:    "", 
-		HTML:      defaultHTML,
+		Colour:    "#FFF", // White by default
+		HTML:      mewn.String("./runtime/assets/default.html"),
 	}
 
 	if userConfig != nil {
@@ -194,17 +111,3 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 
 	return result, nil
 }
-
-var defaultHTML = `<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-</head>
-
-<body>
-  <div id="app"></div>
-</body>
-
-</html>`

go.mod

@@ -9,6 +9,7 @@ require (
 	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
@@ -21,10 +22,10 @@ require (
 	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-20200323222414-85ca7c5b95cd
+	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c
 	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

@@ -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=
@@ -64,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,6 +81,8 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/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/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/binding/method.go

@@ -196,7 +196,7 @@ func (b *boundMethod) processWailsInit() error {
 	// It must be *wails.Runtime
 	inputName := b.inputs[0].String()
 	b.log.Debugf("WailsInit input type: %s", inputName)
-	if inputName != "*runtime.Runtime" {
+	if inputName != "*wails.Runtime" {
 		return fmt.Errorf("Invalid WailsInit() definition. Expected input to be wails.Runtime, but got %s", inputName)
 	}
 
@@ -219,7 +219,7 @@ func (b *boundMethod) processWailsInit() error {
 }
 
 func (b *boundMethod) processWailsShutdown() error {
-	// We must not have any inputs
+	// We must have only 1 input, it must be *wails.Runtime
 	if len(b.inputs) != 0 {
 		return fmt.Errorf("Invalid WailsShutdown() definition. Expected 0 inputs, but got %d", len(b.inputs))
 	}

lib/event/manager.go

@@ -18,7 +18,6 @@ type Manager struct {
 	log            *logger.CustomLogger
 	renderer       interfaces.Renderer // Messages will be dispatched to the frontend
 	wg             sync.WaitGroup
-	mu             sync.Mutex
 }
 
 // NewManager creates a new event manager with a 100 event buffer
@@ -43,12 +42,12 @@ func (e *Manager) PushEvent(eventData *messages.EventData) {
 // means it does not expire (default).
 type eventListener struct {
 	callback func(...interface{}) // Function to call with emitted event data
-	counter  uint                 // Expire after counter callbacks. 0 = infinite
+	counter  int                  // Expire after counter callbacks. 0 = infinite
 	expired  bool                 // Indicates if the listener has expired
 }
 
 // Creates a new event listener from the given callback function
-func (e *Manager) addEventListener(eventName string, callback func(...interface{}), counter uint) error {
+func (e *Manager) addEventListener(eventName string, callback func(...interface{}), counter int) error {
 
 	// Sanity check inputs
 	if callback == nil {
@@ -76,30 +75,7 @@ func (e *Manager) addEventListener(eventName string, callback func(...interface{
 // On adds a listener for the given event
 func (e *Manager) On(eventName string, callback func(...interface{})) {
 	// Add a persistent eventListener (counter = 0)
-	err := e.addEventListener(eventName, callback, 0)
-	if err != nil {
-		e.log.Error(err.Error())
-	}
-}
-
-// Once adds a listener for the given event that will auto remove
-// after one callback
-func (e *Manager) Once(eventName string, callback func(...interface{})) {
-	// Add a persistent eventListener (counter = 0)
-	err := e.addEventListener(eventName, callback, 1)
-	if err != nil {
-		e.log.Error(err.Error())
-	}
-}
-
-// OnMultiple adds a listener for the given event that will trigger
-// at most <counter> times.
-func (e *Manager) OnMultiple(eventName string, callback func(...interface{}), counter uint) {
-	// Add a persistent eventListener (counter = 0)
-	err := e.addEventListener(eventName, callback, counter)
-	if err != nil {
-		e.log.Error(err.Error())
-	}
+	e.addEventListener(eventName, callback, 0)
 }
 
 // Emit broadcasts the given event to the subscribed listeners
@@ -132,24 +108,20 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 				})
 
 				// Notify renderer
-				err := e.renderer.NotifyEvent(event)
-				if err != nil {
-					e.log.Error(err.Error())
-				}
+				e.renderer.NotifyEvent(event)
 
-				e.mu.Lock()
+				// Notify Go listeners
+				var listenersToRemove []*eventListener
 
 				// Iterate listeners
 				for _, listener := range e.listeners[event.Name] {
 
-					if !listener.expired {
-						// Call listener, perhaps with data
-						if event.Data == nil {
-							go listener.callback()
-						} else {
-							unpacked := event.Data.([]interface{})
-							go listener.callback(unpacked...)
-						}
+					// Call listener, perhaps with data
+					if event.Data == nil {
+						go listener.callback()
+					} else {
+						unpacked := event.Data.([]interface{})
+						go listener.callback(unpacked...)
 					}
 
 					// Update listen counter
@@ -161,8 +133,15 @@ func (e *Manager) Start(renderer interfaces.Renderer) {
 					}
 				}
 
-				e.mu.Unlock()
-
+				// Remove expired listeners in place
+				if len(listenersToRemove) > 0 {
+					listeners := e.listeners[event.Name][:0]
+					for _, listener := range listeners {
+						if !listener.expired {
+							listeners = append(listeners, listener)
+						}
+					}
+				}
 			case <-e.quitChannel:
 				e.running = false
 			}

lib/interfaces/appconfig.go

@@ -5,14 +5,10 @@ type AppConfig interface {
 	GetWidth() int
 	GetHeight() int
 	GetTitle() string
-	GetMinWidth() int
-	GetMinHeight() int
-	GetMaxWidth() int
-	GetMaxHeight() int
 	GetResizable() bool
-	GetHTML() string
+	GetDefaultHTML() string
 	GetDisableInspector() bool
 	GetColour() string
 	GetCSS() string
 	GetJS() string
-}
+}

lib/interfaces/eventmanager.go

@@ -6,8 +6,6 @@ import "github.com/wailsapp/wails/lib/messages"
 type EventManager interface {
 	PushEvent(*messages.EventData)
 	Emit(eventName string, optionalData ...interface{})
-	OnMultiple(eventName string, callback func(...interface{}), counter uint)
-	Once(eventName string, callback func(...interface{}))
 	On(eventName string, callback func(...interface{}))
 	Start(Renderer)
 	Shutdown()