Unicode updates

.gitignore

@@ -16,4 +16,5 @@ examples/**/example*
 cmd/wails/wails
 .DS_Store
 tmp
-node_modules/
+node_modules/
+/runtime/js/runtime/dist

app.go

@@ -2,6 +2,7 @@ package wails
 
 import (
 	"os"
+	"runtime"
 	"syscall"
 
 	"github.com/syossan27/tebata"
@@ -43,7 +44,7 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
 	}
 
 	result := &App{
-		logLevel:       "info",
+		logLevel:       "debug",
 		renderer:       renderer.NewWebView(),
 		ipc:            ipc.NewManager(),
 		bindingManager: binding.NewManager(),
@@ -102,6 +103,11 @@ 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/templates/angular-template/frontend/browserslist

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

cmd/templates/angular-template/frontend/src/wailsbridge.js

@@ -1,17 +0,0 @@
-/*
-    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

@@ -1,17 +0,0 @@
-/*
-    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);
-    }
-  }
-};

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
-		HTML:      mewn.String("./runtime/assets/default.html"),
+		defaultHTML: mewn.String("./runtime/assets/default.html"),
 	}
 
 	if userConfig != nil {

lib/interfaces/renderer.go

@@ -3,10 +3,12 @@ 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,6 +48,9 @@ type Bridge struct {
 
 	// Mutex for writing to the socket
 	lock sync.Mutex
+
+	// debug
+	debug bool
 }
 
 // Initialise the Bridge Renderer
@@ -74,6 +77,11 @@ 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{
@@ -117,7 +125,6 @@ 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,6 +25,7 @@ type WebView struct {
 	config       interfaces.AppConfig
 	eventManager interfaces.EventManager
 	bindingCache []string
+	debug        bool
 }
 
 // NewWebView returns a new WebView struct
@@ -48,13 +49,22 @@ 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:       config.GetDefaultHTML(),
+		URL:       HTML,
 		Debug:     !config.GetDisableInspector(),
 		ExternalInvokeCallback: func(_ wv.WebView, message string) {
 			w.ipc.Dispatch(message)
@@ -95,6 +105,7 @@ 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() {
@@ -103,6 +114,11 @@ 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)
@@ -172,51 +188,58 @@ func (w *WebView) Run() error {
 
 	w.log.Info("Running...")
 
-	// Runtime assets
+	// Inject firebug in debug mode on Windows
-	wailsRuntime := mewn.String("../../runtime/assets/wails.js")
+	if w.debug {
-	w.evalJS(wailsRuntime)
+		w.log.Debug("Injecting firebug")
+		// firebugLite := mewn.String("../../runtime/assets/injectFirebug.js")
+		// w.evalJS(firebugLite)
+	}
 
-	// Ping the wait channel when the wails runtime is loaded
+	// // Runtime assets
-	w.eventManager.On("wails:loaded", func(...interface{}) {
+	// wailsRuntime := mewn.String("../../runtime/assets/wails.js")
+	// w.evalJS(wailsRuntime)
 
-		// Run this in a different go routine to free up the main process
+	// // Ping the wait channel when the wails runtime is loaded
-		go func() {
+	// w.eventManager.On("wails:loaded", func(...interface{}) {
 
-			// Inject Bindings
+	// 	// Run this in a different go routine to free up the main process
-			for _, binding := range w.bindingCache {
+	// 	go func() {
-				w.evalJSSync(binding)
-			}
 
-			// Inject user CSS
+	// 		// Inject Bindings
-			if w.config.GetCSS() != "" {
+	// 		for _, binding := range w.bindingCache {
-				outputCSS := fmt.Sprintf("%.45s", w.config.GetCSS())
+	// 			w.evalJSSync(binding)
-				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 CSS
-			}
+	// 		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")
 
-			// Inject user JS
+	// 			w.injectCSS(defaultCSS)
-			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())
-			}
 
-			// Emit that everything is loaded and ready
+	// 		// Inject user JS
-			w.eventManager.Emit("wails:ready")
+	// 		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())
+	// 		}
+
+	// 		// 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

@@ -13,7 +13,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
+#cgo windows CFLAGS: -DWEBVIEW_WINAPI=1 -std=c99 -DUNICODE=1 -D_UNICODE=1
 #cgo windows LDFLAGS: -lole32 -lcomctl32 -loleaut32 -luuid -lgdi32
 
 #cgo darwin CFLAGS: -DWEBVIEW_COCOA=1 -x objective-c

lib/renderer/webview/webview.h

@@ -58,6 +58,7 @@ extern "C"
 #elif defined(WEBVIEW_WINAPI)
 #define CINTERFACE
 #include <windows.h>
+#include <tchar.h>
 
 #include <commctrl.h>
 #include <exdisp.h>
@@ -1350,8 +1351,8 @@ struct webview_priv
   }
 
 #define WEBVIEW_KEY_FEATURE_BROWSER_EMULATION \
-  "Software\\Microsoft\\Internet "            \
+  _T("Software\\Microsoft\\Internet "            \
-  "Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION"
+  "Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION")
 
   static int webview_fix_ie_compat_mode()
   {
@@ -1363,7 +1364,7 @@ struct webview_priv
     {
       return -1;
     }
-    for (p = &appname[strlen(appname) - 1]; p != appname && *p != '\\'; p--)
+    for (p = &appname[_tcslen(appname) - 1]; p != appname && *p != _T('\\'); p--)
     {
     }
     p++;
@@ -1872,14 +1873,30 @@ 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) { OutputDebugString(s); }
+  WEBVIEW_API void webview_print_log(const char *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,13 +95,6 @@ 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) {
@@ -211,6 +204,11 @@ 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,18 +1 @@
-<!DOCTYPE html>
+<!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>
-<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

@@ -0,0 +1 @@
+(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,10 +15,7 @@
             "error",
             "tab"
         ],
-        "linebreak-style": [
+        "linebreak-style": 0,
-            "error",
-            "unix"
-        ],
         "quotes": [
             "error",
             "single"

runtime/js/babel.config.js

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

runtime/js/bridge/webpack.config.js

@@ -0,0 +1,37 @@
+/* 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,7 +15,11 @@ The lightweight framework for web-like apps
  * @param {string} message
  */
 function Invoke(message) {
-	window.external.invoke(message);
+	if ( window.wailsbridge ) {
+		window.wailsbridge.websocket.send(message);
+	} else {
+		window.external.invoke(message);
+	}
 }
 
 /**

runtime/js/package.json

@@ -33,11 +33,15 @@
     "@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.35.3",
+    "webpack": "^4.41.2",
     "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,11 +1,12 @@
 {
   "name": "@wailsapp/runtime",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "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",
@@ -21,8 +22,18 @@
   "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": {
-    "dts-gen": "^0.5.8"
+    "babel-core": "^6.26.3",
+    "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

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

scripts/build.go

@@ -0,0 +1,82 @@
+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")
+}