v1.9.0

v1.8.1
Merge branches '542-use-supplied-HTML' and 'develop' of github.com:wailsapp/wails into develop
2026-04-02 21:29:17 -07:00 · 2020-10-29 20:20:26 +11:00 · 2020-10-29 20:17:42 +11:00 · 2020-10-29 20:17:37 +11:00 · 2020-10-29 19:57:11 +11:00 · 2020-10-29 19:54:49 +11:00
17 changed files with 71 additions and 60 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -39,3 +39,4 @@ Wails is what it is because of the time and effort given by these great people.
  * [Kyle](https://github.com/kmuchmore)
  * [Balakrishna Prasad Ganne](https://github.com/aayush420)
  * [Charaf Rezrazi](https://github.com/Rezrazi)
+  * [misitebao](https://github.com/misitebao)
--- a/app.go
+++ b/app.go
@@ -2,7 +2,6 @@ package wails

 import (
 	"os"
-	"runtime"
 	"syscall"

 	"github.com/syossan27/tebata"
@@ -117,11 +116,6 @@ func (a *App) start() error {
 		return err
 	}

-	// Enable console for Windows debug builds
-	if runtime.GOOS == "windows" && BuildMode == cmd.BuildModeDebug {
-		a.renderer.EnableConsole()
-	}
-
 	// Start signal handler
 	t := tebata.New(os.Interrupt, os.Kill, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
 	t.Reserve(func() {
--- a/cmd/helpers.go
+++ b/cmd/helpers.go
@@ -574,6 +574,10 @@ func ldFlags(po *ProjectOptions, buildMode string) string {
 		ldflags += "-H windowsgui "
 	}

+	if po.UseFirebug {
+		ldflags += "-X github.com/wailsapp/wails/lib/renderer.UseFirebug=true "
+	}
+
 	ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode

 	// Add additional ldflags passed in via the `ldflags` cli flag
--- a/cmd/project.go
+++ b/cmd/project.go
@@ -165,6 +165,7 @@ type ProjectOptions struct {
 	Architecture           string
 	LdFlags                string
 	GoPath                 string
+	UseFirebug             bool

 	// Supported platforms
 	Platforms []string `json:"platforms,omitempty"`
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.8.1-pre6"
+const Version = "v1.9.0"
--- a/cmd/wails/4_build.go
+++ b/cmd/wails/4_build.go
@@ -26,6 +26,7 @@ func init() {
 	var packageApp = false
 	var forceRebuild = false
 	var debugMode = false
+	var usefirebug = false
 	var gopath = ""
 	var typescriptFilename = ""
 	var verbose = false
@@ -42,6 +43,7 @@ func init() {
 		BoolFlag("p", "Package application on successful build", &packageApp).
 		BoolFlag("f", "Force rebuild of application components", &forceRebuild).
 		BoolFlag("d", "Build in Debug mode", &debugMode).
+		BoolFlag("firebug", "Enable firebug console for debug builds", &usefirebug).
 		BoolFlag("verbose", "Verbose output", &verbose).
 		StringFlag("t", "Generate Typescript definitions to given file (at runtime)", &typescriptFilename).
 		StringFlag("ldflags", "Extra options for -ldflags", &ldflags).
@@ -71,6 +73,7 @@ func init() {
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}
 		projectOptions.Verbose = verbose
+		projectOptions.UseFirebug = usefirebug

 		// Check we are in project directory
 		// Check project.json loads correctly
--- a/config.go
+++ b/config.go
@@ -1,7 +1,8 @@
 package wails

 import (
-	"github.com/leaanthony/mewn"
+	b64 "encoding/base64"
+
 	"github.com/wailsapp/wails/runtime"
 )

@@ -9,7 +10,6 @@ import (
 type AppConfig struct {
 	Width, Height    int
 	Title            string
-	defaultHTML      string
 	HTML             string
 	JS               string
 	CSS              string
@@ -33,9 +33,9 @@ func (a *AppConfig) GetTitle() string {
 	return a.Title
 }

-// GetDefaultHTML returns the default HTML
-func (a *AppConfig) GetDefaultHTML() string {
-	return a.defaultHTML
+// GetHTML returns the HTML for the app
+func (a *AppConfig) GetHTML() string {
+	return "data:text/html;base64," + b64.URLEncoding.EncodeToString([]byte(a.HTML))
 }

 // GetResizable returns true if the window should be resizable
@@ -75,6 +75,10 @@ func (a *AppConfig) merge(in *AppConfig) error {
 		a.Colour = in.Colour
 	}

+	if in.HTML != "" {
+		a.HTML = in.HTML
+	}
+
 	if in.JS != "" {
 		a.JS = in.JS
 	}
@@ -99,7 +103,7 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		Resizable: true,
 		Title:     "My Wails App",
 		Colour:    "#FFF", // White by default
-		HTML:      mewn.String("./runtime/assets/default.html"),
+		HTML:      defaultHTML,
 	}

 	if userConfig != nil {
@@ -111,3 +115,17 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {

 	return result, nil
 }
+
+var defaultHTML = `<!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>
+</body>
+
+</html>`
--- a/lib/interfaces/appconfig.go
+++ b/lib/interfaces/appconfig.go
@@ -6,9 +6,9 @@ type AppConfig interface {
 	GetHeight() int
 	GetTitle() string
 	GetResizable() bool
-	GetDefaultHTML() string
+	GetHTML() string
 	GetDisableInspector() bool
 	GetColour() string
 	GetCSS() string
 	GetJS() string
-}
+}
--- a/lib/interfaces/renderer.go
+++ b/lib/interfaces/renderer.go
@@ -8,7 +8,6 @@ import (
 type Renderer interface {
 	Initialise(AppConfig, IPCManager, EventManager) error
 	Run() error
-	EnableConsole()

 	// Binding
 	NewBinding(bindingName string) error
--- a/lib/renderer/bridge/bridge.go
+++ b/lib/renderer/bridge/bridge.go
@@ -56,10 +56,6 @@ func (h *Bridge) Initialise(appConfig interfaces.AppConfig, ipcManager interface
 	return nil
 }

-// EnableConsole not needed for bridge!
-func (h *Bridge) EnableConsole() {
-}
-
 func (h *Bridge) wsBridgeHandler(w http.ResponseWriter, r *http.Request) {
 	conn, err := websocket.Upgrade(w, r, w.Header(), 1024, 1024)
 	if err != nil {
--- a/lib/renderer/bridge/renderer-mewn.go
+++ b/lib/renderer/bridge/renderer-mewn.go
--- a/lib/renderer/renderer-mewn.go
+++ b/lib/renderer/renderer-mewn.go
--- a/lib/renderer/webview.go
+++ b/lib/renderer/webview.go
@@ -18,14 +18,17 @@ import (

 // WebView defines the main webview application window
 // Default values in []
+
+// UseFirebug indicates whether to inject the firebug console
+var UseFirebug = ""
+
 type WebView struct {
-	window        wv.WebView // The webview object
-	ipc           interfaces.IPCManager
-	log           *logger.CustomLogger
-	config        interfaces.AppConfig
-	eventManager  interfaces.EventManager
-	bindingCache  []string
-	enableConsole bool
+	window       wv.WebView // The webview object
+	ipc          interfaces.IPCManager
+	log          *logger.CustomLogger
+	config       interfaces.AppConfig
+	eventManager interfaces.EventManager
+	bindingCache []string
 }

 // NewWebView returns a new WebView struct
@@ -55,7 +58,7 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 		Height:    config.GetHeight(),
 		Title:     config.GetTitle(),
 		Resizable: config.GetResizable(),
-		URL:       config.GetDefaultHTML(),
+		URL:       config.GetHTML(),
 		Debug:     !config.GetDisableInspector(),
 		ExternalInvokeCallback: func(_ wv.WebView, message string) {
 			w.ipc.Dispatch(message, w.callback)
@@ -104,11 +107,6 @@ func (w *WebView) evalJS(js string) error {
 	return nil
 }

-// EnableConsole enables the console!
-func (w *WebView) EnableConsole() {
-	w.enableConsole = true
-}
-
 // Escape the Javascripts!
 func escapeJS(js string) (string, error) {
 	result := strings.Replace(js, "\\", "\\\\", -1)
@@ -179,10 +177,9 @@ func (w *WebView) Run() error {
 	w.log.Info("Running...")

 	// Inject firebug in debug mode on Windows
-	if w.enableConsole {
-		w.log.Debug("Enabling Wails console")
-		console := mewn.String("../../runtime/assets/console.js")
-		w.evalJS(console)
+	if UseFirebug != "" {
+		w.log.Debug("Injecting Firebug")
+		w.evalJS(`window.usefirebug=true;`)
 	}

 	// Runtime assets
--- a/runtime/assets/default.html
+++ b/runtime/assets/default.html
@@ -1,18 +0,0 @@
-<!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>
--- a/runtime/assets/wails.js
+++ b/runtime/assets/wails.js
--- a/runtime/js/core/main.js
+++ b/runtime/js/core/main.js
@@ -13,7 +13,7 @@ import * as Browser from './browser';
 import { On, OnMultiple, Emit, Notify, Heartbeat, Acknowledge } from './events';
 import { NewBinding } from './bindings';
 import { Callback } from './calls';
-import { AddScript, InjectCSS } from './utils';
+import { AddScript, InjectCSS, InjectFirebug } from './utils';
 import { AddIPCListener } from './ipc';
 import * as Store from './store';

@@ -60,6 +60,11 @@ window.onerror = function (msg, url, lineNo, columnNo, error) {
 	window.wails.Log.Error('error: ' + error);
 };

+// Use firebug?
+if( window.usefirebug ) { 
+	InjectFirebug();
+}
+
 // Emit loaded event
 Emit('wails:loaded');

--- a/runtime/js/core/utils.js
+++ b/runtime/js/core/utils.js
@@ -20,6 +20,18 @@ export function AddScript(js, callbackID) {
 	}
 }

+export function InjectFirebug() {
+	// set the debug attribute on HTML
+	var html = document.getElementsByTagName('html')[0];
+	html.setAttribute('debug', 'true');
+	var firebugURL = 'https://wails.app/assets/js/firebug-lite.js#startOpened=true,disableWhenFirebugActive=false';
+	var script = document.createElement('script');
+	script.src = firebugURL;
+	script.type = 'application/javascript';
+	document.head.appendChild(script);
+	window.wails.Log.Info('Injected firebug');
+}
+
 // Adapted from webview - thanks zserge!
 export function InjectCSS(css) {
 	var elem = document.createElement('style');
Author	SHA1	Message	Date
Lea Anthony	e2599c0f76	v1.9.0	2020-10-29 20:20:26 +11:00
Lea Anthony	39878c1a52	v1.8.1	2020-10-29 20:17:42 +11:00
Lea Anthony	c0932f3fa4	Merge branches '542-use-supplied-HTML' and 'develop' of github.com:wailsapp/wails into develop	2020-10-29 20:17:37 +11:00
Lea Anthony	dc605c1683	Allow use of custom HTML (#545 )	2020-10-29 19:57:11 +11:00
Lea Anthony	c7c9ace232	Allow use of custom HTML	2020-10-29 19:54:49 +11:00
Lea Anthony	5be197b68f	Update contributors	2020-10-28 21:33:06 +11:00
Lea Anthony	3e5c406c95	Merge branch 'develop' of https://github.com/wailsapp/wails into develop	2020-10-28 21:21:13 +11:00
Lea Anthony	be6bebebe4	v1.8.1-pre7	2020-10-28 21:21:10 +11:00
Lea Anthony	5b33ed28fd	Initial support for firebug (#543 ) * Initial support for firebug * Remove windows message	2020-10-28 21:20:47 +11:00