Skip to content

Commit 663766f

Browse files
leaanthonyleaanthony
authored
Merge branch 'v3-alpha' into v3-update-templates
2 parents 4f2d83d + 7e989b9 commit 663766f

File tree

33 files changed

+271
-75
lines changed

33 files changed

+271
-75
lines changed

‎.github/workflows/build-and-test-alpha.yml renamed to ‎.github/workflows/build-and-test-v3.yml

+23-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,30 @@
1-
name: Build + Test v3 alpha
1+
name: Build + Test v3
22

33
on:
4-
push:
5-
branches: [v3-alpha, v3/*, v3-*]
6-
paths-ignore:
7-
- '../../docs/**/*'
8-
workflow_dispatch:
4+
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
6+
pull_request_review:
7+
types: [submitted]
98

109
jobs:
10+
check_approval:
11+
name: Check PR Approval
12+
runs-on: ubuntu-latest
13+
outputs:
14+
approved: ${{ steps.check.outputs.approved }}
15+
steps:
16+
- name: Check if PR is approved
17+
id: check
18+
run: |
19+
if [[ "${{ github.event.review.state }}" == "approved" || "${{ github.event.pull_request.approved }}" == "true" ]]; then
20+
echo "approved=true" >> $GITHUB_OUTPUT
21+
else
22+
echo "approved=false" >> $GITHUB_OUTPUT
23+
fi
24+
1125
test_go:
1226
name: Run Go Tests
27+
needs: check_approval
1328
runs-on: ${{ matrix.os }}
1429
strategy:
1530
fail-fast: false
@@ -58,6 +73,7 @@ jobs:
5873

5974
test_js:
6075
name: Run JS Tests
76+
needs: check_approval
6177
runs-on: ubuntu-latest
6278
strategy:
6379
matrix:
@@ -144,4 +160,4 @@ jobs:
144160
cd ./test-${{ matrix.template }}
145161
wails3 init -n ${{ matrix.template }} -t ${{ matrix.template }}
146162
cd ${{ matrix.template }}
147-
wails3 build
163+
wails3 build

‎docs/src/content/docs/changelog.mdx

+12-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2525

2626
## [Unreleased]
2727

28+
### Added
29+
- Support aarch64 AppImage builds by [@AkshayKalose](https://github.com/AkshayKalose) in [#3981](https://github.com/wailsapp/wails/pull/3981)
30+
31+
### Fixed
32+
- Fixed Windows+Linux Edit Menu issues by [@leaanthony](https://github.com/leaanthony) in [#3f78a3a](https://github.com/wailsapp/wails/commit/3f78a3a8ce7837e8b32242c8edbbed431c68c062)
33+
- Updated the minimum system version in macOS .plist files from 10.13.0 to 10.15.0 by [@AkshayKalose](https://github.com/AkshayKalose) in [#3981](https://github.com/wailsapp/wails/pull/3981)
34+
35+
## v3.0.0-alpha.9 - 2025-01-13
36+
2837
### Added
2938

3039
- `app.OpenFileManager(path string, selectFile bool)` to open the system file manager to the path `path` with optional highlighting via `selectFile` by [@Krzysztofz01](https://github.com/Krzysztofz01) [@rcalixte](https://github.com/rcalixte)
@@ -57,8 +66,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5766
- Common taskfile now defaults to generating Typescript bindings for Typescript templates by [@leaanthony](https://github.com/leaanthony)
5867
- Fix Close application on WM_CLOSE message when no windows are open/systray only by [@mmalcek](https://github.com/mmalcek) in [#3990](https://github.com/wailsapp/wails/pull/3990)
5968
- Fixed garble build by @5aaee9 in [#3192](https://github.com/wailsapp/wails/pull/3192)
60-
- Updated the minimum system version in macOS .plist files from 10.13.0 to 10.15.0 by [@AkshayKalose](https://github.com/AkshayKalose) in [#3981](https://github.com/wailsapp/wails/pull/3981)
61-
69+
- Fixed windows nsis builds by [@leaanthony](https://github.com/leaanthony)
6270

6371
### Changed
6472

@@ -70,6 +78,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7078
- [Windows] Reduced flicker when opening a window by [@leaanthony](https://github.com/leaanthony)
7179
- Removed `Window.Destroy` as this was intended to be an internal function by [@leaanthony](https://github.com/leaanthony)
7280
- Renamed `WindowClose` events to `WindowClosing` by [@leaanthony](https://github.com/leaanthony)
81+
- Frontend builds now use vite environment "development" or "production" depending on build type by [@leaanthony](https://github.com/leaanthony)
82+
- Update to go-webview2 v1.19 by [@leaanthony](https://github.com/leaanthony)
7383

7484
## v3.0.0-alpha.8.3 - 2024-12-07
7585

‎v3/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
github.com/pterm/pterm v0.12.51
3333
github.com/samber/lo v1.38.1
3434
github.com/tc-hib/winres v0.3.1
35-
github.com/wailsapp/go-webview2 v1.0.19-0.20241227010006-11c6e567b916
35+
github.com/wailsapp/go-webview2 v1.0.19
3636
github.com/wailsapp/mimetype v1.4.1
3737
github.com/wailsapp/task/v3 v3.40.1-patched3
3838
golang.org/x/sys v0.28.0

‎v3/go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,8 @@ github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
333333
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
334334
github.com/wailsapp/go-webview2 v1.0.19-0.20241227010006-11c6e567b916 h1:W0UQJWILiXJOOCg7ec5xJNqxkg4Ced5KCGO4tFAf13w=
335335
github.com/wailsapp/go-webview2 v1.0.19-0.20241227010006-11c6e567b916/go.mod h1:qJmWAmAmaniuKGZPWwne+uor3AHMB5PFhqiK0Bbj8kc=
336+
github.com/wailsapp/go-webview2 v1.0.19 h1:7U3QcDj1PrBPaxJNCui2k1SkWml+Q5kvFUFyTImA6NU=
337+
github.com/wailsapp/go-webview2 v1.0.19/go.mod h1:qJmWAmAmaniuKGZPWwne+uor3AHMB5PFhqiK0Bbj8kc=
336338
github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
337339
github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
338340
github.com/wailsapp/task/v3 v3.40.1-patched3 h1:i6O1WNdSur9CGaiMDIYGjsmj/qS4465zqv+WEs6sPRs=

‎v3/internal/commands/build_assets/Taskfile.tmpl.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ tasks:
44
go:mod:tidy:
55
summary: Runs `go mod tidy`
66
internal: true
7-
generates:
8-
- go.sum
9-
sources:
10-
- go.mod
117
cmds:
128
- go mod tidy
139

@@ -36,10 +32,17 @@ tasks:
3632
- task: install:frontend:deps
3733
- task: generate:bindings
3834
cmds:
39-
- npm run build -q
35+
- npm run {{ "{{.BUILD_COMMAND}}" }} -q
36+
env:
37+
PRODUCTION: {{ "'{{.PRODUCTION | default \"false\"}}'" }}
38+
vars:
39+
BUILD_COMMAND: {{ "'{{if eq .PRODUCTION \"true\"}}build{{else}}build:dev{{end}}'" }}
40+
4041

4142
generate:bindings:
4243
summary: Generates bindings for the frontend
44+
deps:
45+
- task: go:mod:tidy
4346
sources:
4447
- "**/*.go"
4548
- go.mod

‎v3/internal/commands/build_assets/windows/Taskfile.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ tasks:
99
deps:
1010
- task: common:go:mod:tidy
1111
- task: common:build:frontend
12+
vars:
13+
PRODUCTION: '{{.PRODUCTION}}'
1214
- task: common:generate:icons
1315
cmds:
1416
- task: generate:syso
@@ -47,7 +49,7 @@ tasks:
4749
PRODUCTION: "true"
4850
cmds:
4951
# Create the Microsoft WebView2 bootstrapper if it doesn't exist
50-
- wails3 generate webview2bootstrapper -dir {{.ROOT_DIR}}/build/windows/nsis
52+
- wails3 generate webview2bootstrapper -dir "{{.ROOT_DIR}}\build\windows\nsis"
5153
- makensis -DARG_WAILS_{{.ARG_FLAG}}_BINARY="{{.ROOT_DIR}}\{{.BIN_DIR}}\{{.APP_NAME}}.exe" project.nsi
5254
vars:
5355
ARCH: '{{.ARCH | default ARCH}}'

‎v3/internal/commands/generate_webview2.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ import (
1212
var webview2Bootstrapper []byte
1313

1414
type GenerateWebView2Options struct {
15-
Directory string `json:"directory"`
15+
Directory string `name:"dir" json:"directory"`
1616
}
1717

1818
func GenerateWebView2Bootstrapper(options *GenerateWebView2Options) error {
19+
println("options.Directory", options.Directory)
20+
options.Directory = filepath.Clean(options.Directory)
21+
println("cleaned options.Directory", options.Directory)
22+
1923
// If the file already exists, exit early
2024
if _, err := os.Stat(filepath.Join(options.Directory, "MicrosoftEdgeWebview2Setup.exe")); err == nil {
2125
return nil

‎v3/internal/templates/base/frontend/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build --minify false --mode development",
9-
"build:prod": "vite build --mode production",
8+
"build:dev": "vite build --minify false --mode development",
9+
"build": "vite build --mode production",
1010
"preview": "vite preview"
1111
},
1212
"devDependencies": {

‎v3/internal/templates/lit-ts/frontend/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "tsc && vite build"
8+
"build:dev": "tsc && vite build --minify false --mode development",
9+
"build": "tsc && vite build --mode production",
10+
"preview": "vite preview"
911
},
1012
"dependencies": {
1113
"lit": "^3.1.0"

‎v3/internal/templates/lit/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build",
8+
"build:dev": "vite build --minify false --mode development",
9+
"build": "vite build --mode production",
910
"preview": "vite preview"
1011
},
1112
"dependencies": {

‎v3/internal/templates/preact-ts/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "tsc && vite build",
8+
"build:dev": "tsc && vite build --minify false --mode development",
9+
"build": "tsc && vite build --mode production",
910
"preview": "vite preview"
1011
},
1112
"dependencies": {

‎v3/internal/templates/preact/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build",
8+
"build:dev": "vite build --minify false --mode development",
9+
"build": "vite build --mode production",
910
"preview": "vite preview"
1011
},
1112
"dependencies": {

‎v3/internal/templates/qwik-ts/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "tsc && vite build",
8+
"build:dev": "tsc && vite build --minify false --mode development",
9+
"build": "tsc && vite build --mode production",
910
"preview": "vite preview"
1011
},
1112
"devDependencies": {

‎v3/internal/templates/qwik/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build",
8+
"build:dev": "vite build --minify false --mode development",
9+
"build": "vite build --mode production",
910
"preview": "vite preview"
1011
},
1112
"devDependencies": {

‎v3/internal/templates/react-swc-ts/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "tsc && vite build",
8+
"build:dev": "tsc && vite build --minify false --mode development",
9+
"build": "tsc && vite build --mode production",
910
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
1011
"preview": "vite preview"
1112
},

‎v3/internal/templates/react-swc/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build",
8+
"build:dev": "vite build --minify false --mode development",
9+
"build": "vite build --mode production",
910
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
1011
"preview": "vite preview"
1112
},

‎v3/internal/templates/react-ts/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "tsc && vite build",
8+
"build:dev": "tsc && vite build --minify false --mode development",
9+
"build": "tsc && vite build --mode production",
910
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
1011
"preview": "vite preview"
1112
},

‎v3/internal/templates/react/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build",
8+
"build:dev": "vite build --minify false --mode development",
9+
"build": "vite build --mode production",
910
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
1011
"preview": "vite preview"
1112
},

‎v3/internal/templates/solid-ts/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "tsc && vite build",
8+
"build:dev": "tsc && vite build --minify false --mode development",
9+
"build": "tsc && vite build --mode production",
910
"preview": "vite preview"
1011
},
1112
"dependencies": {

‎v3/internal/templates/solid/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build",
8+
"build:dev": "vite build --minify false --mode development",
9+
"build": "vite build --mode production",
910
"preview": "vite preview"
1011
},
1112
"dependencies": {

‎v3/internal/templates/svelte-ts/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build",
8+
"build:dev": "vite build --minify false --mode development",
9+
"build": "vite build --mode production",
910
"preview": "vite preview",
1011
"check": "svelte-check --tsconfig ./tsconfig.json"
1112
},

‎v3/internal/templates/svelte/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build",
8+
"build:dev": "vite build --minify false --mode development",
9+
"build": "vite build --mode production",
910
"preview": "vite preview"
1011
},
1112
"devDependencies": {

‎v3/internal/templates/sveltekit-ts/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"private": true,
55
"scripts": {
66
"dev": "vite dev",
7-
"build": "vite build",
7+
"build:dev": "vite build --minify false --mode development",
8+
"build": "vite build --mode production",
89
"preview": "vite preview",
910
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
1011
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"

‎v3/internal/templates/sveltekit/frontend/package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
"private": true,
55
"scripts": {
66
"dev": "vite dev",
7-
"build": "vite build",
8-
"preview": "vite preview"
7+
"build:dev": "vite build --minify false --mode development",
8+
"build": "vite build --mode production",
9+
"preview": "vite preview",
10+
"check": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json",
11+
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --watch"
912
},
1013
"devDependencies": {
1114
"@sveltejs/adapter-auto": "^3.0.0",

‎v3/internal/templates/vanilla-ts/frontend/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "tsc && vite build --minify false --mode development",
9-
"build:prod": "tsc && vite build --mode production",
8+
"build:dev": "tsc && vite build --minify false --mode development",
9+
"build": "tsc && vite build --mode production",
1010
"preview": "vite preview"
1111
},
1212
"devDependencies": {

‎v3/internal/templates/vanilla/frontend/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build --minify false --mode development",
9-
"build:prod": "vite build --mode production",
8+
"build:dev": "vite build --minify false --mode development",
9+
"build": "vite build --mode production",
1010
"preview": "vite preview"
1111
},
1212
"devDependencies": {

‎v3/internal/templates/vue-ts/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vue-tsc && vite build",
8+
"build:dev": "vue-tsc && vite build --minify false --mode development",
9+
"build": "vue-tsc && vite build --mode production",
910
"preview": "vite preview"
1011
},
1112
"dependencies": {

‎v3/internal/templates/vue/frontend/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "vite build",
8+
"build:dev": "vite build --minify false --mode development",
9+
"build": "vite build --mode production",
910
"preview": "vite preview"
1011
},
1112
"dependencies": {

‎v3/internal/version/version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v3.0.0-alpha.8.3
1+
v3.0.0-alpha.9

0 commit comments

Comments
 (0)