Merge branch 'develop' into migrate-tool

* Patch for file dialog on OSX

* Update CONTRIBUTORS.md

* 262 add wails shutdown method (#264)

* feat: support close in bridge mode

* feat: WailsShutdown callback

Now handles proper shutdown through:
  * runtime.Window.Close()
  * Killing the main window
  * Ctrl-C

* chore: version bump

.gitignore

@@ -17,4 +17,3 @@ cmd/wails/wails
 .DS_Store
 tmp
 node_modules/
-/runtime/js/runtime/dist

CONTRIBUTORS.md

@@ -20,4 +20,3 @@ Wails is what it is because of the time and effort given by these great people.
 * [Toyam Cox](https://github.com/Vaelatern)
 * [Robin Eklind](https://github.com/mewmew)
 * [Kris Raney](https://github.com/kraney)
-* [soon cheol shin](https://github.com/scshin0572)

app.go

@@ -2,7 +2,6 @@ package wails
 
 import (
 	"os"
-	"runtime"
 	"syscall"
 
 	"github.com/syossan27/tebata"
@@ -44,7 +43,7 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 	}
 
 	result := &App{
-		logLevel:       "debug",
+		logLevel:       "info",
 		renderer:       renderer.NewWebView(),
 		ipc:            ipc.NewManager(),
 		bindingManager: binding.NewManager(),
@@ -103,11 +102,6 @@ func (a *App) start() error {
 		return err
 	}
 
-	// Set debug mode
-	if runtime.GOOS == "windows" && BuildMode == cmd.BuildModeDebug {
-		a.renderer.EnableDebug()
-	}
-
 	// Start signal handler
 	t := tebata.New(os.Interrupt, os.Kill, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
 	t.Reserve(func() {

cmd/helpers.go

@@ -7,7 +7,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
-	"strings"
 	"time"
 
 	"github.com/leaanthony/mewn"
@@ -88,17 +87,6 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 	buildCommand.Add("build")
 
 	if binaryName != "" {
-		// Alter binary name based on OS
-		switch runtime.GOOS {
-		case "windows":
-			if !strings.HasSuffix(binaryName, ".exe") {
-				binaryName += ".exe"
-			}
-		default:
-			if strings.HasSuffix(binaryName, ".exe") {
-				binaryName = strings.TrimSuffix(binaryName, ".exe")
-			}
-		}
 		buildCommand.Add("-o")
 		buildCommand.Add(binaryName)
 	}
@@ -115,7 +103,7 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 	}
 
 	// Add windows flags
-	if runtime.GOOS == "windows" && buildMode == BuildModeProd {
+	if runtime.GOOS == "windows" {
 		ldflags += "-H windowsgui "
 	}
 

cmd/package.go

@@ -191,15 +191,8 @@ func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 
 	// Build syso
 	sysofile := filepath.Join(b.fs.Cwd(), basename+"-res.syso")
-
+	windresCommand := []string{"windres", "-o", sysofile, tgtRCFile}
-	batfile, err := fs.LocalDir(".")
+	err := NewProgramHelper().RunCommandArray(windresCommand)
-	if err != nil {
-		return err
-	}
-
-	windresBatFile := filepath.Join(batfile.fullPath, "windres.bat")
-	windresCommand := []string{windresBatFile, sysofile, tgtRCFile}
-	err = NewProgramHelper().RunCommandArray(windresCommand)
 	if err != nil {
 		return err
 	}

cmd/program.go

@@ -128,7 +128,6 @@ func (p *ProgramHelper) RunCommandArray(args []string, dir ...string) error {
 		fmt.Printf("ERROR: Looks like '%s' isn't installed. Please install and try again.", program)
 		return err
 	}
-
 	args = args[1:]
 	var stderr string
 	var stdout string

cmd/templates/angular-template/frontend/browserslist

@@ -9,4 +9,4 @@
 last 2 versions
 Firefox ESR
 not dead
-IE 9-11 # For IE 9-11 support, remove 'not'.
+not IE 9-11 # For IE 9-11 support, remove 'not'.

cmd/templates/angular-template/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/create-react-app/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/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v0.18.14-pre"
+const Version = "v0.18.7-pre"

cmd/wails/9_issue.go

@@ -80,16 +80,15 @@ To help you in this process, we will ask for some information, add Go/Wails deta
 		npm := program.FindProgram("npm")
 		if npm != nil {
 			stdout, _, _, _ := npm.Run("--version")
-			npmVersion = stdout
+			nodeVersion = stdout
-			npmVersion = npmVersion[:len(npmVersion)-1]
+			nodeVersion = nodeVersion[:len(nodeVersion)-1]
-			npmVersion = strings.TrimSpace(npmVersion)
 		}
 
 		node := program.FindProgram("node")
 		if node != nil {
 			stdout, _, _, _ := node.Run("--version")
-			nodeVersion = stdout
+			npmVersion = stdout
-			nodeVersion = nodeVersion[:len(nodeVersion)-1]
+			npmVersion = npmVersion[:len(npmVersion)-1]
 		}
 
 		str.WriteString("\n| Name   | Value |\n| ----- | ----- |\n")

cmd/windres.bat

@@ -1 +0,0 @@
-windres.exe -o %1 %2

config.go

@@ -94,12 +94,12 @@ func (a *AppConfig) merge(in *AppConfig) error {
 // Creates the default configuration
 func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 	result := &AppConfig{
-		Width:       800,
+		Width:     800,
-		Height:      600,
+		Height:    600,
-		Resizable:   true,
+		Resizable: true,
-		Title:       "My Wails App",
+		Title:     "My Wails App",
-		Colour:      "#FFF", // White by default
+		Colour:    "#FFF", // White by default
-		defaultHTML: mewn.String("./runtime/assets/default.html"),
+		HTML:      mewn.String("./runtime/assets/default.html"),
 	}
 
 	if userConfig != nil {

lib/interfaces/renderer.go

@@ -3,12 +3,10 @@ package interfaces
 import (
 	"github.com/wailsapp/wails/lib/messages"
 )
-
 // Renderer is an interface describing a Wails target to render the app to
 type Renderer interface {
 	Initialise(AppConfig, IPCManager, EventManager) error
 	Run() error
-	EnableDebug()
 
 	// Binding
 	NewBinding(bindingName string) error

lib/renderer/bridge.go

@@ -48,9 +48,6 @@ type Bridge struct {
 
 	// Mutex for writing to the socket
 	lock sync.Mutex
-
-	// debug
-	debug bool
 }
 
 // Initialise the Bridge Renderer
@@ -77,11 +74,6 @@ func (h *Bridge) evalJS(js string, mtype messageType) error {
 	return nil
 }
 
-// EnableDebug enables debug!
-func (h *Bridge) EnableDebug() {
-	h.debug = true
-}
-
 func (h *Bridge) injectCSS(css string) {
 	// Minify css to overcome issues in the browser with carriage returns
 	minified, err := htmlmin.Minify([]byte(css), &htmlmin.Options{
@@ -125,6 +117,7 @@ func (h *Bridge) sendMessage(conn *websocket.Conn, msg string) {
 
 func (h *Bridge) start(conn *websocket.Conn) {
 
+	// set external.invoke
 	h.log.Infof("Connected to frontend.")
 
 	wailsRuntime := mewn.String("../../runtime/assets/wails.js")

lib/renderer/webview.go

@@ -25,7 +25,6 @@ type WebView struct {
 	config       interfaces.AppConfig
 	eventManager interfaces.EventManager
 	bindingCache []string
-	debug        bool
 }
 
 // NewWebView returns a new WebView struct
@@ -49,22 +48,13 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 	// Save the config
 	w.config = config
 
-	// defaulthtml
-	HTML := config.GetDefaultHTML()
-	if len(HTML) == 0 {
-		HTML = mewn.String("../../runtime/assets/default.html")
-	}
-
-	HTML = fmt.Sprintf("data:text/html,%s", HTML)
-	fmt.Printf("*** %s ***", HTML)
-	w.log.Infof("URL: %s", HTML)
 	// Create the WebView instance
 	w.window = wv.NewWebview(wv.Settings{
 		Width:     config.GetWidth(),
 		Height:    config.GetHeight(),
 		Title:     config.GetTitle(),
 		Resizable: config.GetResizable(),
-		URL:       HTML,
+		URL:       config.GetDefaultHTML(),
 		Debug:     !config.GetDisableInspector(),
 		ExternalInvokeCallback: func(_ wv.WebView, message string) {
 			w.ipc.Dispatch(message)
@@ -105,7 +95,6 @@ func (w *WebView) evalJS(js string) error {
 	if len(js) > 45 {
 		outputJS += "..."
 	}
-	// var outputJS = js
 	w.log.DebugFields("Eval", logger.Fields{"js": outputJS})
 	//
 	w.window.Dispatch(func() {
@@ -114,11 +103,6 @@ func (w *WebView) evalJS(js string) error {
 	return nil
 }
 
-// EnableDebug enables debug!
-func (w *WebView) EnableDebug() {
-	w.debug = true
-}
-
 // Escape the Javascripts!
 func escapeJS(js string) (string, error) {
 	result := strings.Replace(js, "\\", "\\\\", -1)
@@ -188,58 +172,51 @@ func (w *WebView) Run() error {
 
 	w.log.Info("Running...")
 
-	// Inject firebug in debug mode on Windows
+	// Runtime assets
-	if w.debug {
+	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
-		w.log.Debug("Injecting firebug")
+	w.evalJS(wailsRuntime)
-		// firebugLite := mewn.String("../../runtime/assets/injectFirebug.js")
-		// w.evalJS(firebugLite)
-	}
 
-	// // Runtime assets
+	// Ping the wait channel when the wails runtime is loaded
-	// wailsRuntime := mewn.String("../../runtime/assets/wails.js")
+	w.eventManager.On("wails:loaded", func(...interface{}) {
-	// w.evalJS(wailsRuntime)
 
-	// // Ping the wait channel when the wails runtime is loaded
+		// Run this in a different go routine to free up the main process
-	// w.eventManager.On("wails:loaded", func(...interface{}) {
+		go func() {
 
-	// 	// Run this in a different go routine to free up the main process
+			// Inject Bindings
-	// 	go func() {
+			for _, binding := range w.bindingCache {
+				w.evalJSSync(binding)
+			}
 
-	// 		// Inject Bindings
+			// Inject user CSS
-	// 		for _, binding := range w.bindingCache {
+			if w.config.GetCSS() != "" {
-	// 			w.evalJSSync(binding)
+				outputCSS := fmt.Sprintf("%.45s", w.config.GetCSS())
-	// 		}
+				if len(outputCSS) > 45 {
+					outputCSS += "..."
+				}
+				w.log.DebugFields("Inject User CSS", logger.Fields{"css": outputCSS})
+				w.injectCSS(w.config.GetCSS())
+			} else {
+				// Use default wails css
+				w.log.Debug("Injecting Default Wails CSS")
+				defaultCSS := mewn.String("../../runtime/assets/wails.css")
 
-	// 		// Inject user CSS
+				w.injectCSS(defaultCSS)
-	// 		if w.config.GetCSS() != "" {
+			}
-	// 			outputCSS := fmt.Sprintf("%.45s", w.config.GetCSS())
-	// 			if len(outputCSS) > 45 {
-	// 				outputCSS += "..."
-	// 			}
-	// 			w.log.DebugFields("Inject User CSS", logger.Fields{"css": outputCSS})
-	// 			w.injectCSS(w.config.GetCSS())
-	// 		} else {
-	// 			// Use default wails css
-	// 			w.log.Debug("Injecting Default Wails CSS")
-	// 			defaultCSS := mewn.String("../../runtime/assets/wails.css")
 
-	// 			w.injectCSS(defaultCSS)
+			// Inject user JS
-	// 		}
+			if w.config.GetJS() != "" {
+				outputJS := fmt.Sprintf("%.45s", w.config.GetJS())
+				if len(outputJS) > 45 {
+					outputJS += "..."
+				}
+				w.log.DebugFields("Inject User JS", logger.Fields{"js": outputJS})
+				w.evalJSSync(w.config.GetJS())
+			}
 
-	// 		// Inject user JS
+			// Emit that everything is loaded and ready
-	// 		if w.config.GetJS() != "" {
+			w.eventManager.Emit("wails:ready")
-	// 			outputJS := fmt.Sprintf("%.45s", w.config.GetJS())
+		}()
-	// 			if len(outputJS) > 45 {
+	})
-	// 				outputJS += "..."
-	// 			}
-	// 			w.log.DebugFields("Inject User JS", logger.Fields{"js": outputJS})
-	// 			w.evalJSSync(w.config.GetJS())
-	// 		}
-
-	// 		// Emit that everything is loaded and ready
-	// 		w.eventManager.Emit("wails:ready")
-	// 	}()
-	// })
 
 	// Kick off main window loop
 	w.window.Run()

lib/renderer/webview/webview.go

@@ -1,5 +1,6 @@
-// Package webview implements Go bindings to https://github.com/zserge/webview C library.
+// Package wails implements Go bindings to https://github.com/zserge/webview C library.
 // It is a modified version of webview.go from that repository
+
 // Bindings closely repeat the C APIs and include both, a simplified
 // single-function API to just open a full-screen webview window, and a more
 // advanced and featureful set of APIs, including Go-to-JavaScript bindings.
@@ -13,7 +14,7 @@ package webview
 #cgo linux openbsd freebsd CFLAGS: -DWEBVIEW_GTK=1 -Wno-deprecated-declarations
 #cgo linux openbsd freebsd pkg-config: gtk+-3.0 webkit2gtk-4.0
 
-#cgo windows CFLAGS: -DWEBVIEW_WINAPI=1 -std=c99 -DUNICODE=1 -D_UNICODE=1
+#cgo windows CFLAGS: -DWEBVIEW_WINAPI=1
 #cgo windows LDFLAGS: -lole32 -lcomctl32 -loleaut32 -luuid -lgdi32
 
 #cgo darwin CFLAGS: -DWEBVIEW_COCOA=1 -x objective-c

lib/renderer/webview/webview.h

@@ -58,7 +58,6 @@ extern "C"
 #elif defined(WEBVIEW_WINAPI)
 #define CINTERFACE
 #include <windows.h>
-#include <tchar.h>
 
 #include <commctrl.h>
 #include <exdisp.h>
@@ -1039,7 +1038,7 @@ struct webview_priv
     return S_FALSE;
   }
 
-  static const TCHAR *classname = TEXT("WebView");
+  static const TCHAR *classname = "WebView";
   static const SAFEARRAYBOUND ArrayBound = {1, 0};
 
   static IOleClientSiteVtbl MyIOleClientSiteTable = {
@@ -1228,7 +1227,7 @@ struct webview_priv
       }
       VariantInit(&myURL);
       myURL.vt = VT_BSTR;
-// #ifndef UNICODE
+#ifndef UNICODE
       {
         wchar_t *buffer = webview_to_utf16(webPageName);
         if (buffer == NULL)
@@ -1238,9 +1237,9 @@ struct webview_priv
         myURL.bstrVal = SysAllocString(buffer);
         GlobalFree(buffer);
       }
-// #else
+#else
-//       myURL.bstrVal = SysAllocString(webPageName);
+      myURL.bstrVal = SysAllocString(webPageName);
-// #endif
+#endif
       if (!myURL.bstrVal)
       {
       badalloc:
@@ -1278,7 +1277,7 @@ struct webview_priv
             if (!SafeArrayAccessData(sfArray, (void **)&pVar))
             {
               pVar->vt = VT_BSTR;
-// #ifndef UNICODE
+#ifndef UNICODE
               {
                 wchar_t *buffer = webview_to_utf16(url);
                 if (buffer == NULL)
@@ -1288,9 +1287,9 @@ struct webview_priv
                 bstr = SysAllocString(buffer);
                 GlobalFree(buffer);
               }
-// #else
+#else
-//               bstr = SysAllocString(url);
+              bstr = SysAllocString(string);
-// #endif
+#endif
               if ((pVar->bstrVal = bstr))
               {
                 htmlDoc2->lpVtbl->write(htmlDoc2, sfArray);
@@ -1351,8 +1350,8 @@ struct webview_priv
   }
 
 #define WEBVIEW_KEY_FEATURE_BROWSER_EMULATION \
-  _T("Software\\Microsoft\\Internet "            \
+  "Software\\Microsoft\\Internet "            \
-  "Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION")
+  "Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION"
 
   static int webview_fix_ie_compat_mode()
   {
@@ -1364,7 +1363,7 @@ struct webview_priv
     {
       return -1;
     }
-    for (p = &appname[_tcslen(appname) - 1]; p != appname && *p != _T('\\'); p--)
+    for (p = &appname[strlen(appname) - 1]; p != appname && *p != '\\'; p--)
     {
     }
     p++;
@@ -1405,7 +1404,6 @@ struct webview_priv
     {
       return -1;
     }
-
     ZeroMemory(&wc, sizeof(WNDCLASSEX));
     wc.cbSize = sizeof(WNDCLASSEX);
     wc.hInstance = hInstance;
@@ -1433,24 +1431,10 @@ struct webview_priv
     rect.bottom = rect.bottom - rect.top + top;
     rect.top = top;
 
-#ifdef UNICODE
-    wchar_t *u16title = webview_to_utf16(w->title);
-    if (u16title == NULL)
-    {
-      return -1;
-    }
-
     w->priv.hwnd =
-        CreateWindowEx(0, classname, u16title, style, rect.left, rect.top,
-                       rect.right - rect.left, rect.bottom - rect.top,
-                       HWND_DESKTOP, NULL, hInstance, (void *)w);
-#else
-  w->priv.hwnd =
         CreateWindowEx(0, classname, w->title, style, rect.left, rect.top,
                        rect.right - rect.left, rect.bottom - rect.top,
                        HWND_DESKTOP, NULL, hInstance, (void *)w);
-#endif
-    
     if (w->priv.hwnd == 0)
     {
       OleUninitialize();
@@ -1461,14 +1445,7 @@ struct webview_priv
 
     DisplayHTMLPage(w);
 
-#ifdef UNICODE
-    SetWindowText(w->priv.hwnd, u16title);
-    GlobalFree(u16title);
-#else
     SetWindowText(w->priv.hwnd, w->title);
-#endif
-    
-    
     ShowWindow(w->priv.hwnd, SW_SHOWDEFAULT);
     UpdateWindow(w->priv.hwnd);
     SetFocus(w->priv.hwnd);
@@ -1604,20 +1581,9 @@ struct webview_priv
 
   WEBVIEW_API void webview_set_title(struct webview *w, const char *title)
   {
-  #ifdef UNICODE
-    wchar_t *u16title = webview_to_utf16(title);
-    if (u16title == NULL)
-    {
-      return;
-    }
-    SetWindowText(w->priv.hwnd, u16title);
-    GlobalFree(u16title);
-  #else
     SetWindowText(w->priv.hwnd, title);
-  #endif
   }
 
-
   WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
   {
     if (w->priv.is_fullscreen == !!fullscreen)
@@ -1873,30 +1839,14 @@ struct webview_priv
         type |= MB_ICONERROR;
         break;
       }
-  #ifdef UNICODE
-      WCHAR *wtitle = webview_to_utf16(title);
-      WCHAR *warg = webview_to_utf16(arg);
-      MessageBox(w->priv.hwnd, warg, wtitle, type);
-      GlobalFree(warg);
-      GlobalFree(wtitle);
-  #else
       MessageBox(w->priv.hwnd, arg, title, type);
-  #endif
 #endif
     }
   }
 
   WEBVIEW_API void webview_terminate(struct webview *w) { PostQuitMessage(0); }
   WEBVIEW_API void webview_exit(struct webview *w) { OleUninitialize(); }
-  WEBVIEW_API void webview_print_log(const char *s) {
+  WEBVIEW_API void webview_print_log(const char *s) { OutputDebugString(s); }
-  #ifdef UNICODE
-    WCHAR *ws = webview_to_utf16(s);
-    OutputDebugString(ws); 
-    GlobalFree(ws);
-  #else
-    OutputDebugString(s); 
-  #endif
-  }
 
 #endif /* WEBVIEW_WINAPI */
 

runtime/assets/bridge.js

@@ -95,6 +95,13 @@ function startBridge() {
 		window.wailsbridge.reconnectOverlay.style.display = 'none';
 	}
 
+	// Bridge external.invoke
+	window.external = {
+		invoke: function (msg) {
+			window.wailsbridge.websocket.send(msg);
+		}
+	};
+
 	// Adds a script to the Dom.
 	// Removes it if second parameter is true.
 	function addScript(script, remove) {
@@ -204,11 +211,6 @@ function start(callback) {
 }
 
 function Init(callback) {
-	// Bridge window.invoke
-	window.invoke = function (message) {
-		window.wailsbridge.websocket.send(message);
-	}
-	
 	start(callback);
 }
 

runtime/assets/default.html

@@ -1 +1,18 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><script src="https://raw.githubusercontent.com/firebug/firebug-lite/master/build/firebug-lite-debug.js#startOpened=true"></script></head><body><div id="app"></div><script type="text/javascript">function AddScript(js, callbackID){var script = document.createElement('script');script.text=js;document.body.appendChild(script);}</script></body></html>
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+</head>
+
+<body>
+  <div id="app"></div>
+  <script type="text/javascript">function AddScript(js, callbackID) {
+      var script = document.createElement('script');
+      script.text = js;
+      document.body.appendChild(script);
+    }</script>
+</body>
+
+</html>

runtime/assets/injectFirebug.js

@@ -1 +0,0 @@
-(function(){console.log=function(message){document.body.innerHTML=document.body.innerHTML+'<p>'+message+'</p>';};var script=document.createElement('script');script.src="https://raw.githubusercontent.com/firebug/firebug-lite/master/build/firebug-lite-debug.js#startOpened=true";document.body.appendChild(script);})();

runtime/js/.eslintrc

@@ -15,7 +15,10 @@
             "error",
             "tab"
         ],
-        "linebreak-style": 0,
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
         "quotes": [
             "error",
             "single"

runtime/js/babel.config.js

@@ -7,7 +7,7 @@ module.exports = function (api) {
     [
       "@babel/preset-env",
       {
-        "useBuiltIns": "usage",
+        "useBuiltIns": "entry",
         "corejs": {
           "version": 3,
           "proposals": true
@@ -16,10 +16,7 @@ module.exports = function (api) {
     ]
   ];
 
-  const plugins = ["@babel/plugin-transform-object-assign", "transform-es2015-shorthand-properties"]
-
   return {
     presets,
-    plugins
   };
 }

runtime/js/bridge/webpack.config.js

@@ -1,37 +0,0 @@
-/* eslint-disable */
-
-const path = require('path');
-
-module.exports = {
-  entry: './bridge.js',
-  mode: 'production',
-  output: {
-    path: path.resolve(__dirname, '..', 'assets'),
-    filename: 'bridge.js',
-    libraryTarget: 'this'
-  },
-  module: {
-    rules: [
-      {
-        test: /\.m?js$/,
-        exclude: /(node_modules|bower_components)/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            plugins: [],
-            presets: [
-              [
-                '@babel/preset-env',
-                {
-                  'useBuiltIns': 'usage',
-                  'corejs': 3,
-                  'targets': { "browsers": ["last 2 versions", "ie >= 9"] }
-                }
-              ]
-            ]
-          }
-        }
-      }
-    ]
-  }
-};

runtime/js/core/ipc.js

@@ -15,11 +15,7 @@ The lightweight framework for web-like apps
  * @param {string} message
  */
 function Invoke(message) {
-	if ( window.wailsbridge ) {
+	window.external.invoke(message);
-		window.wailsbridge.websocket.send(message);
-	} else {
-		window.external.invoke(message);
-	}
 }
 
 /**

runtime/js/package.json

@@ -33,15 +33,11 @@
     "@babel/core": "^7.5.4",
     "@babel/plugin-transform-object-assign": "^7.2.0",
     "@babel/preset-env": "^7.5.4",
-    "babel-core": "^6.26.3",
     "babel-loader": "^8.0.6",
-    "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
-    "babel-preset-es2015": "^6.24.1",
     "babel-preset-minify": "^0.5.0",
     "core-js": "^3.1.4",
     "eslint": "^6.5.1",
-    "webpack": "^4.41.2",
+    "webpack": "^4.35.3",
     "webpack-cli": "^3.3.5"
-  },
+  }
-  "dependencies": {}
 }

runtime/js/runtime/browser.js

@@ -32,6 +32,6 @@ function OpenFile(filename) {
 }
 
 module.exports = {
-	OpenURL: OpenURL,
+	OpenURL,
-	OpenFile: OpenFile
+	OpenFile
 };

runtime/js/runtime/events.js

@@ -80,10 +80,10 @@ function Acknowledge(eventName) {
 }
 
 module.exports = {
-	OnMultiple: OnMultiple,
+	OnMultiple,
-	On: On,
+	On,
-	Once: Once,
+	Once,
-	Emit: Emit,
+	Emit,
-	Heartbeat: Heartbeat,
+	Heartbeat,
-	Acknowledge: Acknowledge
+	Acknowledge
 };

runtime/js/runtime/log.js

@@ -62,9 +62,9 @@ function Fatal(message) {
 }
 
 module.exports = {
-	Debug: Debug,
+	Debug,
-	Info: Info,
+	Info,
-	Warning: Warning,
+	Warning,
-	Error: Error,
+	Error,
-	Fatal: Fatal
+	Fatal
 };

runtime/js/runtime/main.js

@@ -15,8 +15,8 @@ const Events = require('./events');
 const Init = require('./init');
 
 module.exports = {
-	Log: Log,
+	Log,
-	Browser: Browser,
+	Browser,
-	Events: Events,
+	Events,
-	Init: Init
+	Init
 };

runtime/js/runtime/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@wailsapp/runtime",
-  "version": "1.0.8",
+  "version": "1.0.6",
   "description": "Wails Javascript runtime library",
   "main": "main.js",
   "types": "runtime.d.ts",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "echo \"Error: no test specified\" && exit 1"
-    "build": "webpack"
   },
   "repository": {
     "type": "git",
@@ -22,18 +21,8 @@
   "bugs": {
     "url": "https://github.com/wailsapp/wails/issues"
   },
-  "files": [
-    "*.js",
-    "!webpack.config.js",
-    "runtime.d.ts",
-    "README.md"
-  ],
   "homepage": "https://github.com/wailsapp/wails#readme",
   "devDependencies": {
-    "babel-core": "^6.26.3",
+    "dts-gen": "^0.5.8"
-    "babel-loader": "^8.0.6",
-    "babel-preset-es2015": "^6.24.1",
-    "dts-gen": "^0.5.8",
-    "webpack": "^4.41.2"
   }
 }

runtime/js/runtime/webpack.config.js

@@ -1,37 +0,0 @@
-/* eslint-disable */
-
-const path = require('path');
-
-module.exports = {
-  entry: './main.js',
-  mode: 'production',
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: 'main.js',
-    libraryTarget: 'this'
-  },
-  module: {
-    rules: [
-      {
-        test: /\.m?js$/,
-        exclude: /(node_modules|bower_components)/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            plugins: [],
-            presets: [
-              [
-                '@babel/preset-env',
-                {
-                  'useBuiltIns': 'usage',
-                  'corejs': 3,
-                  'targets': { "browsers": ["last 2 versions", "ie >= 9"] }
-                }
-              ]
-            ]
-          }
-        }
-      }
-    ]
-  }
-};

runtime/js/webpack.prod.js

@@ -17,14 +17,16 @@ module.exports = {
         use: {
           loader: 'babel-loader',
           options: {
-            plugins: [],
+            plugins: ['@babel/plugin-transform-object-assign'],
             presets: [
               [
                 '@babel/preset-env',
                 {
-                  'useBuiltIns': 'usage',
+                  'useBuiltIns': 'entry',
-                  'corejs': 3,
+                  'corejs': {
-                  'targets': { "browsers": ["last 2 versions", "ie >= 9"] }
+                    'version': 3,
+                    'proposals': true
+                  }
                 }
               ]
             ]

scripts/build.go

@@ -1,82 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-)
-
-// Default target to run when none is specified
-// If not set, running mage will list available targets
-// var Default = Build
-
-/*
-# Build runtime
-echo "**** Building Runtime ****"
-cd runtime/js
-npm install
-npm run build
-cd ../..
-
-echo "**** Packing Assets ****"
-cd cmd
-mewn
-cd ..
-cd lib/renderer
-mewn
-cd ../..
-
-echo "**** Installing Wails locally ****"
-cd cmd/wails
-go install
-cd ../..
-
-echo "**** Tidying the mods! ****"
-go mod tidy
-
-echo "**** WE ARE DONE! ****"
-
-*/
-
-func runCommand(command string, args ...string) {
-	cmd := exec.Command(command, args...)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		log.Fatal(err)
-	}
-	cmd.Run()
-	fmt.Println(string(output))
-}
-
-// A build step that requires additional params, or platform specific steps for example
-func main() {
-
-	dir, _ := os.Getwd()
-
-	// Build Runtime
-	fmt.Println("**** Building Runtime ****")
-	runtimeDir, _ := filepath.Abs(filepath.Join(dir, "..", "runtime", "js"))
-	os.Chdir(runtimeDir)
-	runCommand("npm", "run", "build")
-
-	// Pack assets
-	fmt.Println("**** Packing Assets ****")
-	rendererDir, _ := filepath.Abs(filepath.Join(dir, "..", "lib", "renderer"))
-	os.Chdir(rendererDir)
-	runCommand("mewn")
-	cmdDir, _ := filepath.Abs(filepath.Join(dir, "..", "cmd"))
-	os.Chdir(cmdDir)
-	runCommand("mewn")
-
-	// Install Wails
-	fmt.Println("**** Installing Wails locally ****")
-	execDir, _ := filepath.Abs(filepath.Join(dir, "..", "cmd", "wails"))
-	os.Chdir(execDir)
-	runCommand("go", "install")
-
-	baseDir, _ := filepath.Abs(filepath.Join(dir, ".."))
-	os.Chdir(baseDir)
-	runCommand("go", "mod", "tidy")
-}