From d399b7580d20f5c48815017c26e1fbca8d90e92a Mon Sep 17 00:00:00 2001
From: Lea Anthony <lea.anthony@gmail.com>
Date: Wed, 9 Oct 2019 19:34:24 +1100
Subject: [PATCH] Develop (#255)

Hotfix
---
 CONTRIBUTORS.md                                      | 1 +
 cmd/templates/angular-template/frontend/src/main.ts  | 2 +-
 cmd/templates/create-react-app/frontend/src/index.js | 2 +-
 cmd/templates/vuebasic/frontend/src/main.js          | 2 +-
 cmd/templates/vuetify-basic/frontend/src/main.js     | 2 +-
 cmd/version.go                                       | 2 +-
 cmd/wails/main.go                                    | 7 +++++++
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 4e08bbd53..573961acc 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -18,3 +18,4 @@ Wails is what it is because of the time and effort given by these great people.
 * [Florian Didran](https://github.com/fdidron)
 * [Nikolai Zimmermann](https://github.com/Chronophylos)
 * [Toyam Cox](https://github.com/Vaelatern)
+* [Robin Eklind](https://github.com/mewmew)
diff --git a/cmd/templates/angular-template/frontend/src/main.ts b/cmd/templates/angular-template/frontend/src/main.ts
index 0f03b3dc8..296a09b41 100644
--- a/cmd/templates/angular-template/frontend/src/main.ts
+++ b/cmd/templates/angular-template/frontend/src/main.ts
@@ -6,7 +6,7 @@ import { environment } from './environments/environment';
 
 import 'zone.js'
 
-import Wails from '@wailsapp/runtime';
+import * as Wails from '@wailsapp/runtime';
 
 if (environment.production) {
   enableProdMode();
diff --git a/cmd/templates/create-react-app/frontend/src/index.js b/cmd/templates/create-react-app/frontend/src/index.js
index 20ea18549..20eec1c0c 100644
--- a/cmd/templates/create-react-app/frontend/src/index.js
+++ b/cmd/templates/create-react-app/frontend/src/index.js
@@ -4,7 +4,7 @@ import 'core-js/stable';
 import './index.css';
 import App from './App';
 
-import Wails from '@wailsapp/runtime';
+import * as Wails from '@wailsapp/runtime';
 
 Wails.Init(() => {
   ReactDOM.render(<App />, document.getElementById('app'));
diff --git a/cmd/templates/vuebasic/frontend/src/main.js b/cmd/templates/vuebasic/frontend/src/main.js
index 12bcdd594..739f1a3fb 100644
--- a/cmd/templates/vuebasic/frontend/src/main.js
+++ b/cmd/templates/vuebasic/frontend/src/main.js
@@ -4,7 +4,7 @@ import App from './App.vue';
 Vue.config.productionTip = false;
 Vue.config.devtools = true;
 
-import Wails from '@wailsapp/runtime';
+import * as Wails from '@wailsapp/runtime';
 
 Wails.Init(() => {
 	new Vue({
diff --git a/cmd/templates/vuetify-basic/frontend/src/main.js b/cmd/templates/vuetify-basic/frontend/src/main.js
index 0061ba317..de57f6b7a 100644
--- a/cmd/templates/vuetify-basic/frontend/src/main.js
+++ b/cmd/templates/vuetify-basic/frontend/src/main.js
@@ -12,7 +12,7 @@ import App from './App.vue';
 Vue.config.productionTip = false;
 Vue.config.devtools = true;
 
-import Wails from '@wailsapp/runtime';
+import * as Wails from '@wailsapp/runtime';
 
 Wails.Init(() => {
 	new Vue({
diff --git a/cmd/version.go b/cmd/version.go
index 124dcad57..c727b6754 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v0.18.2"
+const Version = "v0.18.3"
diff --git a/cmd/wails/main.go b/cmd/wails/main.go
index ae562209b..bbcc94b32 100644
--- a/cmd/wails/main.go
+++ b/cmd/wails/main.go
@@ -1,6 +1,9 @@
 package main
 
 import (
+	"os"
+	"os/exec"
+
 	"github.com/wailsapp/wails/cmd"
 )
 
@@ -15,5 +18,9 @@ func main() {
 	err := app.Run()
 	if err != nil {
 		logger.Error(err.Error())
+		if exitErr, ok := err.(*exec.ExitError); ok {
+			os.Exit(exitErr.ExitCode())
+		}
+		os.Exit(1)
 	}
 }