Merge branch 'wailsapp:master' into master

.all-contributorsrc

@@ -158,7 +158,7 @@
       ]
     },
     {
-      "login": "codydbentley",
+      "login": "sircodemane",
       "name": "Cody Bentley",
       "avatar_url": "https://avatars.githubusercontent.com/u/6968902?v=4",
       "profile": "https://codybentley.dev/",

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,7 +7,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        ***Please note: No new bug reports are being accepted for Wails v1***
+        ***Please note: No bug reports are currently being accepted for Wails v3***
         Before submitting this issue, please do the following:
         - Do a web search for your error. This usually leads to a much better understanding of the issue.
         - Prove that the error is indeed a Wails bug and not an application bug, with a specific set of steps to reproduce. 
@@ -84,4 +84,4 @@ body:
       description: Add any other context about the problem here.
       placeholder: Add any other context about the problem here.
     validations:
-      required: false
+      required: false

.github/pull_request_template.md

@@ -1,3 +1,11 @@
+
+<!--
+READ CAREFULLY: Before submitting your PR, please ensure you have created an issue for your PR.
+It is essential that you do this so that we can discuss the proposed changes before you spend time on them.
+If you do not create an issue, your PR may be rejected without review.
+If a relevant issue already exists, please reference it in your PR by including `Fixes #<issue number>` in your PR description.
+-->
+
 # Description
 
 Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

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

@@ -2,7 +2,7 @@ name: Build + Test v2
 
 on:
   push:
-    branches: [release/*, master]
+    branches: [release/*, master, bugfix/*]
   workflow_dispatch:
 
 jobs:
@@ -12,45 +12,59 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        go-version: [1.18, 1.19]
+        os: [ubuntu-22.04, ubuntu-24.04, windows-latest, macos-latest, macos-11]
+        go-version: ['1.21']
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install linux dependencies
-        if: matrix.os == 'ubuntu-latest'
-        run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config
+      - uses: awalsh128/cache-apt-pkgs-action@latest
+        if: matrix.os == 'ubuntu-22.04'
+        with:
+          packages: libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config
+          version: 1.0
+
+      - uses: awalsh128/cache-apt-pkgs-action@latest
+        if: matrix.os == 'ubuntu-24.04'
+        with:
+          packages: libgtk-3-dev libwebkit2gtk-4.1-dev build-essential pkg-config
+          version: 1.0
 
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
+          cache-dependency-path: ./v2/go.sum
 
       - name: Run tests (mac)
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-latest' || matrix.os == 'macos-11'
         env:
           CGO_LDFLAGS: -framework UniformTypeIdentifiers -mmacosx-version-min=10.13
         working-directory: ./v2
         run: go test -v ./...
 
       - name: Run tests (!mac)
-        if: matrix.os != 'macos-latest'
+        if: matrix.os != 'macos-latest' && matrix.os != 'macos-11' && matrix.os != 'ubuntu-24.04'
         working-directory: ./v2
         run: go test -v ./...
 
+      - name: Run tests (Ubuntu 24.04)
+        if: matrix.os == 'ubuntu-24.04'
+        working-directory: ./v2
+        run: go test -v -tags webkit2_41 ./...
+
   test_js:
     name: Run JS Tests
     if: github.repository == 'wailsapp/wails'
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
@@ -72,7 +86,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-22.04, windows-latest, macos-latest, ubuntu-24.04, macos-11]
         template:
           [
             svelte,
@@ -89,30 +103,46 @@ jobs:
             vanilla-ts,
             plain,
           ]
-        go-version: [1.18, 1.19]
+        go-version: ['1.21']
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
+          cache-dependency-path: ./v2/go.sum
 
       - name: Build Wails CLI
         run: |
           cd ./v2/cmd/wails
           go install
           wails -help
 
-      - name: Install linux dependencies
-        if: matrix.os == 'ubuntu-latest'
+      - name: Install linux dependencies ( 22.04 )
+        if: matrix.os == 'ubuntu-22.04'
         run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config
 
-      - name: Generate template '${{ matrix.template }}'
+      - name: Install linux dependencies ( 24.04 )
+        if: matrix.os == 'ubuntu-24.04'
+        run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev build-essential pkg-config
+
+      - name: Generate & Build template '${{ matrix.template }}'
+        if: matrix.os != 'ubuntu-24.04'
         run: |
           mkdir -p ./test-${{ matrix.template }}
           cd ./test-${{ matrix.template }}
           wails init -n ${{ matrix.template }} -t ${{ matrix.template }} -ci
           cd ${{ matrix.template }}
           wails build -v 2
+
+      - name: Generate & Build template '${{ matrix.template }}' (ubuntu-24.04)
+        if: matrix.os == 'ubuntu-24.04'
+        run: |
+          mkdir -p ./test-${{ matrix.template }}
+          cd ./test-${{ matrix.template }}
+          wails init -n ${{ matrix.template }} -t ${{ matrix.template }} -ci
+          cd ${{ matrix.template }}
+          wails build -v 2 -tags webkit2_41
+

.github/workflows/generate-sponsor-image.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set Node
         uses: actions/setup-node@v2
         with:
-          node-version: 16.x
+          node-version: 20.x
 
       - name: Update Sponsors
         run: cd scripts/sponsors && chmod 755 ./generate-sponsor-image.sh && ./generate-sponsor-image.sh
@@ -25,7 +25,7 @@ jobs:
           SPONSORKIT_GITHUB_LOGIN: wailsapp
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: "chore: update sponsors.svg"
           add-paths: "website/static/img/sponsors.svg"

.github/workflows/pr.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Verify Changed files
-        uses: tj-actions/verify-changed-files@v11.1
+        uses: tj-actions/verify-changed-files@v17
         id: verify-changed-files
         with:
           files: |
@@ -26,23 +26,50 @@ 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
+
   test_go:
     name: Run Go Tests
     runs-on: ${{ matrix.os }}
     if: github.event.review.state == 'approved'
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        go-version: [1.18, 1.19]
+        os: [ubuntu-22.04, windows-latest, macos-latest, ubuntu-24.04]
+        go-version: ['1.21']
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Install linux dependencies
-        if: matrix.os == 'ubuntu-latest'
+      - name: Install linux dependencies ( 22.04 )
+        if: matrix.os == 'ubuntu-22.04'
         run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config
 
+      - name: Install linux dependencies ( 24.04 )
+        if: matrix.os == 'ubuntu-24.04'
+        run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev build-essential pkg-config
+
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
@@ -56,6 +83,11 @@ jobs:
         run: go test -v ./...
 
       - name: Run tests (!mac)
-        if: matrix.os != 'macos-latest'
+        if: matrix.os != 'macos-latest' && matrix.os != 'ubuntu-24.04'
         working-directory: ./v2
         run: go test -v ./...
+
+      - name: Run tests (Ubuntu 24.04)
+        if: matrix.os == 'ubuntu-24.04'
+        working-directory: ./v2
+        run: go test -v -tags webkit2_41 ./...

.github/workflows/semgrep.yml

@@ -0,0 +1,24 @@
+on:
+  workflow_dispatch: {}
+  pull_request: {}
+  push:
+    branches:
+    - main
+    - master
+    paths:
+    - .github/workflows/semgrep.yml
+  schedule:
+  # random HH:MM to avoid a load spike on GitHub Actions at 00:00
+  - cron: 14 16 * * *
+name: Semgrep
+jobs:
+  semgrep:
+    name: semgrep/ci
+    runs-on: ubuntu-20.04
+    env:
+      SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
+    container:
+      image: returntocorp/semgrep
+    steps:
+    - uses: actions/checkout@v3
+    - run: semgrep ci

.github/workflows/sync-translated-documents.yml

@@ -2,6 +2,8 @@ name: Sync Translations
 
 on:
   workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *"
 
 jobs:
   sync-translated-documents:
@@ -13,7 +15,7 @@ jobs:
       - name: Setup Nodejs
         uses: actions/setup-node@v2
         with:
-          node-version: 18.x
+          node-version: 20.x
 
       - name: Install Task
         uses: arduino/setup-task@v1

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

@@ -15,7 +15,7 @@ jobs:
 
       - name: Verify Changed files
         id: changed-files
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v41
         with:
           files: |
             website/**/*.mdx
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Nodejs
         uses: actions/setup-node@v2
         with:
-          node-version: 18.x
+          node-version: 20.x
 
       - name: Setup Task
         uses: arduino/setup-task@v1

.gitignore

@@ -36,3 +36,6 @@ v2/cmd/wails/internal/commands/initialise/templates/testtemplates/
 /v3/examples/build/bin/testapp
 /websitev3/site/
 /v3/examples/plugins/bin/testapp
+
+# Temporary called mkdocs, should be renamed to more standard -website or similar
+/mkdocs-website/site

.prettierignore

@@ -0,0 +1,3 @@
+website
+v2
+v3

.prettierrc.yml

@@ -0,0 +1,6 @@
+overrides:
+  - files:
+      - "**/*.md"
+    options:
+      printWidth: 80
+      proseWrap: always