Merge branch 'master' into v2-bugfix/loglevel-data-race

wailsapp · Dec 16, 2024 · 83384d1 · 83384d1
2 parents 7973fbf + e219e3b
commit 83384d1
Show file tree

Hide file tree

Showing 17 changed files with 59 additions and 35 deletions.
diff --git a/v2/go.mod b/v2/go.mod
@@ -32,16 +32,16 @@ require (
 	github.com/pterm/pterm v0.12.49
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
 	github.com/samber/lo v1.38.1
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.9.0
 	github.com/tc-hib/winres v0.2.1
 	github.com/tidwall/sjson v1.1.7
 	github.com/tkrajina/go-reflector v0.5.6
-	github.com/wailsapp/go-webview2 v1.0.17
+	github.com/wailsapp/go-webview2 v1.0.18
 	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.25.0
-	golang.org/x/sys v0.20.0
+	golang.org/x/sys v0.27.0
 	golang.org/x/tools v0.17.0
 )
 

diff --git a/v2/go.sum b/v2/go.sum
@@ -212,8 +212,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tc-hib/winres v0.2.1 h1:YDE0FiP0VmtRaDn7+aaChp1KiF4owBiJa5l964l5ujA=
 github.com/tc-hib/winres v0.2.1/go.mod h1:C/JaNhH3KBvhNKVbvdlDWkbMDO9H4fKKDaN7/07SSuk=
 github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
@@ -234,8 +234,8 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/wailsapp/go-webview2 v1.0.17 h1:DkLnUKqW7J///OBXkInMq1fzC88G6ZjHwKuHXThuaco=
-github.com/wailsapp/go-webview2 v1.0.17/go.mod h1:Uk2BePfCRzttBBjFrBmqKGJd41P6QIHeV9kTgIeOZNo=
+github.com/wailsapp/go-webview2 v1.0.18 h1:SSSCoLA+MYikSp1U0WmvELF/4c3x5kH8Vi31TKyZ4yk=
+github.com/wailsapp/go-webview2 v1.0.18/go.mod h1:qJmWAmAmaniuKGZPWwne+uor3AHMB5PFhqiK0Bbj8kc=
 github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
 github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
 github.com/wzshiming/ctc v1.2.3 h1:q+hW3IQNsjIlOFBTGZZZeIXTElFM4grF4spW/errh/c=
@@ -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.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+golang.org/x/sys v0.27.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=

diff --git a/v2/internal/frontend/desktop/darwin/single_instance.go b/v2/internal/frontend/desktop/darwin/single_instance.go
@@ -62,7 +62,7 @@ func HandleSecondInstanceData(secondInstanceMessage *C.char) {
 	}
 }
 
-// CreateLockFile tries to create a file with given name and acquire an
+// createLockFile tries to create a file with given name and acquire an
 // exclusive lock on it. If the file already exists AND is still locked, it will
 // fail.
 func createLockFile(filename string) (*os.File, error) {

diff --git a/v2/internal/frontend/desktop/windows/winc/controlbase.go b/v2/internal/frontend/desktop/windows/winc/controlbase.go
@@ -65,7 +65,7 @@ type ControlBase struct {
 	dispatchq []func()
 }
 
-// initControl is called by controls: edit, button, treeview, listview, and so on.
+// InitControl is called by controls: edit, button, treeview, listview, and so on.
 func (cba *ControlBase) InitControl(className string, parent Controller, exstyle, style uint) {
 	cba.hwnd = CreateWindow(className, parent, exstyle, style)
 	if cba.hwnd == 0 {

diff --git a/v2/internal/menumanager/processedMenu.go b/v2/internal/menumanager/processedMenu.go
@@ -23,7 +23,7 @@ type ProcessedMenuItem struct {
 	Hidden bool `json:",omitempty"`
 	// Checked indicates if the item is selected (used by Checkbox and Radio types only)
 	Checked bool `json:",omitempty"`
-	// Submenu contains a list of menu items that will be shown as a submenu
+	// SubMenu contains a list of menu items that will be shown as a submenu
 	// SubMenu []*MenuItem `json:"SubMenu,omitempty"`
 	SubMenu *ProcessedMenu `json:",omitempty"`
 	/*

diff --git a/v2/pkg/commands/buildtags/buildtags.go b/v2/pkg/commands/buildtags/buildtags.go
@@ -8,7 +8,7 @@ import (
 )
 
 // Parse parses the given tags string and returns
-// a cleaned slice of strings. Both comma and space delimeted
+// a cleaned slice of strings. Both comma and space delimited
 // tags are supported but not mixed. If mixed, an error is returned.
 func Parse(tags string) ([]string, error) {
 	if tags == "" {

diff --git a/v2/pkg/menu/menuitem.go b/v2/pkg/menu/menuitem.go
@@ -22,7 +22,7 @@ type MenuItem struct {
 	Hidden bool
 	// Checked indicates if the item is selected (used by Checkbox and Radio types only)
 	Checked bool
-	// Submenu contains a list of menu items that will be shown as a submenu
+	// SubMenu contains a list of menu items that will be shown as a submenu
 	// SubMenu []*MenuItem `json:"SubMenu,omitempty"`
 	SubMenu *Menu
 

diff --git a/website/docs/community/showcase/minesweeper-xp.mdx b/website/docs/community/showcase/minesweeper-xp.mdx
@@ -0,0 +1,10 @@
+# Minesweeper XP
+
+```mdx-code-block
+<p style={{ "text-align": "center" }}>
+  <img src={require("@site/static/img/showcase/minesweeper-xp.webp").default} />
+  <br />
+</p>
+```
+
+[Minesweeper-XP](https://git.new/Minesweeper-XP) allows you to experience the classic Minesweeper XP (+ 98 and 3.1) on macOS, Windows, and Linux!
diff --git a/website/docs/community/showcase/wailsterm.mdx b/website/docs/community/showcase/wailsterm.mdx
@@ -0,0 +1,10 @@
+# WailsTerm
+
+```mdx-code-block
+<p style={{ "text-align": "center" }}>
+  <img src={require("@site/static/img/showcase/wailsterm.webp").default} />
+  <br />
+</p>
+```
+
+[WailsTerm](https://github.com/rlshukhov/wailsterm) is a simple translucent terminal app powered by Wails and Xterm.js.
diff --git a/website/docs/gettingstarted/installation.mdx b/website/docs/gettingstarted/installation.mdx
@@ -7,7 +7,7 @@ sidebar_position: 1
 ## Supported Platforms
 
 - Windows 10/11 AMD64/ARM64
-- MacOS 10.13+ AMD64
+- MacOS 10.15+ AMD64 for development, MacOS 10.13+ for release
 - MacOS 11.0+ ARM64
 - Linux AMD64/ARM64
 

diff --git a/website/docs/guides/mac-appstore.mdx b/website/docs/guides/mac-appstore.mdx
@@ -81,9 +81,9 @@ wails build -platform darwin/universal -clean
 
 cp ./embedded.provisionprofile "./build/bin/$APP_NAME.app/Contents"
 
-codesign --timestamp --options=runtime -s "$APP_CERTIFICATE" -v --entitlements ./build/darwin/entitlements.plist ./build/bin/$APP_NAME.app
+codesign --timestamp --options=runtime -s "$APP_CERTIFICATE" -v --entitlements ./build/darwin/entitlements.plist "./build/bin/$APP_NAME.app"
 
-productbuild --sign "$PKG_CERTIFICATE" --component ./build/bin/$APP_NAME.app /Applications ./$APP_NAME.pkg
+productbuild --sign "$PKG_CERTIFICATE" --component "./build/bin/$APP_NAME.app" /Applications "./$APP_NAME.pkg"
 ```
 
 #### Upload App Bundle

diff --git a/website/docs/guides/sveltekit.mdx b/website/docs/guides/sveltekit.mdx
@@ -14,8 +14,8 @@ This guide will go into:
 - Navigate into your newly created myapp folder.
 - Delete the folder named "frontend"
 
-##### While in the Wails project root. Use your favorite package manager and install SvelteKit as the new frontend.  Follow the prompts.
-- `npm create svelte@latest frontend`
+##### While in the Wails project root. Use the Svelte CLI to create a SvelteKit project as the new frontend. Follow the prompts, nothing Wails specific is needed here.
+- `npx sv create frontend`
 
 ##### Modify wails.json.
 - Add `"wailsjsdir": "./frontend/src/lib",` Do note that this is where your Go and runtime functions will appear.

diff --git a/website/src/pages/changelog.mdx b/website/src/pages/changelog.mdx
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Changed
 - Removed documentation references for 'The default module name in go.mod is "changeme". You should change this to something more appropriate.' as it appears to be no longer relevant.
+- Update script in Mac App Store guide to support app names containing spaces by @cristianrgreco
 
 ### Added
 - Added option to set window class name on Windows. Added in [PR](https://github.com/wailsapp/wails/pull/3828) by @APshenkin
@@ -26,6 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed typo by @takuyahara in [PR](https://github.com/wailsapp/wails/pull/3846)
 - Fixed incorrect TS definition of `WindowSetSize` by @leaanthony
 - Fixed data race in loglevel change by @leaanthony in [PR](https://github.com/wailsapp/wails/pull/3905)
+- chore: fix some comments in [PR](https://github.com/wailsapp/wails/pull/3932) by @lvyaoting
+
 ### Changed
 - Allow to specify macos-min-version externally. Implemented by @APshenkin in [PR](https://github.com/wailsapp/wails/pull/3756)
 

diff --git a/website/static/img/showcase/minesweeper-xp.webp b/website/static/img/showcase/minesweeper-xp.webp
diff --git a/website/static/img/showcase/wailsterm.webp b/website/static/img/showcase/wailsterm.webp