Skip to content

Commit 81211d5

Browse files
authored
Merge branch 'v3-alpha' into v3-alpha-bugfix-auto_fill-auto_password_save
2 parents 46dd5ef + 7453df5 commit 81211d5

File tree

102 files changed

+5673
-2752
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+5673
-2752
lines changed

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

+20-13
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,23 @@ jobs:
223223
cd ${{ matrix.template }}
224224
wails3 build
225225
226-
results:
227-
if: ${{ always() }}
228-
runs-on: ubuntu-latest
229-
name: v3 Build Results
230-
needs: [test_go, test_js, test_templates]
231-
steps:
232-
- run: |
233-
result="${{ needs.build.result }}"
234-
if [[ $result == "success" || $result == "skipped" ]]; then
235-
exit 0
236-
else
237-
exit 1
238-
fi
226+
results:
227+
if: ${{ always() }}
228+
runs-on: ubuntu-latest
229+
name: v3 Build Results
230+
needs: [test_go, test_js, test_templates]
231+
steps:
232+
- run: |
233+
go_result="${{ needs.test_go.result }}"
234+
js_result="${{ needs.test_js.result }}"
235+
templates_result="${{ needs.test_templates.result }}"
236+
237+
if [[ $go_result == "success" || $go_result == "skipped" ]] && \
238+
[[ $js_result == "success" || $js_result == "skipped" ]] && \
239+
[[ $templates_result == "success" || $templates_result == "skipped" ]]; then
240+
echo "All required jobs succeeded or were skipped"
241+
exit 0
242+
else
243+
echo "One or more required jobs failed"
244+
exit 1
245+
fi

.github/workflows/pr-v3.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/checkout@v3
1818

1919
- name: Verify Changed files
20-
uses: tj-actions/verify-changed-files@v17
20+
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
2121
id: verify-changed-files
2222
with:
2323
files: |

.github/workflows/publish-npm.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Detect committed package.json changes
2525
id: package-json-changes
26-
uses: tj-actions/changed-files@v45
26+
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
2727
with:
2828
files: |
2929
v3/internal/runtime/desktop/@wailsio/runtime/package.json
@@ -32,7 +32,7 @@ jobs:
3232
if: >-
3333
steps.package-json-changes.outputs.any_modified != 'true'
3434
id: source-changes
35-
uses: tj-actions/changed-files@v45
35+
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
3636
with:
3737
files: |
3838
v3/internal/runtime/Taskfile.yaml

.github/workflows/semgrep.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches:
66
- main
77
- master
8+
- v3-alpha
89
paths:
910
- .github/workflows/semgrep.yml
1011
schedule:

.github/workflows/upload-source-documents.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- name: Verify Changed files
1717
id: changed-files
18-
uses: tj-actions/changed-files@v41
18+
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
1919
with:
2020
files: |
2121
website/**/*.mdx

docs/src/content/docs/changelog.mdx

+10
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7676
- Add cancellation support for query methods on `sqlite` service by [@fbbdev](https://github.com/fbbdev) in [#4067](https://github.com/wailsapp/wails/pull/4067)
7777
- Add prepared statement support to `sqlite` service with JS bindings by [@fbbdev](https://github.com/fbbdev) in [#4067](https://github.com/wailsapp/wails/pull/4067)
7878
- Fix auto save and password auto save always enabled by [@oSethoum](https://github.com/osethoum) in [#4134](https://github.com/wailsapp/wails/pull/4134)
79+
- Add `SetMenu()` on window to allow for setting a menu on a window by [@leaanthony](https://github.com/leaanthony)
80+
- Add Notification support by [@popaprozac] in [#4098](https://github.com/wailsapp/wails/pull/4098)
81+
-  Add File Association support for mac by [@wimaha](https://github.com/wimaha) in [#4177](https://github.com/wailsapp/wails/pull/4177)
82+
7983
### Fixed
8084

8185
- Fixed Windows+Linux Edit Menu issues by [@leaanthony](https://github.com/leaanthony) in [#3f78a3a](https://github.com/wailsapp/wails/commit/3f78a3a8ce7837e8b32242c8edbbed431c68c062)
@@ -107,8 +111,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
107111
-  Ensure menu updates occur on the main thread by [@leaanthony](https://github.com/leaanthony)
108112
- The dragging and resizing mechanism is now more robust and matches expected platform behaviour more closely by [@fbbdev](https://github.com/fbbdev) in [#4100](https://github.com/wailsapp/wails/pull/4100)
109113
- Fixed [#4097](https://github.com/wailsapp/wails/issues/4097) Webpack/angular discards runtime init code by [@fbbdev](https://github.com/fbbdev) in [#4100](https://github.com/wailsapp/wails/pull/4100)
114+
- Fixed initially-hidden menu items by [@IanVS](https://github.com/IanVS) in [#4116](https://github.com/wailsapp/wails/pull/4116)
110115
- Fixed assetFileServer not serving `.html` files when non-extension request when `[request]` doesn't exist but `[request].html` does
111116
- Fixed icon generation paths by [@robin-samuel](https://github.com/robin-samuel) in [#4125](https://github.com/wailsapp/wails/pull/4125)
117+
- Fixed Dialogs runtime function returning escaped paths on Windows by [TheGB0077](https://github.com/TheGB0077) in [#4188](https://github.com/wailsapp/wails/pull/4188)
118+
- Fixed Webview2 detection path in HKCU by [@leaanthony](https://github.com/leaanthony).
119+
- Fixed Windows icon generation task file name by [@yulesxoxo](https://github.com/yulesxoxo) in [#4219](https://github.com/wailsapp/wails/pull/4219).
112120

113121
### Changed
114122

@@ -137,6 +145,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
137145
- Built-in service types are now consistently called `Service` by [@fbbdev](https://github.com/fbbdev) in [#4067](https://github.com/wailsapp/wails/pull/4067)
138146
- Built-in service creation functions with options are now consistently called `NewWithConfig` by [@fbbdev](https://github.com/fbbdev) in [#4067](https://github.com/wailsapp/wails/pull/4067)
139147
- `Select` method on `sqlite` service is now named `Query` for consistency with Go APIs by [@fbbdev](https://github.com/fbbdev) in [#4067](https://github.com/wailsapp/wails/pull/4067)
148+
- Templates: moved runtime to "dependencies", organized package.json files by [@IanVS](https://github.com/IanVS) in [#4133](https://github.com/wailsapp/wails/pull/4133)
149+
- Creates and ad-hoc signs app bundles in dev to enable certain macOS APIs by [@popaprozac] in [#4171](https://github.com/wailsapp/wails/pull/4171)
140150

141151
## v3.0.0-alpha.9 - 2025-01-13
142152

docs/src/content/docs/guides/file-associations.mdx

+3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ fileAssociations:
6262
| description | Description shown in file properties | Windows |
6363
| iconName | Name of the icon file (without extension) in the build folder | All |
6464
| role | Application's role for this file type (e.g., `Editor`, `Viewer`) | macOS |
65+
| mimeType | MIME type for the file (e.g., `image/jpeg`) | macOS |
6566

6667
## Listening for File Open Events
6768

@@ -105,6 +106,8 @@ Let's walk through setting up file associations for a simple text editor:
105106
Run `wails3 generate icons --help` for more information.
106107
:::
107108

109+
- For macOS add copy statement like `cp build/darwin/documenticon.icns {{.BIN_DIR}}/{{.APP_NAME}}.app/Contents/Resources` in the `create:app:bundle:` task.
110+
108111
2. ### Configure File Associations
109112

110113
Edit the `build/config.yml` file to add your file associations:

docs/src/content/docs/learn/application-menu.mdx

+37
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,43 @@ Create a new application menu using the `NewMenu` method:
1616
menu := app.NewMenu()
1717
```
1818

19+
## Setting the Menu
20+
21+
The way to set the menu varies on the platform:
22+
23+
<Tabs>
24+
<TabItem label="macOS" icon="fa-brands:apple">
25+
26+
On macOS, there is only one menu bar per application. Set the menu using the `SetMenu` method of the application:
27+
28+
```go
29+
app.SetMenu(menu)
30+
```
31+
32+
</TabItem>
33+
34+
<TabItem label="Windows" icon="fa-brands:windows">
35+
36+
On Windows, there is a menu bar per window. Set the menu using the `SetMenu` method of the window:
37+
38+
```go
39+
window.SetMenu(menu)
40+
```
41+
42+
</TabItem>
43+
44+
<TabItem label="Linux" icon="fa-brands:linux">
45+
46+
On Linux, the menu bar is typically per window. Set the menu using the `SetMenu` method of the window:
47+
48+
```go
49+
window.SetMenu(menu)
50+
```
51+
52+
</TabItem>
53+
</Tabs>
54+
55+
1956
## Menu Roles
2057

2158
Wails provides predefined menu roles that automatically create platform-appropriate menu structures:

docs/src/content/docs/learn/build.mdx

+1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ the application on macOS. Key features include:
123123
- Building binaries for amd64, arm64 and universal (both) architectures
124124
- Generating `.icns` icon file
125125
- Creating an `.app` bundle for distributing
126+
- Ad-hoc signing `.app` bundles
126127
- Setting macOS-specific build flags and environment variables
127128

128129
## Task Execution and Command Aliases

0 commit comments

Comments
 (0)