v1.10.1 (#572 )

Merge branch 'develop'
Merge commit '73ee9ef5307c6fa12007395efc68c900ba90070a'
2026-04-22 15:26:15 -07:00 · 2020-12-08 20:50:58 +11:00 · 2020-12-08 20:43:40 +11:00 · 2020-12-08 20:39:29 +11:00 · 2020-10-29 20:18:52 +11:00 · 2020-10-27 21:11:53 +11:00
6 changed files with 24 additions and 24 deletions
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.10.0"
+const Version = "v1.10.1"
@@ -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
@@ -5,7 +5,6 @@ import (
 	"net/url"
 	"strings"

-	"github.com/leaanthony/mewn"
 	"github.com/wailsapp/wails/runtime"
 )

@@ -99,6 +98,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
 	}
@@ -127,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 {
@@ -143,3 +146,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>`
@@ -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	7c04a854da	v1.10.1 (#572 )	2020-12-08 20:50:58 +11:00
Lea Anthony	39d687fa31	Merge branch 'develop'	2020-12-08 20:43:40 +11:00
Lea Anthony	ee04a9235d	Merge commit '73ee9ef5307c6fa12007395efc68c900ba90070a'	2020-12-08 20:39:29 +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