Merge branch 'develop' into new-templates

This reverts commit e0aab7c27f.

CONTRIBUTORS.md

@@ -38,5 +38,3 @@ Wails is what it is because of the time and effort given by these great people.
   * [Altynbek](https://github.com/gelleson)
   * [Kyle](https://github.com/kmuchmore)
   * [Balakrishna Prasad Ganne](https://github.com/aayush420)
-  * [Charaf Rezrazi](https://github.com/Rezrazi)
-  * [misitebao](https://github.com/misitebao)

app.go

@@ -2,6 +2,7 @@ package wails
 
 import (
 	"os"
+	"runtime"
 	"syscall"
 
 	"github.com/syossan27/tebata"
@@ -116,6 +117,11 @@ 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() {

cmd/helpers.go

@@ -574,10 +574,6 @@ 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

cmd/linux.go

@@ -65,8 +65,6 @@ const (
 	Solus
 	// Ctlos Linux distribution
 	Ctlos
-	// EndeavourOS linux distribution
-	EndeavourOS
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -173,8 +171,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = PopOS
 	case "solus":
 		result.Distribution = Solus
-	case "endeavouros":
-		result.Distribution = EndeavourOS
 	default:
 		result.Distribution = Unknown
 	}

cmd/linuxdb.yaml

@@ -203,15 +203,6 @@ distributions:
         gccversioncommand: *gccdumpversion
         programs: *archdefaultprograms
         libraries: *archdefaultlibraries                
-  endeavouros:
-    id: endeavouros
-    releases:
-      default:
-        version: default
-        name: EndeavourOS
-        gccversioncommand: *gccdumpversion
-        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries             
   manjaro:
     id: manjaro
     releases:

cmd/project.go

@@ -165,7 +165,6 @@ type ProjectOptions struct {
 	Architecture           string
 	LdFlags                string
 	GoPath                 string
-	UseFirebug             bool
 
 	// Supported platforms
 	Platforms []string `json:"platforms,omitempty"`

cmd/system.go

@@ -276,7 +276,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		switch distroInfo.Distribution {
 		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
 			libraryChecker = DpkgInstalled
-		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS:
+		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM:
 			libraryChecker = PacmanInstalled
 		case CentOS, Fedora, Tumbleweed, Leap:
 			libraryChecker = RpmInstalled

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v1.10.0-pre1"
+const Version = "v1.8.1-pre5"

cmd/wails/4_build.go

@@ -26,7 +26,6 @@ func init() {
 	var packageApp = false
 	var forceRebuild = false
 	var debugMode = false
-	var usefirebug = false
 	var gopath = ""
 	var typescriptFilename = ""
 	var verbose = false
@@ -43,7 +42,6 @@ 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).
@@ -82,9 +80,6 @@ func init() {
 			return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
 		}
 
-		// Set firebug flag
-		projectOptions.UseFirebug = usefirebug
-
 		// Check that this platform is supported
 		if !projectOptions.PlatformSupported() {
 			logger.Yellow("WARNING: This project is unsupported on %s - it probably won't work!\n         Valid platforms: %s\n", runtime.GOOS, strings.Join(projectOptions.Platforms, ", "))

config.go

@@ -1,39 +1,20 @@
 package wails
 
 import (
-	"fmt"
-	"net/url"
-	"strings"
-
 	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/runtime"
 )
 
 // AppConfig is the configuration structure used when creating a Wails App object
 type AppConfig struct {
-	// The width and height of your application in pixels
+	Width, Height    int
-	Width, Height int
+	Title            string
-
+	defaultHTML      string
-	// The title to put in the title bar
+	HTML             string
-	Title string
+	JS               string
-
+	CSS              string
-	// The HTML your app should use. If you leave it blank, a default will be used:
+	Colour           string
-	// <!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="IE=edge" content="IE=edge"></head><body><div id="app"></div><script type="text/javascript"></script></body></html>
+	Resizable        bool
-	HTML string
-
-	// The Javascript your app should use. Normally this should be generated by a bundler.
-	JS string
-
-	// The CSS your app should use. Normally this should be generated by a bundler.
-	CSS string
-
-	// The colour of your window. Can take "#fff", "rgb(255,255,255)", "rgba(255,255,255,1)" formats
-	Colour string
-
-	// Indicates whether your app should be resizable
-	Resizable bool
-
-	// Indicated if the devtools should be disabled
 	DisableInspector bool
 }
 
@@ -52,14 +33,9 @@ func (a *AppConfig) GetTitle() string {
 	return a.Title
 }
 
-// GetHTML returns the default HTML
+// GetDefaultHTML returns the default HTML
-func (a *AppConfig) GetHTML() string {
+func (a *AppConfig) GetDefaultHTML() string {
-	if len(a.HTML) > 0 {
+	return a.defaultHTML
-		a.HTML = url.QueryEscape(a.HTML)
-		a.HTML = "data:text/html," + strings.ReplaceAll(a.HTML, "+", "%20")
-		a.HTML = strings.ReplaceAll(a.HTML, "%3D", "=")
-	}
-	return a.HTML
 }
 
 // GetResizable returns true if the window should be resizable
@@ -103,10 +79,6 @@ func (a *AppConfig) merge(in *AppConfig) error {
 		a.JS = in.JS
 	}
 
-	if in.HTML != "" {
-		a.HTML = in.HTML
-	}
-
 	if in.Width != 0 {
 		a.Width = in.Width
 	}
@@ -137,9 +109,5 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		}
 	}
 
-	println("****************************************************")
-	fmt.Printf("%+v\n", result)
-	println("****************************************************")
-
 	return result, nil
 }

lib/interfaces/appconfig.go

@@ -6,7 +6,7 @@ type AppConfig interface {
 	GetHeight() int
 	GetTitle() string
 	GetResizable() bool
-	GetHTML() string
+	GetDefaultHTML() string
 	GetDisableInspector() bool
 	GetColour() string
 	GetCSS() string

lib/interfaces/renderer.go

@@ -8,6 +8,7 @@ import (
 type Renderer interface {
 	Initialise(AppConfig, IPCManager, EventManager) error
 	Run() error
+	EnableConsole()
 
 	// Binding
 	NewBinding(bindingName string) error

lib/renderer/bridge/bridge.go

@@ -56,6 +56,10 @@ 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 {

lib/renderer/bridge/session.go

@@ -2,6 +2,7 @@ package renderer
 
 import (
 	"time"
+	"unsafe"
 
 	"github.com/gorilla/websocket"
 	"github.com/leaanthony/mewn"
@@ -49,7 +50,7 @@ func (s *session) Identifier() string {
 
 func (s *session) sendMessage(msg string) error {
 	if !s.done {
-		s.writeChan <- []byte(msg)
+		s.writeChan <- *(*[]byte)(unsafe.Pointer(&msg))
 	}
 	return nil
 }

lib/renderer/webview.go

@@ -18,17 +18,14 @@ 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
+	window        wv.WebView // The webview object
-	ipc          interfaces.IPCManager
+	ipc           interfaces.IPCManager
-	log          *logger.CustomLogger
+	log           *logger.CustomLogger
-	config       interfaces.AppConfig
+	config        interfaces.AppConfig
-	eventManager interfaces.EventManager
+	eventManager  interfaces.EventManager
-	bindingCache []string
+	bindingCache  []string
+	enableConsole bool
 }
 
 // NewWebView returns a new WebView struct
@@ -58,7 +55,7 @@ func (w *WebView) Initialise(config interfaces.AppConfig, ipc interfaces.IPCMana
 		Height:    config.GetHeight(),
 		Title:     config.GetTitle(),
 		Resizable: config.GetResizable(),
-		URL:       config.GetHTML(),
+		URL:       config.GetDefaultHTML(),
 		Debug:     !config.GetDisableInspector(),
 		ExternalInvokeCallback: func(_ wv.WebView, message string) {
 			w.ipc.Dispatch(message, w.callback)
@@ -107,6 +104,11 @@ 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)
@@ -177,9 +179,10 @@ func (w *WebView) Run() error {
 	w.log.Info("Running...")
 
 	// Inject firebug in debug mode on Windows
-	if UseFirebug != "" {
+	if w.enableConsole {
-		w.log.Debug("Injecting Firebug")
+		w.log.Debug("Enabling Wails console")
-		w.evalJS(`window.usefirebug=true;`)
+		console := mewn.String("../../runtime/assets/console.js")
+		w.evalJS(console)
 	}
 
 	// Runtime assets

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, InjectFirebug } from './utils';
+import { AddScript, InjectCSS } from './utils';
 import { AddIPCListener } from './ipc';
 import * as Store from './store';
 
@@ -60,11 +60,6 @@ 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');
 

runtime/js/core/utils.js

@@ -20,18 +20,6 @@ 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');