Merge branch 'master' into develop

[v1] Update logrus to v1.8.1
[mac] Fixes #879
2026-04-22 15:26:15 -07:00 · 2021-10-26 19:35:18 +11:00 · 2021-10-26 19:32:53 +11:00 · 2021-10-26 19:28:15 +11:00 · 2021-10-26 19:21:41 +11:00 · 2021-10-26 19:20:39 +11:00
84 changed files with 4699 additions and 16080 deletions
@@ -1,5 +1,5 @@
 <p align="center" style="text-align: center">
-   <img src="logo_cropped.png" width="40%"><br/>
+   <img src="logo.png" width="55%"><br/>
 </p>
 <p align="center">
   Build desktop applications using Go & Web Technologies.<br/><br/>
@@ -79,48 +79,49 @@ This project is supported by these kind people / companies:
 <a href="https://github.com/snider" style="width:100px;">
  <img src="https://github.com/snider.png?size=100" width="100"/>
 </a>
+<a href="https://github.com/codydbentley" style="width:100px">
+  <img src="https://github.com/codydbentley.png?size=100" width="100"/>
+</a>
+<br/>
 <br/>
 <a href="https://github.com/matryer" style="width:100px">
  <img src="https://github.com/matryer.png" width="100"/>
 </a>
 <a href="https://www.jetbrains.com?from=Wails" style="width:100px">
-  <img src="jetbrains-grayscale.png" width="100"/>
+  <img src="/img/jetbrains-grayscale.png" width="100"/>
 </a>
-<a href="https://github.com/tc-hib" style="width:55px;border-radius: 50%">
- <img src="https://github.com/tc-hib.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/tc-hib" style="width:55px">
+ <img src="https://github.com/tc-hib.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/picatz" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/picatz.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/picatz" style="width:50px">
+  <img src="https://github.com/picatz.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/tylertravisty" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/tylertravisty.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/tylertravisty" style="width:50px">
+  <img src="https://github.com/tylertravisty.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/akhudek" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/akhudek.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/akhudek" style="width:50px">
+  <img src="https://github.com/akhudek.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/trea" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/trea.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/trea" style="width:50px">
+  <img src="https://github.com/trea.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/LanguageAgnostic" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/LanguageAgnostic" style="width:55px">
+  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/fcjr" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/fcjr.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/fcjr" style="width:55px">
+  <img src="https://github.com/fcjr.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/nickarellano" style="width:60px;border-radius: 50%">
-  <img src="https://github.com/nickarellano.png?size=60" width="60" style="border-radius: 50%"/>
+<a href="https://github.com/nickarellano" style="width:60px">
+  <img src="https://github.com/nickarellano.png?size=60" width="60"/>
 </a>
-<a href="https://github.com/bglw" style="width:65px;border-radius: 50%">
-  <img src="https://github.com/bglw.png?size=65" width="65" style="border-radius: 50%"/>
+<a href="https://github.com/bglw" style="width:65px">
+  <img src="https://github.com/bglw.png?size=65" width="65"/>
 </a>
-<a href="https://github.com/jugglingjsons" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/jugglingjsons.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/jugglingjsons" style="width:50px">
+  <img src="https://github.com/jugglingjsons.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/marcus-crane" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/marcus-crane.png?size=50" width="50" style="border-radius: 50%"/>
-</a>
-<a href="https://github.com/codydbentley" style="width:65px">
-  <img src="https://github.com/codydbentley.png?size=65" width="65"/>
+<a href="https://github.com/marcus-crane" style="width:65px">
+  <img src="https://github.com/marcus-crane.png?size=65" width="65"/>
 </a>
 <a href="https://github.com/bbergshaven" style="width:45px">
  <img src="https://github.com/bbergshaven.png?size=45" width="45"/>
@@ -128,7 +129,18 @@ This project is supported by these kind people / companies:
 <a href="https://github.com/Gilgames000" style="width:45px">
  <img src="https://github.com/Gilgames000.png?size=45" width="45"/>
 </a>
-
+<a href="https://github.com/ilgityildirim" style="width:50px">
+  <img src="https://github.com/ilgityildirim.png?size=50" width="50"/>
+</a>
+<a href="https://github.com/ondoki" style="width:65px">
+  <img src="https://github.com/ondoki.png?size=65" width="65"/>
+</a>
+<a href="https://github.com/questrail" style="width:50px">
+  <img src="https://github.com/questrail.png?size=50" width="50"/>
+</a>
+<a href="https://github.com/DonTomato" style="width:45px">
+  <img src="https://github.com/DonTomato.png?size=45" width="45"/>
+</a>

 <span id="nav-5"></span>

@@ -1,5 +1,5 @@
 <p align="center" style="text-align: center">
-   <img src="logo_cropped.png" width="40%"><br/>
+   <img src="logo.png" width="40%"><br/>
 </p>
 <p align="center">
   使用 Go 和 Web 技术构建桌面应用程序。<br/><br/>
@@ -73,47 +73,74 @@

 这个项目由以下这些人或者公司支持：

+
+<a href="https://github.com/sponsors/leaanthony" style="width:100px;">
+  <img src="sponsors/bronze%20sponsor.png" width="100"/>
+</a>
+<a href="https://github.com/snider" style="width:100px;">
+  <img src="https://github.com/snider.png?size=100" width="100"/>
+</a>
+<a href="https://github.com/codydbentley" style="width:100px">
+  <img src="https://github.com/codydbentley.png?size=100" width="100"/>
+</a>
+<br/>
+<br/>
 <a href="https://github.com/matryer" style="width:100px">
  <img src="https://github.com/matryer.png" width="100"/>
 </a>
 <a href="https://www.jetbrains.com?from=Wails" style="width:100px">
-  <img src="jetbrains-grayscale.png" width="100"/>
+  <img src="/img/jetbrains-grayscale.png" width="100"/>
 </a>
-<a href="https://github.com/tc-hib" style="width:55px;border-radius: 50%">
- <img src="https://github.com/tc-hib.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/tc-hib" style="width:55px">
+ <img src="https://github.com/tc-hib.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/picatz" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/picatz.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/picatz" style="width:50px">
+  <img src="https://github.com/picatz.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/tylertravisty" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/tylertravisty.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/tylertravisty" style="width:50px">
+  <img src="https://github.com/tylertravisty.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/akhudek" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/akhudek.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/akhudek" style="width:50px">
+  <img src="https://github.com/akhudek.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/trea" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/trea.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/trea" style="width:50px">
+  <img src="https://github.com/trea.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/LanguageAgnostic" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/LanguageAgnostic" style="width:55px">
+  <img src="https://github.com/LanguageAgnostic.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/snider" style="width:60px;border-radius: 50%">
-  <img src="https://github.com/snider.png?size=60" width="60" style="border-radius: 50%"/>
+<a href="https://github.com/fcjr" style="width:55px">
+  <img src="https://github.com/fcjr.png?size=55" width="55"/>
 </a>
-<a href="https://github.com/fcjr" style="width:55px;border-radius: 50%">
-  <img src="https://github.com/fcjr.png?size=55" width="55" style="border-radius: 50%"/>
+<a href="https://github.com/nickarellano" style="width:60px">
+  <img src="https://github.com/nickarellano.png?size=60" width="60"/>
 </a>
-<a href="https://github.com/nickarellano" style="width:60px;border-radius: 50%">
-  <img src="https://github.com/nickarellano.png?size=60" width="60" style="border-radius: 50%"/>
+<a href="https://github.com/bglw" style="width:65px">
+  <img src="https://github.com/bglw.png?size=65" width="65"/>
 </a>
-<a href="https://github.com/bglw" style="width:65px;border-radius: 50%">
-  <img src="https://github.com/bglw.png?size=65" width="65" style="border-radius: 50%"/>
+<a href="https://github.com/jugglingjsons" style="width:50px">
+  <img src="https://github.com/jugglingjsons.png?size=50" width="50"/>
 </a>
-<a href="https://github.com/jugglingjsons" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/jugglingjsons.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/marcus-crane" style="width:65px">
+  <img src="https://github.com/marcus-crane.png?size=65" width="65"/>
 </a>
-<a href="https://github.com/marcus-crane" style="width:50px;border-radius: 50%">
-  <img src="https://github.com/marcus-crane.png?size=50" width="50" style="border-radius: 50%"/>
+<a href="https://github.com/bbergshaven" style="width:45px">
+  <img src="https://github.com/bbergshaven.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/Gilgames000" style="width:45px">
+  <img src="https://github.com/Gilgames000.png?size=45" width="45"/>
+</a>
+<a href="https://github.com/ilgityildirim" style="width:50px">
+  <img src="https://github.com/ilgityildirim.png?size=50" width="50"/>
+</a>
+<a href="https://github.com/ondoki" style="width:65px">
+  <img src="https://github.com/ondoki.png?size=65" width="65"/>
+</a>
+<a href="https://github.com/questrail" style="width:50px">
+  <img src="https://github.com/questrail.png?size=50" width="50"/>
+</a>
+<a href="https://github.com/DonTomato" style="width:45px">
+  <img src="https://github.com/DonTomato.png?size=45" width="45"/>
 </a>

 <span id="nav-5"></span>
@@ -71,6 +71,11 @@ const (
 	Crux
 	// RHEL distribution
 	RHEL
+	// NixOS distribution
+	NixOS
+	// Artix linux distribution
+	ArtixLinux
+
 )

 // DistroInfo contains all the information relating to a linux distribution
@@ -183,6 +188,10 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = EndeavourOS
 	case "crux":
 		result.Distribution = Crux
+	case "nixos":
+		result.Distribution = NixOS
+	case "artix":
+		result.Distribution = ArtixLinux
 	default:
 		result.Distribution = Unknown
 	}
@@ -274,6 +283,18 @@ func PrtGetInstalled(packageName string) (bool, error) {
 	return exitCode == 0, nil
 }

+// NixEnvInstalled uses nix-env to see if a package is installed
+func NixEnvInstalled(packageName string) (bool, error) {
+	program := NewProgramHelper()
+	nixEnv := program.FindProgram("nix-env")
+	if nixEnv == nil {
+		return false, fmt.Errorf("cannot check dependencies: nix-env not found")
+	}
+	packageName = strings.ReplaceAll(packageName, "+", `\+`)
+	_, _, exitCode, _ := nixEnv.Run("-q", packageName)
+	return exitCode == 0, nil
+}
+
 // RequestSupportForDistribution promts the user to submit a request to support their
 // currently unsupported distribution
 func RequestSupportForDistribution(distroInfo *DistroInfo) error {
@@ -213,6 +213,15 @@ distributions:
        gccversioncommand: *gccdumpversion
        programs: *archdefaultprograms
        libraries: *archdefaultlibraries
+  artix:
+    id: artix 
+    releases:
+      default:
+        version: default
+        name: Artix Linux
+        gccversioncommand: *gccdumpversion
+        programs: *archdefaultprograms
+        libraries: *archdefaultlibraries
  ctlos:
    id: ctlos
    releases:
@@ -345,3 +354,22 @@ distributions:
            help: Please install with `sudo prt-get depinst gtk3` and try again
          - name: webkitgtk
            help: Please install with `sudo prt-get depinst webkitgtk` and try again
+  nixos:
+    id: nixos
+    releases:
+      default:
+        version: default
+        name: NixOS
+        gccversioncommand: *gccdumpversion
+        programs:
+          - name: gcc
+            help: Please install with `nix-env -iA nixos.gcc`
+          - name: pkg-config
+            help: Please install with `nix-env -iA nixos.pkg-config`
+          - name: npm
+            help: Please install with `nix-env -iA nixos.nodejs`
+        libraries:
+          - name: gtk+3
+            help: Please install with `nix-env -iA nixos.gtk3`
+          - name: webkitgtk
+            help: Please install with `nix-env -iA nixos.nodePackages.webkitgtk`
@@ -281,7 +281,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, EndeavourOS, ArtixLinux:
 			libraryChecker = PacmanInstalled
 		case CentOS, Fedora, Tumbleweed, Leap, RHEL:
 			libraryChecker = RpmInstalled
@@ -293,6 +293,8 @@ func CheckDependencies(logger *Logger) (bool, error) {
 			libraryChecker = EOpkgInstalled
 		case Crux:
 			libraryChecker = PrtGetInstalled
+		case NixOS:
+			libraryChecker = NixEnvInstalled
 		default:
 			return false, RequestSupportForDistribution(distroInfo)
 		}
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.16.5"
+const Version = "v1.16.7"
@@ -15,6 +15,7 @@ func init() {
 	projectOptions := projectHelper.NewProjectOptions()
 	commandDescription := `Generates a new Wails project using the given flags. 
 Any flags that are required and not given will be prompted for.`
+	build := false

 	initCommand := app.Command("init", "Initialises a new Wails project").
 		LongDescription(commandDescription).
@@ -23,7 +24,8 @@ Any flags that are required and not given will be prompted for.`
 		StringFlag("template", "Template name", &projectOptions.Template).
 		StringFlag("name", "Project name", &projectOptions.Name).
 		StringFlag("description", "Project description", &projectOptions.Description).
-		StringFlag("output", "Output binary name", &projectOptions.BinaryName)
+		StringFlag("output", "Output binary name", &projectOptions.BinaryName).
+		BoolFlag("build", "Build project after generating", &build)

 	initCommand.Action(func() error {

@@ -64,6 +66,10 @@ Any flags that are required and not given will be prompted for.`
 			return err
 		}
 		genSpinner.Success()
+		if !build {
+			logger.Yellow("Project '%s' initialised. Run `wails build` to build it.", projectOptions.Name)
+			return nil
+		}

 		// Build the project
 		cwd, _ := os.Getwd()
@@ -16,12 +16,13 @@ require (
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
 	github.com/pkg/errors v0.8.1 // indirect
-	github.com/sirupsen/logrus v1.4.1
+	github.com/sirupsen/logrus v1.8.1
+	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/syossan27/tebata v0.0.0-20180602121909-b283fe4bc5ba
 	golang.org/x/image v0.0.0-20200430140353-33d19683fad8
 	golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
-	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c
+	golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359
 	golang.org/x/text v0.3.0
 	gopkg.in/AlecAivazis/survey.v1 v1.8.4
 	gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
@@ -54,6 +54,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -76,9 +78,12 @@ golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
 golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 h1:2B5p2L5IfGiD7+b9BOoRMC6DgObAVZV+Fsp050NqXik=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 gopkg.in/AlecAivazis/survey.v1 v1.8.4 h1:10xXXN3wgIhPheb5NI58zFgZv32Ana7P3Tl4shW+0Qc=
@@ -54,7 +54,7 @@ extern "C"
    int ready;
    int js_busy;
    int should_exit;
-    
+
    int min_width;
    int min_height;
    int max_width;
@@ -179,7 +179,7 @@ struct webview_priv
  WEBVIEW_API int webview_inject_css(struct webview *w, const char *css);
  WEBVIEW_API void webview_set_title(struct webview *w, const char *title);
  WEBVIEW_API void webview_focus(struct webview *w);
-  WEBVIEW_API void webview_minsize(struct webview *w, int width, int height);  
+  WEBVIEW_API void webview_minsize(struct webview *w, int width, int height);
  WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height);
  WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen);
  WEBVIEW_API void webview_set_color(struct webview *w, uint8_t r, uint8_t g,
@@ -342,12 +342,12 @@ struct webview_priv
    w->priv.should_exit = 0;
    w->priv.queue = g_async_queue_new();
    w->priv.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    
+
    w->priv.min_width = -1;
    w->priv.min_height = -1;
    w->priv.max_width = -1;
    w->priv.max_height = -1;
-    
+
    gtk_window_set_title(GTK_WINDOW(w->priv.window), w->title);

    if (w->resizable)
@@ -421,13 +421,13 @@ struct webview_priv
  }

  WEBVIEW_API void webview_minsize(struct webview *w, int width, int height) {
-  
+
    w->priv.min_width = width;
    w->priv.min_height = height;

    GdkGeometry hints;
    GdkWindowHints usedHints = (GdkWindowHints) GDK_HINT_MIN_SIZE;
-    
+
    hints.min_width = w->priv.min_width;
    hints.min_height = w->priv.min_height;
    if (w->priv.max_width != -1) {
@@ -435,18 +435,18 @@ struct webview_priv
      hints.max_height = w->priv.max_height;
      usedHints = (GdkWindowHints)(GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
    }
-    
+
    gtk_window_set_geometry_hints(GTK_WINDOW(w->priv.window), w->priv.window, &hints, usedHints);
  }

  WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height) {
-    
+
    w->priv.max_width = width;
    w->priv.max_height = height;
-  
+
    GdkGeometry hints;
    GdkWindowHints usedHints = (GdkWindowHints) GDK_HINT_MAX_SIZE;
-    
+
    if (w->priv.min_width != -1) {
      hints.min_width = w->priv.min_width;
      hints.min_height = w->priv.min_height;
@@ -454,7 +454,7 @@ struct webview_priv
    }
    hints.max_width = w->priv.max_width;
    hints.max_height = w->priv.max_height;
-    
+
    gtk_window_set_geometry_hints(GTK_WINDOW(w->priv.window), w->priv.window, &hints, usedHints);
  }

@@ -514,7 +514,6 @@ struct webview_priv
      }
      gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dlg), FALSE);
      gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dlg), FALSE);
-      gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(dlg), TRUE);
      gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dlg), TRUE);
      gtk_file_chooser_set_create_folders(GTK_FILE_CHOOSER(dlg), TRUE);
      gint response = gtk_dialog_run(GTK_DIALOG(dlg));
@@ -1398,12 +1397,12 @@ struct webview_priv
    case WM_GETMINMAXINFO:
    {
      if (w != NULL) {
-        // get pixel density 
+        // get pixel density
        HDC hDC = GetDC(NULL);
        double DPIScaleX = GetDeviceCaps(hDC, 88)/96.0;
        double DPIScaleY = GetDeviceCaps(hDC, 90)/96.0;
        ReleaseDC(NULL, hDC);
-      	
+
        RECT rcClient, rcWind;
        POINT ptDiff;
        GetClientRect(hwnd, &rcClient);
@@ -1413,7 +1412,7 @@ struct webview_priv
        int heightExtra = (rcWind.bottom - rcWind.top) - rcClient.bottom;

        LPMINMAXINFO lpMMI = (LPMINMAXINFO)lParam;
-      
+
        if (w->priv.min_width != -1) {
          lpMMI->ptMinTrackSize.x = w->priv.min_width * DPIScaleX + widthExtra;
          lpMMI->ptMinTrackSize.y = w->priv.min_height * DPIScaleY + heightExtra;
@@ -1423,7 +1422,7 @@ struct webview_priv
          lpMMI->ptMaxTrackSize.y = w->priv.max_height * DPIScaleY + heightExtra;
        }
      }
-      
+
      return 0;
    }
    case WM_DESTROY:
@@ -2328,14 +2327,14 @@ struct webview_priv
  {
    [w->priv.window makeKeyWindow];
  }
-  
+
  WEBVIEW_API void webview_minsize(struct webview *w, int width, int height) {
    NSSize size;
    size.width = width;
    size.height = height;
    [w->priv.window setMinSize:size];
  }
-  
+
  WEBVIEW_API void webview_maxsize(struct webview *w, int width, int height) {
    NSSize size;
    size.width = width;
@@ -2346,7 +2345,7 @@ struct webview_priv
    [button performSelectorOnMainThread:@selector(setEnabled:) withObject:NO
    waitUntilDone:NO];
  }
-  
+
  WEBVIEW_API void webview_set_fullscreen(struct webview *w, int fullscreen)
  {
    int b = ((([w->priv.window styleMask] & NSWindowStyleMaskFullScreen) ==
@@ -2503,4 +2502,4 @@ struct webview_priv
 }
 #endif

-#endif /* WEBVIEW_H */
+#endif /* WEBVIEW_H */
@@ -117,12 +117,20 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
 		}

 		// Tags
+		experimental := false
 		userTags := []string{}
 		for _, tag := range strings.Split(tags, " ") {
 			thisTag := strings.TrimSpace(tag)
 			if thisTag != "" {
 				userTags = append(userTags, thisTag)
 			}
+			if thisTag == "exp" {
+				experimental = true
+			}
+		}
+
+		if runtime.GOOS == "darwin" && !experimental {
+			return fmt.Errorf("MacOS version coming soon!")
 		}

 		// Webview2 installer strategy (download by default)
@@ -3,8 +3,6 @@ package dev
 import (
 	"context"
 	"fmt"
-	"github.com/wailsapp/wails/v2/cmd/wails/internal"
-	"github.com/wailsapp/wails/v2/internal/gomod"
 	"io"
 	"net/http"
 	"os"
@@ -18,6 +16,9 @@ import (
 	"syscall"
 	"time"

+	"github.com/wailsapp/wails/v2/cmd/wails/internal"
+	"github.com/wailsapp/wails/v2/internal/gomod"
+
 	"github.com/leaanthony/slicer"
 	"github.com/wailsapp/wails/v2/internal/project"

@@ -88,7 +89,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 	command.StringFlag("wailsjsdir", "Directory to generate the Wails JS modules", &flags.wailsjsdir)
 	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &flags.tags)
 	command.IntFlag("v", "Verbosity level (0 - silent, 1 - standard, 2 - verbose)", &flags.verbosity)
-	command.StringFlag("loglevel", "Loglevel to use - Trace, Dev, Info, Warning, Error", &flags.loglevel)
+	command.StringFlag("loglevel", "Loglevel to use - Trace, Debug, Info, Warning, Error", &flags.loglevel)
 	command.BoolFlag("f", "Force build application", &flags.forceBuild)
 	command.IntFlag("debounce", "The amount of time to wait to trigger a reload on change", &flags.debounceMS)
 	command.StringFlag("devserverurl", "The url of the dev server to use", &flags.devServerURL)
@@ -98,6 +99,22 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		logger := clilogger.New(w)
 		app.PrintBanner()

+		experimental := false
+		userTags := []string{}
+		for _, tag := range strings.Split(flags.tags, " ") {
+			thisTag := strings.TrimSpace(tag)
+			if thisTag != "" {
+				userTags = append(userTags, thisTag)
+			}
+			if thisTag == "exp" {
+				experimental = true
+			}
+		}
+
+		if runtime.GOOS == "darwin" && !experimental {
+			return fmt.Errorf("MacOS version coming soon!")
+		}
+
 		cwd, err := os.Getwd()
 		if err != nil {
 			return err
@@ -255,11 +272,11 @@ func defaultDevFlags() devFlags {

 // generateBuildOptions creates a build.Options using the flags
 func generateBuildOptions(flags devFlags) *build.Options {
-	return &build.Options{
+	result := &build.Options{
 		OutputType:     "dev",
 		Mode:           build.Dev,
 		Arch:           runtime.GOARCH,
-		Pack:           true,
+		Pack:           false,
 		Platform:       runtime.GOOS,
 		LDFlags:        flags.ldflags,
 		Compiler:       flags.compilerCommand,
@@ -268,6 +285,11 @@ func generateBuildOptions(flags devFlags) *build.Options {
 		Verbosity:      flags.verbosity,
 		WailsJSDir:     flags.wailsjsdir,
 	}
+	switch runtime.GOOS {
+	case "darwin":
+		result.Pack = false
+	}
+	return result
 }

 // loadAndMergeProjectConfig reconciles flags passed to the CLI with project config settings and updates
@@ -367,13 +389,15 @@ func runFrontendDevCommand(cwd string, devCommand string, wg *sync.WaitGroup) fu
 		if runtime.GOOS == "windows" {
 			// Credit: https://stackoverflow.com/a/44551450
 			// For whatever reason, killing an npm script on windows just doesn't exit properly with cancel
-			kill := exec.Command("TASKKILL", "/T", "/F", "/PID", strconv.Itoa(cmd.Process.Pid))
-			kill.Stderr = os.Stderr
-			kill.Stdout = os.Stdout
-			err := kill.Run()
-			if err != nil {
-				if err.Error() != "exit status 1" {
-					LogRed("Error from '%s': %s", devCommand, err.Error())
+			if cmd != nil && cmd.Process != nil {
+				kill := exec.Command("TASKKILL", "/T", "/F", "/PID", strconv.Itoa(cmd.Process.Pid))
+				kill.Stderr = os.Stderr
+				kill.Stdout = os.Stdout
+				err := kill.Run()
+				if err != nil {
+					if err.Error() != "exit status 1" {
+						LogRed("Error from '%s': %s", devCommand, err.Error())
+					}
 				}
 			}
 		} else {
@@ -1,6 +1,7 @@
 package generate

 import (
+	"fmt"
 	"github.com/leaanthony/clir"
 	"github.com/wailsapp/wails/v2/cmd/wails/internal"
 	"github.com/wailsapp/wails/v2/internal/shell"
@@ -36,14 +37,14 @@ func AddModuleCommand(app *clir.Cli, parent *clir.Command, w io.Writer) error {
 		tagList := internal.ParseUserTags(tags)
 		tagList = append(tagList, "bindings")

-		_, _, err = shell.RunCommand(cwd, "go", "build", "-tags", strings.Join(tagList, ","), "-o", filename)
+		stdout, stderr, err := shell.RunCommand(cwd, "go", "build", "-tags", strings.Join(tagList, ","), "-o", filename)
 		if err != nil {
-			return err
+			return fmt.Errorf("%s\n%s\n%s", stdout, stderr, err)
 		}

-		_, _, err = shell.RunCommand(cwd, filename)
+		stdout, stderr, err = shell.RunCommand(cwd, filename)
 		if err != nil {
-			return err
+			return fmt.Errorf("%s\n%s\n%s", stdout, stderr, err)
 		}

 		err = os.Remove(filename)
@@ -22,7 +22,7 @@ func (b *App) startup(ctx context.Context) {
 }

 // domReady is called after the front-end dom has been loaded
-func (b App) domReady(ctx context.Context) {
+func (b *App) domReady(ctx context.Context) {
 	// Add your action here
 }

@@ -13,6 +13,7 @@ body {
 	margin: 0;
 	width: 100%;
 	height: 100%;
+	overscroll-behavior: none;
 }

@font-face {
@@ -22,7 +22,7 @@ func (b *App) startup(ctx context.Context) {
 }

 // domReady is called after the front-end dom has been loaded
-func (b App) domReady(ctx context.Context) {
+func (b *App) domReady(ctx context.Context) {
 	// Add your action here
 }

@@ -8,8 +8,9 @@ body {
  margin: 0;
  color: white;
  font-family: "Nunito", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
-    "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
-    sans-serif;
+  "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
+  sans-serif;
+  overscroll-behavior: none;
 }

@font-face {
@@ -1,3 +1,3 @@
 package internal

-var Version = "v2.0.0-beta.10"
+var Version = "v2.0.0-beta.15"
@@ -21,7 +21,7 @@ require (
 	github.com/leaanthony/debme v1.2.1
 	github.com/leaanthony/go-ansi-parser v1.0.1
 	github.com/leaanthony/go-common-file-dialog v1.0.3
-	github.com/leaanthony/go-webview2 v0.0.0-20211007095229-b1759d2e4ec7
+	github.com/leaanthony/go-webview2 v0.0.0-20211022194343-1e4c8d4226f3
 	github.com/leaanthony/gosod v1.0.3
 	github.com/leaanthony/idgen v1.0.0
 	github.com/leaanthony/slicer v1.5.0
@@ -43,7 +43,7 @@ require (
 	github.com/ztrue/tracerr v0.3.0
 	golang.org/x/mod v0.4.1
 	golang.org/x/net v0.0.0-20210510120150-4163338589ed
-	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6
+	golang.org/x/sys v0.0.0-20211020174200-9d6173849985
 	golang.org/x/tools v0.1.0
 	nhooyr.io/websocket v1.8.6
 )
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lea Anthony	f9e559f069	Merge branch 'master' into develop	2021-10-26 19:35:18 +11:00
Lea Anthony	9a4c603001	[v1] Update logrus to v1.8.1	2021-10-26 19:32:53 +11:00
Lea Anthony	98a95e99a5	[mac] Fixes #879	2021-10-26 19:28:15 +11:00
Lea Anthony	d19c982eed	v2.0.0-beta.15	2021-10-26 19:21:41 +11:00
Lea Anthony	a963836e75	[v2] fix: check process exists before killing	2021-10-26 19:20:39 +11:00
Lea Anthony	00e9eb4b0b	[v2] fix: run frontend:dev when using `wails dev`	2021-10-26 19:20:09 +11:00
Lea Anthony	262b6281e1	Update sponsors. Cheers DonTomato!	2021-10-26 19:05:07 +11:00
Lea Anthony	f66c70f0be	Merge pull request #893 from Wakeful-Cloud/master Fixed WindowGetSize	2021-10-25 19:20:47 +11:00
Wakeful-Cloud	717d373668	Fixed WindowGetSize	2021-10-24 18:00:47 -06:00
Lea Anthony	d29fa94aa4	Merge pull request #891 from Wakeful-Cloud/master Fix TypeScript runtime declaration	2021-10-24 19:11:11 +11:00
Wakeful-Cloud	01dd0cd0b2	Fix TypeScript runtime declaration	2021-10-24 04:05:47 +00:00
Lea Anthony	126cc78d1a	[v2] add `overscroll-behavior`	2021-10-24 09:03:05 +11:00
Lea Anthony	5703d465fc	[v2] v2.0.0-beta.14	2021-10-23 08:52:02 +11:00
Lea Anthony	0c2963cf53	[windows] Add webview2 permissions	2021-10-23 07:17:58 +11:00
Lea Anthony	b61fd16936	[windows] Disable swipe navigation	2021-10-23 05:50:39 +11:00
Lea Anthony	3a8ba96cb3	[windows] Update webview2 to 91.0.992.28	2021-10-23 05:50:39 +11:00
Lea Anthony	3b1d74cf84	Merge pull request #886 from TAINCER/patch-1 Added Angular template to Community templates list	2021-10-22 17:11:50 +11:00
Lea Anthony	2e0a6f95a0	[website] Update dialog docs	2021-10-22 16:59:44 +11:00
Timm Ortloff	8470bfb26b	Added Angular template to Community templates list	2021-10-22 06:47:03 +02:00
Lea Anthony	bea0c1446a	[mac] dialog support	2021-10-22 08:42:36 +11:00
Lea Anthony	35ebbdfa12	[v2] Fix typo in templates	2021-10-22 08:42:35 +11:00
Lea Anthony	bb25b3f42f	Update events.mdx	2021-10-20 20:31:58 +11:00
Lea Anthony	4a11f9bb20	Update sponsors	2021-10-20 17:40:57 +11:00
Lea Anthony	c1a20d0509	[mac] Fix SetRGBA and disabling context menus in prod build	2021-10-19 20:08:43 +11:00
Lea Anthony	32c3721b1b	[mac] Fix webviewistransparent and debug flag	2021-10-19 20:07:36 +11:00
Lea Anthony	913cc56adf	[v2] Add flag to remove default context menu	2021-10-19 20:06:18 +11:00
Lea Anthony	38f37e817b	[mac] Get asset server hooked up, window drag, Window runtime.	2021-10-18 22:02:23 +11:00
Lea Anthony	4e68f92083	[v2] Add WindowGetPos & WindowGetSize	2021-10-18 21:42:02 +11:00
Lea Anthony	3edbda313e	[mac] add SetRGBA and basic hooks for asset serving	2021-10-17 21:50:15 +11:00
Lea Anthony	04cde94c96	[windows] add build tags to browser runtime	2021-10-17 21:50:15 +11:00
Lea Anthony	1faa962cf5	Update README.md	2021-10-16 15:47:02 +11:00
Lea Anthony	94a74520be	Update logo	2021-10-16 15:45:59 +11:00
Lea Anthony	27dd40fd29	Update logos	2021-10-16 08:57:28 +11:00
Lea Anthony	616ecabb41	[mac] migrated colour code	2021-10-14 20:38:11 +11:00
Lea Anthony	15cd325034	[mac] experimental	2021-10-14 20:35:45 +11:00
Lea Anthony	450eb2e7ae	[mac] message passing, quit	2021-10-14 20:34:47 +11:00
Lea Anthony	84622b829c	[website] Fix build	2021-10-14 17:55:01 +11:00
Lea Anthony	a1323ce5e9	[mac] experimental	2021-10-13 22:01:35 +11:00
Lea Anthony	49629f6dc6	[mac] Fix build tags	2021-10-13 21:16:07 +11:00
Lea Anthony	231848cb9e	[mac] Don't create .app in dev	2021-10-13 21:16:06 +11:00
Lea Anthony	a51d8bb47d	[v2] Move "AlwaysOnTop" option	2021-10-13 08:05:31 +11:00
Lea Anthony	e0e4c0ae11	[v2] Add "AlwaysOnTop" option	2021-10-13 08:02:35 +11:00
Lea Anthony	d47b3734af	[v2] v2.0.0-beta.13	2021-10-12 20:47:03 +11:00
Lea Anthony	26d248a4b6	[v2] Add flag to disable scrollbar drag	2021-10-12 20:45:53 +11:00
Lea Anthony	6413a6fb4d	Update Sponsors	2021-10-12 20:35:38 +11:00
Lea Anthony	5e36f4fc7f	[v2] Remove chromium message on shutdown	2021-10-12 08:58:33 +11:00
Lea Anthony	b47c278c95	Merge pull request #868 from stankovic98/add-artix-linux add artix linux distro	2021-10-12 08:54:16 +11:00
Lea Anthony	81a9619fd7	[v2] v2.0.0-beta.12	2021-10-12 06:53:35 +11:00
Lea Anthony	ce103af77b	[v2] Update 'replace' line in go.mod	2021-10-12 06:51:22 +11:00
Lea Anthony	2649c3d17d	[v2] Fix bindings.js	2021-10-12 06:34:01 +11:00
Lea Anthony	a35cc035b0	Merge pull request #867 from marktohark/master add locker for websocket.WriteMessage	2021-10-12 06:21:53 +11:00
Antonio	a94a720a68	add artix linux distro	2021-10-11 17:16:24 +02:00
unknown	995fe38ee4	add locker for websocket.WriteMessage	2021-10-11 21:10:55 +08:00
Lea Anthony	7fd311f7a6	Merge pull request #865 from marktohark/master add \r\n for awaitIPC callback	2021-10-11 22:50:47 +11:00
unknown	356774e3f7	use backtick with return	2021-10-11 19:41:45 +08:00
unknown	5d8653be83	add \r\n for awaitIPC callback	2021-10-11 16:41:11 +08:00
Lea Anthony	8b5bcdfeff	[v2] v2.0.0-beta.11	2021-10-11 19:24:04 +11:00
Lea Anthony	f6655d019f	[v2] Better errors	2021-10-11 19:23:31 +11:00
Lea Anthony	8f31183fa8	[v2] Fix client timeouts	2021-10-11 19:23:31 +11:00
Lea Anthony	64528b4f02	Merge pull request #863 from marcus-crane/master Correct help text for enabling Debug log level	2021-10-11 17:56:25 +11:00
Marcus Crane	7945853294	Correct help text for enabling Debug log level All in forms of documentation, the correct name for the second most verbose log level is "Debug" but under `wails dev --help`, it's called Dev Trying to use it throws an error as well so correcting the name to be Debug	2021-10-11 13:31:28 +13:00
Lea Anthony	3caa0f1438	v1.16.7	2021-09-03 19:15:37 +10:00
Florian Didron	b8ef90cb41	fix: prevent hidden files to show on gtk host when opening a file dialog	2021-09-03 19:12:47 +10:00
Lea Anthony	9efc648e3d	Merge pull request #789 from diogox/develop Add NixOS support	2021-09-03 18:55:53 +10:00
Diogo Xavier	baa96f47d8	Add NixOS support	2021-08-30 19:15:10 +01:00
Lea Anthony	184ce763c1	v1.16.6	2021-08-14 19:02:16 +10:00
Lea Anthony	229ee95f91	Don't build project by default. Added `-build` flag to `wails init` to mimic old behaviour	2021-08-14 19:00:35 +10:00