Speed up Wails Serve

fix: call package when -p flag provided

.1.gitignore

@@ -1,17 +0,0 @@
-lib/project/templates/vue
-lib/project/templates/blank
-tools
-test
-.vscode/
-tmp
-examples/**/example*
-!examples/**/*.*
-node_modules
-cmd.old
-lib.old
-cmd/wails/wails
-.DS_Store
-rewrite
-.rewrite
-examples/WIP/*
-docs

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Description**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behaviour:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behaviour**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**System Details**
+Please paste the output of `wails report` here.
+
+**Additional context**
+Add any other context about the problem here.

.gitignore

@@ -14,4 +14,6 @@
 examples/**/example*
 !examples/**/*.*
 cmd/wails/wails
-.DS_Store
+.DS_Store
+tmp
+dist

.goreleaser.yml

@@ -0,0 +1,26 @@
+# This is an example goreleaser.yaml file with some sane defaults.
+# Make sure to check the documentation at http://goreleaser.com
+before:
+  hooks:
+    - ./scripts/updateversion.sh
+builds:
+- env:
+  - CGO_ENABLED=0
+  main: ./cmd/wails/main.go
+archive:
+  replacements:
+    darwin: Darwin
+    linux: Linux
+    windows: Windows
+    386: i386
+    amd64: x86_64
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  name_template: "{{ .Tag }}-next"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+    - '^docs:'
+    - '^test:'

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 wailsapp
+Copyright (c) 2018-Present Lea Anthony
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1 +1,84 @@
-# Coming Soon
+<p align="center" style="text-align: center">
+   <img src="https://github.com/wailsapp/docs/raw/master/.vuepress/public/media/logo_cropped.png" width="40%"><br/>
+</p>
+<p align="center">
+   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>
+   <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>
+</p>
+
+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!
+
+## Features
+
+- Use standard Go libraries/frameworks for the backend
+- Use any frontend technology to build your UI
+- Expose Go methods/functions to the frontend via a single bind command
+- Uses native rendering engines - no embedded browser
+- Shared events system
+- Native file dialogs
+- Powerful cli tool
+- Multiplatform
+
+## 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.11 or above
+- npm
+
+### MacOS
+
+Make sure you have the xcode command line tools installed. This can be done by running:
+
+`xcode-select --install`
+
+### Linux
+
+#### Ubuntu 18.04
+
+`sudo apt install pkg-config build-essential libgtk-3-dev libwebkit2gtk-4.0-dev`
+
+Note: If you have successfully installed these dependencies on a different flavour of Linux, please consider submitting a PR.
+
+### 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.
+
+## Installation
+
+Installation is as simple as running the following command:
+
+<pre style='color:white'>
+go get -u github.com/wailsapp/wails/cmd/wails
+</pre>
+
+## Next Steps
+
+It is recommended at this stage to read the comprehensive documentation at [https://wails.app](https://wails.app).
+
+## FAQ
+
+ * 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.
+
+ * Who is this project aimed at?
+
+   Go programmers who want to bundle an HMTL frontend with their applications, without resorting to creating a server and opening a browser to view it.
+
+## 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.
+  * [Serge Zaitsev](https://github.com/zserge) - Creator of [Webview](https://github.com/zserge/webview) which Wails uses for the windowing.
+
+Special Mentions:
+
+  * [Bill Kennedy](https://twitter.com/goinggodotnet) - Go guru, encourager and all-round nice guy, whose energy and inspiration powered me on when I had none left.
+  * [Mark Bates](https://github.com/markbates) - Creator of [Packr](https://github.com/gobuffalo/packr), inspiration for packing strategies.
+

app.go

@@ -2,13 +2,12 @@ package wails
 
 import (
 	"github.com/wailsapp/wails/cmd"
-	"github.com/wailsapp/wails/cmd/frameworks"
 )
 
 // -------------------------------- Compile time Flags ------------------------------
 
-// DebugMode indicates if we are in debug Mode
-var DebugMode = "true"
+// BuildMode indicates what mode we are in
+var BuildMode = cmd.BuildModeProd
 
 // ----------------------------------------------------------------------------------
 
@@ -18,7 +17,6 @@ type App struct {
 	cli            *cmd.Cli        // In debug mode, we have a cli
 	renderer       Renderer        // The renderer is what we will render the app to
 	logLevel       string          // The log level of the app
-	headless       bool            // Indicates if the app should be started in headless mode
 	ipc            *ipcManager     // Handles the IPC calls
 	log            *CustomLogger   // Logger
 	bindingManager *bindingManager // Handles binding of Go code to renderer
@@ -55,7 +53,7 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 	result.config = appconfig
 
 	// Set up the CLI if not in release mode
-	if DebugMode == "true" {
+	if BuildMode != cmd.BuildModeProd {
 		result.cli = result.setupCli()
 	} else {
 		// Disable Inspector in release mode
@@ -67,12 +65,12 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 
 // Run the app
 func (a *App) Run() error {
-	if DebugMode == "true" {
+	if BuildMode != cmd.BuildModeProd {
 		return a.cli.Run()
-	} else {
-		a.logLevel = "error"
-		return a.start()
 	}
+
+	a.logLevel = "error"
+	return a.start()
 }
 
 func (a *App) start() error {
@@ -84,7 +82,7 @@ func (a *App) start() error {
 	a.log.Info("Starting")
 
 	// Check if we are to run in headless mode
-	if a.headless {
+	if BuildMode == cmd.BuildModeBridge {
 		a.renderer = &Headless{}
 	}
 
@@ -109,11 +107,6 @@ func (a *App) start() error {
 		return err
 	}
 
-	// Inject framework, if specified
-	if frameworks.FrameworkToUse != nil {
-		a.renderer.InjectFramework(frameworks.FrameworkToUse.JS, frameworks.FrameworkToUse.CSS)
-	}
-
 	// Inject CSS
 	a.renderer.AddCSSList(a.cssCache)
 

app_cli.go

@@ -1,8 +1,6 @@
 package wails
 
 import (
-	"fmt"
-
 	"github.com/wailsapp/wails/cmd"
 )
 
@@ -11,18 +9,17 @@ func (app *App) setupCli() *cmd.Cli {
 
 	// Create a new cli
 	result := cmd.NewCli(app.config.Title, "Debug build")
+	result.Version(cmd.Version)
 
 	// Setup cli to handle loglevel and headless flags
 	result.
 		StringFlag("loglevel", "Sets the log level [debug|info|error|panic|fatal]. Default debug", &app.logLevel).
-		BoolFlag("headless", "Runs the app in headless mode", &app.headless).
+		// BoolFlag("headless", "Runs the app in headless mode", &app.headless).
 		Action(app.start)
 
 	// Banner
 	result.PreRun(func(cli *cmd.Cli) error {
 		log := cmd.NewLogger()
-		log.PrintBanner()
-		fmt.Println()
 		log.YellowUnderline(app.config.Title + " - Debug Build")
 		return nil
 	})

app_config.go

@@ -4,11 +4,9 @@ import (
 	"strings"
 
 	"github.com/dchest/htmlmin"
-	"github.com/gobuffalo/packr"
+	"github.com/leaanthony/mewn"
 )
 
-var assets = packr.NewBox("./assets/default")
-
 // AppConfig is the configuration structure used when creating a Wails App object
 type AppConfig struct {
 	Width, Height    int
@@ -85,7 +83,7 @@ func newAppConfig(userConfig *AppConfig) (*AppConfig, error) {
 		Resizable: true,
 		Title:     "My Wails App",
 		Colour:    "#FFF", // White by default
-		HTML:      BoxString(&defaultAssets, "default.html"),
+		HTML:      mewn.String("./wailsruntimeassets/default/default.html"),
 	}
 
 	if userConfig != nil {

assets/default/default.html

@@ -1 +0,0 @@
-<div id="app"></div>

assets/headless/index.html

@@ -1,179 +0,0 @@
-<html>
-
-<head>
-  <title>Wails Headless</title>
-  <style>
-    .wails-reconnect-overlay {
-      position: fixed;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      background: rgba(0, 0, 0, 0.6);
-      font-family: sans-serif;
-      display: none;
-      z-index: 999999;
-    }
-
-    .wails-reconnect-overlay-content {
-      padding: 20px 30px;
-      text-align: center;
-      width: 20em;
-      position: relative;
-      height: 17em;
-      border-radius: 1em;
-      margin: 5% auto 0;
-      background-color: white;
-      box-shadow: 1px 1px 20px 3px;
-      background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC8AAAAuCAMAAACPpbA7AAAAqFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQAAAAAAAAEBAQAAAAAAAAAAAAEBAQEBAQDAwMBAQEAAAABAQEAAAAAAAAAAAABAQEAAAAAAAACAgICAgIBAQEAAAAAAAAAAAAAAAAAAAAAAAABAQEAAAACAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBQWKCj6oAAAAN3RSTlMALiIqDhkGBAswJjP0GxP6NR4W9/ztjRDMhWU50G9g5eHXvbZ9XEI9xZTcqZl2aldKo55QwoCvZUgzhAAAAs9JREFUSMeNleeWqjAUhU0BCaH3Itiw9zKT93+zG02QK1hm/5HF+jzZJ6fQe6cyXE+jg9X7o9wxuylIIf4Tv2V3+bOrEXnf8dwQ/KQIGDN2/S+4OmVCVXL/ScBnfibxURqIByP/hONE8r8T+bDMlQ98KSl7Y8hzjpS8v1qtDh8u5f8KQpGpfnPPhqG8JeogN37Hq9eaN2xRhIwAaGnvws8F1ShxqK5ob2twYi1FAMD4rXsYtnC/JEiRbl4cUrCWhnMCLRFemXezXbb59QK4WASOsm6n2W1+4CBT2JmtzQ6fsrbGubR/NFbd2g5Y179+5w/GEHaKsHjYCet7CgrXU3txarNC7YxOVJtIj4/ERzMdZfzc31hp+8cD6eGILgarZY9uZ12hAs03vfBD9C171gS5Omz7OcvxALQIn4u8RRBBBcsi9WW2woO9ipLgfzpYlggg3ZRdROUC8KT7QLqq3W9KB5BbdFVg4929kdwp6+qaZnMCCNBdj+NyN1W885Ry/AL3D4AQbsVV4noCiM/C83kyYq80XlDAYQtralOiDzoRAHlotWl8q2tjvYlOgcg1A8jEApZa+C06TBdAz2Qv0wu11I/zZOyJQ6EwGez2P2b8PIQr1hwwnAZsAxwA4UAYOyXUxM/xp6tHAn4GUmPGM9R28oVxgC0e/zQJJI6DyhyZ1r7uzRQhpcW7x7vTaWSzKSG6aep77kroTEl3U81uSVaUTtgEINfC8epx+Q4F9SpplHG84Ek6m4RAq9/TLkOBrxyeuddZhHvGIp1XXfFy3Z3vtwNblKGiDn+J+92vwwABHghj7HnzlS1H5kB49AZvdGCFgiBPq69qfXPr3y++yilF0ON4R8eR7spAsLpZ95NqAW5tab1c4vkZm6aleajchMwYTdILQQTwE2OV411ZM9WztDjPql12caBi6gDpUKmDd4U1XNdQxZ4LIXQ5/Tr4P7I9tYcFrDK3AAAAAElFTkSuQmCC");
-      background-repeat: no-repeat;
-      background-position: center;
-    }
-
-    .wails-reconnect-overlay-title {
-      font-size: 2em;
-    }
-
-    .wails-reconnect-overlay-message {
-      font-size: 1.3em;
-    }
-
-    /* https://codepen.io/EastingAndNorthing/pen/aNWrZz - Cheers Mark! */
-
-    .wails-reconnect-overlay-loadingspinner {
-      pointer-events: none;
-      width: 2.5em;
-      height: 2.5em;
-      border: 0.4em solid transparent;
-      border-color: #eee;
-      border-top-color: #3E67EC;
-      border-radius: 50%;
-      animation: loadingspin 1s linear infinite;
-      margin: auto;
-      padding: 2.5em;
-    }
-
-    @keyframes loadingspin {
-      100% {
-        transform: rotate(360deg)
-      }
-    }
-  </style>
-</head>
-
-<body>
-  <div class="wails-reconnect-overlay">
-    <div class="wails-reconnect-overlay-content">
-      <div class="wails-reconnect-overlay-title">Disconnected</div><br>
-      <div class="wails-reconnect-overlay-loadingspinner"></div><br>
-      <div class="wails-reconnect-overlay-message">Waiting for backend</div>
-    </div>
-  </div>
-
-  <div id="app"></div>
-
-  <script id="wails-headless-runtime">
-    (function () {
-
-      var websocket = null;
-      var connectTimer = null;
-      var reconnectOverlay = document.querySelector(".wails-reconnect-overlay");
-      var connectionState = "disconnected";
-
-      function showReconnectOverlay() {
-        reconnectOverlay.style.display = 'block';
-      }
-
-      function hideReconnectOverlay() {
-        reconnectOverlay.style.display = 'none';
-      }
-
-      window.external = {
-        invoke: function (msg) {
-          websocket.send(msg);
-        }
-      };
-
-      function addScript(script, id) {
-        var s = document.createElement("script")
-        if (id) {
-          s.id = id;
-        }
-        s.textContent = script;
-        document.head.appendChild(s)
-      }
-
-      function handleConnect() {
-        console.log("[Wails] Connected to backend");
-        addKeyListener();
-        hideReconnectOverlay();
-        clearInterval(connectTimer);
-        websocket.onclose = handleDisconnect;
-        websocket.onmessage = handleMessage;
-        connectionState = "connected";
-        // websocket.onerror = function () { }
-      }
-
-      function handleDisconnect() {
-        console.log("[Wails] Disconnected from backend");
-        websocket = null;
-        removeKeyListener();
-        connectionState = "disconnected";
-        showReconnectOverlay();
-        connect();
-      }
-
-      function connect() {
-        connectTimer = setInterval(function () {
-          if (websocket == null) {
-            websocket = new WebSocket("ws://localhost:34115/ws")
-            websocket.onopen = handleConnect;
-            websocket.onerror = function (e) {
-              e.stopImmediatePropagation();
-              e.stopPropagation();
-              e.preventDefault();
-              websocket = null;
-              return false
-            }
-          }
-        }, 300);
-      }
-
-      function handleMessage(e) {
-        addScript(e.data);
-      }
-
-      // Key listener
-      var delta = 300;
-      var lastKeypressTime = 0;
-      function KeyHandler(event) {
-        if (event.key === "`") {
-          var thisKeypressTime = new Date();
-          if (thisKeypressTime - lastKeypressTime <= delta) {
-            console.log("Double tap!")
-            // optional - if we'd rather not detect a triple-press
-            // as a second double-press, reset the timestamp
-            thisKeypressTime = 0;
-          }
-          lastKeypressTime = thisKeypressTime;
-        }
-      }
-
-      function addKeyListener() {
-        document.body.addEventListener('keydown', KeyHandler);
-      }
-
-      function removeKeyListener() {
-        document.body.removeEventListener('keydown', KeyHandler);
-      }
-
-      connect();
-
-
-    }());
-
-  </script>
-
-</body>
-
-</html>

binding_function.go

@@ -153,8 +153,11 @@ func (b *boundFunction) setInputValue(index int, typ reflect.Type, val interface
 		}
 	}()
 
-	// Do the conversion
-	result = reflect.ValueOf(val).Convert(typ)
-
+	// Translate javascript null values
+	if val == nil {
+		result = reflect.Zero(typ)
+	} else {
+		result = reflect.ValueOf(val).Convert(typ)
+	}
 	return result, err
 }

binding_manager.go

@@ -163,8 +163,71 @@ func (b *bindingManager) bind(object interface{}) {
 	b.objectsToBind = append(b.objectsToBind, object)
 }
 
+func (b *bindingManager) processFunctionCall(callData *callData) (interface{}, error) {
+	// Return values
+	var result []reflect.Value
+	var err error
+
+	function := b.functions[callData.BindingName]
+	if function == nil {
+		return nil, fmt.Errorf("Invalid function name '%s'", callData.BindingName)
+	}
+	result, err = function.call(callData.Data)
+	if err != nil {
+		return nil, err
+	}
+
+	// Do we have an error return type?
+	if function.hasErrorReturnType {
+		// We do - last result is an error type
+		// Check if the last result was nil
+		b.log.Debugf("# of return types: %d", len(function.returnTypes))
+		b.log.Debugf("# of results: %d", len(result))
+		errorResult := result[len(function.returnTypes)-1]
+		if !errorResult.IsNil() {
+			// It wasn't - we have an error
+			return nil, errorResult.Interface().(error)
+		}
+	}
+	return result[0].Interface(), nil
+}
+
+func (b *bindingManager) processMethodCall(callData *callData) (interface{}, error) {
+	// Return values
+	var result []reflect.Value
+	var err error
+
+	// do we have this method?
+	method := b.methods[callData.BindingName]
+	if method == nil {
+		return nil, fmt.Errorf("Invalid method name '%s'", callData.BindingName)
+	}
+
+	result, err = method.call(callData.Data)
+	if err != nil {
+		return nil, err
+	}
+
+	// Do we have an error return type?
+	if method.hasErrorReturnType {
+		// We do - last result is an error type
+		// Check if the last result was nil
+		b.log.Debugf("# of return types: %d", len(method.returnTypes))
+		b.log.Debugf("# of results: %d", len(result))
+		errorResult := result[len(method.returnTypes)-1]
+		if !errorResult.IsNil() {
+			// It wasn't - we have an error
+			return nil, errorResult.Interface().(error)
+		}
+	}
+	if result != nil {
+		return result[0].Interface(), nil
+	}
+	return nil, nil
+}
+
 // process an incoming call request
-func (b *bindingManager) processCall(callData *callData) (interface{}, error) {
+func (b *bindingManager) processCall(callData *callData) (result interface{}, err error) {
 	b.log.Debugf("Wanting to call %s", callData.BindingName)
 
 	// Determine if this is function call or method call by the number of
@@ -176,13 +239,10 @@ func (b *bindingManager) processCall(callData *callData) (interface{}, error) {
 		}
 	}
 
-	// Return values
-	var result []reflect.Value
-	var err error
-
 	// We need to catch reflect related panics and return
 	// a decent error message
 	// TODO: DEBUG THIS!
+
 	defer func() {
 		if r := recover(); r != nil {
 			err = fmt.Errorf("%s", r.(string))
@@ -191,59 +251,14 @@ func (b *bindingManager) processCall(callData *callData) (interface{}, error) {
 
 	switch dotCount {
 	case 1:
-		function := b.functions[callData.BindingName]
-		if function == nil {
-			return nil, fmt.Errorf("Invalid function name '%s'", callData.BindingName)
-		}
-		result, err = function.call(callData.Data)
-		if err != nil {
-			return nil, err
-		}
-
-		// Do we have an error return type?
-		if function.hasErrorReturnType {
-			// We do - last result is an error type
-			// Check if the last result was nil
-			b.log.Debugf("# of return types: %d", len(function.returnTypes))
-			b.log.Debugf("# of results: %d", len(result))
-			errorResult := result[len(function.returnTypes)-1]
-			if !errorResult.IsNil() {
-				// It wasn't - we have an error
-				return nil, errorResult.Interface().(error)
-			}
-		}
-		return result[0].Interface(), nil
+		result, err = b.processFunctionCall(callData)
 	case 2:
-		// do we have this method?
-		method := b.methods[callData.BindingName]
-		if method == nil {
-			return nil, fmt.Errorf("Invalid method name '%s'", callData.BindingName)
-		}
-		result, err = method.call(callData.Data)
-		if err != nil {
-			return nil, err
-		}
-
-		// Do we have an error return type?
-		if method.hasErrorReturnType {
-			// We do - last result is an error type
-			// Check if the last result was nil
-			b.log.Debugf("# of return types: %d", len(method.returnTypes))
-			b.log.Debugf("# of results: %d", len(result))
-			errorResult := result[len(method.returnTypes)-1]
-			if !errorResult.IsNil() {
-				// It wasn't - we have an error
-				return nil, errorResult.Interface().(error)
-			}
-		}
-		if result != nil {
-			return result[0].Interface(), nil
-		}
-		return nil, nil
-
+		result, err = b.processMethodCall(callData)
 	default:
-		return nil, fmt.Errorf("Invalid binding name '%s'", callData.BindingName)
+		result = nil
+		err = fmt.Errorf("Invalid binding name '%s'", callData.BindingName)
 	}
+	return
 }
 
 // callWailsInitMethods calls all of the WailsInit methods that were

cmd/build.go

@@ -0,0 +1,10 @@
+package cmd
+
+const (
+	// BuildModeProd indicates we are building for prod mode
+	BuildModeProd = "prod"
+	// BuildModeDebug indicates we are building for debug mode
+	BuildModeDebug = "debug"
+	// BuildModeBridge indicates we are building for bridge mode
+	BuildModeBridge = "bridge"
+)

cmd/bundle.go

@@ -1,191 +0,0 @@
-package cmd
-
-import (
-	"bytes"
-	"fmt"
-	"image"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"text/template"
-	"time"
-
-	"github.com/jackmordaunt/icns"
-)
-
-// BundleHelper helps with the 'wails bundle' command
-type BundleHelper struct {
-	fs     *FSHelper
-	log    *Logger
-	system *SystemHelper
-}
-
-// NewBundleHelper creates a new BundleHelper!
-func NewBundleHelper() *BundleHelper {
-	return &BundleHelper{
-		fs:     NewFSHelper(),
-		log:    NewLogger(),
-		system: NewSystemHelper(),
-	}
-}
-
-type plistData struct {
-	Title    string
-	Exe      string
-	BundleID string
-	Version  string
-	Author   string
-	Date     string
-}
-
-func newPlistData(title, exe, bundleID, version, author string) *plistData {
-	now := time.Now().Format(time.RFC822)
-	return &plistData{
-		Title:    title,
-		Exe:      exe,
-		Version:  version,
-		BundleID: bundleID,
-		Author:   author,
-		Date:     now,
-	}
-}
-
-func defaultString(val string, defaultVal string) string {
-	if val != "" {
-		return val
-	}
-	return defaultVal
-}
-
-func (b *BundleHelper) getBundleFileBaseDir() string {
-	return filepath.Join(b.system.homeDir, "go", "src", "github.com", "wailsapp", "wails", "cmd", "bundle", runtime.GOOS)
-}
-
-// Bundle the application into a platform specific package
-func (b *BundleHelper) Bundle(po *ProjectOptions) error {
-	// Check we have the exe
-	if !b.fs.FileExists(po.BinaryName) {
-		return fmt.Errorf("cannot bundle non-existant binary file '%s'. Please build with 'wails build' first", po.BinaryName)
-	}
-	switch runtime.GOOS {
-	case "darwin":
-		return b.bundleOSX(po)
-	default:
-		return fmt.Errorf("platform '%s' not supported for bundling yet", runtime.GOOS)
-	}
-}
-
-// Bundle the application
-func (b *BundleHelper) bundleOSX(po *ProjectOptions) error {
-
-	system := NewSystemHelper()
-	config, err := system.LoadConfig()
-	if err != nil {
-		return err
-	}
-
-	name := defaultString(po.Name, "WailsTest")
-	exe := defaultString(po.BinaryName, name)
-	version := defaultString(po.Version, "0.1.0")
-	author := defaultString(config.Name, "Anonymous")
-	bundleID := strings.Join([]string{"wails", name, version}, ".")
-	plistData := newPlistData(name, exe, bundleID, version, author)
-	appname := po.Name + ".app"
-
-	// Check binary exists
-	source := path.Join(b.fs.Cwd(), exe)
-	if !b.fs.FileExists(source) {
-		// We need to build!
-		return fmt.Errorf("Target '%s' not available. Has it been compiled yet?", exe)
-	}
-
-	// REmove the existing bundle
-	os.RemoveAll(appname)
-
-	exeDir := path.Join(b.fs.Cwd(), appname, "/Contents/MacOS")
-	b.fs.MkDirs(exeDir, 0755)
-	resourceDir := path.Join(b.fs.Cwd(), appname, "/Contents/Resources")
-	b.fs.MkDirs(resourceDir, 0755)
-	tmpl := template.New("infoPlist")
-	plistFile := filepath.Join(b.getBundleFileBaseDir(), "info.plist")
-	infoPlist, err := ioutil.ReadFile(plistFile)
-	if err != nil {
-		return err
-	}
-	tmpl.Parse(string(infoPlist))
-
-	// Write the template to a buffer
-	var tpl bytes.Buffer
-	err = tmpl.Execute(&tpl, plistData)
-	if err != nil {
-		return err
-	}
-	filename := path.Join(b.fs.Cwd(), appname, "Contents", "Info.plist")
-	err = ioutil.WriteFile(filename, tpl.Bytes(), 0644)
-	if err != nil {
-		return err
-	}
-
-	// Copy executable
-	target := path.Join(exeDir, exe)
-	err = b.fs.CopyFile(source, target)
-	if err != nil {
-		return err
-	}
-
-	err = os.Chmod(target, 0755)
-	if err != nil {
-		return err
-	}
-	err = b.bundleIcon(resourceDir)
-	return err
-}
-
-func (b *BundleHelper) bundleIcon(resourceDir string) error {
-
-	// TODO: Read this from project.json
-	const appIconFilename = "appicon.png"
-
-	srcIcon := path.Join(b.fs.Cwd(), appIconFilename)
-
-	// Check if appicon.png exists
-	if !b.fs.FileExists(srcIcon) {
-
-		// Install default icon
-		iconfile := filepath.Join(b.getBundleFileBaseDir(), "icon.png")
-		iconData, err := ioutil.ReadFile(iconfile)
-		if err != nil {
-			return err
-		}
-		err = ioutil.WriteFile(srcIcon, iconData, 0644)
-		if err != nil {
-			return err
-		}
-	}
-
-	tgtBundle := path.Join(resourceDir, "iconfile.icns")
-	imageFile, err := os.Open(srcIcon)
-	if err != nil {
-		return err
-	}
-	defer imageFile.Close()
-	srcImg, _, err := image.Decode(imageFile)
-	if err != nil {
-		return err
-
-	}
-	dest, err := os.Create(tgtBundle)
-	if err != nil {
-		return err
-
-	}
-	defer dest.Close()
-	if err := icns.Encode(dest, srcImg); err != nil {
-		return err
-
-	}
-	return nil
-}

cmd/cli.go

@@ -194,10 +194,8 @@ func (c *Command) Action(callback Action) *Command {
 
 // PrintHelp - Output the help text for this command
 func (c *Command) PrintHelp() {
-	versionString := c.AppVersion
-	if versionString != "" {
-		versionString = " " + versionString
-	}
+	c.log.PrintBanner()
+
 	commandTitle := c.CommandPath
 	if c.Shortdescription != "" {
 		commandTitle += " - " + c.Shortdescription
@@ -211,7 +209,6 @@ func (c *Command) PrintHelp() {
 		fmt.Println(c.Longdescription + "\n")
 	}
 	if len(c.SubCommands) > 0 {
-		fmt.Println("")
 		c.log.White("Available commands:")
 		fmt.Println("")
 		for _, subcommand := range c.SubCommands {
@@ -222,9 +219,9 @@ func (c *Command) PrintHelp() {
 			}
 			fmt.Printf("   %s%s%s %s\n", subcommand.Name, spacer, subcommand.Shortdescription, isDefault)
 		}
+		fmt.Println("")
 	}
 	if c.flagCount > 0 {
-		fmt.Println("")
 		c.log.White("Flags:")
 		fmt.Println()
 		c.Flags.SetOutput(os.Stdout)

cmd/frameworks.go

@@ -1,69 +0,0 @@
-package cmd
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"path"
-	"path/filepath"
-	"runtime"
-)
-
-// FrameworkMetadata contains information about a given framework
-type FrameworkMetadata struct {
-	Name        string `json:"name"`
-	BuildTag    string `json:"buildtag"`
-	Description string `json:"description"`
-}
-
-// Utility function for creating new FrameworkMetadata structs
-func loadFrameworkMetadata(pathToMetadataJSON string) (*FrameworkMetadata, error) {
-	result := &FrameworkMetadata{}
-	configData, err := ioutil.ReadFile(pathToMetadataJSON)
-	if err != nil {
-		return nil, err
-	}
-	// Load and unmarshall!
-	err = json.Unmarshal(configData, result)
-	if err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-// GetFrameworks returns information about all the available frameworks
-func GetFrameworks() ([]*FrameworkMetadata, error) {
-
-	var err error
-
-	// Calculate framework base dir
-	_, filename, _, _ := runtime.Caller(1)
-	frameworksBaseDir := filepath.Join(path.Dir(filename), "frameworks")
-
-	// Get the subdirectories
-	fs := NewFSHelper()
-	frameworkDirs, err := fs.GetSubdirs(frameworksBaseDir)
-	if err != nil {
-		return nil, err
-	}
-
-	// Prepare result
-	result := []*FrameworkMetadata{}
-
-	// Iterate framework directories, looking for metadata.json files
-	for _, frameworkDir := range frameworkDirs {
-		var frameworkMetadata FrameworkMetadata
-		metadataFile := filepath.Join(frameworkDir, "metadata.json")
-		jsonData, err := ioutil.ReadFile(metadataFile)
-		if err != nil {
-			return nil, err
-		}
-		err = json.Unmarshal(jsonData, &frameworkMetadata)
-		if err != nil {
-			return nil, err
-		}
-		result = append(result, &frameworkMetadata)
-	}
-
-	// Read in framework metadata
-	return result, nil
-}

cmd/frameworks/bootstrap4default.go

@@ -1,16 +0,0 @@
-// +build frameworkbootstrap4
-
-package frameworks
-
-import (
-	"github.com/gobuffalo/packr"
-)
-
-func init() {
-	assets := packr.NewBox("./bootstrap4default/assets")
-	FrameworkToUse = &Framework{
-		Name: "Bootstrap 4",
-		JS:   BoxString(&assets, "bootstrap.bundle.min.js"),
-		CSS:  BoxString(&assets, "bootstrap.min.css"),
-	}
-}

cmd/frameworks/bootstrap4default/main.go

@@ -1,17 +0,0 @@
-// +build frameworkbootstrap4
-
-package bootstrap4
-
-import (
-	"github.com/gobuffalo/packr"
-	"github.com/wailsapp/wails/frameworks"
-)
-
-func init() {
-	assets := packr.NewBox("./assets")
-	frameworks.FrameworkToUse = &frameworks.Framework{
-		Name: "Bootstrap 4",
-		JS:   BoxString(&assets, "bootstrap.bundle.min.js"),
-		CSS:  BoxString(&assets, "bootstrap.min.css"),
-	}
-}

cmd/frameworks/bootstrap4default/metadata.json

@@ -1,5 +0,0 @@
-{
-  "Name": "Bootstrap 4",
-  "Description": "Standard Bootstrap 4 with default theme",
-  "BuildTag": "frameworkbootstrap4"
-}

cmd/frameworks/bootstrap4lux.go

@@ -1,16 +0,0 @@
-// +build frameworkbootstrap4lux
-
-package frameworks
-
-import (
-	"github.com/gobuffalo/packr"
-)
-
-func init() {
-	assets := packr.NewBox("./bootstrap4lux/assets")
-	FrameworkToUse = &Framework{
-		Name: "Bootstrap 4 (Lux)",
-		JS:   BoxString(&assets, "bootstrap.bundle.min.js"),
-		CSS:  BoxString(&assets, "bootstrap.min.css"),
-	}
-}

cmd/frameworks/bootstrap4lux/main.go

@@ -1,17 +0,0 @@
-// +build frameworkbootstrap4lux
-
-package bootstrap4
-
-import (
-	"github.com/gobuffalo/packr"
-	"github.com/wailsapp/wails/frameworks"
-)
-
-func init() {
-	assets := packr.NewBox("./assets")
-	frameworks.FrameworkToUse = &frameworks.Framework{
-		Name: "Bootstrap 4 (Lux)",
-		JS:   BoxString(&assets, "bootstrap.bundle.min.js"),
-		CSS:  BoxString(&assets, "bootstrap.min.css"),
-	}
-}

cmd/frameworks/bootstrap4lux/metadata.json

@@ -1,5 +0,0 @@
-{
-  "Name": "Bootstrap 4 (Lux)",
-  "Description": "Bootstrap with Lux theme",
-  "BuildTag": "frameworkbootstrap4lux"
-}

cmd/frameworks/main.go

@@ -1,28 +0,0 @@
-package frameworks
-
-import (
-	"log"
-
-	"github.com/gobuffalo/packr"
-)
-
-// Framework has details about a specific framework
-type Framework struct {
-	Name    string
-	JS      string
-	CSS     string
-	Options string
-}
-
-// FrameworkToUse is the framework we will use when building
-// Set by `wails init`, used by `wails build`
-var FrameworkToUse *Framework
-
-// BoxString extracts a string from a packr box
-func BoxString(box *packr.Box, filename string) string {
-	result, err := box.FindString(filename)
-	if err != nil {
-		log.Fatal(err)
-	}
-	return result
-}

cmd/fs.go

@@ -41,6 +41,14 @@ func (fs *FSHelper) FileExists(path string) bool {
 	return fi.Mode().IsRegular()
 }
 
+// CreateFile creates a file at the given filename location with the contents
+// set to the given data. It will create intermediary directories if needed.
+func (fs *FSHelper) CreateFile(filename string, data []byte) error {
+	// Ensure directory exists
+	fs.MkDirs(filepath.Dir(filename))
+	return ioutil.WriteFile(filename, data, 0644)
+}
+
 // MkDirs creates the given nested directories.
 // Returns error on failure
 func (fs *FSHelper) MkDirs(fullPath string, mode ...os.FileMode) error {
@@ -80,6 +88,22 @@ func (fs *FSHelper) Cwd() string {
 	return cwd
 }
 
+// RemoveFile removes the given filename
+func (fs *FSHelper) RemoveFile(filename string) error {
+	return os.Remove(filename)
+}
+
+// RemoveFiles removes the given filenames
+func (fs *FSHelper) RemoveFiles(files []string) error {
+	for _, filename := range files {
+		err := os.Remove(filename)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // GetSubdirs will return a list of FQPs to subdirectories in the given directory
 func (fs *FSHelper) GetSubdirs(dir string) (map[string]string, error) {
 

cmd/helpers.go

@@ -0,0 +1,295 @@
+package cmd
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"time"
+
+	mewn "github.com/leaanthony/mewn"
+	"github.com/leaanthony/slicer"
+	"github.com/leaanthony/spinner"
+)
+
+var fs = NewFSHelper()
+
+// ValidateFrontendConfig checks if the frontend config is valid
+func ValidateFrontendConfig(projectOptions *ProjectOptions) error {
+	if projectOptions.FrontEnd.Dir == "" {
+		return fmt.Errorf("Frontend directory not set in project.json")
+	}
+	if projectOptions.FrontEnd.Build == "" {
+		return fmt.Errorf("Frontend build command not set in project.json")
+	}
+	if projectOptions.FrontEnd.Install == "" {
+		return fmt.Errorf("Frontend install command not set in project.json")
+	}
+	if projectOptions.FrontEnd.Bridge == "" {
+		return fmt.Errorf("Frontend bridge config not set in project.json")
+	}
+
+	return nil
+}
+
+// InstallGoDependencies will run go get in the current directory
+func InstallGoDependencies() error {
+	depSpinner := spinner.New("Installing Dependencies...")
+	depSpinner.SetSpinSpeed(50)
+	depSpinner.Start()
+	err := NewProgramHelper().RunCommand("go get")
+	if err != nil {
+		depSpinner.Error()
+		return err
+	}
+	depSpinner.Success()
+	return nil
+}
+
+// BuildApplication will attempt to build the project based on the given inputs
+func BuildApplication(binaryName string, forceRebuild bool, buildMode string, packageApp bool, projectOptions *ProjectOptions) error {
+
+	// Generate Windows assets if needed
+	if runtime.GOOS == "windows" {
+		cleanUp := !packageApp
+		err := NewPackageHelper().PackageWindows(projectOptions, cleanUp)
+		if err != nil {
+			return err
+		}
+	}
+
+	// Check Mewn is installed
+	err := CheckMewn()
+	if err != nil {
+		return err
+	}
+
+	compileMessage := "Packing + Compiling project"
+
+	if buildMode == BuildModeDebug {
+		compileMessage += " (Debug Mode)"
+	}
+
+	packSpinner := spinner.New(compileMessage + "...")
+	packSpinner.SetSpinSpeed(50)
+	packSpinner.Start()
+
+	buildCommand := slicer.String()
+	buildCommand.Add("mewn")
+
+	if buildMode == BuildModeBridge {
+		// Ignore errors
+		buildCommand.Add("-i")
+	}
+	buildCommand.Add("build")
+
+	if binaryName != "" {
+		buildCommand.Add("-o")
+		buildCommand.Add(binaryName)
+	}
+
+	// If we are forcing a rebuild
+	if forceRebuild {
+		buildCommand.Add("-a")
+	}
+
+	// Setup ld flags
+	ldflags := "-w -s "
+	if buildMode == BuildModeDebug {
+		ldflags = ""
+	}
+
+	// Add windows flags
+	if runtime.GOOS == "windows" {
+		ldflags += "-H windowsgui "
+	}
+
+	ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode
+
+	buildCommand.AddSlice([]string{"-ldflags", ldflags})
+	err = NewProgramHelper().RunCommandArray(buildCommand.AsSlice())
+	if err != nil {
+		packSpinner.Error()
+		return err
+	}
+	packSpinner.Success()
+
+	// packageApp
+	if packageApp {
+		err = PackageApplication(projectOptions)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// PackageApplication will attempt to package the application in a pltform dependent way
+func PackageApplication(projectOptions *ProjectOptions) error {
+	// Package app
+	message := "Generating .app"
+	if runtime.GOOS == "windows" {
+		err := CheckWindres()
+		if err != nil {
+			return err
+		}
+		message = "Generating resource bundle"
+	}
+	packageSpinner := spinner.New(message)
+	packageSpinner.SetSpinSpeed(50)
+	packageSpinner.Start()
+	err := NewPackageHelper().Package(projectOptions)
+	if err != nil {
+		packageSpinner.Error()
+		return err
+	}
+	packageSpinner.Success()
+	return nil
+}
+
+// BuildFrontend runs the given build command
+func BuildFrontend(buildCommand string) error {
+	buildFESpinner := spinner.New("Building frontend...")
+	buildFESpinner.SetSpinSpeed(50)
+	buildFESpinner.Start()
+	err := NewProgramHelper().RunCommand(buildCommand)
+	if err != nil {
+		buildFESpinner.Error()
+		return err
+	}
+	buildFESpinner.Success()
+	return nil
+}
+
+// CheckMewn checks if mewn is installed and if not, attempts to fetch it
+func CheckMewn() (err error) {
+	programHelper := NewProgramHelper()
+	if !programHelper.IsInstalled("mewn") {
+		buildSpinner := spinner.New()
+		buildSpinner.SetSpinSpeed(50)
+		buildSpinner.Start("Installing Mewn asset packer...")
+		err := programHelper.InstallGoPackage("github.com/leaanthony/mewn/cmd/mewn")
+		if err != nil {
+			buildSpinner.Error()
+			return err
+		}
+		buildSpinner.Success()
+	}
+	return nil
+}
+
+// CheckWindres checks if Windres is installed and if not, aborts
+func CheckWindres() (err error) {
+	if runtime.GOOS != "windows" {
+		return nil
+	}
+	programHelper := NewProgramHelper()
+	if !programHelper.IsInstalled("windres") {
+		return fmt.Errorf("windres not installed. It comes by default with mingw. Ensure you have installed mingw correctly")
+	}
+	return nil
+}
+
+// InstallFrontendDeps attempts to install the frontend dependencies based on the given options
+func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forceRebuild bool, caller string) error {
+
+	// Install frontend deps
+	err := os.Chdir(projectOptions.FrontEnd.Dir)
+	if err != nil {
+		return err
+	}
+
+	// Check if frontend deps have been updated
+	feSpinner := spinner.New("Installing frontend dependencies (This may take a while)...")
+	feSpinner.SetSpinSpeed(50)
+	feSpinner.Start()
+
+	requiresNPMInstall := true
+
+	// Read in package.json MD5
+	fs := NewFSHelper()
+	packageJSONMD5, err := fs.FileMD5("package.json")
+	if err != nil {
+		return err
+	}
+
+	const md5sumFile = "package.json.md5"
+
+	// If we aren't forcing the install and the md5sum file exists
+	if !forceRebuild && fs.FileExists(md5sumFile) {
+		// Yes - read contents
+		savedMD5sum, err := fs.LoadAsString(md5sumFile)
+		// File exists
+		if err == nil {
+			// Compare md5
+			if savedMD5sum == packageJSONMD5 {
+				// Same - no need for reinstall
+				requiresNPMInstall = false
+				feSpinner.Success("Skipped frontend dependencies (-f to force rebuild)")
+			}
+		}
+	}
+
+	// Md5 sum package.json
+	// Different? Build
+	if requiresNPMInstall || forceRebuild {
+		// Install dependencies
+		err = NewProgramHelper().RunCommand(projectOptions.FrontEnd.Install)
+		if err != nil {
+			feSpinner.Error()
+			return err
+		}
+		feSpinner.Success()
+
+		// Update md5sum file
+		ioutil.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
+	}
+
+	bridgeFile := "wailsbridge.prod.js"
+	if caller == "serve" {
+		bridgeFile = "wailsbridge.js"
+	}
+
+	// Copy bridge to project
+	bridgeAssets := mewn.Group("../wailsruntimeassets/bridge/")
+	bridgeFileData := bridgeAssets.Bytes(bridgeFile)
+	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, projectOptions.FrontEnd.Bridge, "wailsbridge.js")
+	err = fs.CreateFile(bridgeFileTarget, bridgeFileData)
+	if err != nil {
+		return err
+	}
+
+	// Build frontend
+	err = BuildFrontend(projectOptions.FrontEnd.Build)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// ServeProject attempts to serve up the current project so that it may be connected to
+// via the Wails bridge
+func ServeProject(projectOptions *ProjectOptions, logger *Logger) error {
+	go func() {
+		time.Sleep(2 * time.Second)
+		logger.Green(">>>>> To connect, you will need to run '" + projectOptions.FrontEnd.Serve + "' in the '" + projectOptions.FrontEnd.Dir + "' directory <<<<<")
+	}()
+	location, err := filepath.Abs(projectOptions.BinaryName)
+	if err != nil {
+		return err
+	}
+
+	logger.Yellow("Serving Application: " + location)
+	cmd := exec.Command(location)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err = cmd.Run()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

cmd/linux.go

@@ -12,7 +12,7 @@ const (
 	// Unknown is the catch-all distro
 	Unknown LinuxDistribution = 0
 	// Ubuntu distribution
-	Ubuntu  LinuxDistribution = 1
+	Ubuntu LinuxDistribution = 1
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -67,13 +67,11 @@ func GetLinuxDistroInfo() *DistroInfo {
 
 // DpkgInstalled uses dpkg to see if a package is installed
 func DpkgInstalled(packageName string) (bool, error) {
-	result := false
 	program := NewProgramHelper()
 	dpkg := program.FindProgram("dpkg")
 	if dpkg == nil {
 		return false, fmt.Errorf("cannot check dependencies: dpkg not found")
 	}
 	_, _, exitCode, _ := dpkg.Run("-L", packageName)
-	result = exitCode == 0
-	return result, nil
+	return exitCode == 0, nil
 }

cmd/log.go

@@ -17,6 +17,7 @@ func NewLogger() *Logger {
 	return &Logger{errorOnly: false}
 }
 
+// SetErrorOnly ensures that only errors are logged out
 func (l *Logger) SetErrorOnly(errorOnly bool) {
 	l.errorOnly = errorOnly
 }
@@ -99,6 +100,17 @@ func (l *Logger) Error(format string, a ...interface{}) {
 	color.New(color.FgHiRed).PrintfFunc()("Error: "+format+"\n", a...)
 }
 
+// PrintSmallBanner prints a condensed banner
+func (l *Logger) PrintSmallBanner(message ...string) {
+	yellow := color.New(color.FgYellow).SprintFunc()
+	red := color.New(color.FgRed).SprintFunc()
+	msg := ""
+	if len(message) > 0 {
+		msg = " - " + message[0]
+	}
+	fmt.Printf("%s %s%s\n", yellow("Wails"), red(Version), msg)
+}
+
 // PrintBanner prints the Wails banner before running commands
 func (l *Logger) PrintBanner() error {
 	banner1 := ` _       __      _ __    

cmd/package.go

@@ -0,0 +1,259 @@
+package cmd
+
+import (
+	"bytes"
+	"fmt"
+	"image"
+	"io/ioutil"
+	"os"
+	"path"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"text/template"
+	"time"
+
+	"github.com/jackmordaunt/icns"
+)
+
+// PackageHelper helps with the 'wails package' command
+type PackageHelper struct {
+	fs     *FSHelper
+	log    *Logger
+	system *SystemHelper
+}
+
+// NewPackageHelper creates a new PackageHelper!
+func NewPackageHelper() *PackageHelper {
+	return &PackageHelper{
+		fs:     NewFSHelper(),
+		log:    NewLogger(),
+		system: NewSystemHelper(),
+	}
+}
+
+type plistData struct {
+	Title     string
+	Exe       string
+	PackageID string
+	Version   string
+	Author    string
+	Date      string
+}
+
+func newPlistData(title, exe, packageID, version, author string) *plistData {
+	now := time.Now().Format(time.RFC822)
+	return &plistData{
+		Title:     title,
+		Exe:       exe,
+		Version:   version,
+		PackageID: packageID,
+		Author:    author,
+		Date:      now,
+	}
+}
+
+func defaultString(val string, defaultVal string) string {
+	if val != "" {
+		return val
+	}
+	return defaultVal
+}
+
+func (b *PackageHelper) getPackageFileBaseDir() string {
+	// Calculate template base dir
+	_, filename, _, _ := runtime.Caller(1)
+	return filepath.Join(path.Dir(filename), "packages", runtime.GOOS)
+}
+
+// Package the application into a platform specific package
+func (b *PackageHelper) Package(po *ProjectOptions) error {
+	switch runtime.GOOS {
+	case "darwin":
+		// Check we have the exe
+		if !b.fs.FileExists(po.BinaryName) {
+			return fmt.Errorf("cannot bundle non-existent binary file '%s'. Please build with 'wails build' first", po.BinaryName)
+		}
+		return b.packageOSX(po)
+	case "windows":
+		return b.PackageWindows(po, true)
+	case "linux":
+		return fmt.Errorf("linux is not supported at this time. Please see https://github.com/wailsapp/wails/issues/2")
+	default:
+		return fmt.Errorf("platform '%s' not supported for bundling yet", runtime.GOOS)
+	}
+}
+
+// Package the application for OSX
+func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
+
+	system := NewSystemHelper()
+	config, err := system.LoadConfig()
+	if err != nil {
+		return err
+	}
+
+	name := defaultString(po.Name, "WailsTest")
+	exe := defaultString(po.BinaryName, name)
+	version := defaultString(po.Version, "0.1.0")
+	author := defaultString(config.Name, "Anonymous")
+	packageID := strings.Join([]string{"wails", name, version}, ".")
+	plistData := newPlistData(name, exe, packageID, version, author)
+	appname := po.Name + ".app"
+
+	// Check binary exists
+	source := path.Join(b.fs.Cwd(), exe)
+	if !b.fs.FileExists(source) {
+		// We need to build!
+		return fmt.Errorf("Target '%s' not available. Has it been compiled yet?", exe)
+	}
+
+	// Remove the existing package
+	os.RemoveAll(appname)
+
+	exeDir := path.Join(b.fs.Cwd(), appname, "/Contents/MacOS")
+	b.fs.MkDirs(exeDir, 0755)
+	resourceDir := path.Join(b.fs.Cwd(), appname, "/Contents/Resources")
+	b.fs.MkDirs(resourceDir, 0755)
+	tmpl := template.New("infoPlist")
+	plistFile := filepath.Join(b.getPackageFileBaseDir(), "info.plist")
+	infoPlist, err := ioutil.ReadFile(plistFile)
+	if err != nil {
+		return err
+	}
+	tmpl.Parse(string(infoPlist))
+
+	// Write the template to a buffer
+	var tpl bytes.Buffer
+	err = tmpl.Execute(&tpl, plistData)
+	if err != nil {
+		return err
+	}
+	filename := path.Join(b.fs.Cwd(), appname, "Contents", "Info.plist")
+	err = ioutil.WriteFile(filename, tpl.Bytes(), 0644)
+	if err != nil {
+		return err
+	}
+
+	// Copy executable
+	target := path.Join(exeDir, exe)
+	err = b.fs.CopyFile(source, target)
+	if err != nil {
+		return err
+	}
+
+	err = os.Chmod(target, 0755)
+	if err != nil {
+		return err
+	}
+	err = b.packageIconOSX(resourceDir)
+	return err
+}
+
+// PackageWindows packages the application for windows platforms
+func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
+	basename := strings.TrimSuffix(po.BinaryName, ".exe")
+
+	// Copy icon
+	tgtIconFile := filepath.Join(b.fs.Cwd(), basename+".ico")
+	if !b.fs.FileExists(tgtIconFile) {
+		srcIconfile := filepath.Join(b.getPackageFileBaseDir(), "wails.ico")
+		err := b.fs.CopyFile(srcIconfile, tgtIconFile)
+		if err != nil {
+			return err
+		}
+	}
+
+	// Copy manifest
+	tgtManifestFile := filepath.Join(b.fs.Cwd(), basename+".exe.manifest")
+	if !b.fs.FileExists(tgtManifestFile) {
+		srcManifestfile := filepath.Join(b.getPackageFileBaseDir(), "wails.exe.manifest")
+		err := b.fs.CopyFile(srcManifestfile, tgtManifestFile)
+		if err != nil {
+			return err
+		}
+	}
+
+	// Copy rc file
+	tgtRCFile := filepath.Join(b.fs.Cwd(), basename+".rc")
+	if !b.fs.FileExists(tgtRCFile) {
+		srcRCfile := filepath.Join(b.getPackageFileBaseDir(), "wails.rc")
+		rcfilebytes, err := ioutil.ReadFile(srcRCfile)
+		if err != nil {
+			return err
+		}
+		rcfiledata := strings.Replace(string(rcfilebytes), "$NAME$", basename, -1)
+		err = ioutil.WriteFile(tgtRCFile, []byte(rcfiledata), 0755)
+		if err != nil {
+			return err
+		}
+	}
+
+	// Build syso
+	sysofile := filepath.Join(b.fs.Cwd(), basename+"-res.syso")
+	windresCommand := []string{"windres", "-o", sysofile, tgtRCFile}
+	err := NewProgramHelper().RunCommandArray(windresCommand)
+	if err != nil {
+		return err
+	}
+
+	// clean up
+	if cleanUp {
+		filesToDelete := []string{tgtIconFile, tgtManifestFile, tgtRCFile}
+		err := b.fs.RemoveFiles(filesToDelete)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (b *PackageHelper) copyIcon(resourceDir string) (string, error) {
+
+	// TODO: Read this from project.json
+	const appIconFilename = "appicon.png"
+	srcIcon := path.Join(b.fs.Cwd(), appIconFilename)
+
+	// Check if appicon.png exists
+	if !b.fs.FileExists(srcIcon) {
+
+		// Install default icon
+		iconfile := filepath.Join(b.getPackageFileBaseDir(), "icon.png")
+		iconData, err := ioutil.ReadFile(iconfile)
+		if err != nil {
+			return "", err
+		}
+		err = ioutil.WriteFile(srcIcon, iconData, 0644)
+		if err != nil {
+			return "", err
+		}
+	}
+	return srcIcon, nil
+}
+
+func (b *PackageHelper) packageIconOSX(resourceDir string) error {
+
+	srcIcon, err := b.copyIcon(resourceDir)
+	if err != nil {
+		return err
+	}
+	tgtBundle := path.Join(resourceDir, "iconfile.icns")
+	imageFile, err := os.Open(srcIcon)
+	if err != nil {
+		return err
+	}
+	defer imageFile.Close()
+	srcImg, _, err := image.Decode(imageFile)
+	if err != nil {
+		return err
+
+	}
+	dest, err := os.Create(tgtBundle)
+	if err != nil {
+		return err
+
+	}
+	defer dest.Close()
+	return icns.Encode(dest, srcImg)
+}

cmd/packages/darwin/info.plist

@@ -0,0 +1,11 @@
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0"><dict>
+	<key>CFBundleName</key><string>{{.Title}}</string>
+	<key>CFBundleExecutable</key><string>{{.Exe}}</string>
+	<key>CFBundleIdentifier</key><string>{{.PackageID}}</string>
+	<key>CFBundleVersion</key><string>{{.Version}}</string>
+	<key>CFBundleGetInfoString</key><string>Built by {{.Author}} at {{.Date}} using Wails (https://wails.app)</string>
+	<key>CFBundleShortVersionString</key><string>{{.Version}}</string>
+	<key>CFBundleIconFile</key><string>iconfile</string>
+	<key>NSHighResolutionCapable</key><string>true</string>
+</dict></plist>

cmd/packages/windows/wails.exe.manifest

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <assemblyIdentity type="win32" name="MyApplication" version="1.0.0.0" processorArchitecture="amd64"/>
+
+    <asmv3:application>
+        <asmv3:windowsSettings>
+            <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware> <!-- fallback for Windows 7 and 8 -->
+            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">permonitorv2,permonitor</dpiAwareness> <!-- falls back to per-monitor if per-monitor v2 is not supported -->
+            <gdiScaling xmlns="http://schemas.microsoft.com/SMI/2017/WindowsSettings">true</gdiScaling> <!-- enables GDI DPI scaling -->
+        </asmv3:windowsSettings>
+    </asmv3:application>
+</assembly>

cmd/packages/windows/wails.rc

@@ -0,0 +1,2 @@
+100 ICON    "$NAME$.ico"
+100 24      "$NAME$.exe.manifest"

cmd/program.go

@@ -56,7 +56,7 @@ func (p *Program) GetFullPathToBinary() (string, error) {
 }
 
 // Run will execute the program with the given parameters
-// Returns stdout + stderr as strings and an error if one occured
+// Returns stdout + stderr as strings and an error if one occurred
 func (p *Program) Run(vars ...string) (stdout, stderr string, exitCode int, err error) {
 	command, err := p.GetFullPathToBinary()
 	if err != nil {
@@ -116,6 +116,7 @@ func (p *ProgramHelper) RunCommandArray(args []string) error {
 		return err
 	}
 	args = args[1:]
+	// fmt.Printf("RunCommandArray = %s %+v\n", program, args)
 	_, stderr, err := p.shell.Run(program, args...)
 	if err != nil {
 		fmt.Println(stderr)

cmd/project.go

@@ -4,10 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 
-	"github.com/AlecAivazis/survey"
+	"github.com/leaanthony/slicer"
 )
 
 type author struct {
@@ -19,6 +21,8 @@ type frontend struct {
 	Dir     string `json:"dir"`
 	Install string `json:"install"`
 	Build   string `json:"build"`
+	Bridge  string `json:"bridge"`
+	Serve   string `json:"serve"`
 }
 
 type framework struct {
@@ -46,15 +50,11 @@ func NewProjectHelper() *ProjectHelper {
 // GenerateProject generates a new project using the options given
 func (ph *ProjectHelper) GenerateProject(projectOptions *ProjectOptions) error {
 
-	fs := NewFSHelper()
-	exists, err := ph.templates.TemplateExists(projectOptions.Template)
-	if err != nil {
-		return err
-	}
+	// exists := ph.templates.TemplateExists(projectOptions.Template)
 
-	if !exists {
-		return fmt.Errorf("template '%s' is invalid", projectOptions.Template)
-	}
+	// if !exists {
+	// 	return fmt.Errorf("template '%s' is invalid", projectOptions.Template)
+	// }
 
 	// Calculate project path
 	projectPath, err := filepath.Abs(projectOptions.OutputDirectory)
@@ -62,6 +62,8 @@ func (ph *ProjectHelper) GenerateProject(projectOptions *ProjectOptions) error {
 		return err
 	}
 
+	_ = projectPath
+
 	if fs.DirExists(projectPath) {
 		return fmt.Errorf("directory '%s' already exists", projectPath)
 	}
@@ -82,11 +84,27 @@ func (ph *ProjectHelper) GenerateProject(projectOptions *ProjectOptions) error {
 	if err != nil {
 		return err
 	}
+
+	// // If we are on windows, dump a windows_resource.json
+	// if runtime.GOOS == "windows" {
+	// 	ph.GenerateWindowsResourceConfig(projectOptions)
+	// }
+
 	ph.log.Yellow("Project '%s' generated in directory '%s'!", projectOptions.Name, projectOptions.OutputDirectory)
 	ph.log.Yellow("To compile the project, run 'wails build' in the project directory.")
 	return nil
 }
 
+// // GenerateWindowsResourceConfig generates the default windows resource file
+// func (ph *ProjectHelper) GenerateWindowsResourceConfig(po *ProjectOptions) {
+
+// 	fmt.Println(buffer.String())
+
+// 	// vi.Build()
+// 	// vi.Walk()
+// 	// err := vi.WriteSyso(outPath, runtime.GOARCH)
+// }
+
 // LoadProjectConfig loads the project config from the given directory
 func (ph *ProjectHelper) LoadProjectConfig(dir string) (*ProjectOptions, error) {
 	po := ph.NewProjectOptions()
@@ -97,15 +115,14 @@ func (ph *ProjectHelper) LoadProjectConfig(dir string) (*ProjectOptions, error)
 // NewProjectOptions creates a new default set of project options
 func (ph *ProjectHelper) NewProjectOptions() *ProjectOptions {
 	result := ProjectOptions{
-		Name:            "",
-		Description:     "Enter your project description",
-		Version:         "0.1.0",
-		BinaryName:      "",
-		system:          NewSystemHelper(),
-		log:             NewLogger(),
-		templates:       NewTemplateHelper(),
-		templateNameMap: make(map[string]string),
-		Author:          &author{},
+		Name:        "",
+		Description: "Enter your project description",
+		Version:     "0.1.0",
+		BinaryName:  "",
+		system:      NewSystemHelper(),
+		log:         NewLogger(),
+		templates:   NewTemplateHelper(),
+		Author:      &author{},
 	}
 
 	// Populate system config
@@ -118,193 +135,70 @@ func (ph *ProjectHelper) NewProjectOptions() *ProjectOptions {
 	return &result
 }
 
-// SelectQuestion creates a new select type question for Survey
-func SelectQuestion(name, message string, options []string, defaultValue string, required bool) *survey.Question {
-	result := survey.Question{
-		Name: name,
-		Prompt: &survey.Select{
-			Message: message,
-			Options: options,
-			Default: defaultValue,
-		},
-	}
-	if required {
-		result.Validate = survey.Required
-	}
-	return &result
-}
-
-// InputQuestion creates a new input type question for Survey
-func InputQuestion(name, message string, defaultValue string, required bool) *survey.Question {
-	result := survey.Question{
-		Name: name,
-		Prompt: &survey.Input{
-			Message: message + ":",
-			Default: defaultValue,
-		},
-	}
-	if required {
-		result.Validate = survey.Required
-	}
-	return &result
-}
-
 // ProjectOptions holds all the options available for a project
 type ProjectOptions struct {
-	Name            string     `json:"name"`
-	Description     string     `json:"description"`
-	Author          *author    `json:"author,omitempty"`
-	Version         string     `json:"version"`
-	OutputDirectory string     `json:"-"`
-	UseDefaults     bool       `json:"-"`
-	Template        string     `json:"-"`
-	BinaryName      string     `json:"binaryname"`
-	FrontEnd        *frontend  `json:"frontend,omitempty"`
-	NPMProjectName  string     `json:"-"`
-	Framework       *framework `json:"framework,omitempty"`
-	system          *SystemHelper
-	log             *Logger
-	templates       *TemplateHelper
-	templateNameMap map[string]string // Converts template prompt text to template name
+	Name             string    `json:"name"`
+	Description      string    `json:"description"`
+	Author           *author   `json:"author,omitempty"`
+	Version          string    `json:"version"`
+	OutputDirectory  string    `json:"-"`
+	UseDefaults      bool      `json:"-"`
+	Template         string    `json:"-"`
+	BinaryName       string    `json:"binaryname"`
+	FrontEnd         *frontend `json:"frontend,omitempty"`
+	NPMProjectName   string    `json:"-"`
+	system           *SystemHelper
+	log              *Logger
+	templates        *TemplateHelper
+	selectedTemplate *TemplateDetails
 }
 
 // Defaults sets the default project template
 func (po *ProjectOptions) Defaults() {
-	po.Template = "basic"
+	po.Template = "vuebasic"
 }
 
 // PromptForInputs asks the user to input project details
 func (po *ProjectOptions) PromptForInputs() error {
 
-	var questions []*survey.Question
-	fs := NewFSHelper()
+	processProjectName(po)
 
-	if po.Name == "" {
-		questions = append(questions, InputQuestion("Name", "The name of the project", "My Project", true))
-	} else {
-		fmt.Println("Project Name: " + po.Name)
-	}
+	processBinaryName(po)
 
-	if po.BinaryName == "" {
-		var binaryNameComputed string
-		if po.Name != "" {
-			binaryNameComputed = strings.ToLower(po.Name)
-			binaryNameComputed = strings.Replace(binaryNameComputed, " ", "-", -1)
-			binaryNameComputed = strings.Replace(binaryNameComputed, string(filepath.Separator), "-", -1)
-			binaryNameComputed = strings.Replace(binaryNameComputed, ":", "-", -1)
-		}
-		questions = append(questions, InputQuestion("BinaryName", "The output binary name", binaryNameComputed, true))
-	} else {
-		fmt.Println("Output binary Name: " + po.BinaryName)
-	}
-
-	if po.OutputDirectory != "" {
-		projectPath, err := filepath.Abs(po.OutputDirectory)
-		if err != nil {
-			return err
-		}
-
-		if fs.DirExists(projectPath) {
-			return fmt.Errorf("directory '%s' already exists", projectPath)
-		}
-
-		fmt.Println("Project Directory: " + po.OutputDirectory)
-	} else {
-		questions = append(questions, InputQuestion("OutputDirectory", "Project directory name", "", true))
-	}
-
-	templateDetails, err := po.templates.GetTemplateDetails()
+	err := processOutputDirectory(po)
 	if err != nil {
 		return err
 	}
 
-	templates := []string{}
-	// Add a Custom Template
-	// templates = append(templates, "Custom - Choose your own CSS framework")
-	for templateName, templateDetails := range templateDetails {
-		templateText := templateName
-		// Check if metadata json exists
-		if templateDetails.Metadata != nil {
-			shortdescription := templateDetails.Metadata["shortdescription"]
-			if shortdescription != "" {
-				templateText += " - " + shortdescription.(string)
-			}
-		}
-		templates = append(templates, templateText)
-		po.templateNameMap[templateText] = templateName
+	// Process Templates
+	templateList := slicer.Interface()
+	options := slicer.String()
+	for _, templateDetails := range po.templates.TemplateList.details {
+		templateList.Add(templateDetails)
+		options.Add(fmt.Sprintf("%s - %s", templateDetails.Metadata.Name, templateDetails.Metadata.ShortDescription))
 	}
 
-	if po.Template != "" {
-		if _, ok := templateDetails[po.Template]; !ok {
-			po.log.Error("Template '%s' invalid.", po.Template)
-			questions = append(questions, SelectQuestion("Template", "Select template", templates, templates[0], true))
-		}
-	} else {
-		questions = append(questions, SelectQuestion("Template", "Select template", templates, templates[0], true))
+	templateIndex := 0
+
+	if len(options.AsSlice()) > 1 {
+		templateIndex = PromptSelection("Please select a template", options.AsSlice(), 0)
 	}
 
-	err = survey.Ask(questions, po)
-	if err != nil {
-		return err
-	}
+	// After selection do this....
+	po.selectedTemplate = templateList.AsSlice()[templateIndex].(*TemplateDetails)
 
 	// Setup NPM Project name
-	po.NPMProjectName = strings.Replace(po.Name, " ", "_", -1)
-
-	// If we selected custom, prompt for framework
-	if po.Template == "custom - Choose your own CSS Framework" {
-		// Ask for the framework
-		var frameworkName string
-		frameworks, err := GetFrameworks()
-		frameworkNames := []string{}
-		metadataMap := make(map[string]*FrameworkMetadata)
-		for _, frameworkMetadata := range frameworks {
-			frameworkDetails := fmt.Sprintf("%s - %s", frameworkMetadata.Name, frameworkMetadata.Description)
-			metadataMap[frameworkDetails] = frameworkMetadata
-			frameworkNames = append(frameworkNames, frameworkDetails)
-		}
-		if err != nil {
-			return err
-		}
-		var frameworkQuestion []*survey.Question
-		frameworkQuestion = append(frameworkQuestion, SelectQuestion("Framework", "Select framework", frameworkNames, frameworkNames[0], true))
-		err = survey.Ask(frameworkQuestion, &frameworkName)
-		if err != nil {
-			return err
-		}
-		// Get metadata
-		metadata := metadataMap[frameworkName]
-
-		// Add to project config
-		po.Framework = &framework{
-			Name:     metadata.Name,
-			BuildTag: metadata.BuildTag,
-		}
-
-	}
+	po.NPMProjectName = strings.ToLower(strings.Replace(po.Name, " ", "_", -1))
 
 	// Fix template name
-	if po.templateNameMap[po.Template] != "" {
-		po.Template = po.templateNameMap[po.Template]
-	}
+	po.Template = strings.Split(po.selectedTemplate.Path, string(os.PathSeparator))[0]
 
-	// Populate template details
-	templateMetadata := templateDetails[po.Template].Metadata
-	if templateMetadata["frontenddir"] != nil {
-		po.FrontEnd = &frontend{}
-		po.FrontEnd.Dir = templateMetadata["frontenddir"].(string)
-	}
-	if templateMetadata["install"] != nil {
-		if po.FrontEnd == nil {
-			return fmt.Errorf("install set in template metadata but not frontenddir")
-		}
-		po.FrontEnd.Install = templateMetadata["install"].(string)
-	}
-	if templateMetadata["build"] != nil {
-		if po.FrontEnd == nil {
-			return fmt.Errorf("build set in template metadata but not frontenddir")
-		}
-		po.FrontEnd.Build = templateMetadata["build"].(string)
+	// // Populate template details
+	templateMetadata := po.selectedTemplate.Metadata
+
+	err = processTemplateMetadata(templateMetadata, po)
+	if err != nil {
+		return err
 	}
 
 	return nil
@@ -337,3 +231,87 @@ func (po *ProjectOptions) LoadConfig(projectDir string) error {
 	}
 	return json.Unmarshal(rawBytes, po)
 }
+
+func computeBinaryName(projectName string) string {
+	if projectName == "" {
+		return ""
+	}
+	var binaryNameComputed = strings.ToLower(projectName)
+	binaryNameComputed = strings.Replace(binaryNameComputed, " ", "-", -1)
+	binaryNameComputed = strings.Replace(binaryNameComputed, string(filepath.Separator), "-", -1)
+	binaryNameComputed = strings.Replace(binaryNameComputed, ":", "-", -1)
+	return binaryNameComputed
+}
+
+func processOutputDirectory(po *ProjectOptions) error {
+	// po.OutputDirectory
+	if po.OutputDirectory == "" {
+		po.OutputDirectory = PromptRequired("Project directory name", computeBinaryName(po.Name))
+	}
+	projectPath, err := filepath.Abs(po.OutputDirectory)
+	if err != nil {
+		return err
+	}
+
+	if NewFSHelper().DirExists(projectPath) {
+		return fmt.Errorf("directory '%s' already exists", projectPath)
+	}
+
+	fmt.Println("Project Directory: " + po.OutputDirectory)
+	return nil
+}
+
+func processProjectName(po *ProjectOptions) {
+	if po.Name == "" {
+		po.Name = Prompt("The name of the project", "My Project")
+	}
+	fmt.Println("Project Name: " + po.Name)
+
+}
+
+func processBinaryName(po *ProjectOptions) {
+	if po.BinaryName == "" {
+		var binaryNameComputed = computeBinaryName(po.Name)
+		po.BinaryName = Prompt("The output binary name", binaryNameComputed)
+		if runtime.GOOS == "windows" {
+			if !strings.HasSuffix(po.BinaryName, ".exe") {
+				po.BinaryName += ".exe"
+			}
+		}
+	}
+	fmt.Println("Output binary Name: " + po.BinaryName)
+}
+
+func processTemplateMetadata(templateMetadata *TemplateMetadata, po *ProjectOptions) error {
+	if templateMetadata.FrontendDir != "" {
+		po.FrontEnd = &frontend{}
+		po.FrontEnd.Dir = templateMetadata.FrontendDir
+	}
+	if templateMetadata.Install != "" {
+		if po.FrontEnd == nil {
+			return fmt.Errorf("install set in template metadata but not frontenddir")
+		}
+		po.FrontEnd.Install = templateMetadata.Install
+	}
+	if templateMetadata.Build != "" {
+		if po.FrontEnd == nil {
+			return fmt.Errorf("build set in template metadata but not frontenddir")
+		}
+		po.FrontEnd.Build = templateMetadata.Build
+	}
+
+	if templateMetadata.Bridge != "" {
+		if po.FrontEnd == nil {
+			return fmt.Errorf("bridge set in template metadata but not frontenddir")
+		}
+		po.FrontEnd.Bridge = templateMetadata.Bridge
+	}
+
+	if templateMetadata.Serve != "" {
+		if po.FrontEnd == nil {
+			return fmt.Errorf("serve set in template metadata but not frontenddir")
+		}
+		po.FrontEnd.Serve = templateMetadata.Serve
+	}
+	return nil
+}

cmd/prompt.go

@@ -0,0 +1,85 @@
+package cmd
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"runtime"
+	"strconv"
+	"strings"
+)
+
+// Prompt asks the user for a value
+func Prompt(question string, defaultValue ...string) string {
+	var answer string
+
+	if len(defaultValue) > 0 {
+		answer = defaultValue[0]
+		question = fmt.Sprintf("%s (%s)", question, answer)
+	}
+	fmt.Printf(question + ": ")
+	reader := bufio.NewReader(os.Stdin)
+	input, _ := reader.ReadString('\n')
+	EOL := "\n"
+	if runtime.GOOS == "windows" {
+		EOL = "\r\n"
+	}
+	input = strings.Replace(input, EOL, "", -1)
+
+	if input != "" {
+		answer = input
+	}
+
+	return answer
+}
+
+// PromptRequired calls Prompt repeatedly until a value is given
+func PromptRequired(question string, defaultValue ...string) string {
+	for {
+		result := Prompt(question, defaultValue...)
+		if result != "" {
+			return result
+		}
+	}
+}
+
+// PromptSelection asks the user to choose an option
+func PromptSelection(question string, options []string, optionalDefaultValue ...int) int {
+
+	defaultValue := -1
+	message := "Please choose an option"
+	fmt.Println(question + ":")
+
+	if len(optionalDefaultValue) > 0 {
+		defaultValue = optionalDefaultValue[0] + 1
+		message = fmt.Sprintf("%s [%d]", message, defaultValue)
+	}
+
+	for index, option := range options {
+		fmt.Printf("  %d: %s\n", index+1, option)
+	}
+
+	selectedValue := -1
+
+	for {
+		choice := Prompt(message)
+		if choice == "" && defaultValue > -1 {
+			selectedValue = defaultValue - 1
+			break
+		}
+
+		// index
+		number, err := strconv.Atoi(choice)
+		if err == nil {
+			if number > 0 && number <= len(options) {
+				selectedValue = number - 1
+				break
+			} else {
+				continue
+			}
+		}
+
+	}
+
+	return selectedValue
+}

cmd/setup.go

@@ -1 +0,0 @@
-package cmd

cmd/system.go

@@ -10,7 +10,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/AlecAivazis/survey"
 	homedir "github.com/mitchellh/go-homedir"
 )
 
@@ -82,55 +81,43 @@ func (s *SystemHelper) BackupConfig() (string, error) {
 
 func (s *SystemHelper) setup() error {
 
-	// Answers. We all need them.
-	answers := &SystemConfig{}
+	systemConfig := make(map[string]string)
 
 	// Try to load current values - ignore errors
-	config, err := s.LoadConfig()
-	defaultName := ""
-	defaultEmail := ""
-	if config != nil {
-		defaultName = config.Name
-		defaultEmail = config.Email
-	}
-	// Questions
-	var simpleQs = []*survey.Question{
-		{
-			Name: "Name",
-			Prompt: &survey.Input{
-				Message: "What is your name:",
-				Default: defaultName,
-			},
-			Validate: survey.Required,
-		},
-		{
-			Name: "Email",
-			Prompt: &survey.Input{
-				Message: "What is your email address:",
-				Default: defaultEmail,
-			},
-			Validate: survey.Required,
-		},
-	}
+	config, _ := s.LoadConfig()
 
-	// ask the questions
-	err = survey.Ask(simpleQs, answers)
-	if err != nil {
-		return err
+	if config.Name != "" {
+		systemConfig["name"] = PromptRequired("What is your name", config.Name)
+	} else {
+		systemConfig["name"] = PromptRequired("What is your name")
+	}
+	if config.Email != "" {
+		systemConfig["email"] = PromptRequired("What is your email address", config.Email)
+	} else {
+		systemConfig["email"] = PromptRequired("What is your email address")
 	}
 
 	// Create the directory
-	err = s.fs.MkDirs(s.wailsSystemDir)
+	err := s.fs.MkDirs(s.wailsSystemDir)
 	if err != nil {
 		return err
 	}
 
+	// Save
+	configData, err := json.Marshal(&systemConfig)
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(s.wailsSystemConfig, configData, 0755)
+	if err != nil {
+		return err
+	}
 	fmt.Println()
 	s.log.White("Wails config saved to: " + s.wailsSystemConfig)
 	s.log.White("Feel free to customise these settings.")
 	fmt.Println()
 
-	return answers.Save(s.wailsSystemConfig)
+	return nil
 }
 
 const introText = `

cmd/templates.go

@@ -3,112 +3,95 @@ package cmd
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
+	"log"
 	"path/filepath"
-	"runtime"
+	"regexp"
 	"strings"
 	"text/template"
+
+	mewn "github.com/leaanthony/mewn"
+	mewnlib "github.com/leaanthony/mewn/lib"
+	"github.com/leaanthony/slicer"
 )
 
-const templateSuffix = ".template"
-
-// TemplateHelper helps with creating projects
-type TemplateHelper struct {
-	system      *SystemHelper
-	fs          *FSHelper
-	templateDir string
-	// templates   map[string]string
-	templateSuffix   string
-	metadataFilename string
+// TemplateMetadata holds all the metadata for a Wails template
+type TemplateMetadata struct {
+	Name             string `json:"name"`
+	ShortDescription string `json:"shortdescription"`
+	Description      string `json:"description"`
+	Install          string `json:"install"`
+	Build            string `json:"build"`
+	Author           string `json:"author"`
+	Created          string `json:"created"`
+	FrontendDir      string `json:"frontenddir"`
+	Serve            string `json:"serve"`
+	Bridge           string `json:"bridge"`
 }
 
-// Template defines a single template
+// TemplateDetails holds information about a specific template
+type TemplateDetails struct {
+	BasePath string
+	Path     string
+	Metadata *TemplateMetadata
+}
+
+// TemplateList is a list of available templates
+type TemplateList struct {
+	details map[string]*TemplateDetails
+}
+
+// NewTemplateList creates a new TemplateList object
+func NewTemplateList(filenames *mewnlib.FileGroup) *TemplateList {
+	// Iterate each template and store information
+
+	result := &TemplateList{details: make(map[string]*TemplateDetails)}
+
+	entries := slicer.String()
+	entries.AddSlice(filenames.Entries())
+
+	// Find all template.json files
+	metadataFiles := entries.Filter(func(filename string) bool {
+		match, _ := regexp.MatchString("(.)+template.json$", filename)
+		return match
+	})
+
+	// Load each metadata file
+	metadataFiles.Each(func(filename string) {
+		fileData := filenames.Bytes(filename)
+		var metadata TemplateMetadata
+		err := json.Unmarshal(fileData, &metadata)
+		if err != nil {
+			log.Fatalf("corrupt metadata for template: %s", filename)
+		}
+		path := strings.Split(filename, string(filepath.Separator))[0]
+		thisTemplate := &TemplateDetails{Path: path, Metadata: &metadata}
+		result.details[filename] = thisTemplate
+	})
+
+	return result
+}
+
+// Template holds details about a Wails template
 type Template struct {
-	Name     string
-	Dir      string
-	Metadata map[string]interface{}
+	Name        string
+	Path        string
+	Description string
+}
+
+// TemplateHelper is a utility object to help with processing templates
+type TemplateHelper struct {
+	TemplateList *TemplateList
+	Files        *mewnlib.FileGroup
 }
 
 // NewTemplateHelper creates a new template helper
 func NewTemplateHelper() *TemplateHelper {
-	result := TemplateHelper{
-		system:           NewSystemHelper(),
-		fs:               NewFSHelper(),
-		templateSuffix:   ".template",
-		metadataFilename: "template.json",
-	}
-	// Calculate template base dir
-	_, filename, _, _ := runtime.Caller(1)
-	result.templateDir = filepath.Join(path.Dir(filename), "templates")
-	// result.templateDir = filepath.Join(result.system.homeDir, "go", "src", "github.com", "wailsapp", "wails", "cmd", "templates")
-	return &result
-}
+	files := mewn.Group("./templates")
 
-// GetTemplateNames returns a map of all available templates
-func (t *TemplateHelper) GetTemplateNames() (map[string]string, error) {
-	templateDirs, err := t.fs.GetSubdirs(t.templateDir)
-	if err != nil {
-		return nil, err
+	return &TemplateHelper{
+		TemplateList: NewTemplateList(files),
+		Files:        files,
 	}
-	return templateDirs, nil
-}
-
-// GetTemplateDetails returns a map of Template structs containing details
-// of the found templates
-func (t *TemplateHelper) GetTemplateDetails() (map[string]*Template, error) {
-	templateDirs, err := t.fs.GetSubdirs(t.templateDir)
-	if err != nil {
-		return nil, err
-	}
-
-	result := make(map[string]*Template)
-
-	for name, dir := range templateDirs {
-		result[name] = &Template{
-			Dir: dir,
-		}
-		metadata, err := t.LoadMetadata(dir)
-		if err != nil {
-			return nil, err
-		}
-		result[name].Metadata = metadata
-		if metadata["name"] != nil {
-			result[name].Name = metadata["name"].(string)
-		} else {
-			// Ignore bad templates?
-			result[name] = nil
-		}
-	}
-
-	return result, nil
-}
-
-// LoadMetadata loads the template's 'metadata.json' file
-func (t *TemplateHelper) LoadMetadata(dir string) (map[string]interface{}, error) {
-	templateFile := filepath.Join(dir, t.metadataFilename)
-	result := make(map[string]interface{})
-	if !t.fs.FileExists(templateFile) {
-		return nil, nil
-	}
-	rawJSON, err := ioutil.ReadFile(templateFile)
-	if err != nil {
-		return nil, err
-	}
-	err = json.Unmarshal(rawJSON, &result)
-	return result, err
-}
-
-// TemplateExists returns true if the given template name exists
-func (t *TemplateHelper) TemplateExists(templateName string) (bool, error) {
-	templates, err := t.GetTemplateNames()
-	if err != nil {
-		return false, err
-	}
-	_, exists := templates[templateName]
-	return exists, nil
 }
 
 // InstallTemplate installs the template given in the project options to the
@@ -116,161 +99,55 @@ func (t *TemplateHelper) TemplateExists(templateName string) (bool, error) {
 func (t *TemplateHelper) InstallTemplate(projectPath string, projectOptions *ProjectOptions) error {
 
 	// Get template files
-	template, err := t.getTemplateFiles(projectOptions.Template)
-	if err != nil {
-		return err
-	}
+	templatePath := projectOptions.selectedTemplate.Path
 
-	// Copy files to target
-	err = template.Install(projectPath, projectOptions)
-	if err != nil {
-		return err
-	}
+	templateFilenames := slicer.String()
+	templateFilenames.AddSlice(projectOptions.templates.Files.Entries())
 
-	return nil
-}
+	templateJSONFilename := filepath.Join(templatePath, "template.json")
 
-// templateFiles categorises files found in a template
-type templateFiles struct {
-	BaseDir       string
-	StandardFiles []string
-	Templates     []string
-	Dirs          []string
-}
-
-// newTemplateFiles returns a new TemplateFiles struct
-func (t *TemplateHelper) newTemplateFiles(dir string) *templateFiles {
-	pathsep := string(os.PathSeparator)
-	// Ensure base directory has trailing slash
-	if !strings.HasSuffix(dir, pathsep) {
-		dir = dir + pathsep
-	}
-	return &templateFiles{
-		BaseDir: dir,
-	}
-}
-
-// AddStandardFile adds the given file to the list of standard files
-func (t *templateFiles) AddStandardFile(filename string) {
-	localPath := strings.TrimPrefix(filename, t.BaseDir)
-	t.StandardFiles = append(t.StandardFiles, localPath)
-}
-
-// AddTemplate adds the given file to the list of template files
-func (t *templateFiles) AddTemplate(filename string) {
-	localPath := strings.TrimPrefix(filename, t.BaseDir)
-	t.Templates = append(t.Templates, localPath)
-}
-
-// AddDir adds the given directory to the list of template dirs
-func (t *templateFiles) AddDir(dir string) {
-	localPath := strings.TrimPrefix(dir, t.BaseDir)
-	t.Dirs = append(t.Dirs, localPath)
-}
-
-// getTemplateFiles returns a struct categorising files in
-// the template directory
-func (t *TemplateHelper) getTemplateFiles(templateName string) (*templateFiles, error) {
-
-	templates, err := t.GetTemplateNames()
-	if err != nil {
-		return nil, err
-	}
-	templateDir := templates[templateName]
-	result := t.newTemplateFiles(templateDir)
-	var localPath string
-	err = filepath.Walk(templateDir, func(dir string, info os.FileInfo, err error) error {
-		if dir == templateDir {
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-
-		// Don't copy template metadata
-		localPath = strings.TrimPrefix(dir, templateDir+string(filepath.Separator))
-		if localPath == t.metadataFilename {
-			return nil
-		}
-
-		// Categorise the file
-		switch {
-		case info.IsDir():
-			result.AddDir(dir)
-		case strings.HasSuffix(info.Name(), templateSuffix):
-			result.AddTemplate(dir)
-		default:
-			result.AddStandardFile(dir)
-		}
-		return nil
+	templateFiles := templateFilenames.Filter(func(filename string) bool {
+		return strings.HasPrefix(filename, templatePath) && filename != templateJSONFilename
 	})
 
-	if err != nil {
-		return nil, fmt.Errorf("error processing template '%s' in path '%q': %v", templateName, templateDir, err)
-	}
-	return result, err
-}
-
-// Install the template files into the given project path
-func (t *templateFiles) Install(projectPath string, projectOptions *ProjectOptions) error {
-
-	fs := NewFSHelper()
-
-	// Create directories
-	var targetDir string
-	for _, dirname := range t.Dirs {
-		targetDir = filepath.Join(projectPath, dirname)
-		fs.MkDir(targetDir)
-	}
-
-	// Copy standard files
-	var targetFile, sourceFile string
 	var err error
-	for _, filename := range t.StandardFiles {
-		sourceFile = filepath.Join(t.BaseDir, filename)
-		targetFile = filepath.Join(projectPath, filename)
+	templateFiles.Each(func(templateFile string) {
 
-		err = fs.CopyFile(sourceFile, targetFile)
+		// Setup filenames
+		relativeFilename := strings.TrimPrefix(templateFile, templatePath)[1:]
+		targetFilename, err := filepath.Abs(filepath.Join(projectOptions.OutputDirectory, relativeFilename))
 		if err != nil {
-			return err
+			return
 		}
-	}
+		filedata := projectOptions.templates.Files.Bytes(templateFile)
 
-	// Do we have template files?
-	if len(t.Templates) > 0 {
-
-		// Iterate over the templates
-		var templateFile string
-		var tmpl *template.Template
-		for _, filename := range t.Templates {
-
-			// Load template text
-			templateFile = filepath.Join(t.BaseDir, filename)
-			templateText, err := fs.LoadAsString(templateFile)
-			if err != nil {
-				return err
-			}
-
-			// Apply template
-			tmpl = template.New(templateFile)
-			tmpl.Parse(templateText)
-
-			// Write the template to a buffer
+		// If file is a template, process it
+		if strings.HasSuffix(templateFile, ".template") {
+			templateData := projectOptions.templates.Files.String(templateFile)
+			tmpl := template.New(templateFile)
+			tmpl.Parse(templateData)
 			var tpl bytes.Buffer
 			err = tmpl.Execute(&tpl, projectOptions)
 			if err != nil {
-				fmt.Println("ERROR!!! " + err.Error())
-				return err
+				return
 			}
 
-			// Save buffer to disk
-			targetFilename := strings.TrimSuffix(filename, templateSuffix)
-			targetFile = filepath.Join(projectPath, targetFilename)
-			err = ioutil.WriteFile(targetFile, tpl.Bytes(), 0644)
-			if err != nil {
-				return err
-			}
+			// Remove template suffix
+			targetFilename = strings.TrimSuffix(targetFilename, ".template")
+
+			// Set the filedata to the template result
+			filedata = tpl.Bytes()
 		}
+
+		// Normal file, just copy it
+		err = fs.CreateFile(targetFilename, filedata)
+		if err != nil {
+			return
+		}
+	})
+
+	if err != nil {
+		return err
 	}
 
 	return nil

cmd/templates/basic/main.go.template

@@ -1,24 +0,0 @@
-package main
-
-import (
-	wails "github.com/wailsapp/wails"
-)
-
-var html = `
-<div style='text-align:center'>
-<h1> Basic Template </h1>
-Welcome to your basic Wails app!
-</div>
-`
-
-func main() {
-
-	// Initialise the app
-	app := wails.CreateApp(&wails.AppConfig{
-		Width:  1024,
-		Height: 768,
-		Title:  "{{.Name}}",
-		HTML:   html,
-	})
-	app.Run()
-}

cmd/templates/basic/template.json

@@ -1,7 +0,0 @@
-{
-  "name": "Basic",
-  "shortdescription": "A basic template",
-  "description": "A basic template using vanilla JS",
-  "author": "Lea Anthony<lea.anthony@gmail.com>",
-  "created": "2018-10-18"
-}

cmd/templates/custom/go.mod.template

@@ -1 +0,0 @@
-module {{.BinaryName}}

cmd/templates/custom/main.go.template

@@ -1,24 +0,0 @@
-package main
-
-import (
-	wails "github.com/wailsapp/wails"
-)
-
-var html = `
-<div style='text-align:center'>
-<h1> Custom </h1>
-Welcome to your basic Wails app with added CSS!
-</div>
-`
-
-func main() {
-
-	// Initialise the app
-	app := wails.CreateApp(&wails.AppConfig{
-		Width:  800,
-		Height: 600,
-		Title:  "{{.Name}}",
-		HTML:   html,
-	})
-	app.Run()
-}

cmd/templates/custom/template.json

@@ -1,7 +0,0 @@
-{
-  "name": "Custom",
-  "shortdescription": "Choose your own CSS Framework",
-  "description": "A basic template allowing use of CSS Frameworks",
-  "author": "Lea Anthony<lea.anthony@gmail.com>",
-  "created": "2018-10-22"
-}

cmd/templates/vuebasic/frontend/README.md

@@ -1,29 +1,35 @@
-# frontend
+# 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/vuebasic/frontend/package.json.template

@@ -0,0 +1,49 @@
+{
+  "name": "{{.NPMProjectName}}",
+  "author": "{{.Author.Name}}<{{.Author.Email}}>",
+  "private": true,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "core-js": "^2.6.4",
+    "vue": "^2.5.22"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^3.4.0",
+    "@vue/cli-plugin-eslint": "^3.4.0",
+    "@vue/cli-service": "^3.4.0",
+    "babel-eslint": "^10.0.1",
+    "eslint": "^5.8.0",
+    "eslint-plugin-vue": "^5.0.0",
+    "eventsource-polyfill": "^0.9.6",
+    "vue-template-compiler": "^2.5.21",
+    "webpack-hot-middleware": "^2.24.3"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "plugin:vue/essential",
+      "eslint:recommended"
+    ],
+    "rules": {},
+    "parserOptions": {
+      "parser": "babel-eslint"
+    }
+  },
+  "postcss": {
+    "plugins": {
+      "autoprefixer": {}
+    }
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
+}

cmd/templates/vuebasic/frontend/src/App.vue

@@ -1,22 +1,18 @@
 <template>
   <div id="app">
     <img alt="Wails logo" src="./assets/images/logo.png" class="logo zoomIn">
-    <HelloWorld msg="Welcome to Your Wails App!"/>
-    <Quote/>
+    <HelloWorld/>
   </div>
 </template>
 
 <script>
 import HelloWorld from "./components/HelloWorld.vue";
-import Quote from "./components/Quote.vue";
 import "./assets/css/main.css";
 
 export default {
   name: "app",
   components: {
-    HelloWorld,
-    Quote
+    HelloWorld
   }
 };
 </script>
-

cmd/templates/vuebasic/frontend/src/assets/css/main.css

@@ -10,21 +10,6 @@
 html {
   height: 100%;
   overflow: hidden;
-  /* https://leaverou.github.io/css3patterns/#carbon */
-  background: linear-gradient(27deg, #151515 5px, transparent 5px) 0 5px,
-    linear-gradient(207deg, #151515 5px, transparent 5px) 10px 0px,
-    linear-gradient(27deg, #222 5px, transparent 5px) 0px 10px,
-    linear-gradient(207deg, #222 5px, transparent 5px) 10px 5px,
-    linear-gradient(90deg, #1b1b1b 10px, transparent 10px),
-    linear-gradient(
-      #1d1d1d 25%,
-      #1a1a1a 25%,
-      #1a1a1a 50%,
-      transparent 50%,
-      transparent 75%,
-      #242424 75%,
-      #242424
-    );
   background-color: #131313;
   background-size: 20px 20px;
 }
@@ -46,10 +31,8 @@ html {
       format("woff2"),
     /* Super Modern Browsers */
       url("../fonts/roboto/roboto-v18-latin-regular.woff") format("woff"),
-    /* Modern Browsers */
-      url("../fonts/roboto/roboto-v18-latin-regular.ttf")
+    /* Modern Browsers */ url("../fonts/roboto/roboto-v18-latin-regular.ttf")
       format("truetype"),
     /* Safari, Android, iOS */
-      url("../fonts/roboto/roboto-v18-latin-regular.svg#Roboto")
-      format("svg"); /* Legacy iOS */
-}
+      url("../fonts/roboto/roboto-v18-latin-regular.svg#Roboto") format("svg"); /* Legacy iOS */
+}

cmd/templates/vuebasic/frontend/src/components/HelloWorld.vue

@@ -0,0 +1,55 @@
+<template>
+  <div class="container">
+    <h1>{{message}}</h1>
+    <a @click="getMessage">Press Me!</a>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      message: " "
+    };
+  },
+  methods: {
+    getMessage: function() {
+      var self = this;
+      window.backend.basic().then(result => {
+        self.message = result;
+      });
+    }
+  }
+};
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+h1 {
+  margin-top: 2em;
+  position: relative;
+  min-height: 5rem;
+  width: 100%;
+}
+a:hover {
+  font-size: 1.7em;
+  border-color: blue;
+  background-color: blue;
+  color: white;
+  border: 3px solid white;
+  border-radius: 10px;
+  padding: 9px;
+  cursor: pointer;
+  transition: 500ms;
+}
+a {
+  font-size: 1.7em;
+  border-color: white;
+  background-color: #121212;
+  color: white;
+  border: 3px solid white;
+  border-radius: 10px;
+  padding: 9px;
+  cursor: pointer;
+}
+</style>

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

@@ -0,0 +1,13 @@
+import Vue from "vue";
+import App from "./App.vue";
+
+Vue.config.productionTip = false;
+Vue.config.devtools = true;
+
+import Bridge from "./wailsbridge";
+
+Bridge.Start(() => {
+  new Vue({
+    render: h => h(App)
+  }).$mount("#app");
+});

cmd/templates/vuebasic/frontend/src/wailsbridge.js

@@ -0,0 +1,17 @@
+/*
+    Wails Bridge (c) 2019-present Lea Anthony
+
+    This prod version is to get around having to rewrite your code
+    for production. When doing a release build, this file will be used 
+    instead of the full version.
+*/
+
+export default {
+  // The main function
+  // Passes the main Wails object to the callback if given.
+  Start: function(callback) {
+    if (callback) {
+      window.wails.events.on("wails:ready", callback);
+    }
+  }
+};

cmd/templates/vuebasic/frontend/vue.config.js

@@ -0,0 +1,43 @@
+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,
+    host: "localhost"
+  }
+};

cmd/templates/vuebasic/main.go.template

@@ -0,0 +1,27 @@
+package main
+
+import (
+  "github.com/leaanthony/mewn"
+  "github.com/wailsapp/wails"
+)
+
+func basic() string {
+  return "Hello World!"
+}
+
+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,
+    Title:  "{{.Name}}",
+    JS:     js,
+    CSS:    css,
+    Colour: "#131313",
+  })
+  app.Bind(basic)
+  app.Run()
+}

cmd/templates/vuebasic/template.json

@@ -1,10 +1,12 @@
 {
-  "name": "Vue2/Webpack",
+  "name": "Vue2/Webpack Basic",
   "shortdescription": "A basic Vue2/WebPack4 template",
   "description": "A basic template using Vue 2 and bundled using Webpack 4",
   "author": "Lea Anthony<lea.anthony@gmail.com>",
   "created": "2018-12-01",
   "frontenddir": "frontend",
   "install": "npm install",
-  "build": "npm run build"
-}
+  "build": "npm run build",
+  "serve": "npm run serve",
+  "bridge": "src"
+}

cmd/templates/vuewebpack/frontend/.browserslistrc

@@ -1,3 +0,0 @@
-> 1%
-last 2 versions
-not ie <= 8

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

@@ -1,18 +0,0 @@
-{
-  "name": "{{.NPMProjectName}}",
-  "author": "{{.Author.Name}}<{{.Author.Email}}>",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build"
-  },
-  "dependencies": {
-    "vue": "^2.5.17"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.1.1",
-    "@vue/cli-service": "^3.1.4",
-    "vue-template-compiler": "^2.5.17"
-  }
-}

cmd/templates/vuewebpack/frontend/postcss.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  plugins: {
-    autoprefixer: {}
-  }
-}

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

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <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>frontend</title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but frontend 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/vuewebpack/frontend/src/assets/css/quote.css

@@ -1,75 +0,0 @@
-/**
-  Credit: https://codepen.io/harmputman/pen/IpAnb
-**/
-
-body {
-  font: normal 300 1em/1.5em sans-serif;
-}
-
-.container {
-  background: #fff;
-  width: 100%;
-  max-width: 480px;
-  min-width: 320px;
-  margin: 2em auto 0;
-  padding: 1.5em;
-  opacity: 0.8;
-  border-radius: 1em;
-  border-color: #117;
-}
-
-p { margin-bottom: 1.5em; }
-p:last-child { margin-bottom: 0; }
-
-blockquote {
-  display: block;
-  border-width: 2px 0;
-  border-style: solid;
-  border-color: #eee;
-  padding: 1.5em 0 0.5em;
-  margin: 1.5em 0;
-  position: relative;
-  color: #117;
-}
-blockquote:before {
-  content: '\201C';
-  position: absolute;
-  top: 0em;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  background: #fff;
-  width: 3rem;
-  height: 2rem;
-  font: 6em/1.08em sans-serif;
-  color: #666;
-  text-align: center;
-}
-blockquote:after {
-  content: "\2013 \2003" attr(cite);
-  display: block;
-  text-align: right;
-  font-size: 0.875em;
-  color: #e70000;
-}
-
-/* https://fdossena.com/?p=html5cool/buttons/i.frag */
-button {
-  display:inline-block;
-  padding:0.35em 1.2em;
-  border:0.1em solid #000;
-  margin:0 0.3em 0.3em 0;
-  border-radius:0.12em;
-  box-sizing: border-box;
-  text-decoration:none;
-  font-family:'Roboto',sans-serif;
-  font-weight:300;
-  font-size: 1em;
-  color:#000;
-  text-align:center;
-  transition: all 0.2s;
-}
-button:hover{
-  color:#FFF;
-  background-color:#000;
-  cursor: pointer;
-}

cmd/templates/vuewebpack/frontend/src/components/HelloWorld.vue

@@ -1,38 +0,0 @@
-<template>
-  <div class="hello">
-    <h1>{{ msg }}</h1>
-    <p></p>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "HelloWorld",
-  props: {
-    msg: String
-  }
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-.hello {
-  margin-top: 2em;
-  position: relative;
-  width: 100%;
-}
-h3 {
-  margin: 40px 0 0;
-}
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-a {
-  color: gold;
-}
-</style>

cmd/templates/vuewebpack/frontend/src/components/Quote.vue

@@ -1,53 +0,0 @@
-<template>
-  <div class="container">
-    <blockquote v-if="quote != null" :cite="quote.person">{{ quote.text }}</blockquote>
-    <p></p>
-    <button @click="getNewQuote()">Get new Quote</button>
-  </div>
-</template>
-
-<script>
-import "../assets/css/quote.css";
-
-export default {
-  data() {
-    return {
-      quote: null
-    };
-  },
-  methods: {
-    getNewQuote: function() {
-      var self = this;
-      wails.$.main.QuotesCollection.GetQuote().then(result => {
-        self.quote = result;
-      });
-    }
-  },
-  created() {
-    this.getNewQuote();
-  }
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-.hello {
-  margin-top: 2em;
-  position: relative;
-  width: 100%;
-}
-h3 {
-  margin: 40px 0 0;
-}
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-a {
-  color: gold;
-}
-</style>

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

@@ -1,8 +0,0 @@
-import Vue from 'vue'
-import App from './App.vue'
-
-Vue.config.productionTip = false
-
-new Vue({
-  render: h => h(App),
-}).$mount('#app')

cmd/templates/vuewebpack/frontend/vue.config.js

@@ -1,35 +0,0 @@
-
-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: {
-    extract: {
-      filename: '[name].css',
-      chunkFilename: '[name].css',
-    }
-  },
-  configureWebpack: {
-    output: {
-      filename: '[name].js',
-    },
-    optimization: {
-      splitChunks: false
-    }
-  },
-
-}

cmd/templates/vuewebpack/go.mod.template

@@ -1 +0,0 @@
-module {{.BinaryName}}

cmd/templates/vuewebpack/main.go.template

@@ -1,21 +0,0 @@
-package main
-
-import (
-	"github.com/gobuffalo/packr"
-	"github.com/wailsapp/wails"
-)
-
-func main() {
-
-	assets := packr.NewBox("./frontend/dist")
-
-	app := wails.CreateApp(&wails.AppConfig{
-		Width:  1024,
-		Height: 768,
-		Title:  "{{.Name}}",
-		JS:     wails.BoxString(&assets, "app.js"),
-		CSS:    wails.BoxString(&assets, "app.css"),
-	})
-	app.Bind(newQuotesCollection())
-	app.Run()
-}

cmd/templates/vuewebpack/quotes.go

@@ -1,61 +0,0 @@
-package main
-
-import (
-	"math/rand"
-	"time"
-)
-
-// Quote holds a single quote and the person who said it
-type Quote struct {
-	Text   string `json:"text"`
-	Person string `json:"person"`
-}
-
-// QuotesCollection holds a collection of quotes!
-type QuotesCollection struct {
-	quotes []*Quote
-}
-
-// AddQuote creates a Quote object with the given inputs and
-// adds it to the Quotes collection
-func (Q *QuotesCollection) AddQuote(text, person string) {
-	Q.quotes = append(Q.quotes, &Quote{Text: text, Person: person})
-}
-
-// GetQuote returns a random Quote object from the Quotes collection
-func (Q *QuotesCollection) GetQuote() *Quote {
-	return Q.quotes[rand.Intn(len(Q.quotes))]
-}
-
-// newQuotesCollection creates a new QuotesCollection
-func newQuotesCollection() *QuotesCollection {
-	result := &QuotesCollection{}
-	rand.Seed(time.Now().Unix())
-	result.AddQuote("Age is an issue of mind over matter. If you don't mind, it doesn't matter", "Mark Twain")
-	result.AddQuote("Anyone who stops learning is old, whether at twenty or eighty. Anyone who keeps learning stays young. The greatest thing in life is to keep your mind young", "Henry Ford")
-	result.AddQuote("Wrinkles should merely indicate where smiles have been", "Mark Twain")
-	result.AddQuote("True terror is to wake up one morning and discover that your high school class is running the country", "Kurt Vonnegut")
-	result.AddQuote("A diplomat is a man who always remembers a woman's birthday but never remembers her age", "Robert Frost")
-	result.AddQuote("As I grow older, I pay less attention to what men say. I just watch what they do", "Andrew Carnegie")
-	result.AddQuote("How incessant and great are the ills with which a prolonged old age is replete", "C. S. Lewis")
-	result.AddQuote("Old age, believe me, is a good and pleasant thing. It is true you are gently shouldered off the stage, but then you are given such a comfortable front stall as spectator", "Confucius")
-	result.AddQuote("Old age has deformities enough of its own. It should never add to them the deformity of vice", "Eleanor Roosevelt")
-	result.AddQuote("Nobody grows old merely by living a number of years. We grow old by deserting our ideals. Years may wrinkle the skin, but to give up enthusiasm wrinkles the soul", "Samuel Ullman")
-	result.AddQuote("An archaeologist is the best husband a woman can have. The older she gets the more interested he is in her", "Agatha Christie")
-	result.AddQuote("All diseases run into one, old age", "Ralph Waldo Emerson")
-	result.AddQuote("Bashfulness is an ornament to youth, but a reproach to old age", "Aristotle")
-	result.AddQuote("Like everyone else who makes the mistake of getting older, I begin each day with coffee and obituaries", "Bill Cosby")
-	result.AddQuote("Age appears to be best in four things old wood best to burn, old wine to drink, old friends to trust, and old authors to read", "Francis Bacon")
-	result.AddQuote("None are so old as those who have outlived enthusiasm", "Henry David Thoreau")
-	result.AddQuote("Every man over forty is a scoundrel", "George Bernard Shaw")
-	result.AddQuote("Forty is the old age of youth fifty the youth of old age", "Victor Hugo")
-	result.AddQuote("You can't help getting older, but you don't have to get old", "George Burns")
-	result.AddQuote("Alas, after a certain age every man is responsible for his face", "Albert Camus")
-	result.AddQuote("Youth is when you're allowed to stay up late on New Year's Eve. Middle age is when you're forced to", "Bill Vaughan")
-	result.AddQuote("Old age is like everything else. To make a success of it, you've got to start young", "Theodore Roosevelt")
-	result.AddQuote("A comfortable old age is the reward of a well-spent youth. Instead of its bringing sad and melancholy prospects of decay, it would give us hopes of eternal youth in a better world", "Maurice Chevalier")
-	result.AddQuote("A man growing old becomes a child again", "Sophocles")
-	result.AddQuote("I will never be an old man. To me, old age is always 15 years older than I am", "Francis Bacon")
-	result.AddQuote("Age considers youth ventures", "Rabindranath Tagore")
-	return result
-}

cmd/version.go

@@ -1,5 +1,4 @@
 package cmd
 
 // Version - Wails version
-// ...oO(There must be a better way)
-const Version = "v0.5.0"
+const Version = "v0.11.0"

cmd/wails/0_setup.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/leaanthony/spinner"
-
 	"github.com/wailsapp/wails/cmd"
 )
 
@@ -20,9 +18,13 @@ func init() {
 
 	setupCommand.Action(func() error {
 
+		logger.PrintBanner()
+
+		var err error
+
 		system := cmd.NewSystemHelper()
-		err := system.Initialise()
-		if err != nil {
+		err = system.Initialise()
+		if err == nil {
 			return err
 		}
 
@@ -31,78 +33,37 @@ Create your first project by running 'wails init'.`
 		if runtime.GOOS != "windows" {
 			successMessage = "🚀 " + successMessage
 		}
-		switch runtime.GOOS {
-		case "darwin":
-			logger.Yellow("Detected Platform: OSX")
-		case "windows":
-			logger.Yellow("Detected Platform: Windows")
-		case "linux":
-			logger.Yellow("Detected Platform: Linux")
-		default:
-			return fmt.Errorf("Platform %s is currently not supported", runtime.GOOS)
-		}
-
-		logger.Yellow("Checking for prerequisites...")
-		// Check we have a cgo capable environment
-
-		requiredPrograms, err := cmd.GetRequiredPrograms()
+		// Platform check
+		err = platformCheck()
 		if err != nil {
 			return err
 		}
-		errors := false
-		programHelper := cmd.NewProgramHelper()
-		for _, program := range *requiredPrograms {
-			bin := programHelper.FindProgram(program.Name)
-			if bin == nil {
-				errors = true
-				logger.Red("Program '%s' not found. %s", program.Name, program.Help)
-			} else {
-				logger.Green("Program '%s' found: %s", program.Name, bin.Path)
-			}
+
+		// Check we have a cgo capable environment
+		logger.Yellow("Checking for prerequisites...")
+		var requiredProgramErrors bool
+		requiredProgramErrors, err = checkRequiredPrograms()
+		if err != nil {
+			return err
 		}
 
 		// Linux has library deps
-		if runtime.GOOS == "linux" {
-			// Check library prerequisites
-			requiredLibraries, err := cmd.GetRequiredLibraries()
-			if err != nil {
-				return err
-			}
-			distroInfo := cmd.GetLinuxDistroInfo()
-			for _, library := range *requiredLibraries {
-				switch distroInfo.Distribution {
-				case cmd.Ubuntu:
-					installed, err := cmd.DpkgInstalled(library.Name)
-					if err != nil {
-						return err
-					}
-					if !installed {
-						errors = true
-						logger.Red("Library '%s' not found. %s", library.Name, library.Help)
-					} else {
-						logger.Green("Library '%s' installed.", library.Name)
-					}
-				default:
-					return fmt.Errorf("unable to check libraries on distribution '%s'. Please ensure that the '%s' equivalent is installed", distroInfo.DistributorID, library.Name)
-				}
-			}
+		var libraryErrors bool
+		libraryErrors, err = checkLibraries()
+		if err != nil {
+			return err
 		}
 
-		// packr
-		if !programHelper.IsInstalled("packr") {
-			buildSpinner := spinner.New()
-			buildSpinner.SetSpinSpeed(50)
-			buildSpinner.Start("Installing packr...")
-			err := programHelper.InstallGoPackage("github.com/gobuffalo/packr/...")
-			if err != nil {
-				buildSpinner.Error()
-				return err
-			}
-			buildSpinner.Success()
+		// Check Mewn
+		err = cmd.CheckMewn()
+		if err != nil {
+			return err
 		}
 
 		logger.White("")
 
+		// Check for errors
+		var errors = libraryErrors || requiredProgramErrors
 		if !errors {
 			logger.Yellow(successMessage)
 		}
@@ -110,3 +71,65 @@ Create your first project by running 'wails init'.`
 		return err
 	})
 }
+
+func platformCheck() error {
+	switch runtime.GOOS {
+	case "darwin":
+		logger.Yellow("Detected Platform: OSX")
+	case "windows":
+		logger.Yellow("Detected Platform: Windows")
+	case "linux":
+		logger.Yellow("Detected Platform: Linux")
+	default:
+		return fmt.Errorf("Platform %s is currently not supported", runtime.GOOS)
+	}
+	return nil
+}
+
+func checkLibraries() (errors bool, err error) {
+	if runtime.GOOS == "linux" {
+		// Check library prerequisites
+		requiredLibraries, err := cmd.GetRequiredLibraries()
+		if err != nil {
+			return false, err
+		}
+		distroInfo := cmd.GetLinuxDistroInfo()
+		for _, library := range *requiredLibraries {
+			switch distroInfo.Distribution {
+			case cmd.Ubuntu:
+				installed, err := cmd.DpkgInstalled(library.Name)
+				if err != nil {
+					return false, err
+				}
+				if !installed {
+					errors = true
+					logger.Red("Library '%s' not found. %s", library.Name, library.Help)
+				} else {
+					logger.Green("Library '%s' installed.", library.Name)
+				}
+			default:
+				return false, fmt.Errorf("unable to check libraries on distribution '%s'. Please ensure that the '%s' equivalent is installed", distroInfo.DistributorID, library.Name)
+			}
+		}
+	}
+	return false, nil
+}
+
+func checkRequiredPrograms() (errors bool, err error) {
+	requiredPrograms, err := cmd.GetRequiredPrograms()
+	if err != nil {
+		return true, err
+	}
+	errors = false
+	programHelper := cmd.NewProgramHelper()
+	for _, program := range *requiredPrograms {
+		bin := programHelper.FindProgram(program.Name)
+		if bin == nil {
+			errors = true
+			logger.Red("Program '%s' not found. %s", program.Name, program.Help)
+		} else {
+			logger.Green("Program '%s' found: %s", program.Name, bin.Path)
+		}
+	}
+	return
+}

cmd/wails/2_init.go

@@ -17,14 +17,14 @@ Any flags that are required and not given will be prompted for.`
 		LongDescription(commandDescription).
 		BoolFlag("f", "Use defaults", &projectOptions.UseDefaults).
 		StringFlag("dir", "Directory to create project in", &projectOptions.OutputDirectory).
-		StringFlag("template", "Template name", &projectOptions.Template).
+		// 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)
 
 	initCommand.Action(func() error {
 
-		logger.WhiteUnderline("Initialising project")
+		logger.PrintSmallBanner("Initialising project")
 		fmt.Println()
 
 		// Check if the system is initialised

cmd/wails/3_build.go

@@ -1,251 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-
-	"github.com/leaanthony/slicer"
-	"github.com/leaanthony/spinner"
-	"github.com/wailsapp/wails/cmd"
-)
-
-func init() {
-
-	var bundle = false
-	var forceRebuild = false
-	var releaseMode = false
-	buildSpinner := spinner.NewSpinner()
-	buildSpinner.SetSpinSpeed(50)
-
-	commandDescription := `This command will check to ensure all pre-requistes are installed prior to building. If not, it will attempt to install them. Building comprises of a number of steps: install frontend dependencies, build frontend, pack frontend, compile main application.`
-	initCmd := app.Command("build", "Builds your Wails project").
-		LongDescription(commandDescription).
-		BoolFlag("b", "Bundle application on successful build", &bundle).
-		BoolFlag("f", "Force rebuild of application components", &forceRebuild).
-		BoolFlag("r", "Build in Release mode", &releaseMode)
-
-	initCmd.Action(func() error {
-		log := cmd.NewLogger()
-		message := "Building Application"
-		if forceRebuild {
-			message += " (force rebuild)"
-		}
-		log.WhiteUnderline(message)
-
-		// Project options
-		projectOptions := &cmd.ProjectOptions{}
-
-		// Check we are in project directory
-		// Check project.json loads correctly
-		fs := cmd.NewFSHelper()
-		err := projectOptions.LoadConfig(fs.Cwd())
-		if err != nil {
-			return err
-		}
-
-		// Validate config
-		// Check if we have a frontend
-		if projectOptions.FrontEnd != nil {
-			if projectOptions.FrontEnd.Dir == "" {
-				return fmt.Errorf("Frontend directory not set in project.json")
-			}
-			if projectOptions.FrontEnd.Build == "" {
-				return fmt.Errorf("Frontend build command not set in project.json")
-			}
-			if projectOptions.FrontEnd.Install == "" {
-				return fmt.Errorf("Frontend install command not set in project.json")
-			}
-		}
-
-		// Check pre-requisites are installed
-
-		// Program checker
-		program := cmd.NewProgramHelper()
-
-		if projectOptions.FrontEnd != nil {
-			// npm
-			if !program.IsInstalled("npm") {
-				return fmt.Errorf("it appears npm is not installed. Please install and run again")
-			}
-		}
-
-		// packr
-		if !program.IsInstalled("packr") {
-			buildSpinner.Start("Installing packr...")
-			err := program.InstallGoPackage("github.com/gobuffalo/packr/...")
-			if err != nil {
-				buildSpinner.Error()
-				return err
-			}
-			buildSpinner.Success()
-		}
-
-		// Save project directory
-		projectDir := fs.Cwd()
-
-		// Install backend deps - needed?
-		if projectOptions.FrontEnd != nil {
-			// Install frontend deps
-			err = os.Chdir(projectOptions.FrontEnd.Dir)
-			if err != nil {
-				return err
-			}
-
-			// Check if frontend deps have been updated
-			feSpinner := spinner.New("Installing frontend dependencies (This may take a while)...")
-			feSpinner.SetSpinSpeed(50)
-			feSpinner.Start()
-
-			requiresNPMInstall := true
-
-			// Read in package.json MD5
-			packageJSONMD5, err := fs.FileMD5("package.json")
-			if err != nil {
-				return err
-			}
-
-			const md5sumFile = "package.json.md5"
-
-			// If we aren't forcing the install and the md5sum file exists
-			if !forceRebuild && fs.FileExists(md5sumFile) {
-				// Yes - read contents
-				savedMD5sum, err := fs.LoadAsString(md5sumFile)
-				// File exists
-				if err == nil {
-					// Compare md5
-					if savedMD5sum == packageJSONMD5 {
-						// Same - no need for reinstall
-						requiresNPMInstall = false
-						feSpinner.Success("Skipped frontend dependencies (-f to force rebuild)")
-					}
-				}
-			}
-
-			// Md5 sum package.json
-			// Different? Build
-			if requiresNPMInstall || forceRebuild {
-				// Install dependencies
-				err = program.RunCommand(projectOptions.FrontEnd.Install)
-				if err != nil {
-					feSpinner.Error()
-					return err
-				}
-				feSpinner.Success()
-
-				// Update md5sum file
-				ioutil.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
-			}
-
-			// Build frontend
-			buildFESpinner := spinner.New("Building frontend...")
-			buildFESpinner.SetSpinSpeed(50)
-			buildFESpinner.Start()
-			err = program.RunCommand(projectOptions.FrontEnd.Build)
-			if err != nil {
-				buildFESpinner.Error()
-				return err
-			}
-			buildFESpinner.Success()
-		}
-
-		// Run packr in project directory
-		err = os.Chdir(projectDir)
-		if err != nil {
-			return err
-		}
-
-		// Support build tags
-		buildTags := []string{}
-
-		// Do we have any frameworks specified?
-		frameworkSpinner := spinner.New()
-		frameworkSpinner.SetSpinSpeed(50)
-		if projectOptions.Framework != nil {
-			frameworkSpinner.Start()
-			frameworkSpinner.Success("Compiling support for " + projectOptions.Framework.Name)
-			buildTags = append(buildTags, projectOptions.Framework.BuildTag)
-		}
-
-		// // Initialise Go Module - if go.mod doesn't exist
-		// if !fs.FileExists("go.mod") {
-		// 	buildSpinner.Start("Initialising Go module...")
-		// 	err = program.RunCommand("go mod init " + projectOptions.BinaryName)
-		// 	if err != nil {
-		// 		buildSpinner.Error()
-		// 		return err
-		// 	}
-		// 	buildSpinner.Success()
-		// }
-
-		depSpinner := spinner.New("Installing Dependencies...")
-		depSpinner.SetSpinSpeed(50)
-		depSpinner.Start()
-		installCommand := "go get"
-		err = program.RunCommand(installCommand)
-		if err != nil {
-			depSpinner.Error()
-			return err
-		}
-		depSpinner.Success()
-
-		compileMessage := "Packing + Compiling project"
-		if releaseMode {
-			compileMessage += " (Release Mode)"
-		}
-
-		packSpinner := spinner.New(compileMessage + "...")
-		packSpinner.SetSpinSpeed(50)
-		packSpinner.Start()
-
-		buildCommand := slicer.String()
-		buildCommand.AddSlice([]string{"packr", "build"})
-
-		// Add build tags
-		if len(buildTags) > 0 {
-			buildCommand.Add("--tags")
-			buildCommand.AddSlice(buildTags)
-
-		}
-
-		if projectOptions.BinaryName != "" {
-			buildCommand.Add("-o")
-			buildCommand.Add(projectOptions.BinaryName)
-		}
-
-		// If we are forcing a rebuild
-		if forceRebuild {
-			buildCommand.Add(" -a")
-		}
-
-		// Release mode
-		if releaseMode {
-			buildCommand.AddSlice([]string{"-ldflags", "-X github.com/wailsapp/wails.DebugMode=false"})
-		}
-		err = program.RunCommandArray(buildCommand.AsSlice())
-		if err != nil {
-			packSpinner.Error()
-			return err
-		}
-		packSpinner.Success()
-
-		if bundle == false {
-			logger.Yellow("Awesome! Project '%s' built!", projectOptions.Name)
-			return nil
-		}
-
-		// Bundle app
-		bundleSpinner := spinner.New("Bundling Application")
-		bundleSpinner.SetSpinSpeed(50)
-		bundleSpinner.Start()
-		bundler := cmd.NewBundleHelper()
-		err = bundler.Bundle(projectOptions)
-		if err != nil {
-			bundleSpinner.Error()
-			return err
-		}
-		bundleSpinner.Success()
-		logger.Yellow("Awesome! Project '%s' built!", projectOptions.Name)
-		return nil
-	})
-}

cmd/wails/4_build.go

@@ -0,0 +1,105 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/leaanthony/spinner"
+	"github.com/wailsapp/wails/cmd"
+)
+
+func init() {
+
+	var packageApp = false
+	var forceRebuild = false
+	var debugMode = false
+	buildSpinner := spinner.NewSpinner()
+	buildSpinner.SetSpinSpeed(50)
+
+	commandDescription := `This command will check to ensure all pre-requistes are installed prior to building. If not, it will attempt to install them. Building comprises of a number of steps: install frontend dependencies, build frontend, pack frontend, compile main application.`
+	initCmd := app.Command("build", "Builds your Wails project").
+		LongDescription(commandDescription).
+		BoolFlag("p", "Package application on successful build", &packageApp).
+		BoolFlag("f", "Force rebuild of application components", &forceRebuild).
+		BoolFlag("d", "Build in Debug mode", &debugMode)
+
+	initCmd.Action(func() error {
+
+		message := "Building Application"
+		if packageApp {
+			message = "Packaging Application"
+		}
+		if forceRebuild {
+			message += " (force rebuild)"
+		}
+		logger.PrintSmallBanner(message)
+		fmt.Println()
+
+		// Project options
+		projectOptions := &cmd.ProjectOptions{}
+
+		// 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")
+		}
+
+		// Validate config
+		// Check if we have a frontend
+		err = cmd.ValidateFrontendConfig(projectOptions)
+		if err != nil {
+			return err
+		}
+
+		// Program checker
+		program := cmd.NewProgramHelper()
+
+		if projectOptions.FrontEnd != nil {
+			// npm
+			if !program.IsInstalled("npm") {
+				return fmt.Errorf("it appears npm is not installed. Please install and run again")
+			}
+		}
+
+		// Save project directory
+		projectDir := fs.Cwd()
+
+		// Install deps
+		if projectOptions.FrontEnd != nil {
+			err = cmd.InstallFrontendDeps(projectDir, projectOptions, forceRebuild, "build")
+			if err != nil {
+				return err
+			}
+		}
+
+		// Move to project directory
+		err = os.Chdir(projectDir)
+		if err != nil {
+			return err
+		}
+
+		// Install dependencies
+		err = cmd.InstallGoDependencies()
+		if err != nil {
+			return err
+		}
+
+		// Build application
+		buildMode := cmd.BuildModeProd
+		if debugMode {
+			buildMode = cmd.BuildModeDebug
+		}
+
+		err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode, packageApp, projectOptions)
+		if err != nil {
+			return err
+		}
+
+		logger.Yellow("Awesome! Project '%s' built!", projectOptions.Name)
+
+		return nil
+
+	})
+}

cmd/wails/6_serve.go

@@ -0,0 +1,59 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/leaanthony/spinner"
+	"github.com/wailsapp/wails/cmd"
+)
+
+func init() {
+
+	var forceRebuild = false
+	buildSpinner := spinner.NewSpinner()
+	buildSpinner.SetSpinSpeed(50)
+
+	commandDescription := `This command builds then serves your application in bridge mode. Useful for developing your app in a browser.`
+	initCmd := app.Command("serve", "Run your Wails project in bridge mode.").
+		LongDescription(commandDescription).
+		BoolFlag("f", "Force rebuild of application components", &forceRebuild)
+
+	initCmd.Action(func() error {
+
+		message := "Serving Application"
+		logger.PrintSmallBanner(message)
+		fmt.Println()
+
+		// Check Mewn is installed
+		err := cmd.CheckMewn()
+		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())
+		if err != nil {
+			return err
+		}
+
+		// Install dependencies
+		err = cmd.InstallGoDependencies()
+		if err != nil {
+			return err
+		}
+
+		buildMode := cmd.BuildModeBridge
+		err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode, false, projectOptions)
+		if err != nil {
+			return err
+		}
+
+		logger.Yellow("Awesome! Project '%s' built!", projectOptions.Name)
+		return cmd.ServeProject(projectOptions, logger)
+	})
+}

cmd/wails/8_update.go

@@ -0,0 +1,69 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+
+	"github.com/leaanthony/spinner"
+	"github.com/wailsapp/wails/cmd"
+)
+
+func init() {
+
+	// var forceRebuild = false
+	checkSpinner := spinner.NewSpinner()
+	checkSpinner.SetSpinSpeed(50)
+
+	commandDescription := `This command checks if there are updates to Wails.`
+	updateCmd := app.Command("update", "Check for Updates.").
+		LongDescription(commandDescription)
+
+	updateCmd.Action(func() error {
+
+		message := "Checking for updates..."
+		logger.PrintSmallBanner(message)
+		fmt.Println()
+
+		// Get versions
+		checkSpinner.Start(message)
+		resp, err := http.Get("https://api.github.com/repos/wailsapp/wails/tags")
+		if err != nil {
+			checkSpinner.Error(err.Error())
+			return err
+		}
+		checkSpinner.Success()
+		body, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			checkSpinner.Error(err.Error())
+			return err
+		}
+
+		data := []map[string]interface{}{}
+		err = json.Unmarshal(body, &data)
+		if err != nil {
+			return err
+		}
+
+		latestVersion := data[0]["name"].(string)
+		fmt.Println()
+		fmt.Println("Current Version: " + cmd.Version)
+		fmt.Println(" Latest Version: " + latestVersion)
+		if latestVersion != cmd.Version {
+			updateSpinner := spinner.NewSpinner()
+			updateSpinner.SetSpinSpeed(40)
+			updateSpinner.Start("Updating to  : " + latestVersion)
+			err = cmd.NewProgramHelper().RunCommandArray([]string{"go", "get", "-u", "github.com/wailsapp/wails/cmd/wails"})
+			if err != nil {
+				updateSpinner.Error(err.Error())
+				return err
+			}
+			updateSpinner.Success()
+			logger.Yellow("Wails updated to " + latestVersion)
+		} else {
+			logger.Yellow("Looks like you're up to date!")
+		}
+		return nil
+	})
+}

cmd/wails/9_issue.go

@@ -0,0 +1,74 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"os"
+	"runtime"
+	"strings"
+
+	"github.com/pkg/browser"
+
+	"github.com/wailsapp/wails/cmd"
+)
+
+func init() {
+
+	commandDescription := `Generates an issue in Github using the given title, description and system report.`
+
+	initCommand := app.Command("issue", "Generates an issue in Github.").
+		LongDescription(commandDescription)
+
+	initCommand.Action(func() error {
+
+		logger.PrintSmallBanner("Generate Issue")
+		fmt.Println()
+		message := `Thanks for taking the time to submit an issue!
+
+To help you in this process, we will ask for some information, add Go/Wails details automatically, then prepare the issue for your editing and submission.
+`
+
+		logger.Yellow(message)
+
+		title := cmd.Prompt("Issue Title")
+		description := cmd.Prompt("Issue Description")
+
+		var str strings.Builder
+
+		gomodule, exists := os.LookupEnv("GO111MODULE")
+		if !exists {
+			gomodule = "(Not Set)"
+		}
+
+		str.WriteString("\n| Name   | Value |\n| ----- | ----- |\n")
+		str.WriteString(fmt.Sprintf("| Wails Version | %s |\n", cmd.Version))
+		str.WriteString(fmt.Sprintf("| Go Version    | %s |\n", runtime.Version()))
+		str.WriteString(fmt.Sprintf("| Platform      | %s |\n", runtime.GOOS))
+		str.WriteString(fmt.Sprintf("| Arch          | %s |\n", runtime.GOARCH))
+		str.WriteString(fmt.Sprintf("| GO111MODULE   | %s |\n", gomodule))
+
+		fmt.Println()
+		fmt.Println("Processing template and preparing for upload.")
+
+		// Grab issue template
+		resp, err := http.Get("https://raw.githubusercontent.com/wailsapp/wails/master/.github/ISSUE_TEMPLATE/bug_report.md")
+		if err != nil {
+			logger.Red("Unable to read in issue template. Are you online?")
+			os.Exit(1)
+		}
+		defer resp.Body.Close()
+		template, _ := ioutil.ReadAll(resp.Body)
+		body := string(template)
+		body = "**Description**\n" + (strings.Split(body, "**Description**")[1])
+		fullURL := "https://github.com/wailsapp/wails/issues/new?"
+		body = strings.Replace(body, "A clear and concise description of what the bug is.", description, -1)
+		body = strings.Replace(body, "Please paste the output of `wails report` here.", str.String(), -1)
+		params := "title=" + title + "&body=" + body
+
+		fmt.Println("Opening browser to file issue.")
+		browser.OpenURL(fullURL + url.PathEscape(params))
+		return nil
+	})
+}

cmd/wails/main.go

@@ -10,15 +10,8 @@ var logger = cmd.NewLogger()
 // Create main app
 var app = cmd.NewCli("wails", "A cli tool for building Wails applications.")
 
-// Prints the cli banner
-func printBanner(app *cmd.Cli) error {
-	logger.PrintBanner()
-	return nil
-}
-
 // Main!
 func main() {
-	app.PreRun(printBanner)
 	err := app.Run()
 	if err != nil {
 		logger.Error(err.Error())

event_manager.go

@@ -87,7 +87,7 @@ func (e *eventManager) start(renderer Renderer) {
 	var wg sync.WaitGroup
 	wg.Add(1)
 
-	// Run main loop in seperate goroutine
+	// Run main loop in separate goroutine
 	go func() {
 		wg.Done()
 		e.log.Info("Listening")
@@ -126,7 +126,7 @@ func (e *eventManager) start(renderer Renderer) {
 					}
 				}
 
-				// Remove expired listners in place
+				// Remove expired listeners in place
 				if len(listenersToRemove) > 0 {
 					listeners := e.listeners[event.Name][:0]
 					for _, listener := range listeners {

go.mod

@@ -1,27 +1,27 @@
 module github.com/wailsapp/wails
 
 require (
-	github.com/AlecAivazis/survey v1.7.1
-	github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc
 	github.com/dchest/cssmin v0.0.0-20151210170030-fb8d9b44afdc // indirect
 	github.com/dchest/htmlmin v0.0.0-20150526090704-e254725e81ac
 	github.com/dchest/jsmin v0.0.0-20160823214000-faeced883947 // indirect
 	github.com/fatih/color v1.7.0
 	github.com/go-playground/colors v1.2.0
-	github.com/gobuffalo/packr v1.21.9
 	github.com/gorilla/websocket v1.4.0
 	github.com/jackmordaunt/icns v1.0.0
-	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/leaanthony/slicer v0.0.0-20190110113548-aa9ea12f976a
-	github.com/leaanthony/spinner v0.4.0
-	github.com/leaanthony/synx v0.0.0-20180923230033-60efbd9984b0 // indirect
-	github.com/leaanthony/wincursor v0.0.0-20180705115120-056510f32d15 // indirect
-	github.com/mattn/go-colorable v0.0.9 // indirect
-	github.com/mattn/go-isatty v0.0.4 // indirect
-	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
-	github.com/mitchellh/go-homedir v1.0.0
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+	github.com/leaanthony/mewn v0.10.4
+	github.com/leaanthony/slicer v1.3.1
+	github.com/leaanthony/spinner v0.5.0
+	github.com/mattn/go-colorable v0.1.1 // indirect
+	github.com/mattn/go-isatty v0.0.6 // indirect
+	github.com/mitchellh/go-homedir v1.1.0
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
-	github.com/sirupsen/logrus v1.2.0
-	golang.org/x/net v0.0.0-20190107155100-1a61f4433d85 // indirect
-	gopkg.in/AlecAivazis/survey.v1 v1.7.1 // indirect
+	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
+	github.com/pkg/errors v0.8.1 // indirect
+	github.com/sirupsen/logrus v1.3.0
+	github.com/stretchr/testify v1.3.0 // indirect
+	github.com/wailsapp/webview v0.2.5
+	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
+	golang.org/x/net v0.0.0-20190310014029-b774fd8d5c0f // indirect
+	golang.org/x/sys v0.0.0-20190310054646-10058d7d4faa // indirect
 )