Merge branch 'develop' into 253-fix-runtime-import

chore: version bump
fix: importing runtime
2026-04-03 21:52:45 -07:00 · 2019-10-09 19:32:40 +11:00 · 2019-10-09 19:30:53 +11:00 · 2019-10-09 14:44:53 +11:00 · 2019-10-09 04:47:00 +11:00 · 2019-10-09 04:44:32 +11:00
10 changed files with 73 additions and 35 deletions
--- 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)
--- 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();
--- 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'));
--- 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({
--- 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({
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v0.18.1"
+const Version = "v0.18.3"
--- 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)
 	}
 }
--- a/runtime/js/package-lock.json
+++ b/runtime/js/package-lock.json
@@ -56,13 +56,15 @@
          "version": "0.3.2",
          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "braces": {
          "version": "2.3.2",
          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
          "dev": true,
+          "optional": true,
          "requires": {
            "arr-flatten": "^1.1.0",
            "array-unique": "^0.3.2",
@@ -81,6 +83,7 @@
              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
              "dev": true,
+              "optional": true,
              "requires": {
                "is-extendable": "^0.1.0"
              }
@@ -253,6 +256,7 @@
          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
          "dev": true,
+          "optional": true,
          "requires": {
            "extend-shallow": "^2.0.1",
            "is-number": "^3.0.0",
@@ -265,6 +269,7 @@
              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
              "dev": true,
+              "optional": true,
              "requires": {
                "is-extendable": "^0.1.0"
              }
@@ -330,7 +335,8 @@
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "is-glob": {
          "version": "4.0.1",
@@ -347,6 +353,7 @@
          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
          "dev": true,
+          "optional": true,
          "requires": {
            "kind-of": "^3.0.2"
          },
@@ -356,6 +363,7 @@
              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
              "dev": true,
+              "optional": true,
              "requires": {
                "is-buffer": "^1.1.5"
              }
@@ -366,13 +374,15 @@
          "version": "3.0.1",
          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "kind-of": {
          "version": "6.0.2",
          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "micromatch": {
          "version": "3.1.10",
@@ -2881,9 +2891,9 @@
      "dev": true
    },
    "eslint": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.2.2.tgz",
-      "integrity": "sha512-mf0elOkxHbdyGX1IJEUsNBzCDdyoUgljF3rRlgfyYh0pwGnreLc0jjD6ZuleOibjmnUWZLY2eXwSooeOgGJ2jw==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.5.1.tgz",
+      "integrity": "sha512-32h99BoLYStT1iq1v2P9uwpyznQ4M2jRiFB6acitKz52Gqn+vPaMDUTB1bYi1WN4Nquj2w+t+bimYUG83DC55A==",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.0.0",
@@ -3001,9 +3011,9 @@
      },
      "dependencies": {
        "acorn": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz",
-          "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==",
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
+          "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
          "dev": true
        }
      }
@@ -3577,7 +3587,8 @@
        "ansi-regex": {
          "version": "2.1.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "aproba": {
          "version": "1.2.0",
@@ -3598,12 +3609,14 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@@ -3618,17 +3631,20 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@@ -3745,7 +3761,8 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@@ -3757,6 +3774,7 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@@ -3771,6 +3789,7 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@@ -3778,12 +3797,14 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "minipass": {
          "version": "2.3.5",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.2",
            "yallist": "^3.0.0"
@@ -3802,6 +3823,7 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@@ -3882,7 +3904,8 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@@ -3894,6 +3917,7 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@@ -3979,7 +4003,8 @@
        "safe-buffer": {
          "version": "5.1.2",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "safer-buffer": {
          "version": "2.1.2",
@@ -4015,6 +4040,7 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@@ -4034,6 +4060,7 @@
          "version": "3.0.1",
          "bundled": true,
          "dev": true,
+          "optional": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
@@ -4077,12 +4104,14 @@
        "wrappy": {
          "version": "1.0.2",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        },
        "yallist": {
          "version": "3.0.3",
          "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
        }
      }
    },
@@ -4134,9 +4163,9 @@
      }
    },
    "glob-parent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz",
-      "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
+      "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
      "dev": true,
      "requires": {
        "is-glob": "^4.0.1"
@@ -5972,9 +6001,9 @@
      }
    },
    "rxjs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
-      "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
+      "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
      "dev": true,
      "requires": {
        "tslib": "^1.9.0"
--- a/runtime/js/package.json
+++ b/runtime/js/package.json
@@ -4,8 +4,8 @@
  "description": "The Javascript Wails Runtime",
  "main": "index.js",
  "scripts": {
-    "build": "eslint core/ && npm run build:prod",
-    "build:prod": "webpack --env prod --colors",
+    "build": "./node_modules/.bin/eslint core/ && npm run build:prod",
+    "build:prod": "./node_modules/.bin/webpack --env prod --colors",
    "test": "echo \"Error: no test specified\" && exit 1"
  },
  "repository": {
@@ -36,7 +36,7 @@
    "babel-loader": "^8.0.6",
    "babel-preset-minify": "^0.5.0",
    "core-js": "^3.1.4",
-    "eslint": "^6.2.2",
+    "eslint": "^6.5.1",
    "webpack": "^4.35.3",
    "webpack-cli": "^3.3.5"
  }
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -3,6 +3,7 @@
 # Build runtime
 echo "**** Building Runtime ****"
 cd runtime/js
+npm install
 npm run build
 cd ../..
Author	SHA1	Message	Date
Lea Anthony	07c17c9e81	Merge branch 'develop' into 253-fix-runtime-import	2019-10-09 19:32:40 +11:00
Lea Anthony	0b19ad1427	chore: version bump	2019-10-09 19:30:53 +11:00
Lea Anthony	79c258bbe0	fix: importing runtime	2019-10-09 14:44:53 +11:00
Lea Anthony	9aca99911e	Update CONTRIBUTORS.md	2019-10-09 04:47:00 +11:00
Robin Eklind	a7f61e335e	cmd/wails: report error status code to OS (#252 ) Fixes #251.	2019-10-09 04:44:32 +11:00
Lea Anthony	9fff0a513e	chore: merge master	2019-10-08 06:30:22 +11:00
Lea Anthony	f453be12c8	hotfix: version number	2019-10-08 06:20:30 +11:00
Lea Anthony	20428b0407	Develop (#250 )	2019-10-08 06:12:08 +11:00