Merge branch 'develop' into feature/v2-mac

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,8 +8,12 @@ assignees: ''
 ---
 
 #####################################################
-     If you have a technical issue, please do not open a bug this way! 
-                      Please use the `wails issue` command!                          
+     **If you have a technical issue, please do not open a bug this way!** 
+                      Please use the `wails issue` command!
+          If you do not do this then the issue may be closed automatically.                      
+
+ NOTE: If your bug is related to Windows, make sure you read 
+ the [Windows Developer Guide](https://wails.app/guides/windows/)
 #####################################################
 
 **Description**
@@ -33,3 +37,5 @@ Please provide your platform, GO version and variables, etc
 
 **Additional context**
 Add any other context about the problem here.
+
+- [ ] This issue is for Windows and I have read the [Windows Developer Guide](https://wails.app/guides/windows/)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

CONTRIBUTORS.md

@@ -38,3 +38,6 @@ 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)
+  * [Elie Grenon](https://github.com/DrunkenPoney)

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() {

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

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
 	}

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:

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"`

cmd/semver.go

@@ -24,11 +24,19 @@ func NewSemanticVersion(version string) (*SemanticVersion, error) {
 
 // IsRelease returns true if it's a release version
 func (s *SemanticVersion) IsRelease() bool {
+	// Limit to v1
+	if s.Version.Major() != 1 {
+		return false
+	}
 	return len(s.Version.Prerelease()) == 0 && len(s.Version.Metadata()) == 0
 }
 
 // IsPreRelease returns true if it's a prerelease version
 func (s *SemanticVersion) IsPreRelease() bool {
+	// Limit to v1
+	if s.Version.Major() != 1 {
+		return false
+	}
 	return len(s.Version.Prerelease()) > 0
 }
 

cmd/semver_test.go

@@ -0,0 +1,65 @@
+package cmd
+
+import (
+	"testing"
+)
+
+func TestSemanticVersion_IsPreRelease(t *testing.T) {
+	tests := []struct {
+		name    string
+		version string
+		want    bool
+	}{
+		{"v1.6.7-pre0", "v1.6.7-pre0", true},
+		{"v2.6.7+pre0", "v2.6.7+pre0", false},
+		{"v2.6.7", "v2.6.7", false},
+		{"v2.0.0+alpha.1", "v2.0.0+alpha.1", false},
+		{"v2.0.0-alpha.1", "v2.0.0-alpha.1", false},
+		{"v1.6.7", "v1.6.7", false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			semanticversion, err := NewSemanticVersion(tt.version)
+			if err != nil {
+				t.Errorf("Invalid semantic version: %s", semanticversion)
+				return
+			}
+			s := &SemanticVersion{
+				Version: semanticversion.Version,
+			}
+			if got := s.IsPreRelease(); got != tt.want {
+				t.Errorf("IsPreRelease() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestSemanticVersion_IsRelease(t *testing.T) {
+	tests := []struct {
+		name    string
+		version string
+		want    bool
+	}{
+		{"v1.6.7", "v1.6.7", true},
+		{"v2.6.7-pre0", "v2.6.7-pre0", false},
+		{"v2.6.7", "v2.6.7", false},
+		{"v2.6.7+release", "v2.6.7+release", false},
+		{"v2.0.0-alpha.1", "v2.0.0-alpha.1", false},
+		{"v1.6.7-pre0", "v1.6.7-pre0", false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			semanticversion, err := NewSemanticVersion(tt.version)
+			if err != nil {
+				t.Errorf("Invalid semantic version: %s", semanticversion)
+				return
+			}
+			s := &SemanticVersion{
+				Version: semanticversion.Version,
+			}
+			if got := s.IsRelease(); got != tt.want {
+				t.Errorf("IsRelease() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

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

cmd/templates/vue3-full/frontend/package.json.template

@@ -19,16 +19,16 @@
     "@types/mocha": "^8.0.3",
     "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
-    "@vue/cli-plugin-eslint": "~4.5.6",
-    "@vue/cli-plugin-router": "~4.5.6",
-    "@vue/cli-plugin-typescript": "~4.5.6",
-    "@vue/cli-plugin-unit-mocha": "~4.5.6",
-    "@vue/cli-service": "~4.5.6",
+    "@vue/cli-plugin-eslint": "~4.5.9",
+    "@vue/cli-plugin-router": "~4.5.9",
+    "@vue/cli-plugin-typescript": "~4.5.9",
+    "@vue/cli-plugin-unit-mocha": "~4.5.9",
+    "@vue/cli-service": "~4.5.9",
     "@vue/compiler-sfc": "^3.0.0",
-    "@vue/eslint-config-typescript": "^5.1.0",
+    "@vue/eslint-config-typescript": "^7.0.0",
     "@vue/test-utils": "^2.0.0-0",
     "chai": "^4.2.0",
-    "eslint": "^7.10.0",
+    "eslint": "<7.0.0",
     "eslint-plugin-vue": "^7.0.0",
     "node-sass": "^4.14.1",
     "sass-loader": "^10.0.2",

cmd/version.go

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

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
@@ -80,6 +83,9 @@ 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,20 +1,37 @@
 package wails
 
 import (
-	"github.com/leaanthony/mewn"
+	"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
-	Title            string
-	defaultHTML      string
-	HTML             string
-	JS               string
-	CSS              string
-	Colour           string
-	Resizable        bool
+	// The width and height of your application in pixels
+	Width, Height int
+
+	// The title to put in the title bar
+	Title string
+
+	// The HTML your app should use. If you leave it blank, a default will be used:
+	// <!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 +50,14 @@ func (a *AppConfig) GetTitle() string {
 	return a.Title
 }
 
-// GetDefaultHTML returns the default HTML
-func (a *AppConfig) GetDefaultHTML() string {
-	return a.defaultHTML
+// GetHTML returns the default HTML
+func (a *AppConfig) GetHTML() string {
+	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 +97,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 +129,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 +141,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>`

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
-}
+}

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

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 {

lib/renderer/bridge/session.go

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