Merge branch 'develop'

v1.10.0
Merge commit '73ee9ef5307c6fa12007395efc68c900ba90070a'
2026-04-16 19:55:05 -07:00 · 2020-12-08 20:43:40 +11:00 · 2020-12-08 20:40:37 +11:00 · 2020-12-08 20:39:29 +11:00 · 2020-11-26 20:44:42 +11:00 · 2020-11-01 06:32:42 +11:00
11 changed files with 86 additions and 41 deletions
--- a/cmd/cmd-mewn.go
+++ b/cmd/cmd-mewn.go
--- a/cmd/linux.go
+++ b/cmd/linux.go
@@ -65,6 +65,8 @@ const (
 	Solus
 	// Ctlos Linux distribution
 	Ctlos
 	// EndeavourOS linux distribution
 	EndeavourOS
 )
 // DistroInfo contains all the information relating to a linux distribution
@@ -132,7 +134,7 @@ func parseOsRelease(osRelease string) *DistroInfo {
 	case "archlabs":
 		result.Distribution = ArchLabs
 	case "ctlos":
-		result.Distribution = Ctlos	
+		result.Distribution = Ctlos
 	case "debian":
 		result.Distribution = Debian
 	case "ubuntu":
@@ -171,6 +173,8 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = PopOS
 	case "solus":
 		result.Distribution = Solus
 	case "endeavouros":
 		result.Distribution = EndeavourOS
 	default:
 		result.Distribution = Unknown
 	}
--- a/cmd/linuxdb.yaml
+++ b/cmd/linuxdb.yaml
@@ -202,7 +202,16 @@ distributions:
        name: Ctlos Linux
        gccversioncommand: *gccdumpversion
        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries                
+        libraries: *archdefaultlibraries   
  endeavouros:
    id: endeavouros
    releases:
      default:
        version: default
        name: EndeavourOS
        gccversioncommand: *gccdumpversion
        programs: *archdefaultprograms
        libraries: *archdefaultlibraries             
  manjaro:
    id: manjaro
    releases:
--- a/cmd/system.go
+++ b/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:
+		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM, EndeavourOS:
 			libraryChecker = PacmanInstalled
 		case CentOS, Fedora, Tumbleweed, Leap:
 			libraryChecker = RpmInstalled
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd
 // Version - Wails version
-const Version = "v1.9.1"
+const Version = "v1.10.0"
--- a/cmd/wails/4_build.go
+++ b/cmd/wails/4_build.go
@@ -73,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,20 +1,38 @@
 package wails
 import (
-	"github.com/leaanthony/mewn"
+	"fmt"
 	"net/url"
 	"strings"
 	"github.com/wailsapp/wails/runtime"
 )
 // AppConfig is the configuration structure used when creating a Wails App object
 type AppConfig struct {
-	Width, Height    int
+	// The width and height of your application in pixels
-	Title            string
+	Width, Height int
-	defaultHTML      string
+
-	HTML             string
+	// The title to put in the title bar
-	JS               string
+	Title string
-	CSS              string
+
-	Colour           string
+	// The HTML your app should use. If you leave it blank, a default will be used:
-	Resizable        bool
+	// <!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>
 	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
 }
@@ -33,9 +51,14 @@ func (a *AppConfig) GetTitle() string {
 	return a.Title
 }
-// GetDefaultHTML returns the default HTML
+// GetHTML returns the default HTML
-func (a *AppConfig) GetDefaultHTML() string {
+func (a *AppConfig) GetHTML() string {
-	return a.defaultHTML
+	if len(a.HTML) > 0 {
 		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
@@ -75,10 +98,18 @@ 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
 	}
 	if in.HTML != "" {
 		a.HTML = in.HTML
 	}
 	if in.Width != 0 {
 		a.Width = in.Width
 	}
@@ -99,7 +130,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 {
@@ -109,5 +140,23 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		}
 	}
 	println("****************************************************")
 	fmt.Printf("%+v\n", result)
 	println("****************************************************")
 	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/renderer/renderer-mewn.go
+++ b/lib/renderer/renderer-mewn.go
--- a/lib/renderer/webview.go
+++ b/lib/renderer/webview.go
@@ -58,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)
--- 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>
Author	SHA1	Message	Date
Lea Anthony	39d687fa31	Merge branch 'develop'	2020-12-08 20:43:40 +11:00
Lea Anthony	8a768cce77	v1.10.0	2020-12-08 20:40:37 +11:00
Lea Anthony	ee04a9235d	Merge commit '73ee9ef5307c6fa12007395efc68c900ba90070a'	2020-12-08 20:39:29 +11:00
Lea Anthony	7e67562e19	Support EndeavourOS (#565 )	2020-11-26 20:44:42 +11:00
Lea Anthony	25d8a8763a	v1.10.0-pre1	2020-11-01 06:32:42 +11:00
Lea Anthony	7929584ec5	542 use supplied html (#547 ) * Fix custom HTML * Update HTML escaping * Added more docs around config	2020-11-01 06:31:35 +11:00
Lea Anthony	0c2c56e1dd	v1.8.1 (#546 ) * resolve angular routing broken when app is built * Updated contributors * handle Set error on Update method * Remove incorrect build flag * v1.8.1-pre1 * added Get method * fixed return * implement gopath handling during cross compilation * update messages to output xgo version TODO: allow image override * use wailsapp/xgo:1.0.1 for cross-compiling * Support platform list in templates * Add warnings for windows builds * add fields Tags to ProjectOptions * add args tags to func BuildNative * add tags to func BuildDocker * delete escape tags * Update Contributors * feat: Vue3, Vue Router, Vuex, and Typescript Template * converted spaces to tabs in vue.config.js * single quotes and tabs Converted vue.config.js to using single quotes Converted example.spec.ts to tabs instead of spaces. * Added semicolons and mocha import * Update contributors * Make vue 3 template linux/mac only * Add tags to build * Add v2 artefacts * Update Vuetify in package.json (#537) * Update contributors * Replaced the old v-content tag with the new v-main (#536) * v1.8.1-pre4 * v1.8.1-pre5 * Update issue templates (#541) * Updated Contributors * Remove zero copy string conversion * v1.8.1-pre6 * Initial support for firebug (#543) * Initial support for firebug * Remove windows message * v1.8.1-pre7 * Update contributors * Allow use of custom HTML * Allow use of custom HTML (#545) * v1.8.1 Co-authored-by: Arthur Wiebe <arthur@artooro.com> Co-authored-by: Ilgıt Yıldırım <ilgit.yildirim@triplebits.com> Co-authored-by: Travis McLane <tmclane@gmail.com> Co-authored-by: Altynbek <go.gelleson@gmail.com> Co-authored-by: Kyle Muchmore <kyle.muchmore@kickview.com> Co-authored-by: Balakrishna Prasad Ganne <balkripra.1996@gmail.com>	2020-10-29 20:18:52 +11:00
Lea Anthony	5267968151	Merge branch 'master' of github.com:wailsapp/wails into master	2020-10-27 21:11:53 +11:00
Lea Anthony	7b31c8ddd2	Update issue templates	2020-10-27 21:11:46 +11:00
Lea Anthony	1e2bc5728a	Revert "resolve angular routing broken when app is built" This reverts commit `e0aab7c27f`.	2020-09-10 14:10:24 +10:00
Arthur Wiebe	e0aab7c27f	resolve angular routing broken when app is built	2020-09-10 14:10:00 +10:00