Merge branch 'v3-alpha' into fix-hidden-menuitem

Author: leaanthony

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

@@ -91,7 +91,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [warp-windows-latest-x64-2x, warp-macos-15-arm64-6x, warp-ubuntu-latest-x64-2x]
+        os: [windows-latest, ubuntu-latest, macos-latest]
         go-version: [1.24]
 
     steps:
@@ -223,16 +223,23 @@ jobs:
           cd ${{ matrix.template }}
           wails3 build
 
-  results:
-    if: ${{ always() }}
-    runs-on: ubuntu-latest
-    name: v3 Build Results
-    needs: [test_go, test_js, test_templates]
-    steps:
-      - run: |
-          result="${{ needs.build.result }}"
-          if [[ $result == "success" || $result == "skipped" ]]; then
-            exit 0
-          else
-            exit 1
-          fi
+results:
+  if: ${{ always() }}
+  runs-on: ubuntu-latest
+  name: v3 Build Results
+  needs: [test_go, test_js, test_templates]
+  steps:
+    - run: |
+        go_result="${{ needs.test_go.result }}"
+        js_result="${{ needs.test_js.result }}"
+        templates_result="${{ needs.test_templates.result }}"
+        
+        if [[ $go_result == "success" || $go_result == "skipped" ]] && \
+           [[ $js_result == "success" || $js_result == "skipped" ]] && \
+           [[ $templates_result == "success" || $templates_result == "skipped" ]]; then
+          echo "All required jobs succeeded or were skipped"
+          exit 0
+        else
+          echo "One or more required jobs failed"
+          exit 1
+        fi

.github/workflows/pr.yml renamed to .github/workflows/pr-v3.yml

@@ -8,11 +8,10 @@ on:
     types: [submitted]
     branches:
       - master
-
 jobs:
   check_docs:
     name: Check Docs
-    if: ${{github.repository == 'wailsapp/wails' && contains(github.head_ref,'feature/')}}
+    if: ${{github.repository == 'wailsapp/wails' && github.base_ref == 'master'}}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -30,37 +29,37 @@ jobs:
         run: |
           echo "::warning::Feature branch does not contain any changes to the website."
 
-#  lint_go:
-#    name: Run Go Linters
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout code
-#        uses: actions/checkout@v4
-#
-#      - name: Setup Go
-#        uses: actions/setup-go@v4
-#        with:
-#          go-version: "1.21"
-#
-#      - name: Update go modules
-#        working-directory: ./v2
-#        run: go mod tidy
-#
-#      - name: Run Linter
-#        uses: golangci/golangci-lint-action@v3
-#        with:
-#          version: v1.54
-#          working-directory: ./v2
-#          args: --timeout=10m0s --config ./.golangci.yml
+  #  lint_go:
+  #    name: Run Go Linters
+  #    runs-on: ubuntu-latest
+  #    steps:
+  #      - name: Checkout code
+  #        uses: actions/checkout@v4
+  #
+  #      - name: Setup Go
+  #        uses: actions/setup-go@v4
+  #        with:
+  #          go-version: "1.21"
+  #
+  #      - name: Update go modules
+  #        working-directory: ./v2
+  #        run: go mod tidy
+  #
+  #      - name: Run Linter
+  #        uses: golangci/golangci-lint-action@v3
+  #        with:
+  #          version: v1.54
+  #          working-directory: ./v2
+  #          args: --timeout=10m0s --config ./.golangci.yml
 
   test_go:
     name: Run Go Tests
     runs-on: ${{ matrix.os }}
-    if: github.event.review.state == 'approved'
+    if: github.event.review.state == 'approved' && github.repository == 'wailsapp/wails' && github.base_ref == 'master'
     strategy:
       matrix:
         os: [ubuntu-22.04, windows-latest, macos-latest, ubuntu-24.04]
-        go-version: ['1.21']
+        go-version: ['1.23']
 
     steps:
       - name: Checkout code

docs/src/content/docs/changelog.mdx

@@ -109,6 +109,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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)
 - 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)
 - Fixed initially-hidden menu items by [@IanVS](https://github.com/IanVS) in [#4116](https://github.com/wailsapp/wails/pull/4116)
+- Fixed assetFileServer not serving `.html` files when non-extension request when `[request]` doesn't exist but `[request].html` does
+- Fixed icon generation paths by [@robin-samuel](https://github.com/robin-samuel) in [#4125](https://github.com/wailsapp/wails/pull/4125)
 
 ### Changed
 

v3/internal/assetserver/asset_fileserver.go

@@ -71,7 +71,15 @@ func (d *assetFileServer) serveFSFile(rw http.ResponseWriter, req *http.Request,
 
 	file, err := d.fs.Open(filename)
 	if err != nil {
-		return err
+		if s := path.Ext(filename); s == "" {
+			filename = filename + ".html"
+			file, err = d.fs.Open(filename)
+			if err != nil {
+				return err
+			}
+		} else {
+			return err
+		}
 	}
 	defer file.Close()
 

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

@@ -66,10 +66,10 @@ tasks:
     sources:
       - "appicon.png"
     generates:
-      - "icons.icns"
-      - "icons.ico"
+      - "darwin/icons.icns"
+      - "windows/icon.ico"
     cmds:
-      - wails3 generate icons -input appicon.png -macfilename darwin/icons.icns -windowsfilename windows/icons.ico
+      - wails3 generate icons -input appicon.png -macfilename darwin/icons.icns -windowsfilename windows/icon.ico
 
   dev:frontend:
     summary: Runs the frontend in development mode