Fix window position inconsistency in MacOS (#3479)

* Fix window position inconsistency in MacOS

* Updated changelog

.github/workflows/build-and-test.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest, macos-11]
-        go-version: ['1.20']
+        go-version: ['1.22']
 
     steps:
       - name: Checkout code
@@ -90,7 +90,7 @@ jobs:
             vanilla-ts,
             plain,
           ]
-        go-version: ['1.20']
+        go-version: ['1.22']
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/pr.yml

@@ -56,7 +56,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        go-version: ['1.20']
+        go-version: ['1.22']
 
     steps:
       - name: Checkout code

v2/cmd/wails/flags/build.go

@@ -24,7 +24,7 @@ type Build struct {
 	Common
 	BuildCommon
 
-	NoPackage               bool   `name:"noPackage" description:"Skips platform specific packaging"`
+	NoPackage               bool   `description:"Skips platform specific packaging"`
 	Upx                     bool   `description:"Compress final binary with UPX (if installed)"`
 	UpxFlags                string `description:"Flags to pass to upx"`
 	Platform                string `description:"Platform to target. Comma separate multiple platforms"`

v2/cmd/wails/internal/commands/build/build.go

@@ -1,439 +0,0 @@
-package build
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"text/tabwriter"
-	"time"
-
-	"github.com/wailsapp/wails/v2/internal/colour"
-	"github.com/wailsapp/wails/v2/internal/project"
-	"github.com/wailsapp/wails/v2/internal/system"
-
-	"github.com/wailsapp/wails/v2/cmd/wails/internal"
-	"github.com/wailsapp/wails/v2/internal/gomod"
-
-	"github.com/leaanthony/clir"
-	"github.com/leaanthony/slicer"
-	"github.com/wailsapp/wails/v2/pkg/clilogger"
-	"github.com/wailsapp/wails/v2/pkg/commands/build"
-)
-
-// AddBuildSubcommand adds the `build` command for the Wails application
-func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
-	command := app.NewSubCommand("build", "Builds the application")
-
-	outputType := "desktop"
-	validTargetTypes := slicer.String([]string{"desktop", "hybrid", "server"})
-
-	command.StringFlag("outputType", fmt.Sprintf("Type of binary %s", validTargetTypes.AsSlice()), &outputType)
-
-	// Setup noPackage flag
-	noPackage := false
-	command.BoolFlag("noPackage", "Skips platform specific packaging", &noPackage)
-
-	compilerCommand := "go"
-	command.StringFlag("compiler", "Use a different go compiler to build, eg go1.15beta1", &compilerCommand)
-
-	skipModTidy := false
-	command.BoolFlag("m", "Skip mod tidy before compile", &skipModTidy)
-
-	compress := false
-	command.BoolFlag("upx", "Compress final binary with UPX (if installed)", &compress)
-
-	compressFlags := ""
-	command.StringFlag("upxflags", "Flags to pass to upx", &compressFlags)
-
-	defaultPlatform := os.Getenv("GOOS")
-	if defaultPlatform == "" {
-		defaultPlatform = runtime.GOOS
-	}
-	defaultArch := os.Getenv("GOARCH")
-	if defaultArch == "" {
-		if system.IsAppleSilicon {
-			defaultArch = "arm64"
-		} else {
-			defaultArch = runtime.GOARCH
-		}
-	}
-	platform := defaultPlatform + "/" + defaultArch
-
-	command.StringFlag("platform", "Platform to target. Comma separate multiple platforms", &platform)
-
-	// Verbosity
-	verbosity := 1
-	command.IntFlag("v", "Verbosity level (0 - silent, 1 - default, 2 - verbose)", &verbosity)
-
-	// ldflags to pass to `go`
-	ldflags := ""
-	command.StringFlag("ldflags", "optional ldflags", &ldflags)
-
-	// tags to pass to `go`
-	tags := ""
-	command.StringFlag("tags", "tags to pass to Go compiler (quoted and space separated)", &tags)
-
-	outputFilename := ""
-	command.StringFlag("o", "Output filename", &outputFilename)
-
-	// Clean build directory
-	cleanBuildDirectory := false
-	command.BoolFlag("clean", "Clean the build directory before building", &cleanBuildDirectory)
-
-	webview2 := "download"
-	command.StringFlag("webview2", "WebView2 installer strategy: download,embed,browser,error.", &webview2)
-
-	skipFrontend := false
-	command.BoolFlag("s", "Skips building the frontend", &skipFrontend)
-
-	forceBuild := false
-	command.BoolFlag("f", "Force build application", &forceBuild)
-
-	updateGoMod := false
-	command.BoolFlag("u", "Updates go.mod to use the same Wails version as the CLI", &updateGoMod)
-
-	debug := false
-	command.BoolFlag("debug", "Retains debug data in the compiled application", &debug)
-
-	nsis := false
-	command.BoolFlag("nsis", "Generate NSIS installer for Windows", &nsis)
-
-	trimpath := false
-	command.BoolFlag("trimpath", "Remove all file system paths from the resulting executable", &trimpath)
-
-	raceDetector := false
-	command.BoolFlag("race", "Build with Go's race detector", &raceDetector)
-
-	windowsConsole := false
-	command.BoolFlag("windowsconsole", "Keep the console when building for Windows", &windowsConsole)
-
-	dryRun := false
-	command.BoolFlag("dryrun", "Dry run, prints the config for the command that would be executed", &dryRun)
-
-	command.Action(func() error {
-
-		quiet := verbosity == 0
-
-		// Create logger
-		logger := clilogger.New(w)
-		logger.Mute(quiet)
-
-		// Validate output type
-		if !validTargetTypes.Contains(outputType) {
-			return fmt.Errorf("output type '%s' is not valid", outputType)
-		}
-
-		if !quiet {
-			app.PrintBanner()
-		}
-
-		// Lookup compiler path
-		compilerPath, err := exec.LookPath(compilerCommand)
-		if err != nil {
-			return fmt.Errorf("unable to find compiler: %s", compilerCommand)
-		}
-
-		// Tags
-		userTags := []string{}
-		for _, tag := range strings.Split(tags, " ") {
-			thisTag := strings.TrimSpace(tag)
-			if thisTag != "" {
-				userTags = append(userTags, thisTag)
-			}
-		}
-
-		// Validate experimental
-		if slicer.String([]string{"hybrid", "server"}).Contains(outputType) {
-			if !slicer.String(userTags).Contains("exp") {
-				return fmt.Errorf("output type '%s' requires the '-tags exp'", outputType)
-			}
-		}
-
-		// Webview2 installer strategy (download by default)
-		wv2rtstrategy := ""
-		webview2 = strings.ToLower(webview2)
-		if webview2 != "" {
-			validWV2Runtime := slicer.String([]string{"download", "embed", "browser", "error"})
-			if !validWV2Runtime.Contains(webview2) {
-				return fmt.Errorf("invalid option for flag 'webview2': %s", webview2)
-			}
-			// These are the build tags associated with the strategies
-			switch webview2 {
-			case "embed":
-				wv2rtstrategy = "wv2runtime.embed"
-			case "error":
-				wv2rtstrategy = "wv2runtime.error"
-			case "browser":
-				wv2rtstrategy = "wv2runtime.browser"
-			}
-		}
-
-		mode := build.Production
-		modeString := "Production"
-		if debug {
-			mode = build.Debug
-			modeString = "Debug"
-		}
-
-		var targets slicer.StringSlicer
-		targets.AddSlice(strings.Split(platform, ","))
-		targets.Deduplicate()
-
-		// Create BuildOptions
-		buildOptions := &build.Options{
-			Logger:              logger,
-			OutputType:          outputType,
-			OutputFile:          outputFilename,
-			CleanBuildDirectory: cleanBuildDirectory,
-			Mode:                mode,
-			Pack:                !noPackage,
-			LDFlags:             ldflags,
-			Compiler:            compilerCommand,
-			SkipModTidy:         skipModTidy,
-			Verbosity:           verbosity,
-			ForceBuild:          forceBuild,
-			IgnoreFrontend:      skipFrontend,
-			Compress:            compress,
-			CompressFlags:       compressFlags,
-			UserTags:            userTags,
-			WebView2Strategy:    wv2rtstrategy,
-			TrimPath:            trimpath,
-			RaceDetector:        raceDetector,
-			WindowsConsole:      windowsConsole,
-		}
-
-		// Start a new tabwriter
-		if !quiet {
-			w := new(tabwriter.Writer)
-			w.Init(os.Stdout, 8, 8, 0, '\t', 0)
-
-			// Write out the system information
-			_, _ = fmt.Fprintf(w, "App Type: \t%s\n", buildOptions.OutputType)
-			_, _ = fmt.Fprintf(w, "Platforms: \t%s\n", platform)
-			_, _ = fmt.Fprintf(w, "Compiler: \t%s\n", compilerPath)
-			_, _ = fmt.Fprintf(w, "Build Mode: \t%s\n", modeString)
-			_, _ = fmt.Fprintf(w, "Skip Frontend: \t%t\n", skipFrontend)
-			_, _ = fmt.Fprintf(w, "Compress: \t%t\n", buildOptions.Compress)
-			_, _ = fmt.Fprintf(w, "Package: \t%t\n", buildOptions.Pack)
-			_, _ = fmt.Fprintf(w, "Clean Build Dir: \t%t\n", buildOptions.CleanBuildDirectory)
-			_, _ = fmt.Fprintf(w, "LDFlags: \t\"%s\"\n", buildOptions.LDFlags)
-			_, _ = fmt.Fprintf(w, "Tags: \t[%s]\n", strings.Join(buildOptions.UserTags, ","))
-			_, _ = fmt.Fprintf(w, "Race Detector: \t%t\n", buildOptions.RaceDetector)
-			if len(buildOptions.OutputFile) > 0 && targets.Length() == 1 {
-				_, _ = fmt.Fprintf(w, "Output File: \t%s\n", buildOptions.OutputFile)
-			}
-			_, _ = fmt.Fprintf(w, "\n")
-			err = w.Flush()
-			if err != nil {
-				return err
-			}
-		}
-		err = checkGoModVersion(logger, updateGoMod)
-		if err != nil {
-			return err
-		}
-
-		cwd, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-		projectOptions, err := project.Load(cwd)
-		if err != nil {
-			return err
-		}
-
-		// Check platform
-		validPlatformArch := slicer.String([]string{
-			"darwin",
-			"darwin/amd64",
-			"darwin/arm64",
-			"darwin/universal",
-			"linux",
-			"linux/amd64",
-			"linux/arm64",
-			"linux/arm",
-			"windows",
-			"windows/amd64",
-			"windows/arm64",
-			"windows/386",
-		})
-
-		outputBinaries := map[string]string{}
-
-		// Allows cancelling the build after the first error. It would be nice if targets.Each would support funcs
-		// returning an error.
-		var targetErr error
-		targets.Each(func(platform string) {
-			if targetErr != nil {
-				return
-			}
-
-			if !validPlatformArch.Contains(platform) {
-				buildOptions.Logger.Println("platform '%s' is not supported - skipping. Supported platforms: %s", platform, validPlatformArch.Join(","))
-				return
-			}
-
-			desiredFilename := projectOptions.OutputFilename
-			if desiredFilename == "" {
-				desiredFilename = projectOptions.Name
-			}
-			desiredFilename = strings.TrimSuffix(desiredFilename, ".exe")
-
-			// Calculate platform and arch
-			platformSplit := strings.Split(platform, "/")
-			buildOptions.Platform = platformSplit[0]
-			buildOptions.Arch = defaultArch
-			if len(platformSplit) > 1 {
-				buildOptions.Arch = platformSplit[1]
-			}
-			banner := "Building target: " + buildOptions.Platform + "/" + buildOptions.Arch
-			logger.Println(banner)
-			logger.Println(strings.Repeat("-", len(banner)))
-
-			if compress && platform == "darwin/universal" {
-				logger.Println("Warning: compress flag unsupported for universal binaries. Ignoring.")
-				compress = false
-			}
-
-			switch buildOptions.Platform {
-			case "linux":
-				if runtime.GOOS != "linux" {
-					logger.Println("Crosscompiling to Linux not currently supported.\n")
-					return
-				}
-			case "darwin":
-				if runtime.GOOS != "darwin" {
-					logger.Println("Crosscompiling to Mac not currently supported.\n")
-					return
-				}
-				macTargets := targets.Filter(func(platform string) bool {
-					return strings.HasPrefix(platform, "darwin")
-				})
-				if macTargets.Length() == 2 {
-					buildOptions.BundleName = fmt.Sprintf("%s-%s.app", desiredFilename, buildOptions.Arch)
-				}
-			}
-
-			if targets.Length() > 1 {
-				// target filename
-				switch buildOptions.Platform {
-				case "windows":
-					desiredFilename = fmt.Sprintf("%s-%s", desiredFilename, buildOptions.Arch)
-				case "linux", "darwin":
-					desiredFilename = fmt.Sprintf("%s-%s-%s", desiredFilename, buildOptions.Platform, buildOptions.Arch)
-				}
-			}
-			if buildOptions.Platform == "windows" {
-				desiredFilename += ".exe"
-			}
-			buildOptions.OutputFile = desiredFilename
-
-			if outputFilename != "" {
-				buildOptions.OutputFile = outputFilename
-			}
-
-			if !dryRun {
-				// Start Time
-				start := time.Now()
-
-				compiledBinary, err := build.Build(buildOptions)
-				if err != nil {
-					logger.Println("Error: %s", err.Error())
-					targetErr = err
-					return
-				}
-
-				buildOptions.IgnoreFrontend = true
-				buildOptions.CleanBuildDirectory = false
-
-				// Output stats
-				buildOptions.Logger.Println(fmt.Sprintf("Built '%s' in %s.\n", compiledBinary, time.Since(start).Round(time.Millisecond).String()))
-
-				outputBinaries[buildOptions.Platform+"/"+buildOptions.Arch] = compiledBinary
-			} else {
-				logger.Println("Dry run: skipped build.")
-			}
-		})
-
-		if targetErr != nil {
-			return targetErr
-		}
-
-		if dryRun {
-			return nil
-		}
-
-		if nsis {
-			amd64Binary := outputBinaries["windows/amd64"]
-			arm64Binary := outputBinaries["windows/arm64"]
-			if amd64Binary == "" && arm64Binary == "" {
-				return fmt.Errorf("cannot build nsis installer - no windows targets")
-			}
-
-			if err := build.GenerateNSISInstaller(buildOptions, amd64Binary, arm64Binary); err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-}
-
-func checkGoModVersion(logger *clilogger.CLILogger, updateGoMod bool) error {
-	cwd, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-	gomodFilename := filepath.Join(cwd, "go.mod")
-	gomodData, err := os.ReadFile(gomodFilename)
-	if err != nil {
-		return err
-	}
-	outOfSync, err := gomod.GoModOutOfSync(gomodData, internal.Version)
-	if err != nil {
-		return err
-	}
-	if !outOfSync {
-		return nil
-	}
-	gomodversion, err := gomod.GetWailsVersionFromModFile(gomodData)
-	if err != nil {
-		return err
-	}
-
-	if updateGoMod {
-		return syncGoModVersion(cwd)
-	}
-
-	logger.Println("Warning: go.mod is using Wails '%s' but the CLI is '%s'. Consider updating your project's `go.mod` file.\n", gomodversion.String(), internal.Version)
-	return nil
-}
-
-func LogGreen(message string, args ...interface{}) {
-	text := fmt.Sprintf(message, args...)
-	println(colour.Green(text))
-}
-
-func syncGoModVersion(cwd string) error {
-	gomodFilename := filepath.Join(cwd, "go.mod")
-	gomodData, err := os.ReadFile(gomodFilename)
-	if err != nil {
-		return err
-	}
-	outOfSync, err := gomod.GoModOutOfSync(gomodData, internal.Version)
-	if err != nil {
-		return err
-	}
-	if !outOfSync {
-		return nil
-	}
-	LogGreen("Updating go.mod to use Wails '%s'", internal.Version)
-	newGoData, err := gomod.UpdateGoModVersion(gomodData, internal.Version)
-	if err != nil {
-		return err
-	}
-	return os.WriteFile(gomodFilename, newGoData, 0755)
-}

v2/cmd/wails/internal/version.txt

@@ -1 +1 @@
-v2.8.1
+v2.8.2

v2/go.mod

@@ -2,7 +2,7 @@ module github.com/wailsapp/wails/v2
 
 go 1.21
 
-toolchain go1.22.1
+toolchain go1.22.0
 
 require (
 	github.com/Masterminds/semver v1.5.0
@@ -42,8 +42,8 @@ require (
 	github.com/wailsapp/mimetype v1.4.1
 	github.com/wzshiming/ctc v1.2.3
 	golang.org/x/mod v0.14.0
-	golang.org/x/net v0.20.0
-	golang.org/x/sys v0.16.0
+	golang.org/x/net v0.25.0
+	golang.org/x/sys v0.20.0
 	golang.org/x/tools v0.17.0
 )
 
@@ -99,11 +99,11 @@ require (
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
 	github.com/yuin/goldmark v1.4.13 // indirect
 	github.com/yuin/goldmark-emoji v1.0.1 // indirect
-	golang.org/x/crypto v0.18.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
 	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
 	golang.org/x/image v0.12.0 // indirect
-	golang.org/x/term v0.16.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/term v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

v2/go.sum

@@ -257,8 +257,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -277,8 +277,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -310,8 +310,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -319,8 +319,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
+golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -329,8 +329,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

v2/internal/app/app_dev.go

@@ -1,4 +1,4 @@
-//go:build dev && desktop
+//go:build dev
 
 package app
 

v2/internal/app/app_hybrid_server.go

@@ -1,128 +0,0 @@
-//go:build (exp && hybrid) || (exp && server)
-// +build exp,hybrid exp,server
-
-package app
-
-import (
-	"context"
-	"fmt"
-	"github.com/wailsapp/wails/v2/internal/binding"
-	"github.com/wailsapp/wails/v2/internal/frontend"
-	"github.com/wailsapp/wails/v2/internal/frontend/desktop"
-	"github.com/wailsapp/wails/v2/internal/frontend/devserver"
-	"github.com/wailsapp/wails/v2/internal/frontend/dispatcher"
-	"github.com/wailsapp/wails/v2/internal/frontend/hybrid"
-	"github.com/wailsapp/wails/v2/internal/frontend/runtime"
-	"github.com/wailsapp/wails/v2/internal/logger"
-	"github.com/wailsapp/wails/v2/internal/menumanager"
-	"github.com/wailsapp/wails/v2/pkg/options"
-)
-
-// App defines a Wails application structure
-type App struct {
-	frontend frontend.Frontend
-	logger   *logger.Logger
-	options  *options.App
-
-	menuManager *menumanager.Manager
-
-	// Indicates if the app is in debug mode
-	debug bool
-
-	// OnStartup/OnShutdown
-	startupCallback  func(ctx context.Context)
-	shutdownCallback func(ctx context.Context)
-	ctx              context.Context
-}
-
-func (a *App) Shutdown() {
-	a.frontend.Quit()
-}
-
-func (a *App) Run() error {
-	err := a.frontend.Run(a.ctx)
-	if a.shutdownCallback != nil {
-		a.shutdownCallback(a.ctx)
-	}
-	return err
-}
-
-// CreateApp creates the app!
-func CreateApp(appoptions *options.App) (*App, error) {
-	var err error
-
-	ctx := context.Background()
-
-	host, port := "localhost", int32(3112)
-	if appoptions.Server != nil {
-		host = appoptions.Server.Host
-		port = appoptions.Server.Port
-	}
-
-	serverURI := fmt.Sprintf("%s:%d", host, port)
-	ctx = context.WithValue(ctx, "starturl", serverURI)
-	ctx = context.WithValue(ctx, "devserver", fmt.Sprintf("%s:%d", host, port))
-
-	// Merge default options
-	options.MergeDefaults(appoptions)
-
-	debug := IsDebug()
-	ctx = context.WithValue(ctx, "debug", debug)
-
-	// Set up logger
-	myLogger := logger.New(appoptions.Logger)
-	myLogger.Info("Frontend available at 'http://%s'", serverURI)
-	if IsDebug() {
-		myLogger.SetLogLevel(appoptions.LogLevel)
-	} else {
-		myLogger.SetLogLevel(appoptions.LogLevelProduction)
-	}
-	ctx = context.WithValue(ctx, "logger", myLogger)
-
-	// Preflight Checks
-	err = PreflightChecks(appoptions, myLogger)
-	if err != nil {
-		return nil, err
-	}
-
-	// Create the menu manager
-	menuManager := menumanager.NewManager()
-
-	// Process the application menu
-	if appoptions.Menu != nil {
-		err = menuManager.SetApplicationMenu(appoptions.Menu)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// Create binding exemptions - Ugly hack. There must be a better way
-	bindingExemptions := []interface{}{appoptions.OnStartup, appoptions.OnShutdown, appoptions.OnDomReady}
-	appBindings := binding.NewBindings(myLogger, appoptions.Bind, bindingExemptions)
-	eventHandler := runtime.NewEvents(myLogger)
-	ctx = context.WithValue(ctx, "events", eventHandler)
-	// Attach logger to context
-	if debug {
-		ctx = context.WithValue(ctx, "buildtype", "debug")
-	} else {
-		ctx = context.WithValue(ctx, "buildtype", "production")
-	}
-
-	messageDispatcher := dispatcher.NewDispatcher(ctx, myLogger, appBindings, eventHandler)
-	appFrontend := hybrid.NewFrontend(ctx, appoptions, myLogger, appBindings, messageDispatcher)
-	eventHandler.AddFrontend(appFrontend)
-
-	result := &App{
-		ctx:              ctx,
-		frontend:         appFrontend,
-		logger:           myLogger,
-		menuManager:      menuManager,
-		startupCallback:  appoptions.OnStartup,
-		shutdownCallback: appoptions.OnShutdown,
-		debug:            debug,
-		options:          appoptions,
-	}
-
-	return result, nil
-
-}

v2/internal/app/app_production.go

@@ -1,4 +1,4 @@
-//go:build production && desktop
+//go:build production
 
 package app
 

v2/internal/frontend/desktop/darwin/WailsContext.m

@@ -55,7 +55,7 @@ typedef void (^schemeTaskCaller)(id<WKURLSchemeTask>);
     
     NSScreen* screen = [self getCurrentScreen];
     NSRect windowFrame = [self.mainWindow frame];
-    NSRect screenFrame = [screen frame];
+    NSRect screenFrame = [screen visibleFrame];
     windowFrame.origin.x = screenFrame.origin.x + (float)x;
     windowFrame.origin.y = (screenFrame.origin.y + screenFrame.size.height) - windowFrame.size.height - (float)y;
     

v2/internal/frontend/desktop/linux/clipboard.go

@@ -4,7 +4,9 @@
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+#cgo linux pkg-config: gtk+-3.0
+#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1
 
 #include "gtk/gtk.h"
 #include "webkit2/webkit2.h"

v2/internal/frontend/desktop/linux/frontend.go

@@ -4,7 +4,9 @@
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+#cgo linux pkg-config: gtk+-3.0 
+#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1
 
 #include "gtk/gtk.h"
 #include "webkit2/webkit2.h"

v2/internal/frontend/desktop/linux/gtk.go

@@ -4,7 +4,9 @@
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+#cgo linux pkg-config: gtk+-3.0
+#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1
 
 #include "gtk/gtk.h"
 

v2/internal/frontend/desktop/linux/keys.go

@@ -4,7 +4,10 @@
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+#cgo linux pkg-config: gtk+-3.0 
+#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1
+
 
 #include "gtk/gtk.h"
 

v2/internal/frontend/desktop/linux/menu.go

@@ -4,7 +4,9 @@
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+#cgo linux pkg-config: gtk+-3.0
+#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1
 
 #include "gtk/gtk.h"
 

v2/internal/frontend/desktop/linux/screen.go

@@ -4,7 +4,10 @@
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+#cgo linux pkg-config: gtk+-3.0 
+#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1
+
 #cgo CFLAGS: -w
 #include <stdio.h>
 #include "webkit2/webkit2.h"

v2/internal/frontend/desktop/linux/webkit2.go

@@ -3,7 +3,8 @@
 package linux
 
 /*
-#cgo linux pkg-config: webkit2gtk-4.0
+#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1
 #include "webkit2/webkit2.h"
 */
 import "C"

v2/internal/frontend/desktop/linux/window.go

@@ -4,7 +4,9 @@
 package linux
 
 /*
-#cgo linux pkg-config: gtk+-3.0 webkit2gtk-4.0
+#cgo linux pkg-config: gtk+-3.0
+#cgo !webkit2_41 pkg-config: webkit2gtk-4.0
+#cgo webkit2_41 pkg-config: webkit2gtk-4.1
 
 #include <JavaScriptCore/JavaScript.h>
 #include <gtk/gtk.h>

v2/internal/frontend/desktop/null/browser.go

@@ -1,5 +0,0 @@
-package null
-
-// BrowserOpenURL does nothing
-func (f *Frontend) BrowserOpenURL(url string) {
-}